From 410baec3db484e8bbe2776c1d974f288c4a70f38 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Wed, 14 Jan 2015 20:13:30 -0700
Subject: [PATCH] Improve formatting of blacklist page

---
 .../basic/blacklist/blacklist.html.php        | 38 ++++++++++---------
 ingo/themes/default/screen.css                | 10 ++++-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/ingo/templates/basic/blacklist/blacklist.html.php b/ingo/templates/basic/blacklist/blacklist.html.php
index d7198d0e038..4d2cb66755a 100644
--- a/ingo/templates/basic/blacklist/blacklist.html.php
+++ b/ingo/templates/basic/blacklist/blacklist.html.php
@@ -9,36 +9,40 @@
 <?php endif; ?>
  </h1>
 
- <div>
+ <div class="blacklistDiv">
   <em><?php echo _("Action for blacklisted addresses:") ?></em>
   <?php echo $this->hordeHelp('ingo', 'blacklist-action') ?>
- </div>
 
- <div class="blacklistAction">
-  <?php echo $this->radioButtonTag('action', 'delete', empty($this->folder), array('id' => 'action_delete')) ?>
-  <?php echo $this->hordeLabel('action_delete', _("_Delete message completely")) ?>
-  <br />
+  <ul class="blacklistAction">
+   <li>
+    <?php echo $this->radioButtonTag('action', 'delete', empty($this->folder), array('id' => 'action_delete')) ?>
+    <?php echo $this->hordeLabel('action_delete', _("_Delete message completely")) ?>
+   </li>
 <?php if ($this->flagonly): ?>
-  <?php echo $this->radioButtonTag('action', 'mark', $this->folder == Ingo::BLACKLIST_MARKER, array('id' => 'action_mark')) ?>
-  <?php echo $this->hordeLabel('action_mark', _("Mar_k message as deleted")) ?>
-  <br />
+   <li>
+    <?php echo $this->radioButtonTag('action', 'mark', $this->folder == Ingo::BLACKLIST_MARKER, array('id' => 'action_mark')) ?>
+    <?php echo $this->hordeLabel('action_mark', _("Mar_k message as deleted")) ?>
+   </li>
+   <li>
 <?php endif; ?>
-  <?php echo $this->radioButtonTag('action', 'folder', $this->folder && ($this->folder != Ingo::BLACKLIST_MARKER), array('id' => 'action_folder')) ?>
-  <?php echo $this->hordeLabel('action_folder', _("_Move message to folder:")) ?>
-  <label for="actionvalue" class="hidden"><?php echo _("Select target folder") ?></label>
-  <?php echo $this->folderlist ?>
+    <?php echo $this->radioButtonTag('action', 'folder', $this->folder && ($this->folder != Ingo::BLACKLIST_MARKER), array('id' => 'action_folder')) ?>
+    <?php echo $this->hordeLabel('action_folder', _("_Move message to folder:")) ?>
+    <label for="actionvalue" class="hidden"><?php echo _("Select target folder") ?></label>
+    <?php echo $this->folderlist ?>
+   </li>
+  </ul>
  </div>
 
- <div>
-  <em><?php echo $this->hordeLabel('blacklist', _("_Enter each address on a new line:")) ?></em>
+ <div class="blacklistDiv">
+  <em><?php echo $this->hordeLabel('blacklist', _("_Blacklist addresses:")) ?></em>
   <?php echo $this->hordeHelp('ingo', 'blacklist-addresses') ?>
  </div>
 
- <div>
+ <div class="blacklistDiv">
   <textarea name="blacklist" id="blacklist" rows="15" cols="80"><?php echo $this->h($this->blacklist) ?></textarea>
  </div>
 
- <div class="control">
+ <div class="horde-form-buttons">
   <input class="horde-default" type="submit" value="<?php echo _("Save") ?>" />
   <input type="button" id="blacklist_return" value="<?php echo _("Return to Rules List") ?>" />
  </div>
diff --git a/ingo/themes/default/screen.css b/ingo/themes/default/screen.css
index 29d36e04fe7..50ca1f0e641 100644
--- a/ingo/themes/default/screen.css
+++ b/ingo/themes/default/screen.css
@@ -66,12 +66,18 @@ table {
 
 /* Blacklist page. */
 .blacklistAction {
-    margin-left: 15px;
-    margin-bottom: 15px;
+    list-style: none;
+    margin: 5px 0 8px 15px;
 }
 .blacklistAction input {
     vertical-align: middle;
 }
+.blacklistAction label {
+    padding-left: 3px;
+}
+.blacklistDiv {
+    padding: 5px;
+}
 
 /* Icons. */
 .ingo-rules {