dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// update maintenance and email pages

Browse Source
This commit is contained in:
Sarah Lorenzini committed 2013-09-05 14:16:06 +02:00
1 parent d9a429eccc
commit 73524c7a4c
3 files changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+3 -1
View File
@@ -27,7 +27,9 @@
{block name="input"} {block name="input"}
{if $field['type'] == 'maintenance_ip'} {if $field['type'] == 'maintenance_ip'}
{$field['script_ip']} {$field['script_ip']}
<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" /> <div class="col-lg-9 ">
<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
</div>
{$field['link_remove_ip']} {$field['link_remove_ip']}
{else} {else}
{$smarty.block.parent} {$smarty.block.parent}
classes/helper/HelperOptions.php
+1 -1
View File
@@ -129,7 +129,7 @@ class HelperOptionsCore extends Helper
$(\'input[name=PS_MAINTENANCE_IP]\').attr(\'value\',\''.Tools::getRemoteAddr().'\'); $(\'input[name=PS_MAINTENANCE_IP]\').attr(\'value\',\''.Tools::getRemoteAddr().'\');
} }
</script>'; </script>';
$field['link_remove_ip'] = ' &nbsp<a href="#" class="button" onclick="addRemoteAddr(); return false;">'.$this->l('Add my IP', 'Helper').'</a>'; $field['link_remove_ip'] = ' &nbsp<div class="col-lg-9 col-lg-offset-3"><a href="#" class="btn btn-default" onclick="addRemoteAddr(); return false;"><i class="icon-plus"></i> '.$this->l('Add my IP', 'Helper').'</a></div>';
} }
// Multishop default value // Multishop default value
controllers/admin/AdminEmailsController.php
+2 -2
View File
@@ -155,8 +155,8 @@ class AdminEmailsControllerCore extends AdminController
'id' => 'testEmail' 'id' => 'testEmail'
), ),
), ),
'bottom' => '<div class="row col-offset-3"><input type="button" class="btn btn-primary" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br /> 'bottom' => '<div class="row"> <div class="col-lg-9 col-lg-offset-3"><input type="button" class="btn btn-default" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br /><br />
<p id="mailResultCheck" style="display:none;"></p></div>', <p class="alert" id="mailResultCheck" style="display:none;"></p></div></div>',
) )
); );
} }