Merge remote-tracking branch 'origin/mobilesidebar'

This commit is contained in:
Jana Deutschländer 2017-03-02 12:11:51 +01:00
commit 75a1a114df
7 changed files with 122 additions and 25 deletions

View file

@ -1,9 +1,14 @@
<?php
if (!defined('DOKU_INC')) die();
if(!defined('DOKU_INC')) die();
echo '<div class="menu-togglelink mobile-only"><a href=\'#\'>MOB</a></div>';
echo '<div class="logo">';
echo '<div class="menu-togglelink mobile-only">';
echo '<a href="#">';
echo inlineSVG(__DIR__ . '/../img/menu.svg');
echo '<span class="sr-out">'.tpl_getLang('a11y_sidebartoggle').'</span>';
echo '</a>';
echo '</div>';
\dokuwiki\template\sprintdoc\Template::getInstance()->mainLogo();
echo "<hr class=\"structure\" /></div>";
echo '<div class="logo">';
\dokuwiki\template\sprintdoc\Template::getInstance()->mainLogo();
echo '<hr class="structure" />';
echo '</div>';

View file

@ -50,22 +50,24 @@
<?php if($conf['breadcrumbs']): ?>
<a class="nav" 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>
<div class="nav-panel level1">
<ul>
<?php /* trace breadcrumbs as list */
// FIXME move to helper class
$crumbs = breadcrumbs();
$crumbs = array_reverse($crumbs, true);
foreach($crumbs as $id => $name) {
echo '<li>';
tpl_link(wl($id), hsc($name), 'title="' . $id . '"');
echo '</li>';
}
?>
</ul>
</div>
<nav class="nav-trace">
<a class="nav" 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>
<div class="nav-panel level1">
<ul>
<?php /* trace breadcrumbs as list */
// FIXME move to helper class
$crumbs = breadcrumbs();
$crumbs = array_reverse($crumbs, true);
foreach($crumbs as $id => $name) {
echo '<li>';
tpl_link(wl($id), hsc($name), 'title="' . $id . '"');
echo '</li>';
}
?>
</ul>
</div>
</nav>
<?php endif ?>