[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-902-g044ec15

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  044ec159007eec106a7a611a775f5b32c99b668d (commit)
      from  6278f808fb5a9487ec1cd265adcceb19b143a280 (commit)

Summary of changes:
 share/html/Admin/Global/Plugins.html |    8 ++++++--
 share/html/NoAuth/css/base/admin.css |    6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 044ec159007eec106a7a611a775f5b32c99b668d
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Dec 16 11:56:09 2010 -0500

    Be a little more user friendly with errors and the enabled via message

diff --git a/share/html/Admin/Global/Plugins.html b/share/html/Admin/Global/Plugins.html
index f6186bc..2767f6e 100644
--- a/share/html/Admin/Global/Plugins.html
+++ b/share/html/Admin/Global/Plugins.html
@@ -64,8 +64,8 @@
 <li class="plugin-<% $enabled ? 'enabled' : 'disabled'%>">
 <span class="name"><% $plugin->Name %></span>
 <span class="description"><% $plugin->Description || loc("No description") %></span>
-% if ($plugin->ConfigEnabled && 1) {
-<span class="plugin-config">Enabled through RT_Config.pm</span>
+% if ($plugin->ConfigEnabled) {
+<span class="config-enabled"><&|/l&>Enabled in your SiteConfig.</&></span>
 % } else {
 <form method="POST">
   <input name="PluginName" value="<% $plugin->Name %>" type="hidden" />
@@ -128,6 +128,10 @@ if ($PluginName) {
                 push @results, loc("Failed to disable plugin [_1]: [_2].", $PluginName, $@);
             }
         }
+        else {
+            push @results, loc("Failed to disable plugin [_1]. Perhaps it's already disabled?",
+                               $PluginName);
+        }
     }
 }
 
diff --git a/share/html/NoAuth/css/base/admin.css b/share/html/NoAuth/css/base/admin.css
index 6caad45..483a489 100644
--- a/share/html/NoAuth/css/base/admin.css
+++ b/share/html/NoAuth/css/base/admin.css
@@ -94,7 +94,7 @@ ul.list-menu ul li {
     margin-left: 0;
     padding-left: 0;
     list-style: none;
-    width: 50%;
+    width: 55%;
 }
 
 .plugin-list li {
@@ -118,9 +118,9 @@ ul.list-menu ul li {
     color: #a0a0a0;
 }
 
-.plugin-list li form .submit {
+.plugin-list li form .submit,
+.plugin-list li .config-enabled {
     position: absolute;
     top: 0.5em;
     right: 1em;
 }
-

-----------------------------------------------------------------------