Changeset ce86f0f in github

Timestamp:

Dec 11, 2011 1:12:33 PM (18 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

312ad9d

Parents:

98c2d69

Message:

Make string for unread count configureable by skin; add file type classes to attachments list

Location:

program

Files:

• include/main.inc (modified) (3 diffs)
• js/app.js (modified) (1 diff)
• steps/mail/show.inc (modified) (1 diff)

program/include/main.inc

@@ -1171 +1171 @@
   static $a_mailboxes;
 
-  $attrib += array('maxlength' => 100, 'realnames' => false);
+  $attrib += array('maxlength' => 100, 'realnames' => false, 'unreadwrap' => ' (%s)');
 
   // add some labels to client
@@ -1218 +1218 @@
     $RCMAIL->output->add_gui_object('mailboxlist', $attrib['id']);
     $RCMAIL->output->set_env('mailboxes', $js_mailboxlist);
+    $RCMAIL->output->set_env('unreadwrap', $attrib['unreadwrap']);
     $RCMAIL->output->set_env('collapsed_folders', (string)$RCMAIL->config->get('collapsed_folders'));
   }
@@ -1373 +1374 @@
 
     $js_name = JQ($folder['id']);
-    $html_name = Q($foldername) . ($unread ? html::span('unreadcount', " ($unread)") : '');
+    $html_name = Q($foldername) . ($unread ? html::span('unreadcount', sprintf($attrib['unreadwrap'], $unread)) : '');
     $link_attrib = $folder['virtual'] ? array() : array(
       'href' => rcmail_url('', array('_mbox' => $folder['id'])),

program/js/app.js

@@ -5625 +5625 @@
 
       if (mycount && text_obj.length)
-        text_obj.html(' ('+mycount+')');
+        text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
       else if (text_obj.length)
         text_obj.remove();

program/steps/mail/show.inc

@@ -131 +131 @@
       }
 
-        $ol .= html::tag('li', null,
+        $classes = array($attach_prop->ctype_primary ? $attach_prop->ctype_primary : 'unknown');
+        if ($attach_prop->ctype_secondary)
+          $classes[] = $attach_prop->ctype_secondary;
+        if (preg_match('/\.([a-z0-9]+)$/', $attach_prop->filename, $m))
+          $classes[] = $m[1];
+        
+        $ol .= html::tag('li', join(' ', $classes),
           html::a(array(
             'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),