Changeset 1807 in subversion

Timestamp:

Sep 16, 2008 2:05:25 PM (5 years ago)

Author:

alec

Message:

• Added icons for forwarded/forwarded+replied messages (#1485257)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (6 diffs)
• program/steps/mail/func.inc (modified) (4 diffs)
• skins/default/images/icons/forwarded_replied.png (added)
• skins/default/templates/mail.html (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -7 +7 @@
 - Fix inline images handling when replying/forwarding html messages
 - Allow and use spellcheck attribute for input/textarea fields (#1485060)
+- Added icons for forwarded/forwarded+replied messages (#1485257)
 
 2008/09/15 (thomasb)

trunk/roundcubemail/program/js/app.js

@@ -391 +391 @@
       row.replied = this.env.messages[uid].replied ? true : false;
       row.flagged = this.env.messages[uid].flagged ? true : false;
+      row.forwarded = this.env.messages[uid].forwarded ? true : false;
       }
 
@@ -1749 +1750 @@
         if (rows[uid].icon && icn_src 
             && !(rows[uid].replied && this.env.repliedicon)
+            && !(rows[uid].forwarded && this.env.forwardedicon)
             && !(rows[uid].deleted && this.env.deletedicon))
           rows[uid].icon.src = icn_src;
@@ -1768 +1770 @@
         parent.rcmail.set_classname(rows[uid].obj, 'unread', false);
 
-        if (rows[uid].replied && parent.rcmail.env.repliedicon)
-          icn_src = parent.rcmail.env.repliedicon;
-        else if (rows[uid].deleted && parent.rcmail.env.deletedicon)
+        if (rows[uid].deleted && parent.rcmail.env.deletedicon)
           icn_src = parent.rcmail.env.deletedicon;
+        else if (rows[uid].replied && parent.rcmail.env.repliedicon)
+          {
+          if (rows[uid].forwarded && parent.rcmail.env.forwardedrepliedicon)
+            icn_src = parent.rcmail.env.forwardedrepliedicon;
+          else
+            icn_src = parent.rcmail.env.repliedicon;
+          }
+        else if (rows[uid].forwarded && parent.rcmail.env.forwardedicon)
+          icn_src = parent.rcmail.env.forwardedicon;
         else if (parent.rcmail.env.messageicon)
           icn_src = parent.rcmail.env.messageicon;
@@ -1860 +1869 @@
           this.set_classname(rows[uid].obj, 'deleted', false);
         }
+
         if (rows[uid].unread && this.env.unreadicon)
           icn_src = this.env.unreadicon;
         else if (rows[uid].replied && this.env.repliedicon)
-          icn_src = this.env.repliedicon;
+          {
+          if (rows[uid].forwarded && this.env.forwardedrepliedicon)
+            icn_src = this.env.forwardedrepliedicon;
+          else
+            icn_src = this.env.repliedicon;
+          }
+        else if (rows[uid].forwarded && this.env.forwardedicon)
+          icn_src = this.env.forwardedicon;
         else if (this.env.messageicon)
           icn_src = this.env.messageicon;
@@ -3472 +3489 @@
                               replied:flags.replied?1:0,
                               unread:flags.unread?1:0,
+                              forwarded:flags.forwarded?1:0,
                               flagged:flags.flagged?1:0};
     
@@ -3481 +3499 @@
       row.className += ' selected';
 
-    var icon = flags.deleted && this.env.deletedicon ? this.env.deletedicon:
-               (flags.unread && this.env.unreadicon ? this.env.unreadicon :
-               (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon));
-
+    var icon = this.env.messageicon;
+    if (flags.deleted && this.env.deletedicon)
+      icon = this.env.deletedicon;
+    else if(flags.unread && this.env.unreadicon)
+      icon = this.env.unreadicon;
+    else if (flags.replied && this.env.repliedicon)
+      {
+      if (flags.forwarded && this.env.forwardedrepliedicon)
+        icon = this.env.forwardedrepliedicon;
+      else
+        icon = this.env.repliedicon;
+      }
+    else if (flags.forwarded && this.env.forwardedicon)
+      icon = this.env.forwardedicon;
+    
     var col = document.createElement('TD');
     col.className = 'icon';

trunk/roundcubemail/program/steps/mail/func.inc

@@ -207 +207 @@
     if ($header->answered)
       $js_row_arr['replied'] = true;
+    if ($header->forwarded)
+      $js_row_arr['forwarded'] = true;
     if ($header->flagged)
       $js_row_arr['flagged'] = true;
@@ -213 +215 @@
     if ($attrib['deletedicon'] && $header->deleted)
       $message_icon = $attrib['deletedicon'];
+    else if ($attrib['repliedicon'] && $header->answered)
+      {
+      if ($attrib['forwardedrepliedicon'] && $header->forwarded)
+        $message_icon = $attrib['forwardedrepliedicon'];
+      else
+        $message_icon = $attrib['repliedicon'];
+      }
+    else if ($attrib['forwardedicon'] && $header->forwarded)
+      $message_icon = $attrib['forwardedicon'];
     else if ($attrib['unreadicon'] && !$header->seen)
       $message_icon = $attrib['unreadicon'];
-    else if ($attrib['repliedicon'] && $header->answered)
-      $message_icon = $attrib['repliedicon'];
     else if ($attrib['messageicon'])
       $message_icon = $attrib['messageicon'];
@@ -297 +306 @@
   if ($attrib['repliedicon'])
     $OUTPUT->set_env('repliedicon', $skin_path . $attrib['repliedicon']);
+  if ($attrib['forwardedicon'])
+    $OUTPUT->set_env('forwardedicon', $skin_path . $attrib['forwardedicon']);
+  if ($attrib['forwardedrepliedicon'])
+    $OUTPUT->set_env('forwardedrepliedicon', $skin_path . $attrib['forwardedrepliedicon']);
   if ($attrib['attachmenticon'])
     $OUTPUT->set_env('attachmenticon', $skin_path . $attrib['attachmenticon']);
@@ -368 +381 @@
     $a_msg_flags['unread'] = $header->seen ? 0 : 1;
     $a_msg_flags['replied'] = $header->answered ? 1 : 0;
+    $a_msg_flags['forwarded'] = $header->forwarded ? 1 : 0;
     $a_msg_flags['flagged'] = $header->flagged ? 1 : 0;
     

trunk/roundcubemail/skins/default/templates/mail.html

@@ -71 +71 @@
   deletedIcon="/images/icons/deleted.png"
   repliedIcon="/images/icons/replied.png"
+  forwardedIcon="/images/icons/forwarded.png"
+  forwardedrepliedIcon="/images/icons/forwarded_replied.png"
   attachmentIcon="/images/icons/attachment.png"
   flaggedIcon="/images/icons/flagged.png"