Merge branch 'fixDoButton' into 'master'

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

See merge request 
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

View file

@ -2,22 +2,21 @@
* This file provides styles for do-task plugin
*/
/* + + + + + global + + + + + */
ul.page-attributes {
.plugin__do_pagetasks {
.plugin_do_pagetasks {
position: relative;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
strong {
overflow: hidden;
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
&.do_none {
position: relative;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
strong {
overflow: hidden;
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix

View file

@ -35,7 +35,7 @@ if($doPlugin !== null) {
$class = 'do_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;
}
@ -43,15 +43,3 @@ if($doPlugin !== null) {
if($doPlugin !== null || $qcPlugin !== null) {
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;*/