More Image/CSS tweaking in DIMP

diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php
index 990bc26..1b0c17b 100644 (file)
--- a/imp/compose-dimp.php
+++ b/imp/compose-dimp.php
@@ -297,7 +297,7 @@ $args = array(
 $t = new IMP_Template(IMP_TEMPLATES . '/imp/');
 $t->setOption('gettext', true);
 $t->set('title', $title);
-$t->set('closelink', Horde::img('close.png', 'X', array('id' => 'compose_close'), $registry->getImageDir('horde')));
+$t->set('closelink', IMP::img('close.png', 'X', array('id' => 'compose_close'), $registry->getImageDir('horde')));
 
 $compose_result = IMP_Views_Compose::showCompose($args);
 $t->set('compose_html', $compose_result['html']);

diff --git a/imp/templates/chunks/compose.php b/imp/templates/chunks/compose.php
index b648fc6..0eb0a5c 100644 (file)
--- a/imp/templates/chunks/compose.php
+++ b/imp/templates/chunks/compose.php
@@ -15,8 +15,6 @@
 $d_read = $GLOBALS['prefs']->getValue('disposition_request_read');
 $save_attach = $GLOBALS['prefs']->getValue('save_attachments');
 
-$loading_img = Horde::img('loading.gif', _("Loading..."));
-
 // Small utility function to simplify creating dimpactions buttons.
 // As of right now, we don't show text only links.
 function _createDAcompose($text, $image, $id)
@@ -89,7 +87,7 @@ function _createDAcompose($text, $image, $id)
       <div id="to_results" class="autocomplete" style="display:none"></div>
      </td>
      <td>
-      <span id="to_loading_img" style="display:none"><?php echo $loading_img ?></span>
+      <span id="to_loading_img" class="loadingImg" style="display:none"></span>
      </td>
     </tr>
    </thead>
@@ -103,7 +101,7 @@ function _createDAcompose($text, $image, $id)
       <div id="cc_results" class="autocomplete" style="display:none"></div>
      </td>
      <td>
-      <span id="cc_loading_img" style="display:none"><?php echo $loading_img ?></span>
+      <span id="cc_loading_img" class="loadingImg" style="display:none"></span>
      </td>
     </tr>
    </thead>
@@ -117,7 +115,7 @@ function _createDAcompose($text, $image, $id)
       <div id="bcc_results" class="autocomplete" style="display:none"></div>
      </td>
      <td>
-      <span id="bcc_loading_img" style="display:none"><?php echo $loading_img ?></span>
+      <span id="bcc_loading_img" class="loadingImg" style="display:none"></span>
      </td>
     </tr>
    </thead>
@@ -133,7 +131,7 @@ function _createDAcompose($text, $image, $id)
   <table cellspacing="0">
    <thead>
     <tr class="atcrow">
-     <td class="label"><?php echo Horde::img('attachment.png') . ': ' ?></td>
+     <td class="label"><span class="iconImg attachmentImg"></span>: </td>
      <td id="attach_cell">
       <input type="file" id="upload" name="file_1" />
 <?php if (strpos($save_attach, 'prompt') !== false): ?>

diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php
index 5eec13c..d1940dd 100644 (file)
--- a/imp/templates/chunks/message.php
+++ b/imp/templates/chunks/message.php
@@ -10,8 +10,6 @@ $horde_img = $registry->getImageDir('horde');
 $menu_view = $prefs->getValue('menu_view');
 $show_text = ($menu_view == 'text' || $menu_view == 'both');
 
-$attachment = Horde::img('attachment.png', '', array('class' => 'attachmentImage'));
-
 // Small utility function to simplify creating dimpactions buttons.
 // As of right now, we don't show text only links.
 function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
@@ -30,11 +28,11 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
  <div id="msgData">
   <div class="noprint">
    <div class="header">
-    <div class="headercloseimg" id="windowclose"><?php echo Horde::img('close.png', 'X', array(), $horde_img) ?></div>
+    <div class="headercloseimg" id="windowclose"><?php echo IMP::img('close.png', 'X', array(), $horde_img) ?></div>
     <div><?php echo _("Message:") . ' ' . $show_msg_result['subject'] ?></div>
    </div>
 
-   <div class="dimpActions">
+   <div class="dimpActions dimpActionsMsg">
     <span id="button_reply_cont"><?php _createDAfmsg(_("Reply"), 'reply_menu.png', 'reply_link', 'hasmenu', $show_text) ?></span>
     <span id="button_forward_cont"><?php _createDAfmsg(_("Forward"), 'forward_menu.png', 'forward_link', 'hasmenu', $show_text) ?></span>
 <?php if (!empty($conf['spam']['reporting']) && (!$conf['spam']['spamfolder'] || ($folder != IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
@@ -51,9 +49,9 @@ 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', '', '', $horde_img) ?><a><?php echo _("Print") ?></a></div>
+      <div id="msg_print"><?php echo IMP::img('print.png', '', '', $horde_img) ?><a><?php echo _("Print") ?></a></div>
 <?php if (!empty($conf['user']['allow_view_source'])): ?>
-      <div id="msg_view_source"><?php echo Horde::img('message_source.png') ?><a><?php echo _("View Message Source") ?></a></div>
+      <div id="msg_view_source"><span class="iconImg msgsourceImg"></span><a><?php echo _("View Message Source") ?></a></div>
 <?php endif; ?>
      </div>
      <div id="msgHeadersContent">
@@ -71,7 +69,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
 <?php endforeach; ?>
 <?php if (isset($show_msg_result['atc_label'])): ?>
         <tr id="msgAtc">
-         <td class="label"><?php if ($show_msg_result['atc_list']): ?><?php echo Horde::link('') . Horde::img('arrow_collapsed.png', '', array('id' => 'partlist_col')) . Horde::img('arrow_expanded.png', '', array('id' => 'partlist_exp', 'style' => 'display:none')) . ' ' . $attachment ?></a><?php else: echo $attachment; endif; ?></td>
+         <td class="label"><?php if ($show_msg_result['atc_list']): ?><?php echo Horde::link('') ?><span id="partlist_col" class="iconImg arrowcollapsedImg"></span><span id="partlist_exp" class="iconImg arrowexpandedImg" style="display:none"></span> <span class="iconImg attachmentImg attachmentImage"></span></a><?php else: ?><span class="iconImg attachmentImg attachmentImage"></span><?php endif; ?></td>
          <td>
           <span class="atcLabel"><?php echo $show_msg_result['atc_label'] ?></span><?php echo $show_msg_result['atc_download'] ?>
 <?php if (isset($show_msg_result['atc_list'])): ?>
@@ -97,7 +95,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
 
  <div id="qreply" style="display:none">
   <div class="header">
-   <div class="headercloseimg"><?php echo Horde::img('close.png', 'X', array(), $horde_img) ?></div>
+   <div class="headercloseimg"><?php echo IMP::img('close.png', 'X', array(), $horde_img) ?></div>
    <div><?php echo _("Message:") . ' ' . $show_msg_result['subject'] ?></div>
   </div>
   <?php echo $compose_result['html']; ?>
@@ -123,4 +121,4 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
  <div><?php _createDAfmsg(_("Add to Address Book"), 'add_contact.png', 'ctx_contacts_add') ?></div>
 </div>
 
-<?php echo Horde::img('popdown.png', 'v', array('class' => 'popdown', 'id' => 'popdown_img', 'style' => 'display:none')) ?>
+<span id="popdown_img" class="iconImg popdownImg popdown" style="display:none"></span>

diff --git a/imp/templates/index/index.inc b/imp/templates/index/index.inc
index c51245e..8aacf92 100644 (file)
--- a/imp/templates/index/index.inc
+++ b/imp/templates/index/index.inc
@@ -168,7 +168,7 @@ function _simpleButton($id, $text, $image, $imagedir = null)
      <div id="mailboxHeader" class="header">
       <div>
        <span class="rightFloat" id="msgHeader"></span>
-       <span id="folderLoading" style="display:none"></span>
+       <span id="folderLoading" class="loadingImg" style="display:none"></span>
        <span id="folderName"></span>
       </div>
      </div>
@@ -259,12 +259,12 @@ function _simpleButton($id, $text, $image, $imagedir = null)
      </div>
      <div id="splitBar" style="display:none" class="splitBar noprint"></div>
      <div id="previewPane" style="display:none">
-      <span id="msgLoading" style="display:none"></span>
+      <span id="msgLoading" class="loadingImg" style="display:none"></span>
       <div id="previewInfo" style="display:none">
        <?php echo _("To preview a message, select it from the list above. A right-click on the messages will display available actions.") ?><br />
        <?php printf(_("Click on a message while holding down the %s key to select multiple messages.  To select a range of messages, click the first message of the range, navigate to the last message of the range, and then click on the last message while holding down the %s key."), '<span class="kbd">' . _("Ctrl") . '</span>', '<span class="kbd">' . _("Shift") . '</span>') ?><br /><br />
        <?php echo _("The following keyboard shortcuts are available:") ?><br />
-       <span class="iconImg keuypImg"></span> / <span class="iconImg keydownImg"></span> . ' : ' . _("Move up/down through the message list.") ?><br />
+       <span class="iconImg keyupImg"></span> / <span class="iconImg keydownImg"></span> : <?php echo _("Move up/down through the message list.") ?><br />
        <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Move one page up/down through the message list.") ?><br />
        <span class="kbd"><?php echo _("Home") ?></span> / <span class="kbd"><?php echo _("End") ?></span> : <?php echo  _("Move to the beginning/end of the message list.") ?><br />
        <span class="kbd"><?php echo _("Del") ?></span> : <?php echo _("Delete the currently selected message(s).") ?> <?php printf(_("%s will delete the current message and move to the next message if a single message is selected."), '<span class="kbd">' . _("Shift") . '</span> + <span class="kbd">' . _("Del") . '</span>') ?><br />

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 0539728..89f00fe 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -7,20 +7,6 @@
     clear: both;
 }
 
-/* Popdown styles. */
-a.popdown {
-    cursor: pointer;
-    background: url("graphics/popdown.png") no-repeat center center;
-    padding: 5px !important;
-}
-a.popdown:hover {
-    padding: 4px !important;
-    border-left: 1px solid #fff;
-    border-top: 1px solid #fff;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-}
-
 /* ini header. */
 #quota {
     float: right;
@@ -137,7 +123,7 @@ div#quota {
 }
 
 /* Message List */
-#folderLoading, #msgLoading {
+span.loadingImg {
     z-index: 1000;
     border: 1px #e0e0e0 solid;
     -moz-border-radius: 5px;
@@ -539,7 +525,7 @@ div.msgSize img {
 /* Actions */
 .dimpActions {
     background: #efefef;
-    padding: 4px 4px 2px 2px;
+    padding: 4px 4px 4px 2px;
     border: 1px silver solid;
     border-bottom: 0px;
     background: transparent url("graphics/backhead_s2.png") repeat-x;
@@ -586,16 +572,12 @@ div.msgSize img {
     -moz-opacity: .25;
     opacity: .25;
 }
-.dimpActions .popdown {
-    border: 0;
-    padding: 2px;
-}
 .dimpActions .popdown:hover {
     border-left: 1px solid #fff;
     border-top: 1px solid #fff;
     border-right: 1px solid #000;
     border-bottom: 1px solid #000;
-    padding: 1px;
+    margin: -1px;
 }
 .dimpActions .disabled .popdown:hover {
     border: 0;
@@ -607,6 +589,9 @@ div.msgSize img {
     display: none;
 }
 
+div.dimpActionsCompose, div.dimpActionsMsg {
+    border-bottom: 1px solid #999;
+}
 div.dimpActionsCompose {
     margin-top: 0;
 }
@@ -737,7 +722,7 @@ div.dimpActionsCompose {
 /* mime status messages */
 .mimeStatusMessage, .mimeStatusWarning, .mimePartInfo {
     color: #000;
-    margin: 2px;
+    padding: 4px;
 }
 .mimeStatusMessage {
     background: #ffc;
@@ -745,7 +730,12 @@ div.dimpActionsCompose {
 }
 .mimePartInfo {
     background: #efefef;
-    border: 1px #c0c0c0 solid;
+}
+.mimePartInfo img {
+    padding-right: 3px;
+}
+.mimepartInfo .downloadAtc {
+    padding-left: 2px;
 }
 .mimeStatusWarning {
     background: #e81222;