# HG changeset patch # User rougeronj # Date 1420800700 -3600 # Node ID be82c14a0ad1c1ae30991156978a66fcc539b97e # Parent 0bde29f307891fd5920712c3f921ad3d0cbdacc7 Split the help popup in antoher html - Hide the help and the login at the begining so we don't see them while the page is loading - Minor css update diff -r 0bde29f30789 -r be82c14a0ad1 src/hdalab/static/hdalab/css/additionnal_renkan.css --- a/src/hdalab/static/hdalab/css/additionnal_renkan.css Fri Jan 09 11:11:51 2015 +0100 +++ b/src/hdalab/static/hdalab/css/additionnal_renkan.css Fri Jan 09 11:51:40 2015 +0100 @@ -33,4 +33,107 @@ .Rk-HdaTags-Search-Icon { background: url("../img/tag_purple.png") no-repeat 5px 2px; } - +.renkan_help{ + line-height: 32px; + float: right; + display: inline-block; +} +.renkan_help p { + display: inline; + font-size: 10px; +} +.renkan_help a { + display:block; +} +.renkan_help ul { + text-align: left; + display: inline; + margin: 0; + padding: 10px 2px 10px 0; + list-style: none; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.4); +} +.renkan_help ul li{ + z-index: 500; + font: bold 12px/18px sans-serif; + display: inline-block; + margin-right: -4px; + position: relative; + padding: 5px; + background: #fff; + cursor: pointer; + width:340px; + -moz-transition: all 0.2s; +} +.renkan_help ul li:hover{ + background: #555; + color:#fff; +} +.renkan_help ul li ul { + padding: 0; + position: absolute; + top: 28px; + left: 0; + width: 100%; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + display: none; + opacity: 0; + visibility: hidden; + -moz-transition: opacity 0.2s; +} +.renkan_help ul li ul li { + display: block; + transition: background-color 0.3s ease 0s; +} +.renkan_help ul li:hover ul { + display: block; + opacity: 1; + visibility: visible; +} +.renkan_help ul.disable, +.renkan_help ul.disable li, +.renkan_help ul.disable li:hover{ + background: none repeat scroll 0 0 #eeeeee; + box-shadow: none; + color: #c1c1c1; + cursor: default; +} +#graph-circle { + background: url("../img/graph-circle.png") no-repeat scroll right 5px center / 25px 25px #ffffff; +} +#graph-line { + background: url("../img/graph-line.png") no-repeat scroll right 5px center / 25px 25px #ffffff; +} +#graph-lineH { + background: url("../img/graph-lineH.png") no-repeat scroll right 5px center / 25px 25px #ffffff; +} +#graph-line:hover a, +#graph-circle:hover a{ + color: #4f5451; +} +#graph-line:hover, +#graph-circle:hover +{ + background-color: rgb(224,224,224); +} +#toggle-help{ +/* position: absolute; */ + background: url('../img/toggle-help.png') no-repeat right center; + background-size: 28px 28px; + height: 28px; + width: 28px; + display: inline-block; + vertical-align: middle; + margin-left: 20px; +} +#dialog-form{ + display: none; +} +#help-container{ + display: none; + padding:10px; + background: rgba(221,221,221,0.97); + border:none; +} \ No newline at end of file diff -r 0bde29f30789 -r be82c14a0ad1 src/hdalab/static/hdalab/css/renkan_help.css --- a/src/hdalab/static/hdalab/css/renkan_help.css Fri Jan 09 11:11:51 2015 +0100 +++ b/src/hdalab/static/hdalab/css/renkan_help.css Fri Jan 09 11:51:40 2015 +0100 @@ -1,107 +1,6 @@ -.renkan_help{ - line-height: 32px; - float: right; - display: inline-block; -} -.renkan_help p { - display: inline; - font-size: 10px; -} -.renkan_help a { - display:block; -} -.renkan_help ul { - text-align: left; - display: inline; - margin: 0; - padding: 10px 2px 10px 0; - list-style: none; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.4); -} -.renkan_help ul li{ - z-index: 500; - font: bold 12px/18px sans-serif; - display: inline-block; - margin-right: -4px; - position: relative; - padding: 5px; - background: #fff; - cursor: pointer; - width:340px; - -moz-transition: all 0.2s; -} -.renkan_help ul li:hover{ - background: #555; - color:#fff; -} -.renkan_help ul li ul { - padding: 0; - position: absolute; - top: 28px; - left: 0; - width: 100%; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - display: none; - opacity: 0; - visibility: hidden; - -moz-transition: opacity 0.2s; -} -.renkan_help ul li ul li { - display: block; - transition: background-color 0.3s ease 0s; -} -.renkan_help ul li:hover ul { - display: block; - opacity: 1; - visibility: visible; -} -.renkan_help ul.disable, -.renkan_help ul.disable li, -.renkan_help ul.disable li:hover{ - background: none repeat scroll 0 0 #eeeeee; - box-shadow: none; - color: #c1c1c1; - cursor: default; -} -#graph-circle { - background: url("../img/graph-circle.png") no-repeat scroll right 5px center / 25px 25px #ffffff; -} -#graph-line { - background: url("../img/graph-line.png") no-repeat scroll right 5px center / 25px 25px #ffffff; -} -#graph-lineH { - background: url("../img/graph-lineH.png") no-repeat scroll right 5px center / 25px 25px #ffffff; -} -#graph-line:hover a, -#graph-circle:hover a{ - color: #4f5451; -} -#graph-line:hover, -#graph-circle:hover -{ - background-color: rgb(224,224,224); -} -#toggle-help{ -/* position: absolute; */ - background: url('../img/toggle-help.png') no-repeat right center; - background-size: 28px 28px; - height: 28px; - width: 28px; - display: inline-block; - vertical-align: middle; - margin-left: 20px; -} - /* #################################################### */ /* -------------------- help Popup -------------------- */ /* #################################################### */ -#help-container{ - padding:10px; - background: rgba(221,221,221,0.97); - border:none; -} .ui-dialog { z-index:600; @@ -221,7 +120,7 @@ height: 31px; width: 31px; } -.img-close{ +#help-slideshow .img-close{ text-align: right; position:absolute; right:10px; @@ -230,7 +129,6 @@ padding-right:40px; background: url('../img/close.png') no-repeat right center; background-size: 34px 34px; - } .slideShowTitle{ diff -r 0bde29f30789 -r be82c14a0ad1 src/hdalab/templates/help_popup.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/templates/help_popup.html Fri Jan 09 11:51:40 2015 +0100 @@ -0,0 +1,46 @@ +{% load static %} +{% load i18n %} + + + +
+ {% trans 'Fermer
ce didacticiel' %} + +
\ No newline at end of file diff -r 0bde29f30789 -r be82c14a0ad1 src/hdalab/templates/renkan_edit.html --- a/src/hdalab/templates/renkan_edit.html Fri Jan 09 11:11:51 2015 +0100 +++ b/src/hdalab/templates/renkan_edit.html Fri Jan 09 11:51:40 2015 +0100 @@ -9,7 +9,6 @@ - {% endblock %} @@ -113,12 +112,10 @@ success: function(data, textStatus, jqXHR) { var d = $(data); if($(".ok",d).length==1){ + console.log("ok"); $("#dialog-form").html($(".ok",d)[0]); $(".hello-user").remove(); $("#nav").append($(".username",d).children()); - //$("#dialog-form .close").click(function(){ - // dialog.dialog( "close" ); - //}); io_options.user_authenticated = true; $(".Rk-Save-Button").addClass("Rk-Save-Online"); dialog.dialog( "close" ); @@ -209,47 +206,7 @@
-
- {% trans 'Fermer
ce didacticiel' %} - -
+ {% include 'help_popup.html' %}