From 80376e9034088910b88d470076b9d277c3e45497 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 30 Sep 2013 11:26:45 +0200
Subject: [PATCH] // Fixed meta title

---
 admin-dev/themes/default/js/admin-theme.js   | 7 -------
 admin-dev/themes/default/template/header.tpl | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js
index 16bbcdf33..d8cfbb35b 100755
--- a/admin-dev/themes/default/js/admin-theme.js
+++ b/admin-dev/themes/default/js/admin-theme.js
@@ -102,13 +102,6 @@ $( document ).ready(function() {
   } else if($('body').hasClass('page-topbar')) {
 	navTopbar();
   }
-  
-  $('#header_shopname').on('click',
-    function(e){
-      e.preventDefault();
-      navSwitch();
-    }
-  );
 
   //tooltip
   $('.label-tooltip').tooltip();
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index c8f463241..e8a3cf533 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>{$meta_title} - PrestaShop&trade;</title>
+	<title>{$shop_name} {if $meta_title != ''}- {$meta_title}{/if} - PrestaShop&trade;</title>
 	{if $display_header}
 	<script type="text/javascript">
 		var help_class_name = '{$controller_name}';