From 6f596d5f6be97bda1e8b8bd620389d1fe0ea7ab1 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Tue, 22 Nov 2011 17:21:41 +0000
Subject: [PATCH] // fix display AdminLogsController

---
 .../logs/{content.tpl => list_header.tpl}      | 18 ++++++++----------
 controllers/admin/AdminLogsController.php      | 18 +++++-------------
 2 files changed, 13 insertions(+), 23 deletions(-)
 rename admin-dev/themes/template/logs/{content.tpl => list_header.tpl} (88%)

diff --git a/admin-dev/themes/template/logs/content.tpl b/admin-dev/themes/template/logs/list_header.tpl
similarity index 88%
rename from admin-dev/themes/template/logs/content.tpl
rename to admin-dev/themes/template/logs/list_header.tpl
index 6a1c6294a..c3cbacae6 100644
--- a/admin-dev/themes/template/logs/content.tpl
+++ b/admin-dev/themes/template/logs/list_header.tpl
@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,12 +19,15 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
+*  @version  Release: $Revision: 9639 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{if $list}
+{extends file="helper/list/list_header.tpl"}
+
+{block name="override_header"}
+
 	<fieldset>
 		<legend>{l s='Severity levels'}</legend>
 		<p>{l s='Meaning of severity levels:'}</p>
@@ -34,11 +37,6 @@
 			<li style="color: orange;">{l s='Error'}</li>
 			<li style="color: red;">{l s='Major issue (crash)'}</li>
 		</ol>
-	</fieldset>
-{/if}
+	</fieldset><br />
 
-{$list}
-<br />
-<h2>{l s='Logs by e-mail'}</h2>
-
-{$options}
+{/block}
\ No newline at end of file
diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php
index 9de2210a9..f564a9571 100644
--- a/controllers/admin/AdminLogsController.php
+++ b/controllers/admin/AdminLogsController.php
@@ -57,27 +57,19 @@ class AdminLogsControllerCore extends AdminController
 						'cast' => 'intval',
 						'type' => 'text',
 						'size' => 5
-					),
+					)
 				),
 				'submit' => array()
-			),
+			)
 		);
 
 		parent::__construct();
 	}
 
-	/**
-	 * Assign smarty variables for all default views, list and form, then call other init functions
-	 */
-	public function initContent()
+	public function initToolbar()
 	{
-		$this->context->smarty->assign(array(
-			'table' => $this->table,
-			'current' => self::$currentIndex,
-			'token' => $this->token,
-			'list' => $this->initList(),
-			'options' => $this->initOptions()
-		));
+		parent::initToolbar();
+		unset($this->toolbar_btn['new']);
 	}
 
 }