Merge branch 'master' into 'spis-master'

# Conflicts:
#   css/area_sidetools.less

css/area_sidetools.less

@@ -73,7 +73,7 @@
     }
 
     p {
-        max-height: 200px;
+        max-height: 6rem;
         overflow-y: auto;
         background-color: @background_page-header;
         border: 1px solid @color-border;
@@ -169,4 +169,4 @@
             }
         }
     }
-}
+}

js/base/rem.min.js

@@ -0,0 +1,7 @@
+/**
+ * Module: rem - v1.3.2
+ * Description: A polyfill to parse CSS links and rewrite pixel equivalents into head for non supporting browsers
+ * Date Built: 2014-07-02
+ * Copyright (c) 2014  | Chuck Carpenter <chuck.carpenter@me.com>,Lucas Serven <lserven@gmail.com>;
+**/
+!function(e){"use strict";var t=function(){var e=document.createElement("div");return e.style.cssText="font-size: 1rem;",/rem/.test(e.style.fontSize)},n=function(){for(var e=document.getElementsByTagName("link"),t=[],n=0;n<e.length;n++)"stylesheet"===e[n].rel.toLowerCase()&&null===e[n].getAttribute("data-norem")&&t.push(e[n].href);return t},r=function(){for(var e=0;e<h.length;e++)l(h[e],o)},o=function(e,t){if(p.push(e.responseText),v.push(t),v.length===h.length){for(var n=0;n<v.length;n++)a(p[n],v[n]);(h=m.slice(0)).length>0?(v=[],p=[],m=[],r()):i()}},a=function(e,t){for(var n,r=d(e).replace(/\/\*[\s\S]*?\*\//g,""),o=/[\w\d\s\-\/\\\[\]:,.'"*()<>+~%#^$_=|@]+\{[\w\d\s\-\/\\%#:!;,.'"*()]+\d*\.?\d+rem[\w\d\s\-\/\\%#:!;,.'"*()]*\}/g,a=r.match(o),i=/\d*\.?\d+rem/g,s=r.match(i),c=/(.*\/)/,l=c.exec(t)[0],u=/@import (?:url\()?['"]?([^'\)"]*)['"]?\)?[^;]*/gm;null!==(n=u.exec(e));)m.push(0===n[1].indexOf("/")?n[1]:l+n[1]);null!==a&&0!==a.length&&(f=f.concat(a),g=g.concat(s))},i=function(){for(var e=/[\w\d\s\-\/\\%#:,.'"*()]+\d*\.?\d+rem[\w\d\s\-\/\\%#:!,.'"*()]*[;}]/g,t=0;t<f.length;t++){u+=f[t].substr(0,f[t].indexOf("{")+1);for(var n=f[t].match(e),r=0;r<n.length;r++)u+=n[r],r===n.length-1&&"}"!==u[u.length-1]&&(u+="\n}")}s()},s=function(){for(var e=0;e<g.length;e++)y[e]=Math.round(parseFloat(g[e].substr(0,g[e].length-3)*w))+"px";c()},c=function(){for(var e=0;e<y.length;e++)y[e]&&(u=u.replace(g[e],y[e]));var t=document.createElement("style");t.setAttribute("type","text/css"),t.id="remReplace",document.getElementsByTagName("head")[0].appendChild(t),t.styleSheet?t.styleSheet.cssText=u:t.appendChild(document.createTextNode(u))},l=function(t,n){try{var r=e.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP")||new ActiveXObject("Msxml2.XMLHTTP"):new XMLHttpRequest;r.open("GET",t,!0),r.onreadystatechange=function(){4===r.readyState&&n(r,t)},r.send(null)}catch(o){if(e.XDomainRequest){var a=new XDomainRequest;a.open("get",t),a.onload=function(){n(a,t)},a.onerror=function(){return!1},a.send()}}},d=function(t){return e.matchMedia||e.msMatchMedia||(t=t.replace(/@media[\s\S]*?\}\s*\}/g,"")),t};if(!t()){var u="",h=n(),m=[],f=[],g=[],p=[],v=[],y=[],w="";w=function(){var e,t=document,n=t.documentElement,r=t.body||t.createElement("body"),o=!t.body,a=t.createElement("div"),i=r.style.fontSize;return o&&n.appendChild(r),a.style.cssText="width:1em; position:absolute; visibility:hidden; padding: 0;",r.style.fontSize="1em",r.appendChild(a),e=a.offsetWidth,o?n.removeChild(r):(r.removeChild(a),r.style.fontSize=i),e}(),r()}}(window);

js/sidebar-menu.js

@@ -1,43 +1,104 @@
 ( function( $, spc ) {
 
-    var mainMenu = function(){
+    var addToggleLink = function($elem){
-        var $menu = $('.nav-main').find('> ul');
+            $elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>');
+        },
+        toggleState = function($toggler){
+            $toggler.toggleClass('closed');
+            $toggler.toggleClass('opened');
+        },
+        focusFirstSubLink = function($elem, is2nd){
 
-        try{
+            var $foc = (is2nd) ? $elem.find('a')[1] : $elem.find('a')[0];
-            if($menu.length > 0){
+
-                var $toggler = $menu.find('> li.level1 > .li'),
+            if($foc){
-                    $submenu = $menu.find('> li.level1 > ul');
+                $foc.focus();
-                if($toggler.length > 0 && $submenu.length > 0){
+            }
-                    $toggler.addClass('closed');
+            return $foc;
-                    $toggler.wrapInner('<a href="#toggleMenu" class="toggler"></a>');
+        },
-                    $toggler.each(function( index ) {
+        focusLastSubLink = function($elem){
-                        $(this).on( "click", function(e) {
+
-                            e.preventDefault();
+            var $foc = $elem.find('a:last-child'),
-                            var $this = $(this);
+                height = $elem.find('p').scrollHeight;
-                            $this.toggleClass('closed');
+
-                            $this.toggleClass('opened');
+            if($foc){
-                            if($this.hasClass('opened')){
+                $foc.focus();
-                                var $foc = $this.closest('li.level1').find('li.level2:first-child').find('a:first-child');
+            }
-                                if($foc.length > 0){
+            $elem.scrollTop(height);
-                                    $foc.focus();
+            return $foc;
+        },
+
+        mainMenu = function(){
+            var $menu = $('.nav-main').find('> ul');
+
+            try{
+                if($menu.length > 0){
+                    var $toggler = $menu.find('> li.level1 > .li'),
+                        $submenu = $menu.find('> li.level1 > ul');
+                    if($toggler.length > 0 && $submenu.length > 0){
+
+                        $toggler.addClass('closed');
+                        addToggleLink($toggler);
+                        $toggler.each(function( index ) {
+                            $(this).on( "click", function(e) {
+                                e.preventDefault();
+                                var $this = $(this);
+                                toggleState($this);
+                                if($this.hasClass('opened')){
+                                    var $foc = focusFirstSubLink($this.closest('li.level1'), true);
                                 }
-                            }
+                            });
                         });
-                    });
 
-                    //FIXME: store current nav state with local storage
+                        //FIXME: store current nav state with local storage
+                    }
+
+
                 }
 
+            }catch(err){
 
             }
+        },
+        sideMenu = function(){
+            var $menus = $('.tools').find('.toggle-menu');
 
-        }catch(err){
 
-        }
+            try{
-    };
+                $menus.each(function( ) {
+                    var $menu = $(this);
+                    if($menu.length > 0){
+                        var $toggler = $menu.find('h6'),
+                            $submenu = $menu.find('nav > ul, nav > div');
+                        if($toggler.length > 0 && $submenu.length > 0) {
+
+                            $toggler.addClass('closed');
+                            addToggleLink($toggler);
+                            $toggler.each(function (index) {
+                                $(this).on("click", function (e) {
+                                    e.preventDefault();
+                                    var $this = $(this);
+                                    toggleState($this);
+                                    if ($this.hasClass('opened')) {
+                                        var $elem = ($submenu.is('div')) ? focusLastSubLink($submenu): focusFirstSubLink($submenu,false);
+                                    }
+                                });
+                            });
+
+                            //FIXME: store current nav state with local storage
+                        }
+                    }
+                });
+
+
+            }catch(err){
+                alert('err');
+            }
+        };
 
     $(function(){
         mainMenu();
+        sideMenu();
     });
 
 } )( jQuery, spc );

script.js

@@ -24,10 +24,11 @@
 
 } )( jQuery, spc, wikiLang );
 
-
 /* DOKUWIKI:include js/plugins/do_tasks.js */
+
+
+
 /* DOKUWIKI:include js/sidebar-menu.js */
 
 
 
-