# HG changeset patch # User rougeronj # Date 1418725537 -3600 # Node ID ee7d77197432c6d6a08123a4c7f5dc48f8e7db6d # Parent bac9b406de8ec13cc4083b5b0804d6b6a8528f72 Improves dropdown and add icons diff -r bac9b406de8e -r ee7d77197432 src/hdalab/static/hdalab/css/renkan_help.css --- 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; } /* #################################################### */ diff -r bac9b406de8e -r ee7d77197432 src/hdalab/static/hdalab/img/graph-circle.png Binary file src/hdalab/static/hdalab/img/graph-circle.png has changed diff -r bac9b406de8e -r ee7d77197432 src/hdalab/static/hdalab/img/graph-line.png Binary file src/hdalab/static/hdalab/img/graph-line.png has changed diff -r bac9b406de8e -r ee7d77197432 src/hdalab/static/hdalab/js/renkan-manual-save.js --- 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; } }); diff -r bac9b406de8e -r ee7d77197432 src/hdalab/templates/renkan_edit.html --- 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 @@
{% trans '(Indisponible si modification du RENKAN)' %}