EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sidebar

Browse source
This commit is contained in:
Jana Deutschländer 2016-12-20 18:02:26 +01:00
commit 77d4a15da5
8 changed files with 108 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

60
css/area_nav-usertools.less
View file

@ -5,6 +5,10 @@
*/ */
.nav-usertools { .nav-usertools {
&.has-bar{
margin-top: @height-context-bar;
padding-top: .5rem;
}
ul{ ul{
float: right; float: right;
padding: 0; margin: .2rem 0 0 0; padding: 0; margin: .2rem 0 0 0;
@ -67,6 +71,62 @@
/* add more icons if needed */ /* add more icons if needed */
} }
&.user-task{
&.noopentasks{
border: 1px solid @color-border;
border-radius: @border-radius;
color: @color-nav;
display: inline-block;
height: 1rem;
min-height: 20px;
min-width: 24px;
box-sizing: content-box;
padding: .3em .25em .15em;
margin-top: 2px;
position: relative;
}
a{
position: relative;
overflow: visible;
white-space: normal;
text-indent: 0;
&:before{
content: "";
position: absolute;
}
}
.prefix{
.fontello();
.hide-text-show-before();
.icon-clipboard();
color: @color-nav;
}
.num{
position: absolute;
padding: .2em .3em .1em;
text-align: center;
font-size: .6rem;
line-height: 100%;
font-weight: 400;
right: -0.3em;
top: -0.4em;
background-color: @color-border;
border-radius: 2px;
color: @color-nav;
}
&.opentasks, &.opentask{
.num{
background-color: @color-link;
color: #fff;
}
}
}
&.user{ &.user{
border: 1px solid @color-border; border: 1px solid @color-border;
border-radius: @border-radius; border-radius: @border-radius;

2
css/area_sidebar-search.less
View file

@ -8,10 +8,10 @@
form{ form{
white-space: nowrap; white-space: nowrap;
.no{ .no{
border: 1px solid ;
padding-right: 1.5rem; padding-right: 1.5rem;
#qsearch__in{ #qsearch__in{
width: 100%; width: 100%;
border: 1px solid green;
} }
} }
} }

6
css/base.less
View file

@ -96,7 +96,11 @@
@color-nav-hover: __nav_menu_hover_color__; @color-nav-hover: __nav_menu_hover_color__;
@color-nav-hover-bg:__nav_menu_hover_bg__; @color-nav-hover-bg:__nav_menu_hover_bg__;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @color-link: __existing__;
@height-context-bar: 50px;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */ /* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
html, body{ html, body{

37
css/base_structure.less
View file

@ -69,6 +69,7 @@
@media @screen_min-md { @media @screen_min-md {
// z-indeces
.nav-direct p{ .nav-direct p{
z-index: 1000; z-index: 1000;
} }
@ -92,21 +93,31 @@
width: 100%; width: 100%;
} }
.header .row > .col-xs-12{ .header, .tools{
position: relative; .row{
height: 150px; position: relative;
min-height: 6rem; > .col-xs-12{
box-sizing: content-box; width: 23%;
box-sizing: border-box;
}
}
} }
.header{
.row > .col-xs-12{
position: relative;
height: 150px;
min-height: 6rem;
}
}
.tools{ .tools{
.row > .col-xs-12{ .row > .col-xs-12{
position: absolute; position: absolute;
width: 23%; background: pink;
}
.main-sidebar{
//background: pink;
} }
} }
.content{ .content{
.row > .col-xs-12{ .row > .col-xs-12{
width: 73%; width: 73%;
@ -115,17 +126,13 @@
background-color: #fff; background-color: #fff;
} }
} }
.claim{
width: 23%;
box-sizing: content-box;
padding-right: (@margin-big / 2);
.claim{
.logo{ .logo{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
height: 1px; height: 1px;
overflow: visible; overflow: visible;
width: 23%;
} }
.logo img{ .logo img{
max-width: 100%; max-width: 100%;
@ -141,7 +148,5 @@
} }
} }
} }
} }

6
css/plugins/magic-matcher.less
View file

@ -20,10 +20,10 @@
border-radius: 0 0 __default_border_radius__ __default_border_radius__; border-radius: 0 0 __default_border_radius__ __default_border_radius__;
position: relative; position: relative;
z-index: 100; z-index: 100;
left: .25%; width: 100%;
width: 99.5%; min-height: @height-context-bar;
min-height: 50px;
padding: .8em 1em .5em; padding: .8em 1em .5em;
margin-bottom: 0;
.chosen-container-single .chosen-single span{ .chosen-container-single .chosen-single span{
line-height: @line-height-bigger; line-height: @line-height-bigger;

23
main.php
View file

@ -234,18 +234,21 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* User Tools */ /* User Tools and MagicMatcher Bar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
$mm = plugin_load('helper', 'magicmatcher_context');
$navClass = "";
if($mm){
$matcher = $mm->getIssueContextBar();
if($matcher !== ""){
$navClass = "has-bar";
}
}
include('tpl/nav-usertools.php'); include('tpl/nav-usertools.php');
if($mm && $matcher !== ""){
?> include('tpl/nav-magicmatcher.php');
}
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* MagicMatcher */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-magicmatcher.php');
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: header.html */ /* Include Hook: header.html */

5
tpl/nav-magicmatcher.php
View file

@ -5,13 +5,10 @@
<div id="dokuwiki_magic-matcher" class="magic-matcher no-print"> <div id="dokuwiki_magic-matcher" class="magic-matcher no-print">
<div class="container"> <div class="container">
<?php <?php
$mm = plugin_load('helper', 'magicmatcher_context');
if($mm){
echo "<h6 class=\"sr-only\" role=\"heading\" aria-level=\"2\">".tpl_getLang('head_magic_matcher')."</h6>"; echo "<h6 class=\"sr-only\" role=\"heading\" aria-level=\"2\">".tpl_getLang('head_magic_matcher')."</h6>";
echo PHP_EOL; echo PHP_EOL;
$mm->tpl(); echo $matcher;
echo PHP_EOL; echo PHP_EOL;
}
?> ?>
</div><!-- .container --> </div><!-- .container -->
</div><!-- .magic-matcher --> </div><!-- .magic-matcher -->

6
tpl/nav-usertools.php
View file

@ -3,7 +3,7 @@
if ($conf['useacl'] && $showTools): ?> if ($conf['useacl'] && $showTools): ?>
<nav id="dokuwiki__usertools" class="nav-usertools"> <nav id="dokuwiki__usertools" class="nav-usertools <?php echo $navClass?>">
<h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['user_tools']; ?></h6> <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['user_tools']; ?></h6>
<ul> <ul>
<li class="log"><?php tpl_actionlink('login'); ?></li> <li class="log"><?php tpl_actionlink('login'); ?></li>
@ -20,7 +20,9 @@
switch ($num) { switch ($num) {
case 0: $class = 'noopentasks'; break; case 0: $class = 'noopentasks'; break;
case 1: $class = 'opentask'; break; case 1: $class = 'opentask'; break;
default: $class = 'opentasks'; break; default:
$class = 'opentask opentasks';
break;
} }
$linktarget = tpl_getConf('tasks_page'); $linktarget = tpl_getConf('tasks_page');
$doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>"; $doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>";