From bd3a260096c3e181a2b02cf216d8db413f8a68d9 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Mon, 18 Feb 2013 13:57:12 +0100
Subject: [PATCH] UI consistency: tweaked some buttons to reflect button state.

---
 include/admin/tpl/comments.inc.tpl  | 5 +++--
 include/admin/tpl/images.inc.tpl    | 2 +-
 include/admin/tpl/plugins.inc.tpl   | 6 +++---
 include/admin/tpl/templates.inc.tpl | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/admin/tpl/comments.inc.tpl b/include/admin/tpl/comments.inc.tpl
index 6f317bbb..37275b1d 100644
--- a/include/admin/tpl/comments.inc.tpl
+++ b/include/admin/tpl/comments.inc.tpl
@@ -2,7 +2,8 @@
 {* jQuery: No *}
 
 {if !empty($errormsg)}
-    <span class="msg_error"><span class="attention"></span> {$errormsg}</span>
+    {* TODO: Not sure anything emitted here actually IS an error. *}
+    <span class="msg_error"><span class="icon-attention"></span> {$errormsg}</span>
 {/if}
 
 <script type="text/javascript">
@@ -85,9 +86,9 @@
 
         <div class="form_buttons">
             <input name="submit" type="submit" value="{$CONST.GO}">
-            {serendipity_hookPlugin hookAll=true hook="backend_comments_top" addData=$sql}
         </div>
     </form>
+    {serendipity_hookPlugin hookAll=true hook="backend_comments_top" addData=$sql}
 {if !is_array($sql)}
     <span class="msg_notice"><span class="icon-info-circle"></span> {$CONST.NO_COMMENTS}</span>
 
diff --git a/include/admin/tpl/images.inc.tpl b/include/admin/tpl/images.inc.tpl
index 1ec09d4d..b8e80562 100644
--- a/include/admin/tpl/images.inc.tpl
+++ b/include/admin/tpl/images.inc.tpl
@@ -250,7 +250,7 @@
     {/for}
     </ul>
     
-    <a class="button_link icon_link" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryCreate">{$CONST.CREATE_NEW_DIRECTORY}</a>
+    <a class="button_link icon_link state_submit" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryCreate">{$CONST.CREATE_NEW_DIRECTORY}</a>
 {/if}
 
 {* TODO: obsolete? *}
diff --git a/include/admin/tpl/plugins.inc.tpl b/include/admin/tpl/plugins.inc.tpl
index ad15b32f..7a67eb2c 100644
--- a/include/admin/tpl/plugins.inc.tpl
+++ b/include/admin/tpl/plugins.inc.tpl
@@ -101,11 +101,11 @@
 
                 <div class="plugin_status">
                 {if isset($requirements_failures.{$plug.class_name})}
-                    <span class="unmet_requirements msg_notice"><span class="icon-info-circle"></span> {$CONST.UNMET_REQUIREMENTS|sprintf:"{if $requirements_failures.{$plug.class_name}.s9y}s9y $plug.requirements..serendipity,{/if} {if $requirements_failures.{$plug.class_name}.php}PHP $plug.requirements.php,{/if} {if $requirements_failures.{$plug.class_name}.smarty}Smarty $plug.requirements.smarty{/if}"}</span>
+                    <span class="unmet_requirements msg_error"><span class="icon-attention"></span> {$CONST.UNMET_REQUIREMENTS|sprintf:"{if $requirements_failures.{$plug.class_name}.s9y}s9y $plug.requirements..serendipity,{/if} {if $requirements_failures.{$plug.class_name}.php}PHP $plug.requirements.php,{/if} {if $requirements_failures.{$plug.class_name}.smarty}Smarty $plug.requirements.smarty{/if}"}</span>
                 {elseif $plug['upgradable'] == true}
-                    <a class="upgradable button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]={$plug.pluginPath}&amp;serendipity[install_plugin]={$plug.plugin_class}{if isset($plug['customURI'])}{$plug.customURI}{/if}">{$CONST.UPGRADE}</a>
+                    <a class="state_submit button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]={$plug.pluginPath}&amp;serendipity[install_plugin]={$plug.plugin_class}{if isset($plug['customURI'])}{$plug.customURI}{/if}">{$CONST.UPGRADE}</a>
                 {elseif $plug.installable == true}
-                    <a class="installable button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]={$plug.pluginPath}&amp;serendipity[install_plugin]={$plug.plugin_class}{if isset($plug.customURI)}{$plug.customURI}{/if}">{$CONST.INSTALL}</a>
+                    <a class="state_submit button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]={$plug.pluginPath}&amp;serendipity[install_plugin]={$plug.plugin_class}{if isset($plug.customURI)}{$plug.customURI}{/if}">{$CONST.INSTALL}</a>
                 {else}
                     <span class="installed block_level"><span class="icon-ok-circle"></span> {$CONST.ALREADY_INSTALLED}</span>
                 {/if}
diff --git a/include/admin/tpl/templates.inc.tpl b/include/admin/tpl/templates.inc.tpl
index 0e861b5c..55536eeb 100644
--- a/include/admin/tpl/templates.inc.tpl
+++ b/include/admin/tpl/templates.inc.tpl
@@ -58,9 +58,9 @@
                 <div class="template_status">
                 {if $template != $cur_template}
                     {if !$info.unmetRequirements}
-                    <a class="set_as_template button_link" href="?serendipity[adminModule]=templates&amp;serendipity[adminAction]=install&amp;serendipity[theme]={$template}{$info.info.customURI}">{$CONST.SET_AS_TEMPLATE}</a>
+                    <a class="state_submit button_link" href="?serendipity[adminModule]=templates&amp;serendipity[adminAction]=install&amp;serendipity[theme]={$template}{$info.info.customURI}">{$CONST.SET_AS_TEMPLATE}</a>
                     {else}
-                    <span class="unmet_requirements block_level"><span class="icon-attention"></span> {$info.unmetRequirements}></span>
+                    <span class="unmet_requirements msg_error"><span class="icon-attention"></span> {$info.unmetRequirements}></span>
                     {/if}
                 {else}
                     <span class="installed block_level"><span class="icon-ok-circle"></span> {$CONST.ALREADY_INSTALLED}</span>