From ecfe61972bc765b408bc326269c9e5266b4c6f51 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Fri, 9 Aug 2013 16:07:07 +0200
Subject: [PATCH] [+] BO : Change action link for button

---
 admin-dev/themes/default/template/header.tpl  |   4 +-
 .../list/list_action_button_delete.tpl        |  27 +++++
 .../list/list_action_button_duplicate.tpl     |  27 +++++
 .../helpers/list/list_action_button_edit.tpl  |  27 +++++
 .../helpers/list/list_action_button_view.tpl  |  27 +++++
 .../template/helpers/list/list_content.tpl    |  12 +-
 classes/helper/HelperList.php                 | 105 +++++++++++++++++-
 7 files changed, 218 insertions(+), 11 deletions(-)
 create mode 100644 admin-dev/themes/default/template/helpers/list/list_action_button_delete.tpl
 create mode 100644 admin-dev/themes/default/template/helpers/list/list_action_button_duplicate.tpl
 create mode 100644 admin-dev/themes/default/template/helpers/list/list_action_button_edit.tpl
 create mode 100644 admin-dev/themes/default/template/helpers/list/list_action_button_view.tpl

diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index b7b04fb34..895271f5d 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -103,14 +103,14 @@
 	<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
 	<![endif]-->
 
-	{*if isset($brightness)*}
+	{if isset($brightness)}
 	<!--
 		/// multishop
 		<style type="text/css">
 			div#header_infos, div#header_infos a#header_shopname, div#header_infos a#header_logout, div#header_infos a#header_foaccess {ldelim}color:{$brightness}{rdelim}
 		</style>
 	-->
-	{*/if*}
+	{/if}
 
 	<link href='http://fonts.googleapis.com/css?family=Ubuntu:300|Open+Sans' rel='stylesheet' type='text/css'>
 
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_button_delete.tpl b/admin-dev/themes/default/template/helpers/list/list_action_button_delete.tpl
new file mode 100644
index 000000000..2d6d69af9
--- /dev/null
+++ b/admin-dev/themes/default/template/helpers/list/list_action_button_delete.tpl
@@ -0,0 +1,27 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<button type="button" class="btn btn-default btn-small" onclick="{if isset($confirm)}if (confirm('{$confirm}')){/if}location.href='{$href}';">
+	<i class="icon-trash"></i>&nbsp;{$action}
+</button>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_button_duplicate.tpl b/admin-dev/themes/default/template/helpers/list/list_action_button_duplicate.tpl
new file mode 100644
index 000000000..3ddb3b35d
--- /dev/null
+++ b/admin-dev/themes/default/template/helpers/list/list_action_button_duplicate.tpl
@@ -0,0 +1,27 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<button type="button" onclick="if (confirm('{$confirm}')) location.href = '{$location_ok}'; else location.href = '{$location_ko}';">
+	<i class="icon-copy"></i>&nbsp;{$action}
+</button>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_button_edit.tpl b/admin-dev/themes/default/template/helpers/list/list_action_button_edit.tpl
new file mode 100644
index 000000000..7e235b9c9
--- /dev/null
+++ b/admin-dev/themes/default/template/helpers/list/list_action_button_edit.tpl
@@ -0,0 +1,27 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<button type="button" class="btn btn-default btn-small" onclick="location.href='{$href}'">
+	<i class="icon-pencil"></i>&nbsp;{$action}
+</button>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_button_view.tpl b/admin-dev/themes/default/template/helpers/list/list_action_button_view.tpl
new file mode 100644
index 000000000..ecbff6b22
--- /dev/null
+++ b/admin-dev/themes/default/template/helpers/list/list_action_button_view.tpl
@@ -0,0 +1,27 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<button type="button" class="btn btn-default btn-small" onclick="location.href='{$href}'">
+	<i class="icon-eye-open"></i>&nbsp;{$action}
+</button>
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index a22b30ac5..fa268a30a 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -136,13 +136,11 @@
 	{/if}
 	{if $has_actions}
 		<td>
-			<div class="btn-group{if count($actions) > 1} btn-group-action{/if}">			
-				<span class="btn btn-default btn-small">
-					{assign var='action' value=$actions[0]}
-					{if isset($tr.$action)}
-						{$tr.$action}
-					{/if}
-				</span>
+			<div class="btn-group{if count($actions) > 1} btn-group-action{/if}">
+				{assign var='action' value=$actions[0]|cat:"_button"}
+				{if isset($tr.$action)}
+					{$tr.$action}
+				{/if}
 				{if count($actions) > 1}
 				<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
 					<span class="caret"></span>&nbsp;
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index 9970776f0..df7ca328d 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -209,6 +209,13 @@ class HelperListCore extends Helper
 						$this->_list[$index][$action] = $this->context->controller->$method_name($this->token, $id, $name);
 					elseif (method_exists($this, $method_name))
 						$this->_list[$index][$action] = $this->$method_name($this->token, $id, $name);
+
+					$method_name = 'display'.ucfirst($action).'Button';
+
+					if (method_exists($this->context->controller, $method_name))
+						$this->_list[$index][$action.'_button'] = $this->context->controller->$method_name($this->token, $id, $name);
+					elseif (method_exists($this, $method_name))
+						$this->_list[$index][$action.'_button'] = $this->$method_name($this->token, $id, $name);
 				}
 			}
 
@@ -328,6 +335,31 @@ class HelperListCore extends Helper
 		return $this->content_tpl->fetch();
 	}
 
+	/**
+	 * Display duplicate action button
+	 */
+	public function displayDuplicateButton($token = null, $id, $name = null)
+	{
+		$tpl = $this->createTemplate('list_action_button_duplicate.tpl');
+		if (!array_key_exists('Bad SQL query', self::$cache_lang))
+			self::$cache_lang['Duplicate'] = $this->l('Duplicate', 'Helper');
+
+		if (!array_key_exists('Copy images too?', self::$cache_lang))
+			self::$cache_lang['Copy images too?'] = $this->l('Copy images too?', 'Helper');
+
+		$duplicate = $this->currentIndex.'&'.$this->identifier.'='.$id.'&duplicate'.$this->table;
+
+		$tpl->assign(array(
+			'href' => Tools::safeOutput($this->currentIndex.'&'.$this->identifier.'='.$id.'&view'.$this->table.'&token='.($token != null ? $token : $this->token)),
+			'action' => self::$cache_lang['Duplicate'],
+			'confirm' => self::$cache_lang['Copy images too?'],
+			'location_ok' => Tools::safeOutput($duplicate.'&token='.($token != null ? $token : $this->token)),
+			'location_ko' => Tools::safeOutput($duplicate.'&noimage=1&token='.($token ? $token : $this->token)),
+		));
+
+		return $tpl->fetch();
+	}
+
 	/**
 	 * Display duplicate action link
 	 */
@@ -394,6 +426,24 @@ class HelperListCore extends Helper
 		return $tpl->fetch();
 	}
 
+	/**
+	 * Display view action button
+	 */
+	public function displayViewButton($token = null, $id, $name = null)
+	{
+		$tpl = $this->createTemplate('list_action_button_view.tpl');
+		if (!array_key_exists('View', self::$cache_lang))
+			self::$cache_lang['View'] = $this->l('View', 'Helper');
+
+		$tpl->assign(array(
+			'href' => Tools::safeOutput($this->currentIndex.'&'.$this->identifier.'='.$id.'&view'.$this->table.'&token='.($token != null ? $token : $this->token)),
+			'action' => self::$cache_lang['View'],
+		));
+
+		return $tpl->fetch();
+
+	}
+
 	/**
 	 * Display view action link
 	 */
@@ -412,6 +462,24 @@ class HelperListCore extends Helper
 
 	}
 
+	/**
+	 * Display edit action button
+	 */
+	public function displayEditButton($token = null, $id, $name = null)
+	{
+		$tpl = $this->createTemplate('list_action_button_edit.tpl');
+		if (!array_key_exists('Edit', self::$cache_lang))
+			self::$cache_lang['Edit'] = $this->l('Edit', 'Helper');
+
+		$tpl->assign(array(
+			'href' => $this->currentIndex.'&'.$this->identifier.'='.$id.'&update'.$this->table.'&token='.($token != null ? $token : $this->token),
+			'action' => self::$cache_lang['Edit'],
+			'id' => $id
+		));
+
+		return $tpl->fetch();
+	}
+
 	/**
 	 * Display edit action link
 	 */
@@ -430,6 +498,39 @@ class HelperListCore extends Helper
 		return $tpl->fetch();
 	}
 
+	/**
+	 * Display delete action button
+	 */
+	public function displayDeleteButton($token = null, $id, $name = null)
+	{
+		$tpl = $this->createTemplate('list_action_button_delete.tpl');
+
+		if (!array_key_exists('Delete', self::$cache_lang))
+			self::$cache_lang['Delete'] = $this->l('Delete', 'Helper');
+
+		if (!array_key_exists('DeleteItem', self::$cache_lang))
+			self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper');
+
+		if (!array_key_exists('Name', self::$cache_lang))
+			self::$cache_lang['Name'] = $this->l('Name:', 'Helper');
+
+		if (!is_null($name))
+			$name = '\n\n'.self::$cache_lang['Name'].' '.$name;
+
+		$data = array(
+			$this->identifier => $id,
+			'href' => Tools::safeOutput($this->currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token != null ? $token : $this->token)),
+			'action' => self::$cache_lang['Delete'],
+		);
+
+		if ($this->specificConfirmDelete !== false)
+			$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : addcslashes(Tools::htmlentitiesDecodeUTF8(self::$cache_lang['DeleteItem'].$name), '\'');
+
+		$tpl->assign(array_merge($this->tpl_delete_link_vars, $data));
+
+		return $tpl->fetch();
+	}
+
 	/**
 	 * Display delete action link
 	 */
@@ -454,10 +555,10 @@ class HelperListCore extends Helper
 			'href' => Tools::safeOutput($this->currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token != null ? $token : $this->token)),
 			'action' => self::$cache_lang['Delete'],
 		);
-		
+
 		if ($this->specificConfirmDelete !== false)
 			$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : addcslashes(Tools::htmlentitiesDecodeUTF8(self::$cache_lang['DeleteItem'].$name), '\'');
-		
+
 		$tpl->assign(array_merge($this->tpl_delete_link_vars, $data));
 
 		return $tpl->fetch();