From b404844ab2424245c82fe8f0cb4aac32473ea4b6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 14 May 2019 13:10:32 +0000
Subject: [PATCH] Bug 22906: Minor corrections to plugins home page

This patch makes a few minor markup improvements to the plugins home
page and corrects some CSS introduced by Bug 22053 which was having
unintended consequences elsewhere.

To test, apply the patch and rebuild the staff client CSS.

 - You should have one or more plugins installed.
 - Go to Administration -> Manage plugins.
 - The "badges" for disabled and enabled should look correct.
 - Go to Tools -> Staged MARC management and click on an batch.
   - In the information about the batch, the labels should be bold.
---
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 18 +++++++++++++-----
 .../prog/en/modules/plugins/plugins-home.tt            | 14 +++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 0ac6b70..333f9fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -524,7 +524,7 @@ input {
 }
 
 label,
-.label:not(.label-primary):not(.label-default) {
+.label {
     color: #000;
     display: inline;
     font-size: inherit;
@@ -3757,6 +3757,14 @@ span {
         font-style: italic;
         margin-left: .5em;
     }
+
+    &[class*=" label-"] {
+        color: #FFF;
+        display: inline;
+        font-size: 75%;
+        font-weight: normal;
+        padding: .2em .6em .3em;
+    }
 }
 
 
@@ -4455,6 +4463,10 @@ input.renew {
     top: 0;
 }
 
+div#makechart ol li {
+    list-style: none;
+}
+
 @media (min-width: 200px) {
 
 }
@@ -4626,10 +4638,6 @@ input.renew {
     }
 }
 
-div#makechart ol li {
-    list-style: none;
-}
-
 @media only screen and ( min-width: 1200px ) {
     .browse-button {
         display: inline-block;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 2c2d556..786290b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -78,12 +78,12 @@
                             [% FOREACH plugin IN plugins %]
                                 <tr>
                                     <td>
+                                        <strong>[% plugin.metadata.name | html %]</strong>
                                         [% IF ( plugin.enabled ) %]
                                             <span class="label label-primary">ENABLED</span>
                                         [% ELSE %]
                                             <span class="label label-default">DISABLED</span>
                                         [% END %]
-                                        <strong>[% plugin.metadata.name | html %]</strong>
                                     </td>
                                     <td>
                                         [% plugin.metadata.description | html %]
@@ -114,27 +114,27 @@
                                                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]">
                                                     [% IF ( CAN_user_plugins_report ) %]
                                                         [% IF plugin.can('report') %]
-                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table"></i> Run report</a></li>
+                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table fa-fw"></i> Run report</a></li>
                                                         [% END %]
                                                     [% END %]
 
                                                     [% IF ( CAN_user_plugins_tool ) %]
                                                         [% IF plugin.can('tool') %]
-                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=tool"><i class="fa fa-wrench"></i> Run tool</a></li>
+                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=tool"><i class="fa fa-wrench fa-fw"></i> Run tool</a></li>
                                                         [% END %]
                                                     [% END %]
 
                                                     [% IF ( CAN_user_plugins_configure ) %]
                                                         [% IF plugin.can('configure') %]
-                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog"></i> Configure</a></li>
+                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog fa-fw"></i> Configure</a></li>
                                                         [% END %]
                                                     [% END %]
                                                     [% IF ( CAN_user_plugins_manage ) %]
-                                                            <li><a class="uninstall_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-uninstall.pl?class=[% plugin.class | html %]"><i class="fa fa-trash"></i> Uninstall</a></li>
+                                                            <li><a class="uninstall_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-uninstall.pl?class=[% plugin.class | html %]"><i class="fa fa-trash fa-fw"></i> Uninstall</a></li>
                                                         [% IF ( plugin.enabled ) %]
-                                                                <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=disable"><i class="fa fa-pause"></i> Disable</a></li>
+                                                                <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=disable"><i class="fa fa-pause fa-fw"></i> Disable</a></li>
                                                         [% ELSE %]
-                                                                <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=enable"><i class="fa fa-play"></i> Enable</a></li>
+                                                                <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=enable"><i class="fa fa-play fa-fw"></i> Enable</a></li>
                                                         [% END %]
                                                     [% END %]
                                                 </ul>
-- 
2.1.4