From 73524c7a4cb686f9a56b82b9d93d1dd90651a8ff Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Thu, 5 Sep 2013 14:14:22 +0200 Subject: [PATCH] // update maintenance and email pages --- .../controllers/maintenance/helpers/options/options.tpl | 4 +++- classes/helper/HelperOptions.php | 2 +- controllers/admin/AdminEmailsController.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl index 2e1505738..a8a1f2d52 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl @@ -27,7 +27,9 @@ {block name="input"} {if $field['type'] == 'maintenance_ip'} {$field['script_ip']} - +
+ +
{$field['link_remove_ip']} {else} {$smarty.block.parent} diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php index 61010b381..2b5645bed 100644 --- a/classes/helper/HelperOptions.php +++ b/classes/helper/HelperOptions.php @@ -129,7 +129,7 @@ class HelperOptionsCore extends Helper $(\'input[name=PS_MAINTENANCE_IP]\').attr(\'value\',\''.Tools::getRemoteAddr().'\'); } '; - $field['link_remove_ip'] = '  '.$this->l('Add my IP', 'Helper').''; + $field['link_remove_ip'] = '  
'.$this->l('Add my IP', 'Helper').'
'; } // Multishop default value diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 29c01a1c6..f9a6e8075 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -155,8 +155,8 @@ class AdminEmailsControllerCore extends AdminController 'id' => 'testEmail' ), ), - 'bottom' => '

-
', + 'bottom' => '


+
', ) ); }