From 61027429eb761740fd31a7d35c5e82eee4ae32ef Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 17 Feb 2016 19:56:54 +0000 Subject: [PATCH] alignment of NM header --- addressbook/inc/class.addressbook_ui.inc.php | 16 ++++--- addressbook/lang/egw_bg.lang | 1 - addressbook/lang/egw_ca.lang | 1 - addressbook/lang/egw_cs.lang | 1 - addressbook/lang/egw_de.lang | 1 - addressbook/lang/egw_el.lang | 1 - addressbook/lang/egw_en.lang | 1 - addressbook/lang/egw_es-es.lang | 1 - addressbook/lang/egw_fi.lang | 1 - addressbook/lang/egw_fr.lang | 1 - addressbook/lang/egw_hu.lang | 1 - addressbook/lang/egw_id.lang | 1 - addressbook/lang/egw_it.lang | 1 - addressbook/lang/egw_lo.lang | 1 - addressbook/lang/egw_nl.lang | 1 - addressbook/lang/egw_pl.lang | 1 - addressbook/lang/egw_pt-br.lang | 1 - addressbook/lang/egw_ru.lang | 1 - addressbook/lang/egw_sk.lang | 1 - addressbook/lang/egw_sl.lang | 1 - addressbook/lang/egw_sv.lang | 1 - addressbook/lang/egw_zh-tw.lang | 1 - addressbook/lang/egw_zh.lang | 1 - addressbook/templates/default/app.css | 5 +- addressbook/templates/pixelegg/app.css | 5 +- calendar/inc/class.calendar_uilist.inc.php | 5 +- calendar/js/app.js | 50 +++++++++++--------- calendar/templates/default/list.xet | 6 +-- calendar/templates/pixelegg/app.css | 13 ----- calendar/templates/pixelegg/app.less | 15 ------ etemplate/templates/default/etemplate2.css | 25 ++++++++-- infolog/inc/class.infolog_ui.inc.php | 13 +++-- infolog/templates/default/app.css | 11 +++-- infolog/templates/pixelegg/app.css | 11 +++-- infolog/templates/pixelegg/app.less | 4 +- phpgwapi/lang/egw_bg.lang | 1 + phpgwapi/lang/egw_ca.lang | 1 + phpgwapi/lang/egw_cs.lang | 1 + phpgwapi/lang/egw_de.lang | 1 + phpgwapi/lang/egw_el.lang | 1 + phpgwapi/lang/egw_en.lang | 1 + phpgwapi/lang/egw_es-es.lang | 1 + phpgwapi/lang/egw_fi.lang | 1 + phpgwapi/lang/egw_fr.lang | 1 + phpgwapi/lang/egw_hu.lang | 1 + phpgwapi/lang/egw_id.lang | 1 + phpgwapi/lang/egw_it.lang | 1 + phpgwapi/lang/egw_lo.lang | 1 + phpgwapi/lang/egw_nl.lang | 1 + phpgwapi/lang/egw_pl.lang | 1 + phpgwapi/lang/egw_pt-br.lang | 1 + phpgwapi/lang/egw_ru.lang | 1 + phpgwapi/lang/egw_sk.lang | 1 + phpgwapi/lang/egw_sl.lang | 1 + phpgwapi/lang/egw_sv.lang | 1 + phpgwapi/lang/egw_zh-tw.lang | 1 + phpgwapi/lang/egw_zh.lang | 1 + timesheet/inc/class.timesheet_ui.inc.php | 7 ++- timesheet/js/app.js | 8 +++- 59 files changed, 120 insertions(+), 118 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 6547d4df10..3b93b6a3ee 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1737,10 +1737,10 @@ window.egw_LAB.wait(function() { $rows['customfields'] = array_values($this->customfields); // full app-header with all search criteria specially for the print - $GLOBALS['egw_info']['flags']['app_header'] = lang('addressbook'); + $header = array(); if ($query['filter'] !== '' && !isset($this->org_views[$query['org_view']])) { - $GLOBALS['egw_info']['flags']['app_header'] .= ' '.($query['filter'] == '0' ? lang('accounts') : + $header[] = ($query['filter'] == '0' ? lang('accounts') : ($GLOBALS['egw']->accounts->get_type($query['filter']) == 'g' ? lang('Group %1',$GLOBALS['egw']->accounts->id2name($query['filter'])) : common::grab_owner_name((int)$query['filter']). @@ -1748,7 +1748,7 @@ window.egw_LAB.wait(function() { } if ($query['org_view']) { - $GLOBALS['egw_info']['flags']['app_header'] .= ': '.$query['org_view_label']; + $header[] = $query['org_view_label']; // Make sure option is there if(!array_key_exists($query['org_view'], $this->org_views)) { @@ -1758,21 +1758,23 @@ window.egw_LAB.wait(function() { } if($query['advanced_search']) { - $GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Advanced search'); + $header[] = lang('Advanced search'); } if ($query['cat_id']) { - $GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Category').' '.$GLOBALS['egw']->categories->id2name($query['cat_id']); + $header[] = lang('Category').' '.$GLOBALS['egw']->categories->id2name($query['cat_id']); } if ($query['searchletter']) { $order = $order == 'n_given' ? lang('first name') : ($order == 'n_family' ? lang('last name') : lang('Organisation')); - $GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("%1 starts with '%2'",$order,$query['searchletter']); + $header[] = lang("%1 starts with '%2'",$order,$query['searchletter']); } if ($query['search'] && !$query['advanced_search']) // do not add that, if we have advanced search active { - $GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("Search for '%1'",$query['search']); + $header[] = lang("Search for '%1'",$query['search']); } + $GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $header); + return $this->total; } diff --git a/addressbook/lang/egw_bg.lang b/addressbook/lang/egw_bg.lang index e389280667..8965739be2 100644 --- a/addressbook/lang/egw_bg.lang +++ b/addressbook/lang/egw_bg.lang @@ -295,7 +295,6 @@ repetition addressbook bg Повторение required fields * addressbook bg Задължителни полета * role addressbook bg Роля room addressbook bg Стая -search for '%1' addressbook bg Търсене на '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook bg Изберете снимка във формат "портрет". Тя ще бъде преоразмерена на 60 пиксела ширина. select a view addressbook bg Избор на изглед select addressbook type addressbook bg Избор на тип адресен указател diff --git a/addressbook/lang/egw_ca.lang b/addressbook/lang/egw_ca.lang index 04b3244d23..6120905afd 100644 --- a/addressbook/lang/egw_ca.lang +++ b/addressbook/lang/egw_ca.lang @@ -262,7 +262,6 @@ removed from distribution list addressbook ca trets de la llista de distribució repetition addressbook ca Repetició role addressbook ca Càrrec room addressbook ca Despatx -search for '%1' addressbook ca Busceu per '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook ca Seleccioneu una fotografia en format jpeg. Serà redimensionada a una amplada de 60 píxels. select a view addressbook ca Seleccioneu una vista select addressbook type addressbook ca Seleccioneu un tipus de llibreta d'adreces diff --git a/addressbook/lang/egw_cs.lang b/addressbook/lang/egw_cs.lang index c441556aff..464fff1689 100644 --- a/addressbook/lang/egw_cs.lang +++ b/addressbook/lang/egw_cs.lang @@ -322,7 +322,6 @@ replacements for inserting contacts into documents addressbook cs Náhrady pro v required fields * addressbook cs povinné položky * role addressbook cs Role room addressbook cs Místnost -search for '%1' addressbook cs Hledat '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook cs Vyberte portrét ve formátu jpeg. Bude upraven na šířku 60 pixelů. select a view addressbook cs Vybrat pohled select addressbook type addressbook cs Vybrat typ adresáře diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index 586aaf7140..6987e33031 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -404,7 +404,6 @@ replacements for inserting contacts into documents addressbook de Platzhalter f required fields * addressbook de unbedingt auszufüllende Felder * role addressbook de Beruf room addressbook de Raum -search for '%1' addressbook de Suche nach '%1' search letter addressbook de Suche nach Buchstaben select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook de Wählen Sie ein hochformatiges jpeg Foto. Es wird 60 Pixel breit skaliert. select a view addressbook de Eine Ansicht auswählen diff --git a/addressbook/lang/egw_el.lang b/addressbook/lang/egw_el.lang index 2969ed9c25..180538b472 100644 --- a/addressbook/lang/egw_el.lang +++ b/addressbook/lang/egw_el.lang @@ -273,7 +273,6 @@ repetition addressbook el Επανάληψη required fields * addressbook el απαιτούμενα πεδία * role addressbook el Ρόλος room addressbook el Γραφείο -search for '%1' addressbook el Αναζήτηση για '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook el Επιλέξτε μια jpeg φωτογραφία σε μορφή πορτραίτου. Θα επαναπροσδιοριστεί σε 60 pixel πλάτος. select a view addressbook el Επιλέξτε μία προβολή select addressbook type addressbook el Επιλέξτε τύπο βιβλίου διευθύνσεων diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index b599aecb8a..faa4e3c083 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -404,7 +404,6 @@ replacements for inserting contacts into documents addressbook en Replacements f required fields * addressbook en Required fields * role addressbook en Occupation room addressbook en Room -search for '%1' addressbook en Search for '%1' search letter addressbook en Search letter select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook en Select a portrait format jpeg photo. It will be re-sized to 60 pixel width. select a view addressbook en Select a view diff --git a/addressbook/lang/egw_es-es.lang b/addressbook/lang/egw_es-es.lang index 83abf2c701..a14abafeec 100644 --- a/addressbook/lang/egw_es-es.lang +++ b/addressbook/lang/egw_es-es.lang @@ -386,7 +386,6 @@ replacements for inserting contacts into documents addressbook es-es Sustitucion required fields * addressbook es-es Campos requeridos * role addressbook es-es Rol room addressbook es-es Habitación -search for '%1' addressbook es-es Buscar '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook es-es Seleccione una foto jpeg en formato vertical. Se redimensionará a un ancho de 60 pixels. select a view addressbook es-es Seleccionar una vista select addressbook type addressbook es-es Seleccionar el tipo de libreta de direcciones diff --git a/addressbook/lang/egw_fi.lang b/addressbook/lang/egw_fi.lang index b77e1fbd97..0f1f3dad4d 100644 --- a/addressbook/lang/egw_fi.lang +++ b/addressbook/lang/egw_fi.lang @@ -358,7 +358,6 @@ replacements for inserting contacts into documents addressbook fi Komennot (repl required fields * addressbook fi Vaaditut kentät * role addressbook fi Ammatti room addressbook fi Huone -search for '%1' addressbook fi Haku '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook fi Valitse jpeg muodossa oleva kuva. Se muokkautuu 60 pikseliä leveäksi kuvaksi. select a view addressbook fi Valitse näkymä select addressbook type addressbook fi Valitse osoitekirjan tyyppi diff --git a/addressbook/lang/egw_fr.lang b/addressbook/lang/egw_fr.lang index 758a38e044..273b856db6 100644 --- a/addressbook/lang/egw_fr.lang +++ b/addressbook/lang/egw_fr.lang @@ -393,7 +393,6 @@ replacements for inserting contacts into documents addressbook fr Remplacements required fields * addressbook fr Champs nécessaires * role addressbook fr Rôle room addressbook fr Salle -search for '%1' addressbook fr Recherche de '%1' search letter addressbook fr Chercher sur une lettre select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook fr Sélectionner une photo jpeg en mode portrait. Elle sera reformatée en 60 pixels de largeur. select a view addressbook fr Sélectionnez une vue diff --git a/addressbook/lang/egw_hu.lang b/addressbook/lang/egw_hu.lang index af0f507be2..f4e54423d1 100644 --- a/addressbook/lang/egw_hu.lang +++ b/addressbook/lang/egw_hu.lang @@ -277,7 +277,6 @@ repetition addressbook hu Ismétlődés required fields * addressbook hu kötelező mezők role addressbook hu Szerep room addressbook hu Szoba -search for '%1' addressbook hu '%1' keresése select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook hu Válasszon ki egy arcképes fotót. Át lesz méretezve 60 pixel szélességűre. select a view addressbook hu Nézet választása select addressbook type addressbook hu Válassza ki a Címjegyzék típusát diff --git a/addressbook/lang/egw_id.lang b/addressbook/lang/egw_id.lang index 6f2edb5bea..911352d27b 100644 --- a/addressbook/lang/egw_id.lang +++ b/addressbook/lang/egw_id.lang @@ -246,7 +246,6 @@ repetition addressbook id Pengulangan required fields * addressbook id Field diperlukan * role addressbook id Peran room addressbook id Ruang -search for '%1' addressbook id Mencari '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook id Select a portrait format jpeg photo. It will be resized to 60 pixel width. select a view addressbook id Pilih tampilan select addressbook type addressbook id Pilih tipe buku alamat diff --git a/addressbook/lang/egw_it.lang b/addressbook/lang/egw_it.lang index 28cf406b31..7138f79957 100644 --- a/addressbook/lang/egw_it.lang +++ b/addressbook/lang/egw_it.lang @@ -398,7 +398,6 @@ replacements for inserting contacts into documents addressbook it Sostituzioni p required fields * addressbook it Campi obbligatori * role addressbook it Ruolo room addressbook it Stanza -search for '%1' addressbook it Cerca '%1' search letter addressbook it Cerca per lettera select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook it Seleziona una foto jpeg in formato ritratto. Sarà ridimensionata ad una larghezza di 60 pixel. select a view addressbook it Seleziona una vista diff --git a/addressbook/lang/egw_lo.lang b/addressbook/lang/egw_lo.lang index af87c4226d..b0d24be8c8 100644 --- a/addressbook/lang/egw_lo.lang +++ b/addressbook/lang/egw_lo.lang @@ -36,7 +36,6 @@ participants addressbook lo ຜູ້ເຂົ້າຮ່ວມ permission denied !!! addressbook lo ບໍ່ໄດ້ຮັບອະນຸຍາດ !!! repetition addressbook lo ການເຮັດຊໍ້າ role addressbook lo ບົດບາດ -search for '%1' addressbook lo ຄົ້ນຫາ '% 1' select multiple contacts for a further action addressbook lo ເລືອກເອົາການຕິດຕໍ່ຫຼາຍຮູບແບບ ເພື່ອການດໍາເນີນການຕໍ່ໄປ show addressbook lo ສະແດງ start admin lo ເລີ່ມ diff --git a/addressbook/lang/egw_nl.lang b/addressbook/lang/egw_nl.lang index 0e82dbfaf9..ef8fb70ecd 100644 --- a/addressbook/lang/egw_nl.lang +++ b/addressbook/lang/egw_nl.lang @@ -395,7 +395,6 @@ replacements for inserting contacts into documents addressbook nl Samenvoegvelde required fields * addressbook nl verplichte velden * role addressbook nl Rol room addressbook nl Kamer -search for '%1' addressbook nl Zoek naar '%1' search letter addressbook nl Zoek letter select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook nl Kies een portretformaat jpeg foto. Het wordt aangepast tot 60 pixels breedte. select a view addressbook nl Kies een weergave diff --git a/addressbook/lang/egw_pl.lang b/addressbook/lang/egw_pl.lang index 0fd1d80130..0166b26969 100755 --- a/addressbook/lang/egw_pl.lang +++ b/addressbook/lang/egw_pl.lang @@ -330,7 +330,6 @@ replacements for inserting contacts into documents addressbook pl Zamienniki do required fields * addressbook pl pola wymagane * role addressbook pl Pozycja room addressbook pl Pokój -search for '%1' addressbook pl Szukaj '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook pl Wybierz zdjęcie w formacie JPEG. Będzie zmniejszone do szerokości 60 pikseli. select a view addressbook pl Wybierz wygląd select addressbook type addressbook pl Wybierz typ książki adresowej diff --git a/addressbook/lang/egw_pt-br.lang b/addressbook/lang/egw_pt-br.lang index c9d3587c1e..b81e685c75 100644 --- a/addressbook/lang/egw_pt-br.lang +++ b/addressbook/lang/egw_pt-br.lang @@ -316,7 +316,6 @@ replacements for inserting contacts into documents addressbook pt-br Substituiç required fields * addressbook pt-br campos requeridos * role addressbook pt-br Função room addressbook pt-br Sala -search for '%1' addressbook pt-br Procurar por '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook pt-br Selecione uma foto no formato jpeg. Ela será alterada para o tamanho de 60 pixels de largura select a view addressbook pt-br Selecionar uma exibição select addressbook type addressbook pt-br Selecionar tipo de Livro de Contatos diff --git a/addressbook/lang/egw_ru.lang b/addressbook/lang/egw_ru.lang index 98637f9fff..4eb20f2d7f 100644 --- a/addressbook/lang/egw_ru.lang +++ b/addressbook/lang/egw_ru.lang @@ -369,7 +369,6 @@ replacements for inserting contacts into documents addressbook ru Подстан required fields * addressbook ru Требуемые поля role addressbook ru Должность room addressbook ru Комната -search for '%1' addressbook ru Искать '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook ru Выбрать фотографию jpeg портретного формата. Она будет масштабирована до 60 пикселей в ширину select a view addressbook ru Выбрать вид select addressbook type addressbook ru Выбрать тип адресной книги diff --git a/addressbook/lang/egw_sk.lang b/addressbook/lang/egw_sk.lang index 6b64681643..f77edec0dc 100644 --- a/addressbook/lang/egw_sk.lang +++ b/addressbook/lang/egw_sk.lang @@ -398,7 +398,6 @@ replacements for inserting contacts into documents addressbook sk Náhrady pre v required fields * addressbook sk Požadované polia * role addressbook sk Pozícia room addressbook sk Miestnosť -search for '%1' addressbook sk Hľadať '%1' search letter addressbook sk Hľadať podľa písmena select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook sk Vyberte obrázok jpeg orientovaný na výšku. Bude prispôsobený na výškový rozmer 60 pixlov. select a view addressbook sk Vyberte pohľad diff --git a/addressbook/lang/egw_sl.lang b/addressbook/lang/egw_sl.lang index 25e22f2693..a490c1c5ec 100644 --- a/addressbook/lang/egw_sl.lang +++ b/addressbook/lang/egw_sl.lang @@ -345,7 +345,6 @@ replacements for inserting contacts into documents addressbook sl Zamenjave za v required fields * addressbook sl Zahtevana polja * role addressbook sl Vloga room addressbook sl Soba -search for '%1' addressbook sl Išči '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook sl Izberite pokončno sliko JPEG. Njena velikost bo spremenjena na širino 60 pikslov. select a view addressbook sl Izberite pogled select addressbook type addressbook sl Izberite vrsto adresarja diff --git a/addressbook/lang/egw_sv.lang b/addressbook/lang/egw_sv.lang index 0155400bd8..1ae2e8cf60 100644 --- a/addressbook/lang/egw_sv.lang +++ b/addressbook/lang/egw_sv.lang @@ -242,7 +242,6 @@ record owner addressbook sv Postens ägare repetition addressbook sv Återkommande role addressbook sv Roll room addressbook sv Rum -search for '%1' addressbook sv Sök efter '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook sv Välj ett jpeg porträtt foto. Bilden skalas om till 60 pixel. select a view addressbook sv Välj vy select addressbook type addressbook sv Välj adressbok typ diff --git a/addressbook/lang/egw_zh-tw.lang b/addressbook/lang/egw_zh-tw.lang index e4ba5eef2d..9f38e61b4c 100644 --- a/addressbook/lang/egw_zh-tw.lang +++ b/addressbook/lang/egw_zh-tw.lang @@ -287,7 +287,6 @@ replacements for inserting contacts into documents addressbook zh-tw 將聯絡 required fields * addressbook zh-tw 必填欄位 role addressbook zh-tw 角色 room addressbook zh-tw 辦公室 -search for '%1' addressbook zh-tw 搜尋 '%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook zh-tw 選擇一個 jpeg 格式的照片，它會被重新調整為寬度 60 畫素。 select a view addressbook zh-tw 選擇一個檢視 select addressbook type addressbook zh-tw 選擇通訊錄類型 diff --git a/addressbook/lang/egw_zh.lang b/addressbook/lang/egw_zh.lang index 58b308443d..949416dbec 100644 --- a/addressbook/lang/egw_zh.lang +++ b/addressbook/lang/egw_zh.lang @@ -292,7 +292,6 @@ replacements for inserting contacts into documents addressbook zh 替换插入 required fields * addressbook zh 必要字段* role addressbook zh 职务 room addressbook zh 房间 -search for '%1' addressbook zh 搜索'%1' select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook zh 选择一个 jpeg 格式的照片，它将被重新调整宽度为60px。 select a view addressbook zh 选择一个查看 select addressbook type addressbook zh 选择通讯簿类型 diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css index 12f2ef916b..e685e0776d 100644 --- a/addressbook/templates/default/app.css +++ b/addressbook/templates/default/app.css @@ -118,7 +118,7 @@ input.et2_radiobox { right: 215px; } #addressbook-index .filtersContainer select { - width: 32%; + width: 31.5%; } select#addressbook-index_col_filter\[tid\] { width: 82px; @@ -127,6 +127,3 @@ select#addressbook-index_col_filter\[tid\] { float:right; width: 200px; } -#addressbook-index_favorite_wrapper { - top:-1px; -} diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 5c2c1c74a7..8aaae89a07 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -137,7 +137,7 @@ input.et2_radiobox { right: 215px; } #addressbook-index .filtersContainer select { - width: 32%; + width: 31.5%; } select#addressbook-index_col_filter\[tid\] { width: 82px; @@ -146,9 +146,6 @@ select#addressbook-index_col_filter\[tid\] { float: right; width: 200px; } -#addressbook-index_favorite_wrapper { - top: -1px; -} @media all { /* ############################################################################# diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 165cdd5d12..683bbd8848 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @package calendar * @author Ralf Becker - * @copyright (c) 2005-13 by RalfBecker-At-outdoor-training.de + * @copyright (c) 2005-16 by RalfBecker-At-outdoor-training.de * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -155,7 +155,6 @@ class calendar_uilist extends calendar_ui 'sort' => 'ASC',// IO direction of the sort: 'ASC' or 'DESC' 'default_cols' => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id', 'filter_onchange' => "app.calendar.filter_change", - 'header_left' => 'calendar.list.dates', 'row_id' => 'row_id', // set in get rows "$event[id]:$event[recur_date]" 'row_modified' => 'modified', 'favorites' => true @@ -353,7 +352,7 @@ class calendar_uilist extends calendar_ui $params['startdate'] = egw_time::to($this->first, egw_time::ET2); $params['enddate'] = egw_time::to($this->last, egw_time::ET2); break; - + // fall through to after given date case 'after': default: diff --git a/calendar/js/app.js b/calendar/js/app.js index 97c1c91920..7eceaae59c 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -5,7 +5,7 @@ * @package calendar * @author Hadi Nategh * @author Nathan Gray - * @copyright (c) 2008-13 by Ralf Becker + * @copyright (c) 2008-16 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -208,7 +208,7 @@ app.classes.calendar = AppJS.extend( * App is responsible for only reacting to "messages" it is interested in! * * Calendar binds listeners to the data cache, so if the data is updated, the widget - * will automatically update itself. + * will automatically update itself. * * @param {string} _msg message (already translated) to show, eg. 'Entry deleted' * @param {string} _app application name @@ -441,10 +441,10 @@ app.classes.calendar = AppJS.extend( /** * Set the app header - * + * * Because the toolbar takes some vertical space and has some horizontal space, * we don't use the system app header, but our own that is in the toolbar - * + * * @param {string} header Text to display */ set_app_header: function(header) { @@ -652,7 +652,7 @@ app.classes.calendar = AppJS.extend( if(widget == null) return; } /* Disabled - * + * // We clone the nodes so we can animate the transition var original = $j(widget.getDOMNode()).closest('.et2_grid'); var cloned = original.clone(true).attr("id","CLONE"); @@ -721,13 +721,13 @@ app.classes.calendar = AppJS.extend( window.setTimeout(function() { cloned.remove(); - + // Makes it jump to destination wrapper.css({ "transition-duration": "0s", "transition-delay": "0s" }); - + // Clean up from animation wrapper .removeClass("calendar_slide") @@ -783,7 +783,7 @@ app.classes.calendar = AppJS.extend( } },0); }; - + // Bind only once, to the whole thing /* Disabled jQuery('body').off('.calendar') @@ -793,12 +793,12 @@ app.classes.calendar = AppJS.extend( { // Consume scroll if in the middle of something if(app.calendar._scroll_disabled) return false; - + // Ignore if they're going the other way var direction = e.originalEvent.deltaY > 0 ? 1 : -1; var at_bottom = direction !== -1; var at_top = direction !== 1; - + $j(this).children(":not(.calendar_calGridHeader)").each(function() { // Check for less than 2px from edge, as sometimes we can't scroll anymore, but still have // 2px left to go @@ -1046,7 +1046,7 @@ app.classes.calendar = AppJS.extend( if (typeof duration != 'undefined' && typeof end != 'undefined') { end.set_disabled(duration.get_value()!==''); - + // Only set end date if not provided, adding seconds fails with DST if (!end.disabled && !content.end) { @@ -1302,6 +1302,10 @@ app.classes.calendar = AppJS.extend( if (filter && dates) { dates.set_disabled(filter.value !== "custom"); + if (filter.value == "custom") + { + jQuery(this.et2.getWidgetById('startdate').getDOMNode()).find('input').focus(); + } } }, @@ -1445,7 +1449,7 @@ app.classes.calendar = AppJS.extend( var widget = _senders[0].iface.getWidget(); return widget.recur_prompt(); } - + // Nextmatch in list view does not have a widget, but we can pull // the data by ID // Check for series @@ -1602,7 +1606,7 @@ app.classes.calendar = AppJS.extend( typeof content.recur_type != 'undefined' && content.recur_type != null && content.recur_type != 0 ) { - if (content.start != start_date || + if (content.start != start_date || content.whole_day != is_whole_day || (duration && ''+content.duration != duration || // End date might ignore seconds, and be 59 seconds off for all day events @@ -1805,7 +1809,7 @@ app.classes.calendar = AppJS.extend( // it will work for other users too. state.owner = 0; } - + // Keywords are only for list view if(state.view == 'listview') { @@ -1826,7 +1830,7 @@ app.classes.calendar = AppJS.extend( delete state.enddate; delete state.start_date; delete state.end_date; - + return state; }, @@ -1992,7 +1996,7 @@ app.classes.calendar = AppJS.extend( break; // Month is calculated individually for the month } - + var grid = view.etemplates[0].widgetContainer.getWidgetById('view'); /* @@ -2009,7 +2013,7 @@ app.classes.calendar = AppJS.extend( // Hide all but the first day header $j(grid.getDOMNode()).toggleClass('hideDayColHeader',state.state.view == 'week'); - + // Determine the different end date & varying values switch(state.state.view) { @@ -2080,7 +2084,7 @@ app.classes.calendar = AppJS.extend( } var row_index = 0; - + // Find any matching, existing rows - they can be kept grid.iterateOver(function(widget) { for(var i = 0; i < value.length; i++) @@ -2197,7 +2201,7 @@ app.classes.calendar = AppJS.extend( view.etemplates[0].widgetContainer.iterateOver(function(w) { w.set_width($j(view.etemplates[0].DOMContainer).width() * 0.69); },this,et2_calendar_timegrid); - + $j(view.etemplates[1].DOMContainer).css({"left":"69%", "height":($j(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'}); // TODO: Maybe some caching here this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) { @@ -2804,7 +2808,7 @@ app.classes.calendar = AppJS.extend( * callbacks. * * @param {Object} state Current state for update, used to determine what to update - * + * */ _update_events: function(state, data) { var updated_days = {}; @@ -3165,7 +3169,7 @@ app.classes.calendar = AppJS.extend( .on('click', '.ui-datepicker-week-col', function() { var view = app.calendar.state.view; var days = app.calendar.state.days; - + // Avoid a full state update, we just want the calendar to update // Directly update to avoid change event from the sidebox calendar var date = new Date(this.nextSibling.dataset.year,this.nextSibling.dataset.month,this.nextSibling.firstChild.textContent,0,0,0); @@ -3312,7 +3316,7 @@ app.classes.calendar = AppJS.extend( { // Avoid unwanted refresh immediately after load nm.controller._grid.doInvalidate = false; - + nm.set_startdate = jQuery.proxy(function(date) { this.state.first = this.date.toString(new Date(date)); },this); @@ -3675,7 +3679,7 @@ jQuery.extend(app.classes.calendar,{ return d; }, end_date: function(state) { - + var d = app.calendar.View.end_date.call(this, state); if(state.sortby && state.sortby === 'month') { diff --git a/calendar/templates/default/list.xet b/calendar/templates/default/list.xet index fce7ab6d17..4df809e118 100644 --- a/calendar/templates/default/list.xet +++ b/calendar/templates/default/list.xet @@ -112,12 +112,8 @@ - - - - - + diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index c1ef799366..ccac109080 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -2598,19 +2598,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar_merge { margin: 9px 0 0 0; } -#calendar-toolbar_toolbar .et2_toolbar_more > h.ui-toolbar-menulistHeader:not(:hover), -#calendar-toolbar_toolbar .et2_toolbar_more div.ui-toolbar-menulist button.et2_button_with_image, -#calendar-toolbar_toolbar .et2_toolbar_actionlist button.et2_button_with_image { - background-color: #fafafa; -} -/*#calendar_sidebox_content { - .egw_fw_ui_category_content { - // Last Element rounded - &:last-of-type{ - .border_radius (0, 0, 10px, 0); - } - } -}*/ /* ######################################################################################## /* * Calendar END */ /* tablets and smartphones */ diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 1dc7565ccb..9f3af588b6 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -1391,21 +1391,6 @@ div#calendar-container { // insert a document #calendar_merge {margin: 9px 0 0 0;} -#calendar-toolbar_toolbar { - .et2_toolbar_more > h.ui-toolbar-menulistHeader:not(:hover), .et2_toolbar_more div.ui-toolbar-menulist button.et2_button_with_image, .et2_toolbar_actionlist button.et2_button_with_image { - background-color: #fafafa; - } -} - -// Last Element in Sidemenu - rounded -/*#calendar_sidebox_content { - .egw_fw_ui_category_content { - // Last Element rounded - &:last-of-type{ - .border_radius (0, 0, 10px, 0); - } - } -}*/ /* ######################################################################################## /* * Calendar END */ diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index ad022874e5..77e5a3ff78 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -1106,6 +1106,7 @@ div.message.floating { .nextmatch_header_row { width: 100%; padding-bottom: 5px; + position: relative; } .nextmatch_header .header_count { padding: 0px 10px; @@ -1136,6 +1137,7 @@ div.message.floating { } .nextmatch_header_row > .header_row_right > * { display: inline-block; + float: left; } .et2_nextmatch .nextmatch_header { border: none; @@ -1157,8 +1159,8 @@ div.message.floating { /* Favorites */ .nextmatch_header div[id$=favorite_wrapper] { - margin-top: 6px; position: relative; + float: left; } #nm_favorites_popup_filters .filter_id, #nm_favorites_popup_filters .filter_value { @@ -1650,7 +1652,24 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button { margin: 1px 4px 1px 0; height: 24px; } -.nextmatch_header_row > div{ +/** + * Daterange selection in NM header + */ +.nextmatch_header_row span.et2_date[name$=date] { + min-width: 14ex; + padding: 0; +} +.nextmatch_header_row span.et2_date[name$=date] > input.et2_date { + margin: 1px 4px 1px 0; + height: 22px; + min-width: 14ex; + padding: 0; + background-color: #fafafa; + border: 1px solid silver; + border-radius: 3px; + padding-left: 5px; +} +.nextmatch_header_row > div { float: left; } .nextmatch_header_row:after { @@ -1667,7 +1686,7 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button { padding-left: 5px; } .et2_toolbar button.toolbar_toggled, .et2_searchbox button.et2_button.toolbar_toggled { - background-color: white; + background-color: lightgray; box-shadow: inset 1px 1px 1px 1px gray !important; } .et2_toolbar-dropdown{ diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 3d1903b937..4f72c71ce5 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @author Ralf Becker * @package infolog - * @copyright (c) 2003-14 by Ralf Becker + * @copyright (c) 2003-16 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -548,16 +548,21 @@ class infolog_ui if ($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$this->called_by) { - $GLOBALS['egw_info']['flags']['app_header'] = lang('Infolog'); + $headers = array(); if ($query['filter'] != '' && !empty($this->filters[$query['filter']])) { - $GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang($this->filters[$query['filter']]); + $headers[] = lang($this->filters[$query['filter']]); } if ($query['action'] && ($title = $query['action_title'] || is_array($query['action_id']) ? $query['action_title'] : egw_link::title($query['action']=='sp'?'infolog':$query['action'],$query['action_id']))) { - $GLOBALS['egw_info']['flags']['app_header'] .= ': '.$title; + $headers[] = $title; } + if ($query['search']) + { + $headers[] = lang("Search for '%1'", $query['search']); + } + $GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $headers); } if (isset($linked)) $query['col_filter']['linked'] = $linked; // add linked back to the colfilter diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css index 757cd6e921..cbc54aea6d 100644 --- a/infolog/templates/default/app.css +++ b/infolog/templates/default/app.css @@ -101,8 +101,9 @@ div#infolog-edit_infolog-edit-description { display: inline-block; } -div#infolog-index_infolog-index-dates { - position: absolute; - right: 12px; - top: 41px; -} \ No newline at end of file +#infolog-index select#infolog-index_cat_id { + width: 200px; +} +#infolog-index select#infolog-index_filter { + width: 150px; +} diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index b0e3e088c2..b95acfa2b8 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -39,7 +39,7 @@ } .normal, .normal_done { - color: black; + color: #000000; } .high { color: #cc0000; @@ -172,10 +172,11 @@ div#infolog-edit_infolog-edit-description { #infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid ul.et2_link_string li.et2_link { display: inline-block; } -div#infolog-index_infolog-index-dates { - position: absolute; - right: 12px; - top: 41px; +#infolog-index select#infolog-index_cat_id { + width: 200px; +} +#infolog-index select#infolog-index_filter { + width: 150px; } /*########################################### # # diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index fa5c4e7cf8..6cb965878f 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -168,7 +168,7 @@ button#infolog-edit_timestamp { top: 13px; } -#infolog-index table.egwGridView_grid { +#infolog-index table.egwGridView_grid { img{height: 16px;} } /* tablets and smartphones */ @@ -195,7 +195,7 @@ button#infolog-edit_timestamp { } label[id^='infolog-index_'][id$='info_enddate]'] { .mob-fontsize-xs; - + time { float: none; font-weight: normal; diff --git a/phpgwapi/lang/egw_bg.lang b/phpgwapi/lang/egw_bg.lang index c0957d8c1b..6a33cf8d32 100644 --- a/phpgwapi/lang/egw_bg.lang +++ b/phpgwapi/lang/egw_bg.lang @@ -758,3 +758,4 @@ your settings have been updated common bg Настройките ви са об zambia common bg Замбия zimbabwe common bg Зимбабве zoom common bg Увеличаване/намаляне +search for '%1' common bg Търсене на '%1' diff --git a/phpgwapi/lang/egw_ca.lang b/phpgwapi/lang/egw_ca.lang index 2e65f035bb..6a6d01ca22 100644 --- a/phpgwapi/lang/egw_ca.lang +++ b/phpgwapi/lang/egw_ca.lang @@ -757,3 +757,4 @@ your settings have been updated common ca Preferències actualitzades zambia common ca ZAMBIA zimbabwe common ca ZIMBABWE zoom common ca Zoom +search for '%1' common ca Busceu per '%1' diff --git a/phpgwapi/lang/egw_cs.lang b/phpgwapi/lang/egw_cs.lang index 2bceb2bb97..045b445374 100644 --- a/phpgwapi/lang/egw_cs.lang +++ b/phpgwapi/lang/egw_cs.lang @@ -795,3 +795,4 @@ your settings have been updated common cs Vaše nastavení byla zaktualizována zambia common cs ZAMBIE zimbabwe common cs ZIMBABWE zoom common cs Lupa +search for '%1' common cs Hledat '%1' diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang index 0b72cd1e33..2cc6630813 100644 --- a/phpgwapi/lang/egw_de.lang +++ b/phpgwapi/lang/egw_de.lang @@ -974,3 +974,4 @@ your settings have been updated common de Ihre Einstellungen wurden aktualisiert zambia common de ZAMBIA zimbabwe common de ZIMBABWE zoom common de Zoomen +search for '%1' common de Suche nach '%1' diff --git a/phpgwapi/lang/egw_el.lang b/phpgwapi/lang/egw_el.lang index 10c7458f61..30ada7aa78 100644 --- a/phpgwapi/lang/egw_el.lang +++ b/phpgwapi/lang/egw_el.lang @@ -724,3 +724,4 @@ your settings have been updated common el Οι ρυθμίσεις σας έχο zambia common el ΖΑΜΠΙΑ zimbabwe common el ΖΙΜΠΑΜΠΟΥΕ zoom common el Εστίαση +search for '%1' common el Αναζήτηση για '%1' diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang index 9c613aa860..5e3a3f3899 100644 --- a/phpgwapi/lang/egw_en.lang +++ b/phpgwapi/lang/egw_en.lang @@ -974,3 +974,4 @@ your settings have been updated common en Your settings have been updated. zambia common en ZAMBIA zimbabwe common en ZIMBABWE zoom common en Zoom +search for '%1' common en Search for '%1' diff --git a/phpgwapi/lang/egw_es-es.lang b/phpgwapi/lang/egw_es-es.lang index 9234cb57f5..aed0ba5c6d 100644 --- a/phpgwapi/lang/egw_es-es.lang +++ b/phpgwapi/lang/egw_es-es.lang @@ -845,3 +845,4 @@ your settings have been updated common es-es Sus preferencias fueron actualizada zambia common es-es ZAMBIA zimbabwe common es-es ZIMBAWE zoom common es-es Escala +search for '%1' common es-es Buscar '%1' diff --git a/phpgwapi/lang/egw_fi.lang b/phpgwapi/lang/egw_fi.lang index e86ba56eb3..46e114ba6e 100644 --- a/phpgwapi/lang/egw_fi.lang +++ b/phpgwapi/lang/egw_fi.lang @@ -852,3 +852,4 @@ your settings have been updated common fi Asetukset päivitetty zambia common fi ZAMBIA zimbabwe common fi ZIMBABWE zoom common fi Suurenna +search for '%1' common fi Haku '%1' diff --git a/phpgwapi/lang/egw_fr.lang b/phpgwapi/lang/egw_fr.lang index d80b535fac..5f325103e0 100644 --- a/phpgwapi/lang/egw_fr.lang +++ b/phpgwapi/lang/egw_fr.lang @@ -919,3 +919,4 @@ your settings have been updated common fr Vos préférences ont été mises à j zambia common fr ZAMBIE zimbabwe common fr ZIMBABWE zoom common fr Agrandissement +search for '%1' common fr Recherche de '%1' diff --git a/phpgwapi/lang/egw_hu.lang b/phpgwapi/lang/egw_hu.lang index a39fe9baac..193a352776 100644 --- a/phpgwapi/lang/egw_hu.lang +++ b/phpgwapi/lang/egw_hu.lang @@ -777,3 +777,4 @@ your settings have been updated common hu A beállításai módosításra kerül zambia common hu Zambia zimbabwe common hu Zimbabwe zoom common hu Nagyítás +search for '%1' common hu '%1' keresése diff --git a/phpgwapi/lang/egw_id.lang b/phpgwapi/lang/egw_id.lang index 8e963eb0ad..26a7e451dd 100644 --- a/phpgwapi/lang/egw_id.lang +++ b/phpgwapi/lang/egw_id.lang @@ -635,3 +635,4 @@ your message has been sent common id Pesan telah terkirim zambia common id ZAMBIA zimbabwe common id ZIMBABWE zoom common id Zoom +search for '%1' common id Mencari '%1' diff --git a/phpgwapi/lang/egw_it.lang b/phpgwapi/lang/egw_it.lang index b7bc9b0811..f96add85a8 100644 --- a/phpgwapi/lang/egw_it.lang +++ b/phpgwapi/lang/egw_it.lang @@ -946,3 +946,4 @@ your settings have been updated common it Le tue impostazioni sono state aggiorn zambia common it ZAMBIA zimbabwe common it ZIMBABWE zoom common it Zoom +search for '%1' common it Cerca '%1' diff --git a/phpgwapi/lang/egw_lo.lang b/phpgwapi/lang/egw_lo.lang index 69dc8761cc..aac324e8dd 100644 --- a/phpgwapi/lang/egw_lo.lang +++ b/phpgwapi/lang/egw_lo.lang @@ -784,3 +784,4 @@ your settings have been updated common lo ໄດ້ປັບປຸງການ zambia common lo ZAMBIA zimbabwe common lo ZIMBABWE zoom common lo ຂະຫຍາຍ +search for '%1' common lo ຄົ້ນຫາ '% 1' diff --git a/phpgwapi/lang/egw_nl.lang b/phpgwapi/lang/egw_nl.lang index ad0bde7b95..2fdfe8fcb7 100644 --- a/phpgwapi/lang/egw_nl.lang +++ b/phpgwapi/lang/egw_nl.lang @@ -923,3 +923,4 @@ your settings have been updated common nl Uw instellingen zijn gewijzigd zambia common nl ZAMBIA zimbabwe common nl ZIMBABWE zoom common nl Inzoemen +search for '%1' common nl Zoek naar '%1' diff --git a/phpgwapi/lang/egw_pl.lang b/phpgwapi/lang/egw_pl.lang index cd2529bc0c..0e340b2606 100755 --- a/phpgwapi/lang/egw_pl.lang +++ b/phpgwapi/lang/egw_pl.lang @@ -797,3 +797,4 @@ your settings have been updated common pl Twoje ustawienia zostały uaktualnione zambia common pl ZAMBIA zimbabwe common pl ZIMBABWE zoom common pl Powiększenie +search for '%1' common pl Szukaj '%1' diff --git a/phpgwapi/lang/egw_pt-br.lang b/phpgwapi/lang/egw_pt-br.lang index a856f0afb7..5aaa4bde20 100755 --- a/phpgwapi/lang/egw_pt-br.lang +++ b/phpgwapi/lang/egw_pt-br.lang @@ -872,3 +872,4 @@ your settings have been updated common pt-br Suas preferências foram atualizada zambia common pt-br ZÂMBIA zimbabwe common pt-br ZIMBABUE zoom common pt-br Zoom +search for '%1' common pt-br Procurar por '%1' diff --git a/phpgwapi/lang/egw_ru.lang b/phpgwapi/lang/egw_ru.lang index 6233243a23..227e8b7541 100644 --- a/phpgwapi/lang/egw_ru.lang +++ b/phpgwapi/lang/egw_ru.lang @@ -877,3 +877,4 @@ your settings have been updated common ru Ваши установки обнов zambia common ru Замбия zimbabwe common ru Зимбабве zoom common ru Масштаб +search for '%1' common ru Искать '%1' diff --git a/phpgwapi/lang/egw_sk.lang b/phpgwapi/lang/egw_sk.lang index ac6f193955..0b15ce405e 100644 --- a/phpgwapi/lang/egw_sk.lang +++ b/phpgwapi/lang/egw_sk.lang @@ -938,3 +938,4 @@ your settings have been updated common sk Vaše nastavenia boli upravené zambia common sk ZAMBIA zimbabwe common sk ZIMBABWE zoom common sk Lupa +search for '%1' common sk Hľadať '%1' diff --git a/phpgwapi/lang/egw_sl.lang b/phpgwapi/lang/egw_sl.lang index 9bbaa683bc..16e25bdd54 100644 --- a/phpgwapi/lang/egw_sl.lang +++ b/phpgwapi/lang/egw_sl.lang @@ -774,3 +774,4 @@ your settings have been updated common sl Vaše nastavitve so bile posodobljene zambia common sl ZAMBIJA zimbabwe common sl ZIMBABVE zoom common sl Zoom +search for '%1' common sl Išči '%1' diff --git a/phpgwapi/lang/egw_sv.lang b/phpgwapi/lang/egw_sv.lang index 14306bb821..0e7bbefe7a 100644 --- a/phpgwapi/lang/egw_sv.lang +++ b/phpgwapi/lang/egw_sv.lang @@ -732,3 +732,4 @@ your settings have been updated common sv Inställningarna uppdaterade zambia common sv ZAMBIA zimbabwe common sv ZIMBABWE zoom common sv Zooma +search for '%1' common sv Sök efter '%1' diff --git a/phpgwapi/lang/egw_zh-tw.lang b/phpgwapi/lang/egw_zh-tw.lang index b50cbc4592..ca24f58e94 100644 --- a/phpgwapi/lang/egw_zh-tw.lang +++ b/phpgwapi/lang/egw_zh-tw.lang @@ -748,3 +748,4 @@ your settings have been updated common zh-tw 您的設定已經更新。 zambia common zh-tw 尚比亞 zimbabwe common zh-tw 辛巴威 zoom common zh-tw 放大 +search for '%1' common zh-tw 搜尋 '%1' diff --git a/phpgwapi/lang/egw_zh.lang b/phpgwapi/lang/egw_zh.lang index 38279c427d..508ae4b146 100644 --- a/phpgwapi/lang/egw_zh.lang +++ b/phpgwapi/lang/egw_zh.lang @@ -764,3 +764,4 @@ your settings have been updated common zh 您的设置已更新 zambia common zh 赞比亚 zimbabwe common zh 津巴布韦 zoom common zh 缩放 +search for '%1' common zh 搜索'%1' diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index 4f0c2a5a5f..6cc85f4970 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @author Ralf Becker * @package timesheet - * @copyright (c) 2005-13 by Ralf Becker + * @copyright (c) 2005-16 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -787,6 +787,11 @@ class timesheet_ui extends timesheet_bo $rows['no_ts_status'] = strpos($query['selectcols'], 'ts_status') === false && !$this->config_data['history'] || $query['no_status']; + if ($query['search']) + { + $GLOBALS['egw_info']['flags']['app_header'] = lang("Search for '%1'", $query['search']); + } + return $total; } diff --git a/timesheet/js/app.js b/timesheet/js/app.js index 529dd854f6..92f7260ae4 100644 --- a/timesheet/js/app.js +++ b/timesheet/js/app.js @@ -4,7 +4,7 @@ * @link http://www.egroupware.org * @package timesheet * @author Hadi Nategh - * @copyright (c) 2008-13 by Ralf Becker + * @copyright (c) 2008-16 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -76,6 +76,10 @@ app.classes.timesheet = AppJS.extend( if (filter && dates) { dates.set_disabled(filter.value !== "custom"); + if (filter.value == "custom") + { + jQuery(this.et2.getWidgetById('startdate').getDOMNode()).find('input').focus(); + } } }, @@ -118,7 +122,7 @@ app.classes.timesheet = AppJS.extend( ts_project.set_blur(_widget.getValue() ? _widget.search.val() : ''); } }, - + /** * Get title in order to set it as document title * @returns {string}