From 81a9f400e799758c364128e4206d06969172defd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 24 Apr 2017 11:15:27 +0200 Subject: [PATCH] Prevent interaction between do-js and our page-tasks-icon The javascript of the do-plugin tries to update the container with the plugin__do_pagetasks class. However, since our container has a different structure than the icon produced by the do-plugin, this attempt fails and leaves the icon in a broken state. This commit changes the class of the container and thus ceases to be affected by the do-plugin's javascript. SPR-946 --- css/plugins/do_tasks.less | 23 +++++++++++------------ tpl/nav-page-attributes.php | 14 +------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 6b66253..b3aea69 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -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 diff --git a/tpl/nav-page-attributes.php b/tpl/nav-page-attributes.php index 1bacb7c..498cb36 100755 --- a/tpl/nav-page-attributes.php +++ b/tpl/nav-page-attributes.php @@ -35,7 +35,7 @@ if($doPlugin !== null) { $class = 'do_late'; $title = sprintf(tpl_getLang('tasks_page_late'), $count['undone'], $count['late']); } - $markup = "
  • " . tpl_getLang('prefix_tasks_page') . " {$count['undone']}
  • "; + $markup = "
  • {$count['undone']}" . tpl_getLang('prefix_tasks_page') . "
  • "; echo $markup; } @@ -43,15 +43,3 @@ if($doPlugin !== null) { if($doPlugin !== null || $qcPlugin !== null) { echo ""; } - - - -/* - - -$out = '
    '; -$out .= $count['undone']; -$out .= '
    '; - -if($return) return $out; -echo $out;*/