From a6d8ffa2933d8bc5fc46a529be2304aa5ecd17a9 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 30 Sep 2013 15:38:06 +0200
Subject: [PATCH] // More breadcrumbs improvements

---
 admin-dev/themes/default/template/header.tpl  |  2 +-
 classes/controller/AdminController.php        | 33 ++++++++++++++-----
 .../admin/AdminCustomersController.php        |  9 +++++
 controllers/admin/AdminProductsController.php |  7 ++--
 install-dev/data/xml/tab.xml                  |  3 --
 install-dev/langs/br/data/tab.xml             |  2 +-
 install-dev/langs/de/data/tab.xml             |  2 +-
 install-dev/langs/en/data/tab.xml             |  2 +-
 install-dev/langs/es/data/tab.xml             |  2 +-
 install-dev/langs/fr/data/tab.xml             |  3 +-
 install-dev/langs/it/data/tab.xml             |  2 +-
 install-dev/langs/nl/data/tab.xml             |  2 +-
 install-dev/langs/pl/data/tab.xml             |  2 +-
 install-dev/langs/ru/data/tab.xml             |  2 +-
 14 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index e8a3cf533..bf5b106cd 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -33,7 +33,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="robots" content="NOFOLLOW, NOINDEX">
-	<title>{$shop_name} {if $meta_title != ''}- {$meta_title}{/if} - PrestaShop&trade;</title>
+	<title>{$shop_name} {if $meta_title != ''}{$navigationPipe|escape:'htmlall':'UTF-8'} {$meta_title}{/if} (PrestaShop&trade;)</title>
 	{if $display_header}
 	<script type="text/javascript">
 		var help_class_name = '{$controller_name}';
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index f1151480a..911201620 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -356,14 +356,24 @@ class AdminControllerCore extends Controller
 	 */
 	public function initBreadcrumbs()
 	{
+		/* Breadcrumb */
+		$navigationPipe = (Configuration::get('PS_NAVIGATION_PIPE') ? Configuration::get('PS_NAVIGATION_PIPE') : '>');
+		$this->context->smarty->assign('navigationPipe', $navigationPipe);
+
 		$tabs = array();
 		$tabs = Tab::recursiveTab($this->id, $tabs);
 		$tabs = array_reverse($tabs);
+		$prev = '';
 		foreach ($tabs as $tab)
+		{
+			if (!empty($prev) && $prev == $tab['name'])
+				array_pop($this->breadcrumbs);
+			$prev = $tab['name'];
 			if ($tab['id_parent'] != 0)
 				$this->breadcrumbs[] = '<a href="'.Tools::htmlentitiesUTF8($this->context->link->getAdminLink($tab['class_name'])).'">'.$tab['name'].'</a>';
 			else
 				$this->breadcrumbs[] = $tab['name'];
+		}
 	}
 
 	/**
@@ -373,24 +383,29 @@ class AdminControllerCore extends Controller
 	 */
 	public function initToolbarTitle()
 	{
-		$bread_extended = array_unique($this->breadcrumbs);
+		$this->toolbar_title = array_unique($this->breadcrumbs);
 
 		switch ($this->display)
 		{
 			case 'edit':
-				$bread_extended[] = $this->l('Edit');
+				$this->toolbar_title[] = $this->l('Edit');
 				break;
 
 			case 'add':
-				$bread_extended[] = $this->l('Add new');
+				$this->toolbar_title[] = $this->l('Add new');
 				break;
 
 			case 'view':
-				$bread_extended[] = $this->l('View');
+				$this->toolbar_title[] = $this->l('View');
 				break;
 		}
-		$this->toolbar_title = $bread_extended;
-    
+
+		if ($filter = $this->addFiltersToBreadcrumbs())
+			$this->toolbar_title[] = $filter;
+	}
+	
+	public function addFiltersToBreadcrumbs()
+	{
 		if (Tools::isSubmit('submitFilter'))
 		{
 			$filters = array();
@@ -424,7 +439,7 @@ class AdminControllerCore extends Controller
 			}
 
 			if (count($filters))
-				$this->toolbar_title[] = sprintf($this->l('filter by %s'), implode(', ', $filters));
+				return sprintf($this->l('filter by %s'), implode(', ', $filters));
 		}
 	}
 
@@ -1272,7 +1287,7 @@ class AdminControllerCore extends Controller
 
 		// Use page title from meta_title if it has been set else from the breadcrumbs array
 		if (!$this->meta_title)
-			$this->meta_title = isset($this->breadcrumbs[1]) ? $this->breadcrumbs[1] : $this->breadcrumbs[0];
+			$this->meta_title = strip_tags(is_array($this->toolbar_title) ? implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title) : $this->toolbar_title);
 		$this->context->smarty->assign('meta_title', $this->meta_title);
 
 		$tpl_action = $this->tpl_folder.$this->display.'.tpl';
@@ -1783,7 +1798,7 @@ class AdminControllerCore extends Controller
 			$helper->id = $this->object->id;
 
 		// @todo : move that in Helper
-		$helper->title = implode(' &gt; ', $this->toolbar_title);
+		$helper->title = is_array($this->toolbar_title) ? implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title) : $this->toolbar_title;
 		$helper->toolbar_btn = $this->toolbar_btn;
 		$helper->show_toolbar = $this->show_toolbar;
 		$helper->toolbar_scroll = $this->toolbar_scroll;
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index c67272bf2..061aa2e03 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -187,6 +187,15 @@ class AdminCustomersControllerCore extends AdminController
 		}
 	}
 
+	public function initToolbarTitle()
+	{
+		parent::initToolbarTitle();
+
+		if ($this->display != 'list')
+			if (($customer = $this->loadObject(true)) && Validate::isLoadedObject($customer))
+				$this->toolbar_title[] = Tools::htmlentitiesUTF8(Tools::substr($customer->firstname, 0, 1).'. '.$customer->firstname);
+	}
+
 	public function initPageHeaderToolbar()
 	{
 		$this->page_header_toolbar_title = $this->l('Customers');
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index f52b5a89c..6351ce766 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2524,9 +2524,10 @@ class AdminProductsControllerCore extends AdminController
 	public function initToolbarTitle()
 	{
 		parent::initToolbarTitle();
-		if ($product = $this->loadObject(true))
-			if ((bool)$product->id && $this->display != 'list' && isset($this->toolbar_title[2]))
-				$this->toolbar_title[2] = $this->toolbar_title[2].' ('.$this->product_name.')';
+		
+		if ($this->display != 'list')
+			if (($product = $this->loadObject(true)) && Validate::isLoadedObject($product))
+				$this->toolbar_title[] = Tools::htmlentitiesUTF8($this->product_name);
 	}
 
 	/**
diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml
index dd992ca4d..b11a8a870 100644
--- a/install-dev/data/xml/tab.xml
+++ b/install-dev/data/xml/tab.xml
@@ -6,9 +6,6 @@
     <field name="active"/>
   </fields>
   <entities>
-    <tab id="Home" id_parent="-1" active="1">
-      <class_name>AdminHome</class_name>
-    </tab>
     <tab id="Dashboard" id_parent="-1" active="1">
       <class_name>AdminDashboard</class_name>
     </tab>
diff --git a/install-dev/langs/br/data/tab.xml b/install-dev/langs/br/data/tab.xml
index d0dd5591e..d4ff4a4ae 100644
--- a/install-dev/langs/br/data/tab.xml
+++ b/install-dev/langs/br/data/tab.xml
@@ -33,7 +33,7 @@
   <tab id="General" name="Geral"/>
   <tab id="Geolocation" name="Geolocaliza&#xE7;&#xE3;o"/>
   <tab id="Groups" name="Grupos"/>
-  <tab id="Home" name="In&#xED;cio"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="Image_Mapping" name="Mapeamento de Imagem"/>
   <tab id="Images" name="Imagens"/>
   <tab id="Instant_Stock_Status" name="Status atual do estoque"/>
diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml
index 237e792eb..8189b5de6 100644
--- a/install-dev/langs/de/data/tab.xml
+++ b/install-dev/langs/de/data/tab.xml
@@ -33,7 +33,7 @@
   <tab id="General" name="Allgemein"/>
   <tab id="Geolocation" name="Geotargeting"/>
   <tab id="Groups" name="Gruppen"/>
-  <tab id="Home" name="Startseite"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="Image_Mapping" name="Bilder-Mapping"/>
   <tab id="Images" name="Bilder"/>
   <tab id="Instant_Stock_Status" name="aktueller Lagerstand"/>
diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml
index 4eaf19c75..c97840cfc 100644
--- a/install-dev/langs/en/data/tab.xml
+++ b/install-dev/langs/en/data/tab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Home"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="CMS_Pages" name="CMS Pages"/>
   <tab id="CMS_Categories" name="CMS Categories"/>
   <tab id="Combinations_Generator" name="Combinations Generator"/>
diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml
index 6d0c59194..875021194 100644
--- a/install-dev/langs/es/data/tab.xml
+++ b/install-dev/langs/es/data/tab.xml
@@ -33,7 +33,7 @@
   <tab id="General" name="General"/>
   <tab id="Geolocation" name="Localizaci&#xF3;n"/>
   <tab id="Groups" name="Grupos"/>
-  <tab id="Home" name="Inicio"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="Image_Mapping" name="Cartograf&#xED;a de im&#xE1;genes"/>
   <tab id="Images" name="Im&#xE1;genes"/>
   <tab id="Instant_Stock_Status" name="Estado de existencias instantes"/>
diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml
index bd427185a..360a56ef9 100644
--- a/install-dev/langs/fr/data/tab.xml
+++ b/install-dev/langs/fr/data/tab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <entity_tab>
   <tab id="Addresses" name="Adresses"/>
-  <tab id="Dashboard" name="Dasboard"/>
+  <tab id="Dashboard" name="Tableau de Bord"/>
   <tab id="Administration" name="Administration"/>
   <tab id="Advanced_Parameters" name="Param&#xE8;tres avanc&#xE9;s"/>
   <tab id="Attachments" name="Documents joints"/>
@@ -34,7 +34,6 @@
   <tab id="General" name="G&#xE9;n&#xE9;rales"/>
   <tab id="Geolocation" name="G&#xE9;olocalisation"/>
   <tab id="Groups" name="Groupes"/>
-  <tab id="Home" name="Accueil"/>
   <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
   <tab id="Images" name="Images"/>
   <tab id="Instant_Stock_Status" name="Etat instantan&#xE9; du stock"/>
diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml
index d92e19771..26dcddef9 100644
--- a/install-dev/langs/it/data/tab.xml
+++ b/install-dev/langs/it/data/tab.xml
@@ -33,7 +33,7 @@
   <tab id="General" name="Generale"/>
   <tab id="Geolocation" name="Geolocalizzazione"/>
   <tab id="Groups" name="Gruppi"/>
-  <tab id="Home" name="Home page"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="Image_Mapping" name="Mapping Immagine"/>
   <tab id="Images" name="Immagini"/>
   <tab id="Instant_Stock_Status" name="Stato dello stock Istantaneo"/>
diff --git a/install-dev/langs/nl/data/tab.xml b/install-dev/langs/nl/data/tab.xml
index ddb0ba5fa..a2a8202b0 100644
--- a/install-dev/langs/nl/data/tab.xml
+++ b/install-dev/langs/nl/data/tab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Home"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="CMS_Pages" name="CMS Pages"/>
   <tab id="CMS_Categories" name="CMS Categories"/>
   <tab id="Combinations_Generator" name="Combinations Generator"/>
diff --git a/install-dev/langs/pl/data/tab.xml b/install-dev/langs/pl/data/tab.xml
index 5594c813a..2b1bf046e 100644
--- a/install-dev/langs/pl/data/tab.xml
+++ b/install-dev/langs/pl/data/tab.xml
@@ -33,7 +33,7 @@
   <tab id="General" name="Ustawienia g&#x142;&#xF3;wne"/>
   <tab id="Geolocation" name="Lokalizacja geograficzna"/>
   <tab id="Groups" name="Grupy"/>
-  <tab id="Home" name="Strona g&#x142;&#xF3;wna"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="Image_Mapping" name="Image Mapping"/>
   <tab id="Images" name="Obrazki"/>
   <tab id="Instant_Stock_Status" name="Natychmiastowe stany magazynowe"/>
diff --git a/install-dev/langs/ru/data/tab.xml b/install-dev/langs/ru/data/tab.xml
index 61e2c4856..9231b4485 100644
--- a/install-dev/langs/ru/data/tab.xml
+++ b/install-dev/langs/ru/data/tab.xml
@@ -33,7 +33,7 @@
   <tab id="General" name="&#x41E;&#x431;&#x449;&#x438;&#x435; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
   <tab id="Geolocation" name="&#x413;&#x435;&#x43E;&#x43B;&#x43E;&#x43A;&#x430;&#x446;&#x438;&#x44F;"/>
   <tab id="Groups" name="&#x413;&#x440;&#x443;&#x43F;&#x43F;&#x44B;"/>
-  <tab id="Home" name="&#x414;&#x43E;&#x43C;&#x43E;&#x439;"/>
+  <tab id="Dashboard" name="Dashboard"/>
   <tab id="Image_Mapping" name="&#x41A;&#x430;&#x440;&#x442;&#x430; &#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43E;&#x43A;"/>
   <tab id="Images" name="&#x438;&#x437;&#x43E;&#x431;&#x440;&#x430;&#x436;&#x435;&#x43D;&#x438;&#x44F;"/>
   <tab id="Instant_Stock_Status" name="&#x422;&#x435;&#x43A;&#x443;&#x449;&#x435;&#x435; &#x441;&#x43E;&#x441;&#x442;&#x43E;&#x44F;&#x43D;&#x438;&#x435; &#x441;&#x43A;&#x43B;&#x430;&#x434;&#x430;"/>