# HG changeset patch # User cavaliet # Date 1411567394 -7200 # Node ID 46cd7ba5bbec19f5919842884bddc725a0f406a2 # Parent aec074085a81610d8ddebefead031ce9e00b8fe3 enhance onbeforeunload and prepare for help text diff -r aec074085a81 -r 46cd7ba5bbec src/hdalab/static/hdalab/css/additionnal_renkan.css --- a/src/hdalab/static/hdalab/css/additionnal_renkan.css Wed Sep 24 13:07:08 2014 +0200 +++ b/src/hdalab/static/hdalab/css/additionnal_renkan.css Wed Sep 24 16:03:14 2014 +0200 @@ -41,4 +41,40 @@ } #toggle-help{ float: right; +} +#help-container{ + display: none; + height: 360px; +} +#help-slideshow{ + height: 320px; +} +ul.bjqs-controls.v-centered li a{ + display:block; + padding:10px; + background:#fff; + color:#000; + text-decoration: none; +} + +ul.bjqs-controls.v-centered li a:hover{ + background:#000; + color:#fff; +} + +ol.bjqs-markers li a{ + padding:5px 10px; + background:#000; + color:#fff; + margin:5px; + text-decoration: none; +} + +ol.bjqs-markers li.active-marker a, +ol.bjqs-markers li a:hover{ + background: #999; +} + +p.bjqs-caption{ + background: rgba(255,255,255,0.5); } \ No newline at end of file diff -r aec074085a81 -r 46cd7ba5bbec src/hdalab/static/hdalab/js/renkan-manual-save.js --- a/src/hdalab/static/hdalab/js/renkan-manual-save.js Wed Sep 24 13:07:08 2014 +0200 +++ b/src/hdalab/static/hdalab/js/renkan-manual-save.js Wed Sep 24 16:03:14 2014 +0200 @@ -29,6 +29,8 @@ $(".Rk-Save-Button").addClass("Rk-Save-Online"); } canRemoveChangeShape = true; + _saveWarn = false; + $(window).off("beforeunload", _onLeave); } }); }; diff -r aec074085a81 -r 46cd7ba5bbec src/hdalab/static/hdalab/lib/bjqs-1.3.min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/lib/bjqs-1.3.min.js Wed Sep 24 16:03:14 2014 +0200 @@ -0,0 +1,14 @@ +/* + * Basic jQuery Slider plug-in v.1.3 + * + * http://www.basic-slider.com + * + * Authored by John Cobb + * http://www.johncobb.name + * @john0514 + * + * Copyright 2011, John Cobb + * License: GNU General Public License, version 3 (GPL-3.0) + * http://www.opensource.org/licenses/gpl-3.0.html + * + */(function(e){"use strict";e.fn.bjqs=function(t){var n={width:700,height:300,animtype:"fade",animduration:450,animspeed:4e3,automatic:!0,showcontrols:!0,centercontrols:!0,nexttext:"Next",prevtext:"Prev",showmarkers:!0,centermarkers:!0,keyboardnav:!0,hoverpause:!0,usecaptions:!0,randomstart:!1,responsive:!1},r=e.extend({},n,t),i=this,s=i.find("ul.bjqs"),o=s.children("li"),u=null,a=null,f=null,l=null,c=null,h=null,p=null,d=null,v={slidecount:o.length,animating:!1,paused:!1,currentslide:1,nextslide:0,currentindex:0,nextindex:0,interval:null},m={width:null,height:null,ratio:null},g={fwd:"forward",prev:"previous"},y=function(){o.addClass("bjqs-slide");r.responsive?b():E();if(v.slidecount>1){r.randomstart&&L();r.showcontrols&&x();r.showmarkers&&T();r.keyboardnav&&N();r.hoverpause&&r.automatic&&C();r.animtype==="slide"&&S()}r.usecaptions&&k();if(r.animtype==="slide"&&!r.randomstart){v.currentindex=1;v.currentslide=2}s.show();o.eq(v.currentindex).show();r.automatic&&(v.interval=setInterval(function(){O(g.fwd,!1)},r.animspeed))},b=function(){m.width=i.outerWidth();m.ratio=m.width/r.width,m.height=r.height*m.ratio;if(r.animtype==="fade"){o.css({height:r.height,width:"100%"});o.children("img").css({height:r.height,width:"100%"});s.css({height:r.height,width:"100%"});i.css({height:r.height,"max-width":r.width,position:"relative"});if(m.width');if(r.responsive&&m.width');a=e('
  • '+r.nexttext+"
  • ");f=e('
  • '+r.prevtext+"
  • ");u.on("click","a",function(t){t.preventDefault();var n=e(this).attr("data-direction");if(!v.animating){n===g.fwd&&O(g.fwd,!1);n===g.prev&&O(g.prev,!1)}});f.appendTo(u);a.appendTo(u);u.appendTo(i);if(r.centercontrols){u.addClass("v-centered");var t=(i.height()-a.children("a").outerHeight())/2,n=t/r.height*100,s=n+"%";a.find("a").css("top",s);f.find("a").css("top",s)}},T=function(){l=e('
      ');e.each(o,function(t,n){var i=t+1,s=t+1;r.animtype==="slide"&&(s=t+2);var o=e('
    1. '+i+"
    2. ");i===v.currentslide&&o.addClass("active-marker");o.on("click","a",function(e){e.preventDefault();!v.animating&&v.currentslide!==s&&O(!1,s)});o.appendTo(l)});l.appendTo(i);c=l.find("li");if(r.centermarkers){l.addClass("h-centered");var t=(r.width-l.width())/2;l.css("left",t)}},N=function(){e(document).keyup(function(e){if(!v.paused){clearInterval(v.interval);v.paused=!0}if(!v.animating)if(e.keyCode===39){e.preventDefault();O(g.fwd,!1)}else if(e.keyCode===37){e.preventDefault();O(g.prev,!1)}if(v.paused&&r.automatic){v.interval=setInterval(function(){O(g.fwd)},r.animspeed);v.paused=!1}})},C=function(){i.hover(function(){if(!v.paused){clearInterval(v.interval);v.paused=!0}},function(){if(v.paused){v.interval=setInterval(function(){O(g.fwd,!1)},r.animspeed);v.paused=!1}})},k=function(){e.each(o,function(t,n){var r=e(n).children("img:first-child").attr("title");r||(r=e(n).children("a").find("img:first-child").attr("title"));if(r){r=e('

      '+r+"

      ");r.appendTo(e(n))}})},L=function(){var e=Math.floor(Math.random()*v.slidecount)+1;v.currentslide=e;v.currentindex=e-1},A=function(e){if(e===g.fwd)if(o.eq(v.currentindex).next().length){v.nextindex=v.currentindex+1;v.nextslide=v.currentslide+1}else{v.nextindex=0;v.nextslide=1}else if(o.eq(v.currentindex).prev().length){v.nextindex=v.currentindex-1;v.nextslide=v.currentslide-1}else{v.nextindex=v.slidecount-1;v.nextslide=v.slidecount}},O=function(e,t){if(!v.animating){v.animating=!0;if(t){v.nextslide=t;v.nextindex=t-1}else A(e);if(r.animtype==="fade"){if(r.showmarkers){c.removeClass("active-marker");c.eq(v.nextindex).addClass("active-marker")}o.eq(v.currentindex).fadeOut(r.animduration);o.eq(v.nextindex).fadeIn(r.animduration,function(){v.animating=!1;v.currentslide=v.nextslide;v.currentindex=v.nextindex})}if(r.animtype==="slide"){if(r.showmarkers){var n=v.nextindex-1;n===v.slidecount-2?n=0:n===-1&&(n=v.slidecount-3);c.removeClass("active-marker");c.eq(n).addClass("active-marker")}r.responsive&&m.width + {% endblock %} {% block js_import %} {{block.super}} + @@ -119,6 +121,21 @@ form = dialog.find( "form" ).on( "submit", function( event ) { manageLoginForm(event, this); }); + + // Slider init + $('#help-slideshow').bjqs({ + animtype: 'slide', + height: 320, + width: 960, + showcontrols: true, + nexttext: "{% trans 'Next' %}", + prevtext: "{% trans 'Previous' %}", + showmarkers : true, + centermarkers : true + }); + $("#toggle-help").click(function(){ + $('#help-container').toggle(); + }); }); @@ -130,7 +147,16 @@ +
      +
      +
        +
      • Slide 1
      • +
      • Slide 2
      • +
      • Slide 3
      • +
      +