Changeset cd900dd in github

Timestamp:

Oct 16, 2005 3:14:00 PM (8 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

8c67d58

Parents:

9fee0ed

Message:

Improved folder display; added Portuguese and Catalan translation

Files:

• program/localization/ca/labels.inc (added)
• program/localization/ca/messages.inc (added)
• program/localization/en/labels.inc (modified) (2 diffs)
• program/localization/pt/labels.inc (added)
• program/localization/pt/messages.inc (added)
• program/localization/pt_BR/labels.inc (added)
• program/localization/pt_BR/messages.inc (added)
• program/steps/mail/func.inc (modified) (7 diffs)
• program/steps/mail/list.inc (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• skins/default/mail.css (modified) (2 diffs)
• skins/default/templates/mail.html (modified) (1 diff)

program/localization/en/labels.inc

@@ -98 +98 @@
 $labels['nextmessages']     = 'Show next set of messages';
 $labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
 
 $labels['select'] = 'Select';
@@ -140 +141 @@
 $labels['composeto']      = 'Compose mail to';
 $labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
 
 

program/steps/mail/func.inc

@@ -100 +100 @@
 
   if ($type=='select')
-    $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox);
+    $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']);
    else
-    $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox);
-
-
-/*
-  foreach ($a_folders as $i => $folder)
-    {
-    $zebra_class = $i%2 ? 'even' : 'odd';
-    $folder_prop = $a_subfolders[$folder];
-    $foldername = isset($folder_prop) ? $folder_prop['name'] : $folder;
-
-    $folder_lc = strtolower($foldername);
-    if (in_array($folder_lc, $special_mailboxes))
-      $foldername = rcube_label($folder_lc);
-        
-    if ($unread_count = $IMAP->messagecount($folder, 'UNSEEN'))
-      $foldername .= sprintf(' (%d)', $unread_count);
-
-    $indent = isset($folder_prop) ? sprintf(' indent%d', $folder_prop['level']) : '';
-    $indent_str = isset($folder_prop) ? str_repeat('  ', (int)$folder_prop['level']) : '';
-  
-    // compose mailbox line
-    if ($type=='select')
-      $out .= sprintf('<option value="%s">%s%s</option>'."\n",
-                      $folder,
-                      $indent_str,
-                      rep_specialchars_output($foldername));
-    
-    else
-      $out .= sprintf('<li class="mailbox %s %s%s%s%s"><a href="#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')">%s</a></li>'."\n",
-                       preg_replace('/[^a-z0-9\-_]/', '', strtolower($folder)),
-                       $zebra_class,
-                       $unread_count ? ' unread' : '',
-                       $folder==$mbox ? ' selected' : '',
-                       $indent,
-                       $folder,
-                       $JS_OBJECT_NAME,
-                       $folder,
-                       $JS_OBJECT_NAME,
-                       $folder,
-                       rep_specialchars_output($foldername));
-    }
-*/
+    $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']);
+
 
   if ($type=='ul')
     $OUTPUT->add_script(sprintf("%s.gui_object('mailboxlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));
 
-
-/*  this is added further up
-  if (!$s_added_script)
-    {
-    $javascript .= sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $mbox);
-    $OUTPUT->add_script($javascript);
-    $s_added_script = TRUE;
-    }
-*/
   return $out . "</$type>";
   }
@@ -193 +144 @@
 
 // return html for a structured list <ul> for the mailbox tree
-function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $nestLevel = 0)
+function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
   {
   global $JS_OBJECT_NAME, $IMAP;
@@ -209 +160 @@
       $foldername = $folder['name'];
 
-    if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN'))
+    // shorten the folder name to a given length
+    if ($maxlength && $maxlength>1)
+      $foldername = abbrevate_string($foldername, $maxlength);
+
+    if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN', ($folder['id']==$mbox)))
       $foldername .= sprintf(' (%d)', $unread_count);
 
@@ -225 +180 @@
 
     if (!empty($folder['folders']))
-      $out .= '<ul>' . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $nestLevel+1) . "</ul>\n";
+      $out .= '<ul>' . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1) . "</ul>\n";
 
     $out .= "</li>\n";
@@ -236 +191 @@
 
 // return html for a flat list <select> for the mailbox tree
-function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $nestLevel=0)
+function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
   {
   global $IMAP;
@@ -244 +199 @@
   foreach ($arrFolders as $key=>$folder)
     {
+    // shorten the folder name to a given length
+    if ($maxlength && $maxlength>1)
+      $foldername = abbrevate_string($folder['name'], $maxlength);
+    else
+      $foldername = $folder['name'];
+
     $out .= sprintf('<option value="%s">%s%s</option>'."\n",
                     $folder['id'],
                     str_repeat('&nbsp;', $nestLevel*4),
-                    rep_specialchars_output($folder['name']));
+                    rep_specialchars_output($foldername));
 
     if (!empty($folder['folders']))
-      $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $nestLevel+1);
+      $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1);
 
     $idx++;
@@ -486 +447 @@
                                               'count' => $max)));
 
-  return $out;
+  return rep_specialchars_output($out);
   }
 

program/steps/mail/list.inc

@@ -21 +21 @@
 
 $REMOTE_REQUEST = TRUE;
+$OUTPUT_TYPE = 'js';
 
+$unseen = $IMAP->messagecount($mbox, 'UNSEEN', !empty($_GET['_refresh']) ? TRUE : FALSE);
 $count = $IMAP->messagecount();
 
@@ -32 +34 @@
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox), $unseen);
 
 

program/steps/settings/func.inc

@@ -51 +51 @@
                        
   // show language selection
+  $a_lang = rcube_list_languages();
+  asort($a_lang);
+  
   $field_id = 'rcmfd_lang';
   $select_lang = new select(array('name' => '_language', 'id' => $field_id));
-  $select_lang->add('Dansk', 'da');
-  $select_lang->add('Deutsch', 'de');
-  $select_lang->add('English', 'en');
-  $select_lang->add('Espanol', 'es');
-  $select_lang->add('Français', 'fr');
-  $select_lang->add('Italiano', 'it');
-  $select_lang->add('Nederlands', 'nl');
+  $select_lang->add(array_values($a_lang), array_keys($a_lang));
+  
 
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",

skins/default/mail.css

@@ -175 +175 @@
 }
 
-#mailboxlist
+#mailboxlist-container
 {
   position: absolute;
@@ -181 +181 @@
   left: 20px;
   width: 160px;
+  bottom: 80px;
+  border: 1px solid #CCCCCC;
+  background-color: #F9F9F9;
+  overflow: auto;
+  /* css hack for IE */
+  height: expression((parseInt(document.documentElement.clientHeight)-180)+'px');
+}
+
+#mailboxlist
+{
+  width: 100%;
   height: auto;
   margin: 0px;
   padding: 0px;
-  border: 1px solid #CCCCCC;
-  background-color: #F9F9F9;
   list-style-image: none;
   list-style-type: none;

skins/default/templates/mail.html

@@ -25 +25 @@
 
 <div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div>
-<roundcube:object name="mailboxlist" id="mailboxlist" />
+<div id="mailboxlist-container"><roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" /></div>
+
 
 <div id="mailcontframe">