From f26c3a2349bfa9a394aae4bb841de186ac051795 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Thu, 11 Sep 2014 10:10:01 +0200
Subject: [PATCH] correct plugin selection

Inter alia removes the ALL option, which "resets" the selection.
As a Smarty only fix, this will now circumvent the ALL logic in plugins.inc.php

Reference #200
---
 templates/2k11/admin/plugins.inc.tpl | 9 +++++----
 templates/2k11/admin/style.css       | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/templates/2k11/admin/plugins.inc.tpl b/templates/2k11/admin/plugins.inc.tpl
index 66d2ddc1..65a82077 100644
--- a/templates/2k11/admin/plugins.inc.tpl
+++ b/templates/2k11/admin/plugins.inc.tpl
@@ -39,10 +39,11 @@
         {$config}
     </form>
 {elseif $adminAction == 'addnew'}
-    <h2>{if $type == 'event'}{$CONST.EVENT_PLUGINS}{else}{$CONST.SIDEBAR_PLUGINS}{/if}{if $only_group != UPGRADE} <span class="plugins_available">{$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:$count_pluginstack}</span>{/if}</h2>
+    <h2>{if $type == 'event'}{$CONST.EVENT_PLUGINS}{else}{$CONST.SIDEBAR_PLUGINS}{/if}{if $only_group != UPGRADE} <span class="plugins_available">({$CONST.PLUGIN_AVAILABLE_COUNT|sprintf:$count_pluginstack})</span>{/if}</h2>
     {foreach $errorstack as $e_idx => $e_name}
     <span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.ERROR}: {$e_name}</span>
     {/foreach}
+
     <form action="serendipity_admin.php" method="get">
         {$formToken}
         <input name="serendipity[adminModule]" type="hidden" value="plugins">
@@ -54,10 +55,10 @@
                 <label for="only_group">{$CONST.GROUP}</label>
                 <select id="only_group" name="serendipity[only_group]">
                 {foreach $groupnames as $available_group => $available_name}
-                    <option value="{$available_group}"{if $only_group == $available_group} selected{/if}>{$available_name}</option>
+                    <option value="{$available_group}"{if $only_group == $available_group} selected{/if}>{$available_name|default:$CONST.ALL_CATEGORIES}</option>
                 {/foreach}
-                    <option value="ALL"{if $only_group == ALL} selected{/if}>{$CONST.ALL_CATEGORIES}</option>
-                    <option value="UPGRADE"{if $only_group == UPGRADE} selected{/if}>{$CONST.WORD_NEW}</option>
+                    {if $only_group != UPGRADE}<option value="UPGRADE"{if $only_group == 'UPGRADE'} selected{/if}>{$CONST.WORD_NEW}</option>{/if}
+
                 </select>
 
                 <div class="form_buttons">
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 9bd1be42..e6deb7c0 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -513,6 +513,9 @@ form > button,
     margin-top: 0;
     margin-bottom: 0;
 }
+.plugins_available {
+    font-size: .75em;
+}
 
 .plugin_desc {
     margin-top: .25em;