refs #4223 display filter in themes as well, changes link color

matomo-org · Nov 11, 2013 · 0004ffd · 0004ffd
1 parent aeca338
commit 0004ffd
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 26 deletions.
diff --git a/plugins/CorePluginsAdmin/javascripts/plugins.js b/plugins/CorePluginsAdmin/javascripts/plugins.js
@@ -7,33 +7,32 @@
 
 $(document).ready(function () {
 
-    var filterType   = 'all';
-    var filterStatus = 'all';
-
     function filterPlugins()
     {
-        var queryEnable = '#plugins tr';
+        var filterStatus = $('.pluginsFilter .status a.active').data('filter-status');
+        var filterType   = $('.pluginsFilter .type a.active').data('filter-type');
+
+        var query = '#plugins tr';
 
         if ('all' == filterType) {
-            queryEnable  += '[data-filter-type]';
+            query  += '[data-filter-type]';
         } else {
-            queryEnable  += '[data-filter-type=' + filterType + ']';
+            query  += '[data-filter-type=' + filterType + ']';
         }
 
         if ('all' == filterStatus) {
-            queryEnable  += '[data-filter-status]';
+            query  += '[data-filter-status]';
         } else {
-            queryEnable  += '[data-filter-status=' + filterStatus + ']';
+            query  += '[data-filter-status=' + filterStatus + ']';
         }
 
         $('#plugins tr').css('display', 'none');
-        $(queryEnable).css('display', 'table-row');
+        $(query).css('display', 'table-row');
     }
 
     $('.pluginsFilter .status').on('click', 'a', function (event) {
         event.preventDefault();
 
-        filterStatus = $(this).data('filter-status');
         $(this).siblings().removeClass('active');
         $(this).addClass('active');
 
@@ -43,7 +42,6 @@ $(document).ready(function () {
     $('.pluginsFilter .type').on('click', 'a', function (event) {
         event.preventDefault();
 
-        filterType = $(this).data('filter-type');
         $(this).siblings().removeClass('active');
         $(this).addClass('active');
 

diff --git a/plugins/CorePluginsAdmin/stylesheets/marketplace.less b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
@@ -19,6 +19,9 @@
 .pluginsFilter .active {
   font-weight: bold;
 }
+.admin .pluginsFilter a {
+  color: #255792;
+}
 
 #installPluginByUpload {
   .description {

diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -41,6 +41,26 @@
 
 {% endmacro %}
 
+{% macro pluginsFilter() %}
+
+    <p class="pluginsFilter">
+        <span class="type">
+            <strong>Type</strong>
+            <a data-filter-type="all" href="#" class="active">All</a> |
+            <a data-filter-type="core" href="#">Core</a> |
+            <a data-filter-type="noncore" href="#">Marketplace</a>
+        </span>
+
+        <span class="status">
+            <strong>Status</strong>
+            <a data-filter-status="all" href="#" class="active">All</a> |
+            <a data-filter-status="active" href="#">Active</a> |
+            <a data-filter-status="inactive" href="#">Inactive</a>
+        </span>
+    </p>
+
+{% endmacro %}
+
 {% macro tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, isTheme) %}
 
 <div id="confirmUninstallPlugin" class="ui-confirm">

diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -17,21 +17,7 @@
 
     <p>{{ 'CorePluginsAdmin_MainDescription'|translate }}</p>
 
-    <p class="pluginsFilter">
-        <span class="type">
-            <strong>Type</strong>
-            <a data-filter-type="all" href="#" class="active">All</a> |
-            <a data-filter-type="core" href="#">Core</a> |
-            <a data-filter-type="noncore" href="#">Marketplace</a>
-        </span>
-
-        <span class="status">
-            <strong>Status</strong>
-            <a data-filter-status="all" href="#" class="active">All</a> |
-            <a data-filter-status="active" href="#">Active</a> |
-            <a data-filter-status="inactive" href="#">Inactive</a>
-        </span>
-    </p>
+    {{ plugins.pluginsFilter() }}
 
     {{ plugins.tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, false) }}
 

diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig
@@ -21,6 +21,8 @@
     {% endif %}
     </p>
 
+    {{ plugins.pluginsFilter() }}
+
     {{ plugins.tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, true) }}
 
 </div>