diff --git a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl index 0ceac7a93..7558ca2e5 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl @@ -53,7 +53,9 @@ {block name="input"} {if $field['type'] == 'textarea_newlines'} - +
+ +
{else} {$smarty.block.parent} {/if} diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php index edb6bb68b..665c838c9 100755 --- a/controllers/admin/AdminGeolocationController.php +++ b/controllers/admin/AdminGeolocationController.php @@ -72,7 +72,7 @@ class AdminGeolocationControllerCore extends AdminController 'icon' => 'world', 'description' => $this->l('You can add IP addresses that will always be allowed to access your shop (e.g. Google bots\' IP).'), 'fields' => array( - 'PS_GEOLOCATION_WHITELIST' => array('title' => $this->l('Whitelisted IP addresses'), 'type' => 'textarea_newlines', 'cols' => 80, 'rows' => 30), + 'PS_GEOLOCATION_WHITELIST' => array('title' => $this->l('Whitelisted IP addresses'), 'type' => 'textarea_newlines', 'cols' => 15, 'rows' => 30), ), 'submit' => array(), ),