Browse Source

Correctifs mode embeded et url reference

idleman 4 years ago
parent
commit
08a4a1fd36

+ 16 - 1
plugin/hackpoint/css/main.css

@@ -475,7 +475,8 @@ div.hackpoint-type-image[data-type="dropzone"] > ul > li > i.pointer{
 	.hackpoint.readonly .btn-delete-sketch,
 	.hackpoint.readonly #resources .delete-resource,
 	.hackpoint.readonly .resource-image .fas.fa-times,
-	.hackpoint.readonly .hackpoint-type-image > div{
+	.hackpoint.readonly .hackpoint-type-image > div,
+	.hackpoint.readonly .btn-private{
 		display:none;
 	}
 
@@ -497,4 +498,18 @@ div.hackpoint-type-image[data-type="dropzone"] > ul > li > i.pointer{
 	list-style-type: disc;
 	list-style-position: inside;
 	color:#a7c4e2;
+}
+
+
+.hackpoint-label{
+	font-size: 2rem;
+}
+
+
+.hackpoint.no-sidebar #resources-toolbar{
+	display: none;
+}
+
+.embeded{
+	
 }

+ 15 - 3
plugin/hackpoint/js/main.js

@@ -17,6 +17,9 @@ function init_plugin_hackpoint(){
 		onSort : hackpoint_sketch_search
 	});
 
+
+	
+	//http://127.0.0.1/hackpoint/index.php?module=hackpoint&page=sheet.sketch&id=1&embeded=1&sidebar=1#resource=2
 	hackpoint_resource_search();
 
 }
@@ -208,7 +211,7 @@ function hackpoint_sketch_share_mode(){
 	var data = {
 		sketch : $('#sketch-form').attr('data-id'),
 		resource : $.urlParam('resource'),
-		menu : $('.share-menu-mode').prop('checked')?1:0,
+		menu : $('.share-menu-mode').prop('checked')?0:1,
 		url : window.location.protocol+'//' + window.location.hostname + window.location.pathname
 	}
 	var html = Mustache.render(tpl,data);
@@ -284,6 +287,7 @@ function hackpoint_resource_search(callback,triggered){
     
     	var trigger =  '#resources li:eq(1)';
     	if(triggered){
+
     		trigger = triggered;
     	}else if($.urlParam('resource')){
     		trigger = '#resources li[data-id="'+$.urlParam('resource')+'"]';
@@ -309,8 +313,16 @@ function hackpoint_resource_edit(element){
 		.attr('data-id',id)
 		.attr('class','resource-'+r.resourceType);
 		
-
-		window.history.replaceState(null, null, "index.php?module=hackpoint&page=sheet.sketch&id="+$('#sketch-form').attr('data-id')+"&resource="+id);
+		var parameters = $.urlParam();
+		parameters.id = $('#sketch-form').attr('data-id');
+		parameters.resource = id;
+		var urlString = 'index.php?';
+		var parameterStrings = [];
+		for (var key in parameters) {
+			parameterStrings.push(key+'='+parameters[key]);
+		}
+		urlString+= parameterStrings.join('&');
+		window.history.replaceState(null, null, urlString);
 
 		init_components('#sketch-editor');
 		if(r.javascript){

+ 9 - 4
plugin/hackpoint/page.sheet.sketch.php

@@ -8,9 +8,14 @@ if(!$sketch->state &&  $sketch->creator != $myUser->login) throw new Exception("
 
 $sketchClasses = $sketch->creator != $myUser->login ? "readonly":"editable";
 
-if(isset($_['embeded']) && $_['embeded'] == 1) $sketchClasses .= ' embeded';
+if(isset($_['embeded']) && $_['embeded'] == 1){
+	$sketchClasses .= ' embeded';
+	echo '<style>#mainMenu{ display:none!important; } .page-sheet-sketch .container-fluid{padding-top:0}</style>';
+}
 if(isset($_['sidebar']) && $_['sidebar'] == 0) $sketchClasses .= ' no-sidebar';
 
+
+
 ?>
 <div class="hackpoint <?php echo $sketchClasses; ?>">
 	
@@ -48,7 +53,7 @@ if(isset($_['sidebar']) && $_['sidebar'] == 0) $sketchClasses .= ' no-sidebar';
 		<div  id="sketch-workspace">
 				<div class="row">
 					<div class="col-md-8">
-						<h3 class="m-0"><input id="label" name="label" class="form-control-plaintext d-inline-block w-50 pt-0 editable-input" placeholder="Nom du sketch ici" onblur="hackpoint_sketch_save();" value="<?php echo $sketch->label; ?>" type="text"></h3>
+						<h3 class="m-0"><input id="label" name="label" class="form-control-plaintext d-inline-block w-50 pt-0 editable-input hackpoint-label" placeholder="Nom du sketch ici" onblur="hackpoint_sketch_save();" value="<?php echo $sketch->label; ?>" type="text"></h3>
 					</div>
 					<div class="col-md-4">
 						<!-- toolbar -->
@@ -59,7 +64,7 @@ if(isset($_['sidebar']) && $_['sidebar'] == 0) $sketchClasses .= ' no-sidebar';
 								
 							</div>
 							<div class="btn-group mr-2" role="group" aria-label="Properties">
-								<label for="state" class="input-group-text pointer m-0" data-tooltip data-placement="bottom" title="Rendre publique/privé">
+								<label for="state" class="input-group-text pointer m-0 btn-private" data-tooltip data-placement="bottom" title="Rendre publique/privé">
 									<input id="state" name="state" class="form-control editable-input" onclick="hackpoint_sketch_save();" <?php echo $sketch->state?'checked="checked"':''; ?> type="checkbox" data-type="checkbox"> Publique
 								</label>
 							</div>
@@ -108,7 +113,7 @@ if(isset($_['sidebar']) && $_['sidebar'] == 0) $sketchClasses .= ' no-sidebar';
 	<label><input type="checkbox" data-type="checkbox" class="share-menu-mode form-control"> n'afficher que la ressource courante  </label> 
    	<textarea class="form-control share-input"></textarea>
 
-   	<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="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" data-close>Fermer</div>