From 3444b1d7a20d38861721f3a51bf4a58367165f11 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 4 Jun 2009 13:05:27 -0600
Subject: [PATCH] Display tweaks; remove redundant edit icon.

---
 ingo/filters.php                   |  1 -
 ingo/templates/filters/filter.html |  3 ---
 ingo/templates/filters/header.inc  |  4 +---
 ingo/themes/screen.css             | 10 ++--------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/ingo/filters.php b/ingo/filters.php
index 2d39f025c..d9deaca82 100644
--- a/ingo/filters.php
+++ b/ingo/filters.php
@@ -242,7 +242,6 @@ if (count($filter_list) == 0) {
 
         /* Create edit link. */
         $entry['editlink'] = Horde::link($editurl, sprintf(_("Edit %s"), $name));
-        $entry['editimg'] = Horde::img('edit.png', sprintf(_("Edit %s"), $name), '', $registry->getImageDir('horde'));
 
         /* Create delete link. */
         if (!is_null($delurl)) {
diff --git a/ingo/templates/filters/filter.html b/ingo/templates/filters/filter.html
index 05834a4cd..72b206e03 100644
--- a/ingo/templates/filters/filter.html
+++ b/ingo/templates/filters/filter.html
@@ -1,9 +1,6 @@
 <loop:filter>
 <tr>
  <td class="nowrap">
-<if:edit_allowed>
-  <tag:filter.editlink /><tag:filter.editimg /></a>
-</if:edit_allowed>
 <if:delete_allowed>
 <if:filter.dellink>
   <tag:filter.dellink /><tag:filter.delimg /></a>
diff --git a/ingo/templates/filters/header.inc b/ingo/templates/filters/header.inc
index 749bfeddb..0fa51cc97 100644
--- a/ingo/templates/filters/header.inc
+++ b/ingo/templates/filters/header.inc
@@ -24,9 +24,7 @@ function moveFromTo(from, to, upurl, downurl)
   <th class="leftAlign"><?php echo _("Rule") ?></th>
   <th width="1%"><?php echo _("Enabled") ?></th>
   <?php if ($edit_allowed): ?>
-  <th width="1%"></th>
-  <th width="1%"></th>
-  <th width="1%"><?php echo _("Move") ?></th>
+  <th colspan="3" width="1%"><?php echo _("Move") ?></th>
   <?php endif; ?>
  </tr>
 </thead>
diff --git a/ingo/themes/screen.css b/ingo/themes/screen.css
index a81e3e6fd..1dfe964b0 100644
--- a/ingo/themes/screen.css
+++ b/ingo/themes/screen.css
@@ -1,9 +1,3 @@
-/* Menu bottom margin, added for BC. */
-#menu {
-    margin-bottom: 8px;
-}
-
-/* Added for BC. */
-.hidden {
-    display: none;
+.striped tr td:first-child {
+    padding-right: 8px;
 }
-- 
2.11.0