Browse Source

Correctifs bug modale close + non activation des ressources

idleman 4 years ago
parent
commit
ef82746c71

+ 1 - 1
install.php

@@ -154,7 +154,7 @@ try {
 				$right->save();
 			}
 
-			global $enablePlugins = array('fr.sys1.factory','fr.sys1.dashboard','fr.sys1.notification','fr.sys1.navigation');
+			$enablePlugins = array('fr.sys1.factory','fr.sys1.dashboard','fr.sys1.notification','fr.sys1.navigation');
 
 
 			if(!empty($custom['action'])) require_once($custom['pluginPath'].$custom['action']);

+ 3 - 0
plugin/hackpoint/css/main.css

@@ -439,3 +439,6 @@ div.hackpoint-type-image[data-type="dropzone"] > ul > li > i.pointer{
 
 
 
+#sketchs .card .progress-bar{
+	padding:5px;
+}

+ 10 - 3
plugin/hackpoint/hackpoint.plugin.php

@@ -36,9 +36,16 @@ function hackpoint_install($id){
 
 	global $conf;
 	require_once(__DIR__.SLASH.'ResourceType.class.php');
-	foreach(ResourceType::types(null,true) as $uid=>$type){
-		$conf->put('hackpoint_resource_'.$uid,true);
-	}
+	
+	$conf->put('hackpoint_resource_arduino',true);
+	$conf->put('hackpoint_resource_file',true);
+	$conf->put('hackpoint_resource_image',true);
+	$conf->put('hackpoint_resource_js',true);
+	$conf->put('hackpoint_resource_php',true);
+	$conf->put('hackpoint_resource_readme',true);
+	//foreach(ResourceType::types(null,true) as $uid=>$type){
+	//	$conf->put('hackpoint_resource_'.$uid,true);
+	//}
 }
 
 //Fonction executée lors de la désactivation du plugin

+ 5 - 0
plugin/hackpoint/js/main.js

@@ -68,6 +68,11 @@ modalize : function(options){
 		modal.show();
 		overlay.show();
 		$(o.blur).addClass('blur');
+
+		modal.find('[data-close]').click(function(){
+			modalize.hide();
+		});
+
 		overlay.click(function(){
 			modalize.hide();
 		});

+ 1 - 1
plugin/hackpoint/page.sheet.sketch.php

@@ -111,7 +111,7 @@ if(isset($_['sidebar']) && $_['sidebar'] == 0) $sketchClasses .= ' no-sidebar';
    	<div class="hidden shareCode"><a href="{{url}}?module=hackpoint&page=sheet.sketch&id={{sketch}}#resource={{resource}}"><small>Voir en taille réelle</small></a><br/><iframe frameborder="0" width="100%" align="center" height="400px" src="{{url}}?module=hackpoint&page=sheet.sketch&id={{sketch}}&embeded=1&sidebar={{menu}}#resource={{resource}}"></iframe></div>
     
     <div class="modalize-footer">
-      <div class="btn btn-dark">Fermer</div>
+      <div class="btn btn-dark" data-close>Fermer</div>
     </div>
   </div>
 </div>