Tweak flag management display.

diff --git a/imp/templates/prefs/flagmanagement.inc b/imp/templates/prefs/flagmanagement.inc
index 4a9d375..7b243f7 100644 (file)
--- a/imp/templates/prefs/flagmanagement.inc
+++ b/imp/templates/prefs/flagmanagement.inc
@@ -19,32 +19,47 @@ IMP::addInlineScript(array(
 ?>
 <input type="hidden" name="flag_action" id="flag_action" />
 <input type="hidden" name="flag_data" id="flag_data" />
-<input id="new_button" type="button" class="button" value="<?php echo _("New Flag") ?>" />
-<table>
+<table class="flagmanagement">
+ <thead>
+  <tr>
+   <td>Label</td>
+   <td>Icon</td>
+   <td class="colorheader">Color</td>
+  </tr>
+ </thead>
+ <tbody>
 <?php foreach ($flaglist as $key => $val):
     $hash = hash('md5', $key);
     $bgid = 'bg_' . $hash;
     $color = htmlspecialchars($val['b']);
     $fgcolor = htmlspecialchars($val['f']);
     $label = htmlspecialchars($val['l']);
-    $bgstyle = 'background-color:' . $color . ';color:' . $fgcolor;
+    $bgstyle = 'background-color:' . $color;
 ?>
- <tr>
+  <tr>
+   <td>
 <?php if ($val['t'] == 'imapp'): ?>
-  <td><input style="<?php echo $bgstyle ?>" name="<?php echo 'label_' . $hash ?>" value="<?php echo $label ?>" /></td>
+   <input name="<?php echo 'label_' . $hash ?>" value="<?php echo $label ?>" />
 <?php else: ?>
-   <td style="<?php echo $bgstyle ?>"><strong><?php echo Horde::label($bgid, $label) ?></strong></td>
+    <?php echo Horde::label($bgid, $label) ?>
 <?php endif; ?>
-  <td>
-<?php if (isset($val['div'])) { echo $val['div']; } ?>
-  </td>
-  <td>
-   <input size="7" style="background:<?php echo $color ?>;color:<?php echo $fgcolor ?>" id="<?php echo $bgid ?>" name="<?php echo $bgid ?>" value="<?php echo $color ?>" />
-   <a class="flagcolorpicker" href="#"><?php echo $picker_img ?></a>
+   </td>
+   <td class="flagicon">
+<?php if ($val['t'] == 'imapp'): ?>
+    <div class="msgflags flagUser" style="<?php echo $bgstyle ?>"></div>
+<?php else: ?>
+    <?php echo $val['div'] ?>
+<?php endif; ?>
+   </td>
+   <td>
+    <input size="7" style="<?php echo $bgstyle ?>;color:<?php echo $fgcolor ?>" id="<?php echo $bgid ?>" name="<?php echo $bgid ?>" value="<?php echo $color ?>" />
+    <a class="flagcolorpicker" href="#"><?php echo $picker_img ?></a>
 <?php if (!empty($val['d'])): ?>
-   <a class="flagdelete" href="#"><?php echo $delete_img ?></a>
+    <a class="flagdelete" href="#"><?php echo $delete_img ?></a>
 <?php endif; ?>
-  </td>
- </tr>
+   </td>
+  </tr>
+ </tbody>
 <?php endforeach; ?>
 </table>
+<input id="new_button" type="button" class="button" value="<?php echo _("New Flag") ?>" />

diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 8e97b6b..2d31982 100644 (file)
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -279,6 +279,21 @@ div.msgflags.flagForwarded, span.contextImg.flagForwarded {
     background-image: url("graphics/mail_forwarded.png");
 }
 
+/* Flag management (prefs) styles. */
+table.flagmanagement {
+    padding-bottom: 10px;
+}
+table.flagmanagement td {
+    padding-right: 12px;
+}
+table.flagmanagement thead td {
+    font-weight: bold;
+    text-decoration: underline;
+}
+table.flagmanagement tbody td.flagicon {
+    text-align: center;
+}
+
 .folderunsub {
     background: #bbb;
     font-style: italic;