Changeset 1052 in subversion

Timestamp:

Feb 12, 2008 1:41:53 PM (5 years ago)

Author:

thomasb

Message:

Show message count in folder list and hint when creating a subfolder

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (2 diffs)
• program/localization/de_CH/labels.inc (modified) (1 diff)
• program/localization/de_CH/messages.inc (modified) (1 diff)
• program/localization/de_DE/labels.inc (modified) (1 diff)
• program/localization/de_DE/messages.inc (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (6 diffs)
• skins/default/common.css (modified) (1 diff)
• skins/default/settings.css (modified) (6 diffs)
• skins/default/templates/managefolders.html (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -2552 +2552 @@
     else
       this.set_env('folder', null);
+      
+    if (this.gui_objects.createfolderhint)
+      this.gui_objects.createfolderhint.innerHTML = this.env.folder ? this.get_label('addsubfolderhint') : '';
     };
 
@@ -2574 +2577 @@
   this.create_folder = function(name)
     {
-  if (this.edit_folder)
-    this.reset_folder_rename();
+    if (this.edit_folder)
+      this.reset_folder_rename();
 
     var form;
     if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
       name = form.elements['_folder_name'].value;
-    if (this.env.folder)
+    if (this.env.folder && name != '')
       name = this.env.folder+this.env.delimiter+name;
 

trunk/roundcubemail/program/localization/de_CH/labels.inc

@@ -228 +228 @@
 $labels['foldername']  = 'Ordnername';
 $labels['subscribed']  = 'Abonniert';
+$labels['messagecount'] = 'Nachrichten';
 $labels['create']      = 'Erstellen';
 $labels['createfolder']  = 'Neuen Ordner erstellen';

trunk/roundcubemail/program/localization/de_CH/messages.inc

@@ -75 +75 @@
 $messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verÀndert werden';
 $messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden';
+$messages['addsubfolderhint'] = 'Wird als Unterdornder des aktuell selektieren Ordners erstellt';
 
 ?>

trunk/roundcubemail/program/localization/de_DE/labels.inc

@@ -179 +179 @@
 $labels['foldername'] = 'Ordnername';
 $labels['subscribed'] = 'Abonniert';
+$labels['messagecount'] = 'Nachrichten';
 $labels['create'] = 'Erstellen';
 $labels['createfolder'] = 'Neuen Ordner erstellen';

trunk/roundcubemail/program/localization/de_DE/messages.inc

@@ -78 +78 @@
 $messages['errorsendingreceipt'] = 'BestÀtigung konnte nicht gesendet werden';
 $messages['nodeletelastidentity'] = 'Sie koennen diesen Absender nicht loeschen.';
+$messages['addsubfolderhint'] = 'Wird als Unterdornder des aktuell selektieren Ordners erstellt';
+
 ?>

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -232 +232 @@
 $labels['foldername']  = 'Folder name';
 $labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
 $labels['create']  = 'Create';
 $labels['createfolder']  = 'Create new folder';

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -78 +78 @@
 $messages['errorsendingreceipt'] = 'Could not send the receipt';
 $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['addsubfolderhint'] = 'This folder will be created as subfolder of the currently selected one';
+
 ?>

trunk/roundcubemail/program/steps/settings/manage_folders.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -160 +160 @@
   // add table header
   $out .= "<thead><tr>\n";
-  $out .= sprintf('<td class="name">%s</td><td class="subscribed">%s</td>'.
+  $out .= sprintf('<td class="name">%s</td><td class="msgcount">%s</td><td class="subscribed">%s</td>'.
                   '<td class="rename">&nbsp;</td><td class="delete">&nbsp;</td>',
-                  rcube_label('foldername'), rcube_label('subscribed'));
+                  rcube_label('foldername'), rcube_label('messagecount'), rcube_label('subscribed'));
                   
   $out .= "\n</tr></thead>\n<tbody>\n";
@@ -202 +202 @@
       $a_js_folders['rcmrow'.($i+1)] = array($folder, rcube_charset_convert($folder, 'UTF-7'));
 
-    $out .= sprintf('<tr id="rcmrow%d" class="%s"><td>%s</td>',
+    $out .= sprintf('<tr id="rcmrow%d" class="%s"><td class="name">%s</td><td class="msgcount">%d</td>',
                     $i+1,
                     $zebra_class,
-                    Q($folder_html));
+                    Q($folder_html),
+                    $IMAP->messagecount($folder));
                     
     if ($protected)
-      $out .= '<td>&nbsp;'.($subscribed ? '&#x2022;' : '-').'</td>';
+      $out .= '<td class="subscribed">&nbsp;'.($subscribed ? '&#x2022;' : '-').'</td>';
     else
-      $out .= '<td>'.$checkbox_subscribe->show($subscribed?$folder:'', array('value' => $folder)).'</td>';
+      $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder:'', array('value' => $folder)).'</td>';
 
     // add rename and delete buttons
     if (!$protected)
-      $out .= sprintf('<td><a href="#rename" title="%s">%s</a>'.
-                      '<td><a href="#delete" title="%s">%s</a></td>',
+      $out .= sprintf('<td class="rename"><a href="#rename" title="%s">%s</a>'.
+                      '<td class="delete"><a href="#delete" title="%s">%s</a></td>',
                       rcube_label('renamefolder'),
                       $edit_button,
@@ -240 +241 @@
 function rcube_create_folder_form($attrib)
   {
+  global $OUTPUT;
+  
   list($form_start, $form_end) = get_form_tags($attrib, 'create-folder');
   unset($attrib['form']);
 
+  if ($attrib['hintbox'])
+    $OUTPUT->add_gui_object('createfolderhint', $attrib['hintbox']);
 
   // return the complete edit form as table
@@ -299 +304 @@
 
   $out .= "\n$form_end";
-
+  
   return $out;
   }
@@ -312 +317 @@
 
 // add some labels to client
-rcube_add_label('deletefolderconfirm');
+rcube_add_label('deletefolderconfirm','addsubfolderhint');
 
 $OUTPUT->send('managefolders');

trunk/roundcubemail/skins/default/common.css

@@ -108 +108 @@
 }
 
+.hint
+{
+  color: #666;
+  font-size: 11px;
+}
 
 /** common user interface objects */

trunk/roundcubemail/skins/default/settings.css

@@ -70 +70 @@
 #folder-manager
 {
-  width: 500px;
-  bottom: 120px;
+  width: 540px;
+  bottom: 140px;
   overflow: auto;
   border: 1px solid #999999;
@@ -120 +120 @@
 {
   position: absolute;
-  width: 500px;
-  height: 100px;
+  width: 540px;
+  height: 120px;
   left: 20px;
   bottom: 20px;
@@ -143 +143 @@
 div.settingsbox
 {
-  width: 500px;
+  width: 540px;
   margin-top: 20px;
   margin-bottom: 20px;
@@ -158 +158 @@
 {
   width: 100%;
-  table-layout: fixed;
 }
 
@@ -164 +163 @@
 {
   padding-left: 6px;
-  padding-right: 20px;
+  padding-right: 10px;
   white-space: nowrap;
   border-bottom: 1px solid #EBEBEB;
@@ -184 +183 @@
 }
 
-#subscription-table td.name
-{
-  width: 280px;
-}
-
-#subscription-table td.subscribed
-{
-  width: 80px;
-}
+#subscription-table thead td.name
+{
+  width: 240px;
+}
+
+#subscription-table thead td.msgcount
+{
+  width: 70px;
+}
+
+#subscription-table thead td.subscribed
+{
+  width: 60px;
+}
+
+#subscription-table tbody td.msgcount,
+#subscription-table tbody td.subscribed
+{
+  padding-left: 18px;
+}
+
+#subscription-table thead td.rename,
+#subscription-table thead td.delete
+{
+  width: 20px;
+  text-align: center;
+}

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

@@ -27 +27 @@
 <div class="settingspart">
 <roundcube:label name="foldername" />:&nbsp;
-<roundcube:object name="createfolder" form="subscriptionform" />
+<roundcube:object name="createfolder" form="subscriptionform" hintbox="rcmailaddfolderhint" />
 <roundcube:button command="create-folder" type="input" class="button" label="create" />
+<div id="rcmailaddfolderhint" class="hint" style="margin-top:1em; height:16px"></div>
 </div>
 </div>