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

# Conflicts:
#	css/area_sidetools.less

css/area_main-sidebar.less

@@ -10,6 +10,7 @@
 
 /* + + + + +  nav main  + + + + + */
     .nav-main {
+        padding-bottom: 1.8rem;
         > ul {
             @icon-size: 2rem;
 

css/area_sidetools.less

@@ -8,10 +8,11 @@
 .side-tools.main-sidebar {
     @icon-size: 2rem;
 
-    > nav {
-        margin-top: 1em;
+    counter-increment: bar-counter;
 
+    > nav {
         > ul {
+            padding-bottom: .4rem;
             margin-bottom: 0;
         }
     }
@@ -25,7 +26,7 @@
         padding: .5em 0 .5em (@icon-size + 1.1);
 
         &::before {
-            content: 'A';
+            content: counter(bar-counter, lower-alpha);
             position: absolute;
             top: 0;
             left: 0;
@@ -62,10 +63,43 @@
 
 
 /* + + +  linklist  + + + */
-    ul {
+    ul,
+    .trace {
         padding-left: (@icon-size + .5);
     }
 
+    ul {
+        border-bottom: 1px solid @color-border;
+    }
+
+    p {
+        max-height: 200px;
+        overflow-y: auto;
+        background-color: @background_page-header;
+        border: 1px solid @color-border;
+        padding: .4rem;
+
+        .bchead,
+        .bcsep {
+            display: none;
+        }
+
+        .breadcrumbs {
+            padding: 0;
+            margin: 0;
+        }
+
+        bdi {
+            display: block;
+            line-height: 125%;
+            padding: .1rem 0;
+        }
+
+        a {
+            cursor: pointer;
+        }
+    }
+
     li {
         list-style-type: none;
 

lang/de/lang.js

@@ -14,6 +14,7 @@ $lang['head_quick_search']          = 'wikiübergreifende Schnellsuche';
 $lang['head_menu_main']             = 'Hauptmenü';
 $lang['head_menu_status']           = 'Seitenstatus';
 $lang['head_breadcrumb']            = 'Standortanzeiger';
+$lang['head_menu_trace']            = 'zuletzt angesehen';
 
 $lang['quality_trigger']            = 'Seitenanalyse ein- bzw. ausblenden';
 

lang/de/lang.php

@@ -18,6 +18,7 @@ $lang['head_quick_search']          = 'wikiübergreifende Schnellsuche';
 $lang['head_menu_main']             = 'Hauptmenü';
 $lang['head_menu_status']           = 'Seitenstatus';
 $lang['head_breadcrumb']            = 'Standortanzeiger';
+$lang['head_menu_trace']            = 'zuletzt angesehen';
 
 $lang['quality_trigger']            = 'Seitenanalyse ein- bzw. ausblenden';
 

lang/en/lang.js

@@ -13,6 +13,7 @@ $lang['head_quick_search']          = 'quick search';
 $lang['head_menu_main']             = 'main menu';
 $lang['head_menu_status']           = 'site status';
 $lang['head_breadcrumb']            = 'location indicator';
+$lang['head_menu_trace']            = 'trace / visited last';
 
 $lang['quality_trigger']            = 'toggle page analysis';
 

lang/en/lang.php

@@ -18,6 +18,7 @@ $lang['head_quick_search']          = 'quick search';
 $lang['head_menu_main']             = 'main menu';
 $lang['head_menu_status']           = 'site status';
 $lang['head_breadcrumb']            = 'location indicator';
+$lang['head_menu_trace']            = 'trace / visited last';
 
 $lang['quality_trigger']            = 'toggle page analysis';
 

main.php

@@ -215,6 +215,16 @@ $showSidebar =  true; /*  */
                             ?>
                         </div><!-- .side-tools -->
 
+                        <div class="side-tools main-sidebar toggle-menu">
+                            <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* trace */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                            include('tpl/nav-trace.php');
+                            ?>
+                        </div><!-- .side-tools -->
 
                         <div class="sidebarfooter main-sidebar">
                             <?php

tpl/nav-trace.php

@@ -0,0 +1,11 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+
+    if ($conf['useacl'] && $showTools): ?>
+
+                            <nav class="nav-trace <?php echo $navClass?>">
+                                <h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_trace'); ?></h6>
+                                <div class="trace"><p><?php tpl_breadcrumbs(); ?></p></div>
+                            </nav><!-- #dokuwiki__usertools -->
+    <?php endif ?>
+