Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
Vincent Augagneur
+3
-1
@@ -53,7 +53,9 @@
|
||||
|
||||
{block name="input"}
|
||||
{if $field['type'] == 'textarea_newlines'}
|
||||
<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
|
||||
<div class="col-lg-9">
|
||||
<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
|
||||
</div>
|
||||
{else}
|
||||
{$smarty.block.parent}
|
||||
{/if}
|
||||
|
||||
@@ -79,16 +79,26 @@
|
||||
{l s='Erase previous images'}
|
||||
</label>
|
||||
<div class="col-lg-9">
|
||||
<div class="radio">
|
||||
<label>
|
||||
<input name="erase" type="checkbox" value="1" checked="checked" />
|
||||
{l s='Deselect this checkbox only if your server timed out and you need to resume the regeneration.'}
|
||||
</label>
|
||||
<div class="row">
|
||||
<div class="input-group col-lg-2">
|
||||
<span class="switch prestashop-switch">
|
||||
<input type="radio" name="erase" id="erase_on" value="1" checked="checked">
|
||||
<label for="erase_on" class="radioCheck">
|
||||
<i class="icon-check-sign color_success"></i> {l s='Yes'}
|
||||
</label>
|
||||
<input type="radio" name="erase" id="erase_off" value="0">
|
||||
<label for="erase_off" class="radioCheck">
|
||||
<i class="icon-ban-circle color_danger"></i> {l s='No'}
|
||||
</label>
|
||||
<span class="slide-button btn btn-default"></span>
|
||||
</span>
|
||||
</div>
|
||||
{l s='Select "No" only if your server timed out and you need to resume the regeneration.'}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-9 col-push-3">
|
||||
<div class="col-lg-9 col-lg-push-3">
|
||||
<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -34,18 +34,22 @@
|
||||
|
||||
{block name="input"}
|
||||
{if $input.type == 'latitude'}
|
||||
<input type="text"
|
||||
{if isset($input.size)}size="{$input.size}"{/if}
|
||||
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
|
||||
name="latitude"
|
||||
id="latitude"
|
||||
value="{$fields_value[$input.name]|escape:'htmlall'}" /> /
|
||||
<input type="text"
|
||||
{if isset($input.size)}size="{$input.size}"{/if}
|
||||
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
|
||||
name="longitude"
|
||||
id="longitude"
|
||||
value="{$fields_value['longitude']|escape:'htmlall'}" />
|
||||
<div class="row">
|
||||
<div class="col-lg-2">
|
||||
<input type="text"
|
||||
{if isset($input.size)}size="{$input.size}"{/if}
|
||||
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
|
||||
name="latitude"
|
||||
id="latitude"
|
||||
value="{$fields_value[$input.name]|escape:'htmlall'}" /> /
|
||||
<input type="text"
|
||||
{if isset($input.size)}size="{$input.size}"{/if}
|
||||
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
|
||||
name="longitude"
|
||||
id="longitude"
|
||||
value="{$fields_value['longitude']|escape:'htmlall'}" />
|
||||
</div>
|
||||
</div>
|
||||
{else}
|
||||
{$smarty.block.parent}
|
||||
{/if}
|
||||
@@ -57,9 +61,9 @@
|
||||
{if $input.type == 'file'}
|
||||
<div class="row">
|
||||
<label class="control-label col-lg-3">{$input.label} </label>
|
||||
<div class="col-lg-6">
|
||||
<div class="col-lg-9">
|
||||
<input type="file" name="{$input.name}" />
|
||||
<p>{$input.desc}</p>
|
||||
{if isset($input.desc)}<p>{$input.desc}</p>{/if}
|
||||
{if isset($fields_value.image) && $fields_value.image}
|
||||
<div id="image">
|
||||
{$fields_value.image}
|
||||
@@ -74,23 +78,15 @@
|
||||
</div>
|
||||
{/if}
|
||||
<div class="row">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{l s='Hours:'}</th>
|
||||
<th>{l s='e.g. 10:00AM - 9:30PM'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach $fields_value.days as $k => $value}
|
||||
<tr style="color: #7F7F7F; font-size: 0.85em;">
|
||||
<td>{$value}</td>
|
||||
<td><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /><br /></td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<label class="control-label col-lg-3">{l s='Hours:'}</label>
|
||||
<div class="col-lg-9"><p class="form-control-static">{l s='e.g. 10:00AM - 9:30PM'}</p></div>
|
||||
</div>
|
||||
{foreach $fields_value.days as $k => $value}
|
||||
<div class="row">
|
||||
<label class="control-label col-lg-3">{$value}</label>
|
||||
<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /></div>
|
||||
</div>
|
||||
{/foreach}
|
||||
{/foreach}
|
||||
{/if}
|
||||
{/block}
|
||||
|
||||
@@ -37,13 +37,13 @@
|
||||
{
|
||||
if (html == 'false')
|
||||
{
|
||||
$("#conf_id_PS_SHOP_STATE_ID").fadeOut();
|
||||
$("#conf_id_PS_SHOP_STATE_ID").parent().fadeOut();
|
||||
$('#PS_SHOP_STATE_ID option[value=0]').attr("selected", "selected");
|
||||
}
|
||||
else
|
||||
{
|
||||
$("#PS_SHOP_STATE_ID").html(html);
|
||||
$("#conf_id_PS_SHOP_STATE_ID").fadeIn();
|
||||
$("#conf_id_PS_SHOP_STATE_ID").parent().fadeIn();
|
||||
$('#PS_SHOP_STATE_ID option[value=' + id_state_selected + ']').attr("selected", "selected");
|
||||
}
|
||||
}
|
||||
@@ -52,13 +52,13 @@
|
||||
|
||||
$(document).ready(function(){
|
||||
{if isset($categoryData.fields.PS_SHOP_STATE_ID.value)}
|
||||
if ($('#PS_SHOP_COUNTRY_ID') && $('#PS_SHOP_STATE_ID'))
|
||||
{
|
||||
ajaxStoreStates({$categoryData.fields.PS_SHOP_STATE_ID.value});
|
||||
$('#PS_SHOP_COUNTRY_ID').change(function() {
|
||||
ajaxStoreStates();
|
||||
});
|
||||
}
|
||||
if ($('#PS_SHOP_COUNTRY_ID') && $('#PS_SHOP_STATE_ID'))
|
||||
{
|
||||
ajaxStoreStates({$categoryData.fields.PS_SHOP_STATE_ID.value});
|
||||
$('#PS_SHOP_COUNTRY_ID').change(function() {
|
||||
ajaxStoreStates();
|
||||
});
|
||||
}
|
||||
{/if}
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -48,13 +48,10 @@
|
||||
<div class="alert alert-info">{$field}</div>
|
||||
{elseif $key == 'input'}
|
||||
{foreach $field as $input}
|
||||
<div class="row {if $input.type == 'hidden'}hide{/if}">
|
||||
<div class="row {if $input.type == 'hidden'}hide{/if}" {if $input.name == 'id_state'}id="contains_states"{if !$contains_states}style="display:none;"{/if}{/if}>
|
||||
{if $input.type == 'hidden'}
|
||||
<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
|
||||
{else}
|
||||
{if $input.name == 'id_state'}
|
||||
<div id="contains_states" {if !$contains_states}style="display:none;"{/if}>
|
||||
{/if}
|
||||
{block name="label"}
|
||||
{if isset($input.label)}
|
||||
<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
|
||||
@@ -524,9 +521,6 @@
|
||||
{/block}
|
||||
</div>
|
||||
{/block}{* end block field *}
|
||||
{if $input.name == 'id_state'}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
{/foreach}
|
||||
|
||||
@@ -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(),
|
||||
),
|
||||
|
||||
@@ -125,7 +125,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
|
||||
if ($this->display == 'options')
|
||||
unset($this->toolbar_btn['new']);
|
||||
else
|
||||
else if ($this->display != 'add' && $this->display != 'edit')
|
||||
unset($this->toolbar_btn['save']);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user