diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | program/include/rcube_contacts.php | 4 | ||||
| -rw-r--r-- | program/localization/de_CH/messages.inc | 1 | ||||
| -rw-r--r-- | program/localization/de_DE/messages.inc | 1 | ||||
| -rw-r--r-- | program/localization/en_US/messages.inc | 1 | ||||
| -rw-r--r-- | program/steps/addressbook/groups.inc | 4 | ||||
| -rw-r--r-- | skins/larry/mail.css | 4 | ||||
| -rw-r--r-- | skins/larry/styles.css | 6 |
8 files changed, 22 insertions, 2 deletions
@@ -3,6 +3,9 @@ CHANGELOG Roundcube Webmail - Display Tiff as Jpeg in browsers without Tiff support (#1488452) - Don't display Pdf/Tiff/Flash attachments inline without browser support (#1488452, #1487929) +- Don't show errors when moving contacts into groups they are already in (#1488493) +- Make folders with unread messages in subfolders bold again (#1486793) +- Abbreviate long attachment file names with ellipsis (#1488499) - Fix html2text conversion of strong|b|a|th|h tags when used in upper case - Add listcontrols template container in Larry skin (#1488498) - Fix host autoselection when default_host is an array (#1488495) diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 7edd0994d..f7fc65147 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -934,7 +934,9 @@ class rcube_contacts extends rcube_addressbook $contact_id ); - if (!$this->db->db_error) + if ($this->db->db_error) + $this->set_error(self::ERROR_SAVING, $this->db->db_error_msg); + else $added++; } diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc index 2260ba089..a34358034 100644 --- a/program/localization/de_CH/messages.inc +++ b/program/localization/de_CH/messages.inc @@ -115,6 +115,7 @@ $messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren au $messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.'; $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.'; $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.'; +$messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung verändert.'; $messages['importwait'] = 'Daten werden importiert, bitte warten...'; $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.'; $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>'; diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc index a0e71d234..6a4bc213b 100644 --- a/program/localization/de_DE/messages.inc +++ b/program/localization/de_DE/messages.inc @@ -113,6 +113,7 @@ $messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren au $messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.'; $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.'; $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.'; +$messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung verändert.'; $messages['importwait'] = 'Daten werden importiert, bitte warten...'; $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.'; $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert.</b>'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 779c41660..995be7b65 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -121,6 +121,7 @@ $messages['selectimportfile'] = 'Please select a file to upload.'; $messages['addresswriterror'] = 'The selected address book is not writeable.'; $messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.'; $messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.'; +$messages['nogroupassignmentschanged'] = 'No group assignments changed.'; $messages['importwait'] = 'Importing, please wait...'; $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.'; $messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>'; diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc index 3ce2bd0d3..b70453889 100644 --- a/program/steps/addressbook/groups.inc +++ b/program/steps/addressbook/groups.inc @@ -47,8 +47,10 @@ if ($RCMAIL->action == 'group-addmembers') { if ($result) $OUTPUT->show_message('contactaddedtogroup'); - else + else if ($plugin['abort'] || $CONTACTS->get_error()) $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error'); + else + $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nogroupassignmentschanged'); } } diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 885efc9c2..c0ceab076 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -186,6 +186,10 @@ a.iconbutton.threadmode.selected { background-position: 6px -1723px; } +#mailboxlist li.unread { + font-weight: bold; +} + #mailboxlist li.virtual > a { color: #aaa; } diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 37f819a21..55cdc47f9 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1916,6 +1916,12 @@ ul.toolbarmenu li span.conversation { text-shadow: 0px 1px 1px #fff; text-decoration: none; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#compose-attachments ul li { + padding-right: 28px; } .attachmentslist li a:hover { |