diff --git a/css/backoffice/components/_search-form.scss b/css/backoffice/components/_search-form.scss index 7d77d9c83..b4160096d 100644 --- a/css/backoffice/components/_search-form.scss +++ b/css/backoffice/components/_search-form.scss @@ -26,6 +26,9 @@ $ibo-search-form-panel--items--hover--color: $ibo-color-grey-200 !default; $ibo-search-form-panel--multiple-choice--hover--color: $ibo-color-grey-200 !default; +$ibo-search-form-panel--hint--margin-left: $ibo-spacing-300 !default; +$ibo-search-form-panel--hint--color: $ibo-color-grey-800 !default; + $ibo-search-form-panel--misc-button--background-color: $ibo-search-form-panel--more-criteria--background-color !default; $ibo-search-form-panel--misc-button--icon--color: $ibo-search-form-panel--more-criteria--icon--color !default; @@ -70,11 +73,6 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search display: none; } - .sft_hint, - .sfobs_hint, - .sft_toggler { - margin-top: 4px; - } .sft_toggler { transform: rotateX(180deg); @@ -848,6 +846,12 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search } } +.sft_hint, +.sfobs_hint, +.sft_toggler { + margin-left: $ibo-search-form-panel--hint--margin-left; + color: $ibo-search-form-panel--hint--color; +} .sf_results_placeholder { @extend %ibo-font-size-150; diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php index 874efe44f..5b66682df 100755 --- a/dictionaries/cs.dictionary.itop.ui.php +++ b/dictionaries/cs.dictionary.itop.ui.php @@ -1478,7 +1478,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php index 2bc703b50..a3a209ad3 100644 --- a/dictionaries/da.dictionary.itop.ui.php +++ b/dictionaries/da.dictionary.itop.ui.php @@ -1469,7 +1469,7 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 6305edcf5..5ff7bda75 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -1468,7 +1468,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm // Search form 'UI:Search:Toggle' => 'Ein-/Ausklappen', 'UI:Search:AutoSubmit:DisabledHint' => 'Automatische Eingabe für diese Klasse deaktiviert', - 'UI:Search:Obsolescence:DisabledHint' => ' Obsolete Daten werden wegen ihrer Einstellung nicht angezeigt', + 'UI:Search:Obsolescence:DisabledHint' => 'Obsolete Daten werden wegen ihrer Einstellung nicht angezeigt', 'UI:Search:NoAutoSubmit:ExplainText' => 'Fügen Sie ein Kriterium in das Suchfeld ein oder klicken Sie auf die Suchschaltfläche, um die Objekte anzuzeigen.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Kriterium hinzufügen', // - Add new criteria button diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 4ea36a895..bef34d8d4 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -1493,8 +1493,8 @@ When associated with a trigger, each action is given an "order" number, specifyi // Search form 'UI:Search:Toggle' => 'Minimize / Expand', - 'UI:Search:AutoSubmit:DisabledHint' => ' Auto submit has been disabled for this class', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden', + 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria', // - Add new criteria button diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index 3fbeec51b..476df0c22 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -1484,7 +1484,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden", // Search form 'UI:Search:Toggle' => 'Minimizar/ Expandir', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto enviar ha sido deshabilitado para esta clase', - 'UI:Search:Obsolescence:DisabledHint' => ' Basado en sus preferencias, datos obsoletos están ocultos', + 'UI:Search:Obsolescence:DisabledHint' => 'Basado en sus preferencias, datos obsoletos están ocultos', 'UI:Search:NoAutoSubmit:ExplainText' => 'Agregue algún criterio en el cuadro de búsqueda o haga click en el botón de búsqueda para ver los objetos.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Agregar nuevo criterio', // - Add new criteria button diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index c635a4081..a67b7f1ae 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -1475,8 +1475,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé // Search form 'UI:Search:Toggle' => 'Réduire / Ouvrir', - 'UI:Search:AutoSubmit:DisabledHint' => ' La soumission automatique a été desactivée pour cette classe', - 'UI:Search:Obsolescence:DisabledHint' => ' Conformément à vos préférences utilisateur, vous ne voyez pas les données obsolètes', + 'UI:Search:AutoSubmit:DisabledHint' => 'La soumission automatique a été desactivée pour cette classe', + 'UI:Search:Obsolescence:DisabledHint' => 'Conformément à vos préférences utilisateur, vous ne voyez pas les données obsolètes', 'UI:Search:NoAutoSubmit:ExplainText' => 'Ajoutez des critères dans le formulaire de recherche ou cliquez sur le bouton rechercher pour voir les objets.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Ajouter un critère', // - Add new criteria button diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php index b29a98d95..29483fa4b 100755 --- a/dictionaries/hu.dictionary.itop.ui.php +++ b/dictionaries/hu.dictionary.itop.ui.php @@ -1469,7 +1469,7 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php index d9f6bd4ff..3091e1a30 100644 --- a/dictionaries/it.dictionary.itop.ui.php +++ b/dictionaries/it.dictionary.itop.ui.php @@ -1480,7 +1480,7 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine" // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index f8ccb5b50..c3cb0fa19 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -1469,7 +1469,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php index 35ceafb84..5a3f0ffcb 100644 --- a/dictionaries/nl.dictionary.itop.ui.php +++ b/dictionaries/nl.dictionary.itop.ui.php @@ -1483,7 +1483,7 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt // Search form 'UI:Search:Toggle' => 'Inklappen / uitklappen', 'UI:Search:AutoSubmit:DisabledHint' => 'Direct zoeken werd uitgeschakeld voor deze klasse.', - 'UI:Search:Obsolescence:DisabledHint' => ' Door jouw voorkeuren worden objecten met status "buiten dienst" verborgen', + 'UI:Search:Obsolescence:DisabledHint' => 'Door jouw voorkeuren worden objecten met status "buiten dienst" verborgen', 'UI:Search:NoAutoSubmit:ExplainText' => 'Voeg enkele criteria toe in het zoekveld of klik op de zoekknop om objecten te zien.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Voeg nieuw criterium toe', // - Add new criteria button diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php index f001abac0..b2f6d6444 100644 --- a/dictionaries/pl.dictionary.itop.ui.php +++ b/dictionaries/pl.dictionary.itop.ui.php @@ -1474,8 +1474,8 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą // Search form 'UI:Search:Toggle' => 'Zwiń / Rozwiń', - 'UI:Search:AutoSubmit:DisabledHint' => ' Automatyczne przesyłanie zostało wyłączone dla tej klasy', - 'UI:Search:Obsolescence:DisabledHint' => ' W oparciu o Twoje preferencje wycofane dane są ukrywane', + 'UI:Search:AutoSubmit:DisabledHint' => 'Automatyczne przesyłanie zostało wyłączone dla tej klasy', + 'UI:Search:Obsolescence:DisabledHint' => 'W oparciu o Twoje preferencje wycofane dane są ukrywane', 'UI:Search:NoAutoSubmit:ExplainText' => 'Dodaj jakieś kryterium w polu wyszukiwania lub kliknij przycisk wyszukiwania, aby wyświetlić obiekty.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Dodaj nowe kryteria', // - Add new criteria button diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php index 1a1af05b3..bc612b5b1 100644 --- a/dictionaries/pt_br.dictionary.itop.ui.php +++ b/dictionaries/pt_br.dictionary.itop.ui.php @@ -1480,7 +1480,7 @@ When associated with a trigger, each action is given an "order" number, specifyi // Search form 'UI:Search:Toggle' => 'Minimizar / Expandir', 'UI:Search:AutoSubmit:DisabledHint' => 'O envio automático foi desativado para esta classe', - 'UI:Search:Obsolescence:DisabledHint' => ' Baseado nas suas preferências, dados obsoletos estão escondidos', + 'UI:Search:Obsolescence:DisabledHint' => 'Baseado nas suas preferências, dados obsoletos estão escondidos', 'UI:Search:NoAutoSubmit:ExplainText' => 'Adicione algum critério na caixa de pesquisa ou clique no botão de pesquisa para visualizar os objetos.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Adicionar novos critérios', // - Add new criteria button diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php index 2cf3727e7..84923d4e8 100644 --- a/dictionaries/ru.dictionary.itop.ui.php +++ b/dictionaries/ru.dictionary.itop.ui.php @@ -1487,7 +1487,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( // Search form 'UI:Search:Toggle' => 'Развернуть / Свернуть', 'UI:Search:AutoSubmit:DisabledHint' => 'Автоматический запуск поиска отключен для данного класса', - 'UI:Search:Obsolescence:DisabledHint' => ' Устаревшие данные скрыты в соответствии с вашими предпочтениями', + 'UI:Search:Obsolescence:DisabledHint' => 'Устаревшие данные скрыты в соответствии с вашими предпочтениями', 'UI:Search:NoAutoSubmit:ExplainText' => 'Добавьте критерии поиска или нажмите кнопку поиска, чтобы просмотреть объекты.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Добавить критерий', // - Add new criteria button diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php index a047554c7..15b18f33b 100644 --- a/dictionaries/sk.dictionary.itop.ui.php +++ b/dictionaries/sk.dictionary.itop.ui.php @@ -1472,7 +1472,7 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php index 59d33999e..33571e123 100644 --- a/dictionaries/tr.dictionary.itop.ui.php +++ b/dictionaries/tr.dictionary.itop.ui.php @@ -1480,7 +1480,7 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe // Search form 'UI:Search:Toggle' => 'Minimize / Expand~~', 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~', - 'UI:Search:Obsolescence:DisabledHint' => ' Based on your preferences, obsolete data are hidden~~', + 'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~', 'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~', 'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~', // - Add new criteria button diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php index a9b7886a5..b9f98ec58 100644 --- a/dictionaries/zh_cn.dictionary.itop.ui.php +++ b/dictionaries/zh_cn.dictionary.itop.ui.php @@ -1480,7 +1480,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // Search form 'UI:Search:Toggle' => '折叠 / 展开', 'UI:Search:AutoSubmit:DisabledHint' => '该类别已禁用自动提交', - 'UI:Search:Obsolescence:DisabledHint' => ' 根据您的设置, 废弃的数据会被隐藏', + 'UI:Search:Obsolescence:DisabledHint' => '根据您的设置, 废弃的数据会被隐藏', 'UI:Search:NoAutoSubmit:ExplainText' => '在搜索框中添加规则，或者单击对象按钮查看对象.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => '添加条件', // - Add new criteria button diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php index dfb05591f..4d06f4946 100644 --- a/sources/application/search/searchform.class.inc.php +++ b/sources/application/search/searchform.class.inc.php @@ -182,12 +182,14 @@ class SearchForm $oUiBlock->AddSubBlock($oUiSearchBlock); $sHtml = ""; if (!$bShowObsoleteData) { + $sShowObsoleteLabel = Dict::S('UI:Search:Obsolescence:DisabledHint'); $sHtml .= ""; - $sHtml .= "".Dict::S('UI:Search:Obsolescence:DisabledHint').""; + $sHtml .= ""; } if ($bAutoSubmit === false) { - $sHtml .= "
"; - $sHtml .= "".Dict::S('UI:Search:AutoSubmit:DisabledHint').""; + $sAutoSubmit = Dict::S('UI:Search:AutoSubmit:DisabledHint'); + $sHtml .= ""; $sHtml .= ""; } $sHtml .= "
";