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

# Conflicts:
#	css/plugins/magic-matcher.less
This commit is contained in:
Silke Pisulla 2017-04-28 15:06:27 +02:00
commit cc0073cf46
22 changed files with 345 additions and 184 deletions

View file

@ -205,4 +205,50 @@ class Template {
echo $mobile;
}
}
/**
* Add the current mode information to the hierarchical breadcrumbs
*/
public function breadcrumbSuffix() {
global $ACT;
global $lang;
global $INPUT;
global $ID;
global $conf;
global $IMG;
if($ACT == 'show') return;
// find an apropriate label for the current mode
if($ACT) {
$label = tpl_getLang('mode_' . $ACT);
if(!$label) {
if(isset($lang['btn_' . $ACT])) {
$label = $lang['btn_' . $ACT];
} else {
$label = $ACT;
}
}
} else {
// actually we would need to create a proper namespace breadcrumb path here,
// but this is the most simplest thing we can do for now
if(defined('DOKU_MEDIADETAIL')) {
$label = hsc(noNS($IMG));
} else {
return;
}
}
if($ACT == 'admin' && $INPUT->has('page')) {
$link = wl($ID, array('do' => 'admin'));
echo '<bdi> : <a href="' . $link . '"><strong>' . $label . '</strong></a></bdi>';
/** @var \DokuWiki_Admin_Plugin $plugin */
$plugin = plugin_load('admin', $INPUT->str('page'));
if(!$plugin) return;
$label = $plugin->getMenuText($conf['lang']);
}
echo '<bdi><span class="curid"> : <strong>' . $label . '</strong></span></bdi>';
}
}

View file

@ -56,7 +56,7 @@
&::after {
background-color: @ini_existing;
background-image: url("svg.php?svg=pencil.svg&f=background_content");
background-image: url("svg.php?svg=pencil.svg&f=background");
border-color: @ini_existing;
}
}

View file

@ -6,7 +6,7 @@
#dokuwiki__content.main-content {
.level2 {
div[class^="level"] {
p a.media {
img {
border: 1px dotted @ini_background_site;
@ -23,7 +23,8 @@
}
> div,
.section_highlight > div {
.section_highlight > div,
div[class^="level"] {
> ul,
> ol {
&:not([class="tabs"]) > li {

View file

@ -10,9 +10,7 @@
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small * 2;
nav > p,
.mmissuelist li,
.mmissuelist div {
nav > p {
color: @ini_nav_menu_color;
&.noissue {
@ -44,35 +42,6 @@
}
}
/* jira itemlist */
.mmissuelist {
li {
&.noissue {
list-style-type: none;
margin-left: 0;
}
a {
display: inline-block;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
}
}
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
@ -93,8 +62,14 @@
}
}
// the wrapper around the toggle to reserve space
div.nav {
height: @icon-size + @margin-small;
border: 1px solid transparent;
}
// the toggle element
a.nav {
div.nav a {
.display-flex();
.align-items();
@ -154,7 +129,6 @@
border: 2px solid @ini_nav_menu_color;
border-top-right-radius: 50%;
border-bottom-left-radius: 50%;
transition: @transition border-color;
}
// real icon
@ -177,6 +151,11 @@
color: @ini_nav_menu_hover_color;
text-decoration: none;
// always show label, even with collapsed sidebar
position: absolute;
z-index: 100;
width: 100%;
span.ico {
border-color: inherit;
@ -278,24 +257,30 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
/* max-width: 1439px */
@media @screen_max-md {
// show when toggled
body.show-mobile-sidebar {
.search.main-sidebar {
display: block !important;
position: relative;
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
form {
margin-bottom: 1rem;
.no {
display: block;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
body.show-mobile-sidebar {
#dokuwiki__aside {
> nav {
position: relative;
@ -320,7 +305,6 @@
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
@ -339,3 +323,4 @@
}
}
}

View file

@ -181,30 +181,32 @@
/* + + + + + wide page content + + + + + */
.wide-content {
.search.main-sidebar {
p.toggleSearch {
position: relative;
z-index: 1;
display: block;
float: left;
width: 100%;
}
form {
input {
border: 0 none;
@media @screen_min-md {
.wide-content {
.search.main-sidebar {
p.toggleSearch {
position: relative;
z-index: 1;
display: block;
float: left;
width: 100%;
}
.no {
#qsearch__in {
width: 0;
padding: 0;
margin: 0;
form {
input {
border: 0 none;
}
button[type="submit"] {
display: none;
.no {
#qsearch__in {
width: 0;
padding: 0;
margin: 0;
}
button[type="submit"] {
display: none;
}
}
}
}

View file

@ -37,6 +37,11 @@
border: 0 none;
}
+ .msg-area + a {
clear: right;
margin-top: 20px;
}
.tab-container {
display: table;
@ -124,6 +129,7 @@
* {
cursor: pointer;
color: inherit;
font-size: inherit;
}
.prefix {
@ -294,9 +300,38 @@
}
}
+ .msg-area + a {
clear: right;
margin-top: 20px;
/* + + + + + tab issues + + + + + */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
li {
&.noissue {
list-style-type: none;
margin-left: 0;
}
a {
display: inline-block;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
}
}
}

View file

@ -15,6 +15,7 @@
@nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing;
@background_darker: rgba(230,230,230, .2);
@ini_sidebar_width: (100 - @ini_site_width) - 4;
@height-context-bar: 50px;

View file

@ -151,7 +151,7 @@
&:active,
&:focus {
background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_bg;
color: @ini_nav_menu_hover_bg;
.prefix {

View file

@ -73,23 +73,7 @@
z-index: 900;
}
/* if z-index is needed for .tools col, then use this:
.tools .row > .col-xs-12 {
z-index: 5; // SPR-945 sometimes too small space for suggestionlist
}
.wide-content .tools .row > .col-xs-12 {
z-index: 1;
}
*/
.header .row > .col-xs-12 {
z-index: 2;
}
.content .row > .col-xs-12 {
z-index: 3;
border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
}

View file

@ -7,8 +7,18 @@
#dokuwiki__content {
#config__manager {
fieldset {
min-width: 100%;
overflow-x: auto;
box-sizing: border-box;
background-color: @background_darker;
margin-left: 0;
margin-right: 0;
}
.selectiondefault {
background-color: transparent;
color: inherit;
}
tr {
@ -16,6 +26,12 @@
background-color: transparent;
color: inherit;
}
&:hover {
td {
color: inherit;
}
}
}
tr.default {
@ -23,5 +39,124 @@
background-color: transparent;
}
}
td.label {
padding: .8em 0 1.2em 1em;
span.outkey {
background-color: @ini_background;
color: inherit;
font-size: (@font-size-small - .06);
font-weight: bold;
padding: 0 @very-small-spacing;
a {
font-size: inherit;
}
}
label {
line-height: @line-height-big;
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1024px */
@media @screen_max-md {
#dokuwiki__content {
#config__manager {
td {
&.label {
label,
span {
font-size: @font-size-small;
}
}
&.label + td {
font-size: @font-size-small;
span {
font-size: inherit;
}
}
select,
input.edit {
font-size: @font-size-small;
}
}
.selectiondefault {
label {
font-size: @font-size-small;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 768px */
@media @screen_max-sm {
#dokuwiki__content {
#config__manager {
table {
border-top: 0 none;
}
td {
padding-top: 0;
&.label {
display: block;
width: 100%;
border: 0 none;
border-top: 1px solid @ini_border;
border-bottom: 0 none;
padding: .8em .5em .3em;
span.outkey {
margin-left: 0;
}
}
.input {
width: 100%;
}
&.value,
&.label + td {
display: block;
width: 100%;
border: 0 none;
margin-bottom: 1.2rem;
}
select,
input.edit {
width: 100%;
text-overflow: ellipsis;
}
}
.selectiondefault {
float: none;
max-width: 100%;
width: auto;
label {
width: 90%;
}
}
}
}
}

View file

@ -7,7 +7,7 @@
/* + + + + + global + + + + + */
#dokuwiki__content {
.dataplugin_entry.mitarbeiter.sectionedit2 {
.dataplugin_entry {
dl {
margin-left: 0;
margin-right: 0;

View file

@ -86,16 +86,6 @@
}
/* + + + + + in meta box + + + + + */
/* see area_nav-metabox.less */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
}
}
/* + + + + + in content + + + + + */
a.jiralink {
font-size: @font-size-default;

View file

@ -63,7 +63,7 @@
&:focus,
&:active {
background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content");
background-image: url("svg.php?svg=file-export.svg&f=background");
border-color: @ini_existing;
color: @ini_background;
text-decoration: none;
@ -104,8 +104,7 @@
z-index: 3;
box-shadow: @box-shadow-bottom;
.hint p {
color: @color-editBox;
p.hint {
margin-top: @small-spacing;
margin-bottom: @margin-small;
}

View file

@ -12,7 +12,7 @@
li {
&.t0 a {
font-size: .9rem;
font-size: .88rem;
}
&.t1 a {
font-size: 1rem;

View file

@ -1,30 +0,0 @@
/**
* Sets up the breadcrumb behaviour (adds do / ACT status information)
* or adds tpl_getLang('image_detail') on detail template
*/
(function($) {
var setBreadcrumbSuffix = function(){
var $breadcrumb = $('.breadcrumbs');
if (!$breadcrumb.length) return;
/**
* add ACT status to breadcrumb (if not show)
* or tpl_getLang('image_detail') on detail.php
*/
var mode = $breadcrumb.attr('data-do');
if(mode && mode.indexOf('show') !== 0){
var markup = '<bdi lang="en"><span class="curid"> : <strong>' + mode + '</strong></span></bdi>';
$breadcrumb.find('p').append(markup);
}
};
$(function(){
setBreadcrumbSuffix();
});
})(jQuery);

View file

@ -48,10 +48,10 @@ jQuery(function () {
/**
* Toggle a navigation panel
*
* @param {jQuery} $toggler The h6 toggler
* @param {jQuery} $toggler The a toggler
*/
toggleNav = function ($toggler) {
var $panel = $toggler.next('div.nav-panel');
var $panel = $toggler.parent().next('div.nav-panel');
var isOpen = $panel.is(':visible');
// open sidebar on interaction
setDefaultContent();
@ -96,7 +96,6 @@ jQuery(function () {
// make the new toggler
var $toggler = jQuery('<a>')
.addClass('nav')
.attr('href', '#')
.attr('role', 'heading')
.attr('aria-level', '2')
@ -105,6 +104,7 @@ jQuery(function () {
.prepend($icon)
.data('index', index)
;
$toggler = jQuery('<div class="nav">').prepend($toggler);
// wrap all following siblings til the next element in a wrapper
var $wrap = jQuery('<div>')
@ -135,7 +135,7 @@ jQuery(function () {
* Initialize the open/close toggling of menu entries
*/
initMenuHandling = function () {
$nav.on('click', 'a.nav', function (e) {
$nav.on('click', 'div.nav a', function (e) {
toggleNav(jQuery(this));
e.preventDefault();
});

View file

@ -20,9 +20,10 @@ $lang['head_magic_matcher'] = 'MagicMatcher';
$lang['head_quick_search'] = 'wikiübergreifende Schnellsuche';
$lang['head_menu_main'] = 'Hauptmenü';
$lang['head_menu_status'] = 'Seitenstatus';
$lang['head_breadcrumb'] = 'Standortanzeiger';
$lang['head_breadcrumb_youarehere'] = 'Standortanzeiger';
$lang['head_menu_trace'] = 'Zuletzt Angesehen';
$lang['head_meta_box'] = 'Metainformationen zur Seite';
$lang['head_menu_starred'] = 'gemerkte Seite';
$lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche';
@ -31,12 +32,17 @@ $lang['meta_box_tags_none'] = 'Keine Tags verknüpft';
$lang['js']['meta_box_toc_none'] = 'kein Inhaltsverzeichnis vorhanden';
$lang['tab_tags'] = 'Tags';
$lang['tab_issues'] = 'Issues';
$lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden';
$lang['prefix_tasks'] = 'offene Aufgaben: ';
$lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: ';
$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: ';
$lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite';
$lang['tasks_page_intime'] = 'Es gibt %1$d offenen Aufgaben für diese Seite.';
$lang['tasks_page_late'] = 'Es gibt %1$d offenen Aufgaben für diese Seite, %2$d sind zu spät.';
$lang['discussion'] = 'Diskussion';
$lang['back_to_article'] = 'Zurück zum Artikel';
@ -48,6 +54,9 @@ $lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster'
$lang['image_detail'] = 'Detailinformationen zum Bild';
$lang['mode_edit'] = 'Seite bearbeiten';
$lang['mode_detail'] = 'Details zum Bild';
/**
* colors
*/
@ -55,11 +64,11 @@ $lang['image_detail'] = 'Detailinformationen zum Bild';
$lang['__site_width__'] = 'Content - Breite (in %)';
$lang['__background_site__'] = 'Website - Hintergrundfarbe';
$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe';
$lang['__text_webframe__'] = 'Claim, Titel, Footer (unverlinkt), Navigation (unverlinkt) - Schriftfarbe';
$lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe';
$lang['__nav_menu_hover_color__'] = 'verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
$lang['__nav_menu_hover_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
$lang['__nav_menu_color__'] = 'Navigation (verlinkt), Footer (verlinkt), Pagetools Icons, Tabbox - Schriftfarbe';
$lang['__nav_menu_hover_color__'] = 'Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
$lang['__nav_menu_hover_bg__'] = 'Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
$lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__text__'] = 'Content: Text - Schriftfarbe';
@ -82,8 +91,8 @@ $lang['__missing__'] = 'Links zu nicht vorhandenen Wikiseiten - S
$lang['__button_color__'] = 'Buttons - Schriftfarbe';
$lang['__button_background__'] = 'Buttons - Hintergrundfarbe';
$lang['__background_alt__'] = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Hintergrundfarbe (alternativ)';
$lang['__text_alt__'] = 'Tabellenkopf unverlinkt, hover: Tabellenzeile, struct Label - Schriftfarbe (alternativ)';
$lang['__background_alt__'] = 'Tabellenkopf, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)';
$lang['__text_alt__'] = 'Tabellenkopf (unverlinkt), Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)';
$lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe';
$lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius';

View file

@ -20,7 +20,7 @@ $lang['head_magic_matcher'] = 'MagicMatcher';
$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_breadcrumb_youarehere'] = 'location indicator';
$lang['head_menu_trace'] = 'Last Visited Pages';
$lang['head_meta_box'] = 'meta data for this page';
$lang['head_menu_starred'] = 'Starred Pages';
@ -38,6 +38,8 @@ $lang['quality_trigger'] = 'toggle page analysis';
$lang['prefix_tasks'] = 'open tasks: ';
$lang['prefix_tasks_page'] = 'open tasks for this page: ';
$lang['prefix_tasks_user'] = 'Your open tasks: ';
$lang['tasks_page_none'] = 'There are no open tasks for this page.';
$lang['tasks_page_intime'] = 'There are %1$d open tasks on this page.';
$lang['tasks_page_late'] = 'There are %1$d open tasks on this page, %2$d are late.';
@ -51,7 +53,8 @@ $lang['osm_zoom_link_text'] = 'view larger map';
$lang['osm_zoom_link_title'] = 'external link opens new window';
$lang['image_detail'] = 'image details';
$lang['mode_edit'] = 'Editing Page';
$lang['mode_detail'] = 'Image Details';
/**
* colors
@ -59,14 +62,14 @@ $lang['image_detail'] = 'image details';
$lang['__site_width__'] = 'content - width (in %)';
$lang['__background__'] = 'website - background color';
$lang['__text_webframe__'] = 'website unlinked: claim, title, footer, navigation - font color';
$lang['__background_site__'] = 'website - background color';
$lang['__text_webframe__'] = 'claim, title, footer (unlinked), navigation (unlinked) - font color';
$lang['__nav_menu_color__'] = 'link: navigation, footer, pagetools icons, tabbox - font color';
$lang['__nav_menu_hover_color__'] = 'link: navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color';
$lang['__nav_menu_hover_bg__'] = 'link: navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color';
$lang['__nav_menu_color__'] = 'navigation (link), footer (link), pagetools icons, tabbox - font color';
$lang['__nav_menu_hover_color__'] = 'navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color';
$lang['__nav_menu_hover_bg__'] = 'navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color';
$lang['__background_content__'] = 'content, breadcrumb, pagetools (hover) - background color';
$lang['__background__'] = 'content, breadcrumb, pagetools (hover) - background color';
$lang['__text__'] = 'content: text - font color';
$lang['__background_neu__'] = 'Content neutral (not too different from the content background) - background color';
@ -87,8 +90,8 @@ $lang['__missing__'] = 'links to non-existing pages - font color'
$lang['__button_color__'] = 'buttons - font color';
$lang['__button_background__'] = 'buttons - background color';
$lang['__background_alt__'] = 'table head, hover: table cell, struct Label - background color (alternative)';
$lang['__text_alt__'] = 'table head unlinked, hover: table cell, struct Label - font color (alternative)';
$lang['__background_alt__'] = 'table head, table cell (hover), struct Label (hover) - background color (alternative)';
$lang['__text_alt__'] = 'table head (unlinked), table cell (hover), struct Label (hover) - font color (alternative)';
$lang['__border__'] = 'tables, form fields, blockquotes - border color';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';

View file

@ -8,4 +8,3 @@
/* DOKUWIKI:include js/meta-box.js */
/* DOKUWIKI:include js/sidebar.js */
/* DOKUWIKI:include js/breadcrumb.js */

View file

@ -145,19 +145,19 @@ __nav_menu_color__ = "#696969" ; @ini_nav_menu_color
__nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color
__nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg
__background __ = "#FFF" ; @ini_background (guaranteed for every plugin)
__background__ = "#FFF" ; @ini_background (guaranteed for every plugin)
__text__ = "#252525" ; @ini_text (guaranteed for every plugin)
__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin)
__background_neu__ = "#FFF" ; @ini_background_neu (guaranteed for every plugin)
__text_neu__ = "#656565" ; @ini_text_neu (guaranteed for every plugin)
__background_page_header__ = "#F6F6F6" ; @ini_background_page_header
__border_light__ = "#dadada" ; @ini_border_light
__border_light__ = "#DADADA" ; @ini_border_light
__background_page_footer__ = "#252525" ; @ini_background_page_footer
; highlighted text (e.g. search snippets)
__highlight__ = "#efefef" ; @ini_highlight (guaranteed for every plugin)
__highlight__ = "#EFEFEF" ; @ini_highlight (guaranteed for every plugin)
__highlight_text__ = "#252525" ; @ini_highlight_text
@ -171,12 +171,12 @@ __link__ = "#286DA8" ; @ini_link
__button_color__ = "#FFF" ; @ini_button_color
__button_background__ = "#286DA8" ; @ini_button_background
__background_alt__ = "#f6f6f6" ; @ini_background_alt (guaranteed for every plugin)
__background_alt__ = "#F6F6F6" ; @ini_background_alt (guaranteed for every plugin)
__text_alt__ = "#454545" ; @ini_text_alt (guaranteed for every plugin)
; border color
__border__ = "#bbbbbb" ; @ini_border (guaranteed for every plugin)
__border__ = "#BBB" ; @ini_border (guaranteed for every plugin)
__default_border_radius__ = "3px" ; @ini_default_border_radius

View file

@ -5,12 +5,12 @@
</nav>
<nav class="nav-sitetools">
<a class="nav" role="heading" aria-level="2">
<div class="nav"><a href="#sidebar-site-tools" role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/sitemap.svg') ?></span>
<span class="lbl"><?php echo $lang['site_tools']; ?></span>
</a>
</a></div>
<div class="nav-panel level1">
<ul>
<ul id="sidebar-site-tools">
<?php
tpl_toolsevent(
'sitetools',
@ -27,12 +27,12 @@
<nav class="nav-usermenu">
<a class="nav" role="heading" aria-level="2">
<div class="nav"><a href="#sidebar-user-tools" role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/account-settings.svg') ?></span>
<span class="lbl"><?php echo $lang['user_tools']; ?></span>
</a>
</a></div>
<div class="nav-panel level1">
<ul>
<ul id="sidebar-user-tools">
<?php /* dokuwiki user tools */
tpl_toolsevent(
'usertools',
@ -56,12 +56,12 @@ if($plugin_starred) $stars = $plugin_starred->loadStars();
if($stars):
?>
<nav class="nav-starred">
<a class="nav" role="heading" aria-level="2">
<div class="nav"><a href="#sidebar-menu-starred" role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/star-circle.svg') ?></span>
<span class="lbl"><?php echo tpl_getLang('head_menu_starred'); ?></span>
</a>
</a></div>
<div class="nav-panel level1 plugin_starred">
<ul>
<ul id="sidebar-menu-starred">
<?php
foreach($stars as $pid => $time) {
echo '<li>';
@ -80,12 +80,12 @@ if($stars):
<?php if($conf['breadcrumbs']): ?>
<nav class="nav-trace">
<a class="nav" role="heading" aria-level="2">
<div class="nav"><a href="#sidebar-menu_trace" role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/apple-safari.svg') ?></span>
<span class="lbl"><?php echo tpl_getLang('head_menu_trace'); ?></span>
</a>
</a></div>
<div class="nav-panel level1">
<ul>
<ul id="sidebar-menu_trace">
<?php /* trace breadcrumbs as list */
// FIXME move to helper class
$crumbs = breadcrumbs();

View file

@ -1,11 +1,13 @@
<?php
if (!defined('DOKU_INC')) die();
if(!defined('DOKU_INC')) die();
if ($conf['breadcrumbs']): ?>
if ($conf['youarehere']): ?>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_breadcrumb_youarehere') ?></h6>
<p>
<?php
tpl_youarehere();
\dokuwiki\template\sprintdoc\Template::getInstance()->breadcrumbSuffix();
?>
</p>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_breadcrumb') ?></h6>
<p><?php tpl_youarehere() ?></p>
<?php endif ?>
<?php endif ?>