Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

css/area_main-sidebar-nav.less

@@ -34,6 +34,10 @@
     }
 
     nav {
+        &.nav-main {
+            margin-bottom: 1rem;
+        }
+
         > p {
             color: @ini_nav_menu_color;
 
@@ -229,17 +233,18 @@
             // simple fake icon
             strong {
                 display: inline-block;
-                font-size: @icon-size * 0.5;
+                width: @icon-size * 0.98;
-                width: @icon-size * 0.9;
+                height: @icon-size * 0.98;
-                height: @icon-size * 0.9;
+                border: 2px solid fade(@ini_nav_menu_color, 80%);
-                line-height: @icon-size * 0.9;
-                margin: @icon-size * 0.05;
-                vertical-align: baseline;
-                text-align: center;
-                color: inherit;
-                border: 2px solid @ini_nav_menu_color;
                 border-top-right-radius: 50%;
                 border-bottom-left-radius: 50%;
+                color: inherit;
+                font-size: @icon-size * 0.5;
+                line-height: @icon-size * 0.9;
+                vertical-align: baseline;
+                text-align: center;
+                margin: @icon-size * 0.05;
+                padding: 0 .05em .05em;
             }
 
             // real icon

css/plugins/starred.less

@@ -24,6 +24,8 @@
 }
 
 nav.nav-starred {
+    margin-top: 1rem;
+
     ul {
         list-style: none;
 

js/base/helper.js

@@ -1,85 +0,0 @@
-/**
- * @file helper funcs
- *
- */
-
-// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-// shuffle func for random values
-// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-Array.prototype.shuffle = function(){
-    var tmp, rand;
-    for(var i =0; i < this.length; i++){
-        rand = Math.floor(Math.random() * this.length);
-        tmp = this[i];
-        this[i] = this[rand];
-        this[rand] =tmp;
-    }
-};
-// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-// js trim func for ie
-// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-if(typeof String.prototype.trim !== 'function') {
-    String.prototype.trim = function() {
-        return this.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-    };
-}
-var linkTo_UnCryptMailto = function(s){
-    location.href=decryptString(s,-2);
-};
-var decryptCharcode = function(n, start, end, offset) {
-    n = n + offset;
-    if (offset > 0 && n > end) {
-        n = start + (n - end - 1);
-    } else if (offset < 0 && n < start) {
-        n = end - (start - n - 1);
-    }
-    return String.fromCharCode(n);
-};
-var decryptString = function(enc, offset) {
-    var dec = '';
-    var len = enc.length;
-    for (var i = 0; i < len; i++) {
-        var n = enc.charCodeAt(i);
-        if (n >= 43 && n <= 58) {
-            dec += decryptCharcode(n, 43, 58, offset);
-        } else if (n >= 64 && n <= 90) {
-            dec += decryptCharcode(n, 64, 90, offset);
-        } else if (n >= 97 && n <= 122) {
-            dec += decryptCharcode(n, 97, 122, offset);
-        } else {
-            dec += enc.charAt(i);
-        }
-    }
-    return dec;
-};
-/**
- * simplify setting and getting state out of a node
- * $("#my_id").data("my_data_attr") equals $$("#my_id").my_data_attr and
- * $("#my_id").data("my_data_attr", "my_data_val") equals $$("#my_id").my_data_attr = my_data_val
- * you can also do
- * $$("#my_id").my_data_val = $$("#my_id").my_data_val + 1.
- */
-var $$ = function(param) {
-    var node = $(param)[0];
-    var id = $.data(node);
-    $.cache[id] = $.cache[id] || {};
-    $.cache[id].node = node;
-    return $.cache[id];
-};
-var alertFB = false;
-if (typeof console === "undefined" || typeof console.log === "undefined") {
-    console = {};
-    if (alertFB) {
-        console.log = function(msg) {
-            alert(msg);
-        };
-    } else {
-        console.log = function() {};
-    }
-}
-
-var wikiLang = "de";
-/**
- * anonymous func: get page language
- */
-(function($){ $("html").attr("lang"); if(typeof(l)!= 'undefined' && l.length>=2) wikiLang=l.substr(0,2).toLowerCase(); if(wikiLang!='de'&& wikiLang!='en') wikiLang='de'; })(jQuery);

js/base/spc.js

@@ -195,3 +195,65 @@
         }
     }
 };
+
+
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+// shuffle func for random values
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Array.prototype.shuffle = function(){
+    var tmp, rand;
+    for(var i =0; i < this.length; i++){
+        rand = Math.floor(Math.random() * this.length);
+        tmp = this[i];
+        this[i] = this[rand];
+        this[rand] =tmp;
+    }
+};
+
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+// js trim func for ie
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+if(typeof String.prototype.trim !== 'function') {
+    String.prototype.trim = function() {
+        return this.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    };
+}
+
+/**
+ * simplify setting and getting state out of a node
+ * $("#my_id").data("my_data_attr") equals $$("#my_id").my_data_attr and
+ * $("#my_id").data("my_data_attr", "my_data_val") equals $$("#my_id").my_data_attr = my_data_val
+ * you can also do
+ * $$("#my_id").my_data_val = $$("#my_id").my_data_val + 1.
+ */
+var $$ = function(param) {
+    var node = $(param)[0];
+    var id = $.data(node);
+    $.cache[id] = $.cache[id] || {};
+    $.cache[id].node = node;
+    return $.cache[id];
+};
+var alertFB = false;
+if (typeof console === "undefined" || typeof console.log === "undefined") {
+    console = {};
+    if (alertFB) {
+        console.log = function(msg) {
+            alert(msg);
+        };
+    } else {
+        console.log = function() {};
+    }
+}
+
+/**
+ * custom event handler ‘show’/’hide’ events for using .on()
+ */
+(function ($) {
+    $.each(['show', 'hide'], function (i, e) {
+        var el = $.fn[e];
+        $.fn[e] = function () {
+            this.trigger(e);
+            return el.apply(this, arguments);
+        };
+    });
+})(jQuery);

js/meta-box.js

@@ -16,12 +16,44 @@
      */
     var registerClickForTabsInMetaBox = function($metaBox) {
 
-        $metaBox.on('click', '.meta-tabs a', function (e) {
+            $metaBox.on('click', '.meta-tabs a', function (e) {
-            e.preventDefault();
+                e.preventDefault();
-            var $tab = $(this),
+                var $tab = $(this),
-                isopen = $tab.attr('aria-expanded') === 'true';
+                    isopen = $tab.attr('aria-expanded') === 'true';
 
-            // disable all existing tabs
+                // disable all existing tabs
+                disableExistingTabs($metaBox);
+
+
+                if (isopen) return; // tab was open, we closed it. we're done
+
+                // enable current tab
+                $tab
+                    .attr('aria-expanded', 'true')
+                    .closest('li')
+                    .addClass('active');
+                $metaBox.find($tab.attr('href'))
+                    .addClass('active')
+                    .attr('aria-hidden', 'false');
+
+            }).find('.meta-content').on('click', 'a[href*="#"]', function (e) {
+                disableExistingTabs($metaBox);
+                /* uses custome event handler hide see spc.js */
+            }).find('#tagging__edit').on('hide', function(e){
+                disableExistingTabs($metaBox);
+            });
+
+            /**
+             * in admin templates show toc tab, if available
+             */
+            if($('body').hasClass('do-admin')) {
+                var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]');
+                if($tocLink.length === 1) {
+                    $tocLink.trigger('click');
+                }
+            }
+        },
+        disableExistingTabs = function($metaBox) {
             $metaBox.find('.meta-tabs li')
                 .removeClass('active')
                 .find('a')
@@ -29,30 +61,7 @@
             $metaBox.find('.meta-content .tab-pane')
                 .removeClass('active')
                 .attr('aria-hidden', 'false');
-
+        };
-            if (isopen) return; // tab was open, we closed it. we're done
-
-            // enable current tab
-            $tab
-                .attr('aria-expanded', 'true')
-                .closest('li')
-                .addClass('active');
-            $metaBox.find($tab.attr('href'))
-                .addClass('active')
-                .attr('aria-hidden', 'false');
-
-        });
-
-        /**
-         * in admin templates show toc tab, if available
-         */
-        if($('body').hasClass('do-admin')) {
-            var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]');
-            if($tocLink.length === 1) {
-                $tocLink.trigger('click');
-            }
-        }
-    };
 
 
     $(function(){