Merge branch 'master' into title

* master:
  Adjust less vars for compatibility
  Use do-plugin's user task button w/ overlay
  SPR-937: comment
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-950: optimate Headerstyling in Mobile
  SPR-950: mobile - magicmatcher additional class makes wrong padding in usertoolicons
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-950: optimate Headerstyling in Mobile
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-942: sublist less indent; SPR-945: min-width for quicksearch
  SPR-942: sublist alignment in sidebar; SPR-953: nav active
  SPR-942: sublist less indent
  SPR-908: qs old data plugin (edit button for table)
  SPR-908: check fix border-radius
  SPR-937: Alignment Sidebar
This commit is contained in:
Andreas Gohr 2017-04-26 11:54:19 +02:00
commit 146503ce08
29 changed files with 351 additions and 159 deletions

View file

@ -23,25 +23,12 @@
/** @var \helper_plugin_do $doplugin */
$doplugin = plugin_load('helper','do');
if ($doplugin !== null && isset($_SERVER['REMOTE_USER'])) {
$tasks = $doplugin->loadTasks(array('status' => array('undone'),'user' => $_SERVER['REMOTE_USER']));
$num = count($tasks);
if ($num === 0) {
$title = tpl_getLang('tasks_user_none');
} else {
$title = sprintf(tpl_getLang('tasks_user_intime'), $num);
$icon = $doplugin->tpl_getUserTasksIconHTML();
if ($icon) {
echo '<li class="user-task">' . $icon . '</li>';
}
$doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>";
$userpage = $doplugin->getConf('userpage');
if ($userpage && $_SERVER['REMOTE_USER'] && $num > 0) {
$linktarget = sprintf($userpage, $_SERVER['REMOTE_USER']) . ':' . 'dashboard';
$linktarget = str_replace('::', ':', $linktarget);
echo '<li class="user-task" title="'.$title.'"><a href="'.wl($linktarget).'">'.$doInner.'</a></li>';
} else {
echo '<li class="user-task" title="'.$title.'"><strong>'.$doInner.'</strong></li>';
}
} ?>
}
?>
</ul>
</nav><!-- #dokuwiki__usertools -->