Clean up dimpOptions CSS/display

diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php
index 1b3b382..5449dd0 100644 (file)
--- a/imp/templates/chunks/message.php
+++ b/imp/templates/chunks/message.php
@@ -44,11 +44,26 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
    <div class="msgHeaders">
     <div id="msgHeaders">
      <div class="dimpOptions noprint">
-      <div id="msg_print"><?php echo Horde::img('print.png', '', '', $registry->getImageDir('horde')) ?><a><?php echo _("Print") ?></a></div>
+      <div>
+       <span id="msg_print">
+        <span class="iconImg"></span>
+        <a><?php echo _("Print") ?></a>
+       </span>
+      </div>
 <?php if (!empty($conf['user']['allow_view_source'])): ?>
-      <div id="msg_view_source"><span class="iconImg"></span><a><?php echo _("View Source") ?></a></div>
+      <div>
+       <span id="msg_view_source">
+        <span class="iconImg"></span>
+        <a><?php echo _("View Source") ?></a>
+       </span>
+      </div>
 <?php endif; ?>
-      <div><span class="iconImg saveAsImg"></span><a href="<?php echo $show_msg_result['save_as'] ?>"><?php echo _("Save") ?></a></div>
+      <div>
+       <span>
+        <span class="iconImg saveAsImg"></span>
+        <a href="<?php echo $show_msg_result['save_as'] ?>"><?php echo _("Save") ?></a>
+       </span>
+      </div>
      </div>
      <div id="msgHeadersContent">
       <table cellspacing="0">

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index b92427a..86b69ee 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -254,10 +254,25 @@ function _simpleButton($id, $text, $image)
         </div>
         <div id="msgHeaders" style="display:none">
          <div class="dimpOptions noprint">
-          <div id="msg_newwin_options"><span class="iconImg"></span><a><?php echo _("Open in new window") ?></a></div>
-          <div id="msg_print"><span class="iconImg"></span><a><?php echo _("Print") ?></a></div>
+          <div>
+           <span id="msg_newwin_options">
+            <span class="iconImg"></span>
+            <a><?php echo _("Open in new window") ?></a>
+           </span>
+          </div>
+          <div>
+           <span id="msg_print">
+            <span class="iconImg"></span>
+            <a><?php echo _("Print") ?></a>
+           </span>
+          </div>
 <?php if (!empty($conf['user']['allow_view_source'])): ?>
-          <div id="msg_view_source"><span class="iconImg"></span><a><?php echo _("View Source") ?></a></div>
+          <div>
+           <span id="msg_view_source">
+            <span class="iconImg"></span>
+            <a><?php echo _("View Source") ?></a>
+           </span>
+          </div>
 <?php endif; ?>
          </div>
          <div id="msgHeadersContent">

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 14e749e..a826004 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -351,26 +351,27 @@ div.vpRow.flagDeleted {
     padding-right: 1px;
 }
 
-/* Options */
+/* Message options. */
 .dimpOptions {
     float: right;
 }
 .dimpOptions div {
-    cursor: pointer;
     line-height: 16px;
-    padding-top: 1px;
+    padding-bottom: 2px;
+}
+.dimpOptions span {
+    cursor: pointer;
 }
-.dimpOptions div a, .dimpOptions div a:visited {
+.dimpOptions .iconImg {
+    margin-right: 0;
+}
+.dimpOptions a, .dimpOptions a:visited {
     text-decoration: none;
     color: #000;
 }
-.dimpOptions div a:hover {
+.dimpOptions a:hover {
     text-decoration: underline;
 }
-.dimpOptions div img {
-    float: left;
-    padding: 1px 4px 0 0;
-}
 
 /* Actions */
 .dimpActions {