Improves dropdown and add icons
authorrougeronj
Tue, 16 Dec 2014 11:25:37 +0100
changeset 409 ee7d77197432
parent 408 bac9b406de8e
child 410 84f2039b6007
Improves dropdown and add icons
src/hdalab/static/hdalab/css/renkan_help.css
src/hdalab/static/hdalab/img/graph-circle.png
src/hdalab/static/hdalab/img/graph-line.png
src/hdalab/static/hdalab/js/renkan-manual-save.js
src/hdalab/templates/renkan_edit.html
--- a/src/hdalab/static/hdalab/css/renkan_help.css	Tue Dec 16 10:54:43 2014 +0100
+++ b/src/hdalab/static/hdalab/css/renkan_help.css	Tue Dec 16 11:25:37 2014 +0100
@@ -3,6 +3,10 @@
     float: right;
     display: inline-block;
 }
+.renkan_help p {
+	display: inline;
+	font-size: 10px;
+}
 .renkan_help ul {
   text-align: left;
   display: inline;
@@ -20,7 +24,7 @@
   padding: 5px;
   background: #fff;
   cursor: pointer;
-  width:250px;
+  width:340px;
   -moz-transition: all 0.2s;
 }
 .renkan_help ul li:hover{
@@ -59,10 +63,10 @@
     cursor: default;
 }
 #graph-circle {
-	background: url("../img/graph-circle2.png") no-repeat scroll  right 5px center / 25px 25px #ffffff;
+	background: url("../img/graph-circle.png") no-repeat scroll  right 5px center / 25px 25px #ffffff;
 }
 #graph-line {
-	background: url("../img/graph-line2.png") no-repeat scroll  right 5px center / 25px 25px #ffffff;
+	background: url("../img/graph-line.png") no-repeat scroll  right 5px center / 25px 25px #ffffff;
 }
 #graph-line a{
 }
@@ -83,7 +87,7 @@
     width: 28px;
     display: inline-block;
 	vertical-align: middle;
-	margin-left: 10px;
+	margin-left: 20px;
 }
 
 /* #################################################### */
Binary file src/hdalab/static/hdalab/img/graph-circle.png has changed
Binary file src/hdalab/static/hdalab/img/graph-line.png has changed
--- a/src/hdalab/static/hdalab/js/renkan-manual-save.js	Tue Dec 16 10:54:43 2014 +0100
+++ b/src/hdalab/static/hdalab/js/renkan-manual-save.js	Tue Dec 16 11:25:37 2014 +0100
@@ -72,17 +72,15 @@
         _model.on("change remove", function(_model) {
             _checkLeave();
             if(canRemoveChangeShape && !changeShapeRemoved){
-            	console.log("KATAPLA");
-            	$("#graph-layout").addClass("disable");
-            	$("#graph-layout ul").remove();
+            	$(".renkan_help ul").addClass("disable");
+            	$(".renkan_help ul li ul").remove();
                 changeShapeRemoved = true;
             }
         });
         _checkLeave();
         if(canRemoveChangeShape && !changeShapeRemoved){
-        	console.log("KATAPLA2");
-        	$("#graph-layout").addClass("disable");
-        	$("#graph-layout ul").remove();
+        	$(".renkan_help ul").addClass("disable");
+        	$(".renkan_help ul li ul").remove();
             changeShapeRemoved = true;
         }
     });
--- a/src/hdalab/templates/renkan_edit.html	Tue Dec 16 10:54:43 2014 +0100
+++ b/src/hdalab/templates/renkan_edit.html	Tue Dec 16 11:25:37 2014 +0100
@@ -170,15 +170,16 @@
 <div class="all-title">
 	<h1><strong>RENKAN</strong></h1>
 	<div class="renkan_help">
-		<ul id="graph-layout">
+		<ul>
 			<li>
-				{% trans 'Graph Layout' %}
+				{% trans 'Changer de disposition' %}
+				<p> {% trans '(Indisponible si modification du RENKAN)' %}</p>
 				<ul>
 					{% if 'shape=circle' in switch_shape_url %}
 						<li id="graph-line"><a href="">&#10003&nbsp;{% trans 'See the graph in line' %}</a></li>
-						<li id="graph-circle"><a href="{{ switch_shape_url }}">&nbsp;&nbsp;{% trans 'See the graph in circle' %}</a></li>
+						<li id="graph-circle"><a href="{{ switch_shape_url }}">&nbsp;&nbsp;&nbsp;{% trans 'See the graph in circle' %}</a></li>
 					{% else %}
-						<li id="graph-line"><a href="{{ switch_shape_url }}">&nbsp;&nbsp;{% trans 'See the graph in line' %}</a></li>
+						<li id="graph-line"><a href="{{ switch_shape_url }}">&nbsp;&nbsp;&nbsp;{% trans 'See the graph in line' %}</a></li>
 						<li id="graph-circle"><a href="">&#10003&nbsp;{% trans 'See the graph in circle' %}</a></li>
 					{% endif %}
 				</ul>