diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/js/app.js | 9 | ||||
| -rw-r--r-- | program/localization/de_CH/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/de_CH/messages.inc | 1 | ||||
| -rw-r--r-- | program/localization/de_DE/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/de_DE/messages.inc | 2 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/en_US/messages.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/manage_folders.inc | 27 |
8 files changed, 30 insertions, 14 deletions
diff --git a/program/js/app.js b/program/js/app.js index 2c212a80e..07b42a5f5 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -2551,6 +2551,9 @@ function rcube_webmail() this.set_env('folder', folder); else this.set_env('folder', null); + + if (this.gui_objects.createfolderhint) + this.gui_objects.createfolderhint.innerHTML = this.env.folder ? this.get_label('addsubfolderhint') : ''; }; @@ -2573,13 +2576,13 @@ function rcube_webmail() // tell server to create and subscribe a new mailbox 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; if (name) diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc index 3d2c81500..018bf4e01 100644 --- a/program/localization/de_CH/labels.inc +++ b/program/localization/de_CH/labels.inc @@ -227,6 +227,7 @@ $labels['folder'] = 'Ordner'; $labels['folders'] = 'Ordner'; $labels['foldername'] = 'Ordnername'; $labels['subscribed'] = 'Abonniert'; +$labels['messagecount'] = 'Nachrichten'; $labels['create'] = 'Erstellen'; $labels['createfolder'] = 'Neuen Ordner erstellen'; $labels['rename'] = 'Umbenennen'; diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc index 90bffeef5..91779ab73 100644 --- a/program/localization/de_CH/messages.inc +++ b/program/localization/de_CH/messages.inc @@ -74,5 +74,6 @@ $messages['copysuccess'] = '$nr Adressen erfolgreich kopiert'; $messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden'; $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'; ?>
\ No newline at end of file diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc index 409c4af8d..d74c296dd 100644 --- a/program/localization/de_DE/labels.inc +++ b/program/localization/de_DE/labels.inc @@ -178,6 +178,7 @@ $labels['folder'] = 'Ordner'; $labels['folders'] = 'Ordner'; $labels['foldername'] = 'Ordnername'; $labels['subscribed'] = 'Abonniert'; +$labels['messagecount'] = 'Nachrichten'; $labels['create'] = 'Erstellen'; $labels['createfolder'] = 'Neuen Ordner erstellen'; $labels['rename'] = 'Umbenennen'; diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc index 2ef66ac6b..90537f66b 100644 --- a/program/localization/de_DE/messages.inc +++ b/program/localization/de_DE/messages.inc @@ -77,4 +77,6 @@ $messages['movingmessage'] = 'Die E-Mail wird verschoben...'; $messages['receiptsent'] = 'Bestätigung erfolgreich gesendet'; $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'; + ?> diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 533e40f99..9a9c8410c 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -231,6 +231,7 @@ $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; $labels['foldername'] = 'Folder name'; $labels['subscribed'] = 'Subscribed'; +$labels['messagecount'] = 'Messages'; $labels['create'] = 'Create'; $labels['createfolder'] = 'Create new folder'; $labels['rename'] = 'Rename'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 5ee04d77c..4a3554142 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -77,4 +77,6 @@ $messages['movingmessage'] = 'Moving message...'; $messages['receiptsent'] = 'Successfully sent a read receipt'; $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'; + ?>
\ No newline at end of file diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index e457dadf5..fb6ee147a 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.inc @@ -5,7 +5,7 @@ | program/steps/settings/manage_folders.inc | | | | 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 | | | | PURPOSE: | @@ -159,9 +159,9 @@ function rcube_subscription_form($attrib) // 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"> </td><td class="delete"> </td>', - rcube_label('foldername'), rcube_label('subscribed')); + rcube_label('foldername'), rcube_label('messagecount'), rcube_label('subscribed')); $out .= "\n</tr></thead>\n<tbody>\n"; @@ -201,20 +201,21 @@ function rcube_subscription_form($attrib) if (!$protected) $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> '.($subscribed ? '•' : '-').'</td>'; + $out .= '<td class="subscribed"> '.($subscribed ? '•' : '-').'</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, rcube_label('deletefolder'), @@ -239,9 +240,13 @@ function rcube_subscription_form($attrib) 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 $out = "$form_start\n"; @@ -298,7 +303,7 @@ function rcube_rename_folder_form($attrib) } $out .= "\n$form_end"; - + return $out; } @@ -311,7 +316,7 @@ $OUTPUT->add_handlers(array( )); // add some labels to client -rcube_add_label('deletefolderconfirm'); +rcube_add_label('deletefolderconfirm','addsubfolderhint'); $OUTPUT->send('managefolders'); ?> |