refs #5192 fixed some screenshot tests

matomo-org · May 26, 2014 · 29b0ae7 · 29b0ae7
1 parent 45fa682
commit 29b0ae7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/plugins/CoreHome/templates/_topBarTopMenu.twig b/plugins/CoreHome/templates/_topBarTopMenu.twig
@@ -21,16 +21,13 @@
     {% endset %}
 
     {% macro userMenuItem(label, menu, currentModule, currentAction) %}
-        {% if (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}
-            <a class="item active"
-               {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}
-                    >{{ label|translate }}</a>
-        {% else %}
-            <a class="item"
-               href="index.php{{ menu._url|urlRewriteWithParameters }}"
-               {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}
-                    >{{ label|translate }}</a>
-        {% endif %}
+
+        <a class="item {% if (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}active{% endif %}"
+           href="index.php{{ menu._url|urlRewriteWithParameters }}"
+           id="usermenu-{{ menu._url.module|lower }}-{{ menu._url.action|default('index')|lower }}"
+           {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}
+                >{{ label|translate }}</a>
+
     {% endmacro %}
 
     <span class="topBarElem">

diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php
@@ -7,8 +7,6 @@
  *
  */
 namespace Piwik\Plugins\Feedback;
-use Piwik\Menu\MenuTop;
-use Piwik\Piwik;
 
 
 /**

diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI