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

Template.php

@@ -88,7 +88,7 @@ class Template {
      * @return array
      */
     public function getMetaBoxTabs() {
-        global $lang;
+        global $lang, $INFO;
         $tabs = array();
 
         $toc = tpl_toc(true);
@@ -106,7 +106,7 @@ class Template {
                 'id' => 'spr__tab-tags',
                 'label' => tpl_getLang('tab_tags'),
                 'tab' => $this->plugins['tagging']->tpl_tags(false),
-                'count' => null, // FIXME
+                'count' => count($this->plugins['tagging']->findItems(array('pid' => $INFO['id']), 'tag')),
             );
         }
 

css/area_main-content-secedit.less

@@ -21,7 +21,6 @@
         z-index: 2;
         top: 0;
         float: right;
-        margin-top: 0;
 
         form div.no {
             button {

css/plugins/do_tasks.less

@@ -2,22 +2,21 @@
  * This file provides styles for do-task plugin
  */
 
-
 /* + + + + +  global  + + + + + */
 
 ul.page-attributes {
-    .plugin__do_pagetasks {
+    .plugin_do_pagetasks {
+        position: relative;
+        border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+
+        strong {
+            overflow: hidden;
+            background-color: @ini_background;
+            border-color: @noopentasks-border;
+            color: @ini_text_webframe;
+        }
+
         &.do_none {
-            position: relative;
-            border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
-
-            strong {
-                overflow: hidden;
-                background-color: @ini_background;
-                border-color: @noopentasks-border;
-                color: @ini_text_webframe;
-            }
-
             .num {
                 background-color: @noopentasks-border; // fix
                 color: @noopentasks-color; // fix

js/sidebar.js

@@ -12,18 +12,19 @@ jQuery(function () {
             $nav.find('div.nav-panel').hide(); // close all panels
             jQuery('body').addClass('wide-content');
             removeToggleStorage();
+            window.sessionStorage.setItem('wide-content', true);
         },
 
         /**
          * removes information about the toggle-state
          */
         removeToggleStorage = function () {
-            for (var index=0; index <= sessionStorage.length; index += 1) {
-                var item = sessionStorage.getItem('sidebar-section-' + index + '-open');
+            for (var index=0; index <= window.sessionStorage.length; index += 1) {
+                var item = window.sessionStorage.getItem('sidebar-section-' + index + '-open');
                 if (!item) {
-                    break;
+                    continue;
                 }
-                sessionStorage.removeItem('sidebar-section-' + index + '-open');
+                window.sessionStorage.removeItem('sidebar-section-' + index + '-open');
             }
         },
 
@@ -32,7 +33,7 @@ jQuery(function () {
          */
         setDefaultContent = function () {
             jQuery('body').removeClass('wide-content');
-
+            window.sessionStorage.setItem('wide-content', false);
         },
 
         /**
@@ -60,7 +61,7 @@ jQuery(function () {
                     focusFirstSubLink($panel);
                 }
             });
-            sessionStorage.setItem('sidebar-section-' + $toggler.data('index') + '-open', !isOpen);
+            window.sessionStorage.setItem('sidebar-section-' + $toggler.data('index') + '-open', !isOpen);
         },
 
         /**
@@ -123,7 +124,7 @@ jQuery(function () {
                     $toggler.parent('li').addClass('toggler');
                 }
 
-                if (sessionStorage.getItem('sidebar-section-' + index + '-open') === 'true') {
+                if (window.sessionStorage.getItem('sidebar-section-' + index + '-open') === 'true') {
                     $wrap.css('display', 'block');
                 }
 
@@ -166,6 +167,10 @@ jQuery(function () {
                     setWideContent();
                 }
             });
+
+            if (window.sessionStorage.getItem('wide-content') === 'true') {
+                setWideContent();
+            }
         },
 
         /**

tpl/nav-page-attributes.php

@@ -35,7 +35,7 @@ if($doPlugin !== null) {
         $class = 'do_late';
         $title = sprintf(tpl_getLang('tasks_page_late'), $count['undone'], $count['late']);
     }
-    $markup = "<li class=\"plugin__do_pagetasks $class\" title=\"$title\"><strong><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span><span class=\"num\">{$count['undone']}</span></strong></li>";
+    $markup = "<li class=\"plugin_do_pagetasks $class\" title=\"$title\"><strong><span class=\"num\">{$count['undone']}</span><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span></strong></li>";
 
     echo $markup;
 }
@@ -43,15 +43,3 @@ if($doPlugin !== null) {
 if($doPlugin !== null || $qcPlugin !== null) {
     echo "</ul>";
 }
-
-
-
-/*
-
-
-$out = '<div class="plugin__do_pagetasks" title="' . $title . '"><span class="' . $class . '">';
-$out .= $count['undone'];
-$out .= '</span></div>';
-
-if($return) return $out;
-echo $out;*/