From ba6699a3781dfaf13d2d00bccd159c9fb67e5a9d Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Thu, 12 Sep 2013 15:55:14 +0200
Subject: [PATCH] // Fix Admin access

---
 .../controllers/access/helpers/form/form.tpl         | 12 ++++++------
 controllers/admin/AdminAccessController.php          |  5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
index 421037a1f..7a63b4220 100644
--- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
@@ -32,7 +32,8 @@
 		$('div.productTabs a').click(function() {
 			var id = $(this).attr('id');
 			$('.nav-profile').removeClass('selected');
-			$(this).addClass('selected');
+			$(this).addClass('selected active');
+			$(this).siblings().removeClass('active');
 			$('.tab-profile').hide()
 			$('.'+id).show();
 		});
@@ -175,11 +176,10 @@
 <div class="productTabs col-lg-2">
 	<div class="tab list-group">
 	{foreach $profiles as $profile}
-		<a class="list-group-item nav-profile {if $profile.id_profile == $current_profile}selected{/if}" id="profile-{$profile.id_profile}" href="{$current}&token={$token}&id_profile={$profile.id_profile}">{$profile.name}</a>
+		<a class="list-group-item nav-profile {if $profile.id_profile == $current_profile}active{/if}" id="profile-{$profile.id_profile}" href="{$current}&token={$token}&id_profile={$profile.id_profile}">{$profile.name}</a>
 	{/foreach}
 	</div>
 </div>
-
 <form id="{$table}_form" class="defaultForm form-horizontal col-lg-10" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 	<fieldset>
 		{if $form_id}
@@ -195,8 +195,8 @@
 
 		{foreach $profiles as $profile}
 
-			<div class="profile-{$profile.id_profile} tab-profile" style="display:{if $profile.id_profile == $current_profile}block{else}none{/if}">
-
+			<div class="profile-{$profile.id_profile} tab-profile" style="display:{if $profile.id_profile != $current_profile}none{/if}">
+				<h3>{$profile.name}</h3>
 				{if $profile.id_profile != $admin_profile}
 					<table class="table" id="table_{$profile.id_profile}">
 						<thead>
@@ -418,4 +418,4 @@
 
 		{/foreach}
 	</fieldset>
-</form>
+</form>
\ No newline at end of file
diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php
index ad30435dc..823c6ad49 100644
--- a/controllers/admin/AdminAccessController.php
+++ b/controllers/admin/AdminAccessController.php
@@ -114,16 +114,11 @@ class AdminAccessControllerCore extends AdminController
 	public function initContent()
 	{
 		$this->display = 'edit';
-		// toolbar (save, cancel, new, ..)
-		$this->initToolbar();
-		unset($this->toolbar_btn['save']);
-		unset($this->toolbar_btn['cancel']);
 
 		if (!$this->loadObject(true))
 			return;
 
 		$this->content .= $this->renderForm();
-
 		$this->context->smarty->assign(array(
 			'content' => $this->content,
 			'url_post' => self::$currentIndex.'&token='.$this->token,