From 8637e1c41b98f37bc676ba4d5e6e058cec1b1cd1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 17 Feb 2016 13:23:27 +0000 Subject: [PATCH] move label of all addressbook selectboxes into all-label (eg. "All categories"), resize selectboxes via css automatic, fix borders of favorites and row-counter in nextmatch header --- addressbook/inc/class.addressbook_ui.inc.php | 13 ++--- addressbook/lang/egw_de.lang | 4 +- addressbook/lang/egw_en.lang | 3 ++ addressbook/templates/default/app.css | 17 +++++- addressbook/templates/default/index.xet | 2 +- addressbook/templates/pixelegg/app.css | 15 ++++++ etemplate/inc/class.etemplate_new.inc.php | 2 +- .../class.etemplate_widget_nextmatch.inc.php | 4 +- etemplate/js/et2_extension_nextmatch.js | 8 +-- etemplate/lang/egw_de.lang | 17 ++++++ etemplate/lang/egw_en.lang | 3 +- etemplate/templates/default/etemplate2.css | 39 ++++++++++---- pixelegg/css/pixelegg.css | 44 ++------------- pixelegg/less/etemplate2.less | 54 ------------------- pixelegg/less/layout_messages.less | 25 ++++----- 15 files changed, 113 insertions(+), 137 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 8138294f8a..6547d4df10 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -5,7 +5,7 @@ * @link www.egroupware.org * @author Cornelius Weiss * @author Ralf Becker - * @copyright (c) 2005-14 by Ralf Becker + * @copyright (c) 2005-16 by Ralf Becker * @copyright (c) 2005/6 by Cornelius Weiss * @package addressbook * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License @@ -215,11 +215,12 @@ class addressbook_ui extends addressbook_bo 'order' => 'n_family', // IO name of the column to sort after (optional for the sortheaders) 'sort' => 'ASC', // IO direction of the sort: 'ASC' or 'DESC' 'col_filter' => array(), // IO array of column-name value pairs (optional for the filterheaders) - 'filter_label' => lang('Addressbook'), // I label for filter (optional) + //'cat_id_label' => lang('Categories'), + //'filter_label' => lang('Addressbook'), // I label for filter (optional) 'filter' => '', // =All // IO filter, if not 'no_filter' => True 'filter_no_lang' => True, // I set no_lang for filter (=dont translate the options) 'no_filter2' => True, // I disable the 2. filter (params are the same as for filter) - 'filter2_label' => lang('Distribution lists'), // IO filter2, if not 'no_filter2' => True + //'filter2_label'=> lang('Distribution lists'), // IO filter2, if not 'no_filter2' => True 'filter2' => '', // IO filter2, if not 'no_filter2' => True 'filter2_no_lang'=> True, // I set no_lang for filter2 (=dont translate the options) 'lettersearch' => true, @@ -251,7 +252,7 @@ class addressbook_ui extends addressbook_bo $content['nm'] = array_merge($content['nm'],$state); } } - $sel_options['cat_id'] = array('' => lang('all'), '0' => lang('None')); + $sel_options['cat_id'] = array('' => lang('All categories'), '0' => lang('None')); // Edit and delete list actions depends on permissions if($this->get_lists(EGW_ACL_EDIT)) @@ -270,7 +271,7 @@ class addressbook_ui extends addressbook_bo egw_cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']); if ($this->lists_available()) { - $sel_options['filter2'] = $this->get_lists(EGW_ACL_READ,array('' => lang('none'))); + $sel_options['filter2'] = $this->get_lists(EGW_ACL_READ,array('' => lang('No distribution list'))); $sel_options['filter2']['add'] = lang('Add a new list').'...'; // put it at the end } if ($do_email) @@ -293,7 +294,7 @@ class addressbook_ui extends addressbook_bo { $content['nm']['header_left'] = 'addressbook.index.left'; } - $sel_options['filter'] = $sel_options['owner'] = $this->get_addressbooks(EGW_ACL_READ,lang('All')); + $sel_options['filter'] = $sel_options['owner'] = $this->get_addressbooks(EGW_ACL_READ, lang('All addressbooks')); $sel_options['to'] = array( 'to' => 'To', 'cc' => 'Cc', diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index 6865492643..586aaf7140 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -60,8 +60,10 @@ addressbook vcard import addressbook de Adressbuch per vCard-Format importieren addressbook-fieldname addressbook de Adressbuch Feldname addvcard addressbook de VCard hinzufügen advanced search addressbook de Erweiterte Suche +all addressbooks addressbook de Alle Adressbücher all contacts addressbook de Alle Kontakte all in one field addressbook de Alle Kategorien in einem Feld ausgeben +all types addressbook de Alle Typen allow members of following groups to edit contact-data of accounts addressbook de Erlaube Mitgliedern der folgenden Gruppen die Kontaktdaten von Benutzern zu bearbeiten allow users to maintain their own account-data admin de Erlaube Benutzern ihre eigenen Benutzerdaten zu verwalten alt. csv import addressbook de Alt. CSV Import @@ -348,6 +350,7 @@ new contact submitted by %1 at %2 addressbook de Neuer Kontakt eingetragen von % new window opened to edit infolog for your selection addressbook de Es wird ein neues Fenster zum erstellen des Infolog Eintrags geöffnet next date addressbook de Nächster Termin no categories selected addressbook de keine Kategorien ausgewählt +no distribution list addressbook de Keine Verteilerliste no fallback addressbook de Keine Ausweichlösung no vcard addressbook de Keine VCard number addressbook de Nummer @@ -396,7 +399,6 @@ region addressbook de Region remove from distribution list addressbook de Von Verteilerliste löschen remove selected contacts from distribution list addressbook de Ausgewählte Kontakte vom Verteiler löschen removed from distribution list addressbook de vom Verteiler gelöscht -rename selected distribution list addressbook de Ausgewählte Verteilerliste hinzufügen repetition addressbook de Wiederholung replacements for inserting contacts into documents addressbook de Platzhalter für das Einfügen von Kontakten in Dokumente required fields * addressbook de unbedingt auszufüllende Felder * diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index 9eee2d6853..b599aecb8a 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -60,8 +60,10 @@ addressbook vcard import addressbook en Addressbook vCard import addressbook-fieldname addressbook en Address book field name addvcard addressbook en Add vCard advanced search addressbook en Advanced search +all addressbooks addressbook en All addressbooks all contacts addressbook en All contacts all in one field addressbook en All in one field +all types addressbook en All types allow members of following groups to edit contact-data of accounts addressbook en Allow members of following groups to edit contact-data of accounts allow users to maintain their own account-data admin en Allow users to maintain their own account data alt. csv import addressbook en Alt. CSV Import @@ -348,6 +350,7 @@ new contact submitted by %1 at %2 addressbook en New contact submitted by %1 at new window opened to edit infolog for your selection addressbook en New window opened to edit InfoLog. next date addressbook en Next date no categories selected addressbook en No categories selected +no distribution list addressbook en No distribution list no fallback addressbook en No fallback no vcard addressbook en No vCard number addressbook en Number diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css index b57a6c6703..12f2ef916b 100644 --- a/addressbook/templates/default/app.css +++ b/addressbook/templates/default/app.css @@ -109,9 +109,24 @@ input.et2_radiobox { .addressbookHooked .egwGridView_grid label>span.et2_link { display: none; } +/** + * adjust width of select-boxes in nextmatch + */ +#addressbook-index .filtersContainer { + position: absolute; + left: 288px; + right: 215px; +} +#addressbook-index .filtersContainer select { + width: 32%; +} +select#addressbook-index_col_filter\[tid\] { + width: 82px; +} #addressbook-index_addressbook-index-row select{ float:right; + width: 200px; } #addressbook-index_favorite_wrapper { top:-1px; -} \ No newline at end of file +} diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet index 56fcec32ae..4509519555 100644 --- a/addressbook/templates/default/index.xet +++ b/addressbook/templates/default/index.xet @@ -184,7 +184,7 @@