From e29009d1bad9fd2792fd1ee5a3c3381a7d03d50b Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Mon, 5 Jan 2015 23:35:51 +0100
Subject: [PATCH] Fix mispositioned Akismet block/unblock buttons.

References #247
---
 .../serendipity_event_spamblock.php                |  4 ++--
 templates/2k11/admin/style.css                     | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php b/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
index c0ad1649..4a346e86 100644
--- a/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
+++ b/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
@@ -1359,8 +1359,8 @@ var $filter_defaults;
                     $akismet_apikey = $this->get_config('akismet');
                     $akismet        = $this->get_config('akismet_filter');
                     if (!empty($akismet_apikey)) {
-                        $eventData['action_more'] .= ' <a class="button_link" title="' . PLUGIN_EVENT_SPAMBLOCK_SPAM . '" href="serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[spamIsSpam]=' . $eventData['id'] . $addData . '#' . $clink . '"><span class="icon-block"></span> ' . PLUGIN_EVENT_SPAMBLOCK_SPAM . '</a>';
-                        $eventData['action_more'] .= ' <a class="button_link" title="' . PLUGIN_EVENT_SPAMBLOCK_NOT_SPAM . '" href="serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[spamNotSpam]=' . $eventData['id'] . $addData . '#' . $clink . '"><span class="icon-ok-circled"></span> ' . PLUGIN_EVENT_SPAMBLOCK_NOT_SPAM . '</a>';
+                        $eventData['action_more'] .= ' <a class="button_link actions_extra" title="' . PLUGIN_EVENT_SPAMBLOCK_SPAM . '" href="serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[spamIsSpam]=' . $eventData['id'] . $addData . '#' . $clink . '"><span class="icon-block"></span><span class="visuallyhidden"> ' . PLUGIN_EVENT_SPAMBLOCK_SPAM . '</span></a>';
+                        $eventData['action_more'] .= ' <a class="button_link actions_extra" title="' . PLUGIN_EVENT_SPAMBLOCK_NOT_SPAM . '" href="serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[spamNotSpam]=' . $eventData['id'] . $addData . '#' . $clink . '"><span class="icon-ok-circled"></span><span class="visuallyhidden"> ' . PLUGIN_EVENT_SPAMBLOCK_NOT_SPAM . '</span></a>';
                     }
 
                     $eventData['action_author'] .= ' <a class="button_link" title="' . ($author_is_filtered ? PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR : PLUGIN_EVENT_SPAMBLOCK_ADD_AUTHOR) . '" href="serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[spamBlockAuthor]=' . $eventData['id'] . $addData . $randomString . '#' . $clink . '"><span class="icon-' . ($author_is_filtered ? 'ok-circled' : 'block') .'"></span><span class="visuallyhidden"> ' . ($author_is_filtered ? PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR : PLUGIN_EVENT_SPAMBLOCK_ADD_AUTHOR) . '</span></a>';
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index e4b992ea..e81f0141 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -433,6 +433,7 @@ form > a,
 form > button,
 .edit_actions li,
 .actions li,
+.actions_extra,
 #login .form_field label,
 #filter_comments label,
 #serendipity_comment label,
@@ -1526,7 +1527,8 @@ fieldset p,
     margin: 0 .4em 0 0;
 }
 
-.actions li {
+.actions li,
+.actions_extra {
     margin: 0 0 .5em;
 }
 
@@ -1563,7 +1565,8 @@ form > .button_link:first-of-type,
     margin-bottom: 3em;
 }
 
-#serendipity_comments_list .actions {
+#serendipity_comments_list .actions,
+.actions_extra {
     float: left;
     margin: .75em 0;
 }
@@ -2737,10 +2740,15 @@ img.mfp-img {
         padding-top: 0;
     }
 
-    .actions li {
+    .actions li,
+    .actions_extra {
         margin: 0 .4em .5em 0;
     }
 
+    .actions_extra {
+        margin-top: .75em;
+    }
+
     #edit_entry_submit {
         top: -3.25em;
     }