From dab860cfbdd1cc91e169d6d515fe6d4404de819a Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Fri, 13 May 2016 15:27:11 +0000 Subject: [PATCH] Breadcrumb: reviewed icon and label for global search and search menus just openin a search form SVN:trunk[4083] --- application/menunode.class.inc.php | 4 +++- dictionaries/cs.dictionary.itop.ui.php | 2 ++ dictionaries/da.dictionary.itop.ui.php | 2 ++ dictionaries/de.dictionary.itop.ui.php | 2 ++ dictionaries/dictionary.itop.ui.php | 2 ++ dictionaries/es_cr.dictionary.itop.ui.php | 2 ++ dictionaries/fr.dictionary.itop.ui.php | 2 ++ dictionaries/hu.dictionary.itop.ui.php | 2 ++ dictionaries/it.dictionary.itop.ui.php | 2 ++ dictionaries/ja.dictionary.itop.ui.php | 2 ++ dictionaries/nl.dictionary.itop.ui.php | 2 ++ dictionaries/pt_br.dictionary.itop.ui.php | 2 ++ dictionaries/ru.dictionary.itop.ui.php | 2 ++ dictionaries/tr.dictionary.itop.ui.php | 2 ++ dictionaries/zh.dictionary.itop.ui.php | 2 ++ pages/UI.php | 5 +++++ 16 files changed, 36 insertions(+), 1 deletion(-) diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index ab1757799..f1612fe06 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -740,9 +740,11 @@ class SearchMenuNode extends MenuNode $this->sClass = $sClass; $this->aReflectionProperties['class'] = $sClass; } - + public function RenderContent(WebPage $oPage, $aExtraParams = array()) { + $oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/search.png'); + $oSearch = new DBObjectSearch($this->sClass); $aParams = array_merge(array('open' => true, 'table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams); $oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams); diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php index e9b7331a5..0f7724b76 100755 --- a/dictionaries/cs.dictionary.itop.ui.php +++ b/dictionaries/cs.dictionary.itop.ui.php @@ -764,6 +764,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'UI:ErrorPageTitle' => 'iTop - Chyba', 'UI:ObjectDoesNotExist' => 'Tento objekt neexistuje (nebo nemáte oprávnění k jeho zobrazení).', 'UI:SearchResultsPageTitle' => 'iTop - Výsledky hledání', + 'UI:SearchResultsTitle' => 'Výsledky hledání', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Nic k hledání', 'UI:Search:NeedleTooShort' => 'Zadaný výraz "%1$s" je příliš krátký. Zadejte prosím alespoň %2$d znaky.', 'UI:Search:Ongoing' => 'Hledám "%1$s"', diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php index 01750548e..360e8df93 100644 --- a/dictionaries/da.dictionary.itop.ui.php +++ b/dictionaries/da.dictionary.itop.ui.php @@ -609,6 +609,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'UI:ErrorPageTitle' => 'iTop - Fejl', 'UI:ObjectDoesNotExist' => 'Beklager, dette objekt eksisterer ikke (eller du har ikke tilladelse til at se det).', 'UI:SearchResultsPageTitle' => 'iTop - Søge Resultater', + 'UI:SearchResultsTitle' => 'Søge Resultater', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Intet at søge efter', 'UI:FullTextSearchTitle_Text' => 'Resultater for "%1$s":', 'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objekt(er) af klasse %2$s fundet.', diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 4c00995dc..30b1de8cd 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -606,6 +606,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'UI:ErrorPageTitle' => 'iTop - Fehler', 'UI:ObjectDoesNotExist' => 'Leider existiert dieses Objekt nicht oder Sie sind nicht berechtigt es einzusehen.', 'UI:SearchResultsPageTitle' => 'iTop - Suchergebnisse', + 'UI:SearchResultsTitle' => 'Suchergebnisse', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Kein Suchbegriff eingegeben', 'UI:FullTextSearchTitle_Text' => 'Ergebnisse für "%1$s":', 'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d Objekt(e) der Klasse %2$s gefunden.', diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index b003bf04f..83d94b01b 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -767,6 +767,8 @@ Dict::Add('EN US', 'English', 'English', array( 'UI:ErrorPageTitle' => 'iTop - Error', 'UI:ObjectDoesNotExist' => 'Sorry, this object does not exist (or you are not allowed to view it).', 'UI:SearchResultsPageTitle' => 'iTop - Search Results', + 'UI:SearchResultsTitle' => 'Search Results', + 'UI:SearchResultsTitle+' => 'Full-text search results', 'UI:Search:NoSearch' => 'Nothing to search for', 'UI:Search:NeedleTooShort' => 'The search string "%1$s" is too short. Please type at least %2$d characters.', 'UI:Search:Ongoing' => 'Searching for "%1$s"', diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index 4fef06a4a..e34c12e26 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -761,6 +761,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'UI:ErrorPageTitle' => 'iTop - Error', 'UI:ObjectDoesNotExist' => 'Disculpe, este objeto no existe (o no está autorizado para verlo).', 'UI:SearchResultsPageTitle' => 'iTop - Resultados de la Búsqueda', + 'UI:SearchResultsTitle' => 'Resultados de la Búsqueda', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Nada para buscar', 'UI:FullTextSearchTitle_Text' => 'Resultados para "%1$s":', 'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objeto(s) de la clase %2$s encontrado(s).', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 9489d11af..ed3ae6a1c 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -656,6 +656,8 @@ Dict::Add('FR FR', 'French', 'Français', array( 'UI:ErrorPageTitle' => 'iTop - Erreur', 'UI:ObjectDoesNotExist' => 'Désolé cet objet n\'existe pas (où vous n\'êtes pas autorisé à l\'afficher).', 'UI:SearchResultsPageTitle' => 'iTop - Résultats de la recherche', + 'UI:SearchResultsTitle' => 'Recherche globale', + 'UI:SearchResultsTitle+' => 'Résultat de recherche globale', 'UI:Search:NoSearch' => 'Rien à rechercher', 'UI:Search:NeedleTooShort' => 'La clé de recherche "%1$s" est trop courte. Veuillez saisir au moins %2$d caractères.', 'UI:Search:Ongoing' => 'Recherche de "%1$s"', diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php index 349867538..6fdc8d349 100755 --- a/dictionaries/hu.dictionary.itop.ui.php +++ b/dictionaries/hu.dictionary.itop.ui.php @@ -540,6 +540,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'UI:ErrorPageTitle' => 'iTop - Hiba', 'UI:ObjectDoesNotExist' => 'Sajnálom ez az objektum nem létezik (vagy a megtekintése nem engedélyezett a felhasználó számára).', 'UI:SearchResultsPageTitle' => 'iTop - Keresés eredményei', + 'UI:SearchResultsTitle' => 'Keresés eredményei', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Nincs keresés', 'UI:FullTextSearchTitle_Text' => '"%1$s" keresés eredményei:', 'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s osztály %1$d objektuma', diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php index f19b649bf..608d48e89 100644 --- a/dictionaries/it.dictionary.itop.ui.php +++ b/dictionaries/it.dictionary.itop.ui.php @@ -672,6 +672,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'UI:ErrorPageTitle' => 'iTop - Errore', 'UI:ObjectDoesNotExist' => 'Spiacenti, questo oggetto non esiste (o non si è autorizzati per vederlo).', 'UI:SearchResultsPageTitle' => 'iTop - Risultati della ricerca', + 'UI:SearchResultsTitle' => 'Risultati della ricerca', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Niente da ricercare', 'UI:FullTextSearchTitle_Text' => 'Risultati per "%1$s":', 'UI:Search:Count_ObjectsOf_Class_Found' => 'Trovato l\'oggetto(i) %1$d della classe %2$s.', diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index 94fcce725..5797b06a1 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -609,6 +609,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'UI:ErrorPageTitle' => 'iTop - エラー', 'UI:ObjectDoesNotExist' => '申し訳ございません。このオブジェクトは既に存在しません。(あるいは参照する権限がありません。)', 'UI:SearchResultsPageTitle' => 'iTop - 検索結果', + 'UI:SearchResultsTitle' => '検索結果', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => '検索するものがありません。', 'UI:FullTextSearchTitle_Text' => '"%1$s"の結果：', 'UI:Search:Count_ObjectsOf_Class_Found' => '%2$sクラスの%1$dオブジェクトが見つかりました。', diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php index 5ede92d93..13e1c9bab 100644 --- a/dictionaries/nl.dictionary.itop.ui.php +++ b/dictionaries/nl.dictionary.itop.ui.php @@ -769,6 +769,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'UI:ErrorPageTitle' => 'iTop - Error', 'UI:ObjectDoesNotExist' => 'Sorry, dit object bestaat niet (of u bent niet gemachtigd het te bekijken).', 'UI:SearchResultsPageTitle' => 'iTop - Zoekresultaten', + 'UI:SearchResultsTitle' => 'Zoekresultaten', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Geen zoekopdracht', 'UI:Search:NeedleTooShort' => 'De zoekopdracht "%1$s" is te kort. Type tenminste %2$d karakters.', 'UI:Search:Ongoing' => 'Zoeken naar "%1$s"', diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php index 945071594..dbcc67a4b 100644 --- a/dictionaries/pt_br.dictionary.itop.ui.php +++ b/dictionaries/pt_br.dictionary.itop.ui.php @@ -761,6 +761,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'UI:ErrorPageTitle' => 'Erro', 'UI:ObjectDoesNotExist' => 'Desculpe, este objeto não existe (ou você não tem permissão para vê-lo).', 'UI:SearchResultsPageTitle' => 'Resultado da pesquisa', + 'UI:SearchResultsTitle' => 'Resultado da pesquisa', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Nada a pesquisar de', 'UI:FullTextSearchTitle_Text' => 'Resultado para "%1$s":', 'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objeto(s) da classe %2$s encontrado(s).', diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php index a6d387cb9..a4f08f825 100644 --- a/dictionaries/ru.dictionary.itop.ui.php +++ b/dictionaries/ru.dictionary.itop.ui.php @@ -757,6 +757,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'UI:ErrorPageTitle' => 'iTop - Ошибка', 'UI:ObjectDoesNotExist' => 'Извните, этот объект не существует (или вы не можете его видеть).', 'UI:SearchResultsPageTitle' => 'iTop - Результаты поиска', + 'UI:SearchResultsTitle' => 'Результаты поиска', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Ничего не найдено', 'UI:FullTextSearchTitle_Text' => 'Результаты для "%1$s":', 'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d объект(ы) класса %2$s найдено.', diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php index bfdc48533..9ff3537f7 100644 --- a/dictionaries/tr.dictionary.itop.ui.php +++ b/dictionaries/tr.dictionary.itop.ui.php @@ -646,6 +646,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'UI:ErrorPageTitle' => 'iTop - Hata', 'UI:ObjectDoesNotExist' => 'Nesne mevcut değil veya yetkiniz yok.', 'UI:SearchResultsPageTitle' => 'iTop - Arama Sonuçları', + 'UI:SearchResultsTitle' => 'Arama Sonuçları', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => 'Nothing to search for', 'UI:FullTextSearchTitle_Text' => '"%1$s" için arama sonuçları:', 'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s sınıfına ait %1$d nesne bulundu.', diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php index 019d528bb..ce2806695 100644 --- a/dictionaries/zh.dictionary.itop.ui.php +++ b/dictionaries/zh.dictionary.itop.ui.php @@ -645,6 +645,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:ErrorPageTitle' => 'iTop - 错误', 'UI:ObjectDoesNotExist' => '抱歉, 该对象不存在 (或您未被允许浏览该对象).', 'UI:SearchResultsPageTitle' => 'iTop - 搜索结果', + 'UI:SearchResultsTitle' => '搜索结果', + 'UI:SearchResultsTitle+' => 'Full-text search results~~', 'UI:Search:NoSearch' => '没有可搜索的内容', 'UI:FullTextSearchTitle_Text' => '"%1$s" 的结果:', 'UI:Search:Count_ObjectsOf_Class_Found' => '发现 %2$s 类的 %1$d 个对象.', diff --git a/pages/UI.php b/pages/UI.php index 6be996d4a..05fd8353c 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -460,6 +460,7 @@ try /////////////////////////////////////////////////////////////////////////////////////////// case 'full_text': // Global "google-like" search + $oP->DisableBreadCrumb(); $sFullText = trim(utils::ReadParam('text', '', false, 'raw_data')); $iTune = utils::ReadParam('tune', 0); if (empty($sFullText)) @@ -534,6 +535,10 @@ try if ($iErrors == 0) { $oP->set_title(Dict::S('UI:SearchResultsPageTitle')); + $sPageId = "ui-global-search"; + $sLabel = Dict::S('UI:SearchResultsTitle'); + $sDescription = Dict::S('UI:SearchResultsTitle+'); + $oP->SetBreadCrumbEntry($sPageId, $sLabel, $sDescription, '', utils::GetAbsoluteUrlAppRoot().'images/search.png'); $oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js'); $oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js'); $oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');