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

Merge branch 'fixDoButton' into 'master'

Browse source 
Prevent interaction between do-js and our page-tasks-icon

See merge request !52
This commit is contained in:
Jana Deutschländer 2017-04-24 12:08:06 +02:00
commit 0ddfd51e0d
2 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
css/plugins/do_tasks.less
View file

@ -2,12 +2,10 @@
* This file provides styles for do-task plugin * This file provides styles for do-task plugin
*/ */
/* + + + + + global + + + + + */ /* + + + + + global + + + + + */
ul.page-attributes { ul.page-attributes {
.plugin__do_pagetasks { .plugin_do_pagetasks {
&.do_none {
position: relative; position: relative;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
@ -18,6 +16,7 @@ ul.page-attributes {
color: @ini_text_webframe; color: @ini_text_webframe;
} }
&.do_none {
.num { .num {
background-color: @noopentasks-border; // fix background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix color: @noopentasks-color; // fix

14
tpl/nav-page-attributes.php
View file

@ -35,7 +35,7 @@ if($doPlugin !== null) {
$class = 'do_late'; $class = 'do_late';
$title = sprintf(tpl_getLang('tasks_page_late'), $count['undone'], $count['late']); $title = sprintf(tpl_getLang('tasks_page_late'), $count['undone'], $count['late']);
} }
$markup = "<li class=\"plugin__do_pagetasks $class\" title=\"$title\"><strong><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span><span class=\"num\">{$count['undone']}</span></strong></li>"; $markup = "<li class=\"plugin_do_pagetasks $class\" title=\"$title\"><strong><span class=\"num\">{$count['undone']}</span><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span></strong></li>";
echo $markup; echo $markup;
} }
@ -43,15 +43,3 @@ if($doPlugin !== null) {
if($doPlugin !== null || $qcPlugin !== null) { if($doPlugin !== null || $qcPlugin !== null) {
echo "</ul>"; echo "</ul>";
} }
/*
$out = '<div class="plugin__do_pagetasks" title="' . $title . '"><span class="' . $class . '">';
$out .= $count['undone'];
$out .= '</span></div>';
if($return) return $out;
echo $out;*/