Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
Kevin Granger
@@ -32,7 +32,7 @@
|
||||
{/if}
|
||||
<span class="title">{$title|escape}<br /><small>{$subtitle|escape}</small></span>
|
||||
<span class="value">{$value|escape}</span>
|
||||
</{if $href}a{else}div{/if}>
|
||||
</{if isset($href) && $href}a{else}div{/if}>
|
||||
|
||||
{if isset($source) && $source != ''}
|
||||
<script>
|
||||
|
||||
@@ -12,12 +12,13 @@
|
||||
<field name="stores"/>
|
||||
</fields>
|
||||
<entities>
|
||||
<image_type id="small_default" name="small_default" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
|
||||
<image_type id="medium_default" name="medium_default" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
|
||||
<image_type id="large_default" name="large_default" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
|
||||
<image_type id="thickbox_default" name="thickbox_default" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="cart_default" name="cart_default" width="80" height="80" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="small_default" name="small_default" width="98" height="98" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="medium_default" name="medium_default" width="125" height="125" products="1" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="home_default" name="home_default" width="270" height="270" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="large_default" name="large_default" width="458" height="458" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="thickbox_default" name="thickbox_default" width="800" height="800" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="category_default" name="category_default" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="home_default" name="home_default" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
|
||||
<image_type id="scene_default" name="scene_default" width="520" height="189" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
|
||||
<image_type id="m_scene_default" name="m_scene_default" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
|
||||
</entities>
|
||||
|
||||
@@ -99,7 +99,7 @@ $(function(){ldelim}
|
||||
{if $field_name eq 'company'}
|
||||
<div class="form-group">
|
||||
<label for="company">{l s='Company'}</label>
|
||||
<input class="form-control" type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company|escape:'html'}{/if}{/if}" onkeyup="if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');" />
|
||||
<input class="form-control" type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company|escape:'html'}{/if}{/if}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');}" />
|
||||
</div>
|
||||
{/if}
|
||||
{if $field_name eq 'vat_number'}
|
||||
@@ -107,7 +107,7 @@ $(function(){ldelim}
|
||||
<div id="vat_number">
|
||||
<div class="form-group">
|
||||
<label for="vat_number">{l s='VAT number'}</label>
|
||||
<input type="text" class="form-control" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{else}{if isset($address->vat_number)}{$address->vat_number|escape:'html'}{/if}{/if}" onkeyup="if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');" />
|
||||
<input type="text" class="form-control" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{else}{if isset($address->vat_number)}{$address->vat_number|escape:'html'}{/if}{/if}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok'); }" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -135,7 +135,7 @@ $(function(){ldelim}
|
||||
{if $field_name eq 'address2'}
|
||||
<div class="required form-group">
|
||||
<label for="address2">{l s='Address (Line 2)'}</label>
|
||||
<input class="form-control" type="text" id="address2" name="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{else}{if isset($address->address2)}{$address->address2|escape:'html'}{/if}{/if}" onkeyup="if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');" />
|
||||
<input class="form-control" type="text" id="address2" name="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{else}{if isset($address->address2)}{$address->address2|escape:'html'}{/if}{/if}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok'); }" />
|
||||
</div>
|
||||
{/if}
|
||||
{if $field_name eq 'postcode'}
|
||||
@@ -214,8 +214,8 @@ $(function(){ldelim}
|
||||
{/if}
|
||||
<div class="form-group">
|
||||
<label for="other">{l s='Additional information'}</label>
|
||||
<textarea class="form-control" id="other" name="other" cols="26" rows="3" onkeyup="if (validate_{$address_validation.other.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');
|
||||
">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other|escape:'html'}{/if}{/if}</textarea>
|
||||
<textarea class="form-control" id="other" name="other" cols="26" rows="3" onkeyup="if($(this).val().length) { if (validate_{$address_validation.other.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');
|
||||
}">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other|escape:'html'}{/if}{/if}</textarea>
|
||||
</div>
|
||||
<div class="form-group phone-number">
|
||||
<label for="phone">{l s='Home phone'}</label>
|
||||
@@ -227,7 +227,7 @@ $(function(){ldelim}
|
||||
<div class="clearfix"></div>
|
||||
<div class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}form-group">
|
||||
<label for="phone_mobile">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
|
||||
<input type="tel" id="phone_mobile" class="form-control" name="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{else}{if isset($address->phone_mobile)}{$address->phone_mobile|escape:'html'}{/if}{/if}" onkeyup="if (validate_{$address_validation.phone_mobile.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');" />
|
||||
<input type="tel" id="phone_mobile" class="form-control" name="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{else}{if isset($address->phone_mobile)}{$address->phone_mobile|escape:'html'}{/if}{/if}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.phone_mobile.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok'); }" />
|
||||
</div>
|
||||
<div class="required form-group" id="adress_alias">
|
||||
<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label>
|
||||
|
||||
@@ -36,9 +36,13 @@
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
{if isset($smarty.get.search_query) && isset($smarty.get.results) && $smarty.get.results > 1}
|
||||
{if isset($smarty.get.search_query) && isset($smarty.get.results) && $smarty.get.results > 1 && isset($smarty.server.HTTP_REFERER)}
|
||||
<div class="pull-right">
|
||||
<strong ><i class="icon-chevron-left left"></i> {l s='Back to Search results for "%s" (%d other results)' sprintf=[$smarty.get.search_query,$smarty.get.results]}</strong>
|
||||
<strong>
|
||||
<a href="{$smarty.server.HTTP_REFERER|escape}" onclick="history.back();">
|
||||
<i class="icon-chevron-left left"></i> {l s='Back to Search results for "%s" (%d other results)' sprintf=[$smarty.get.search_query,$smarty.get.results]}
|
||||
</a>
|
||||
</strong>
|
||||
</div>
|
||||
{/if}
|
||||
<!-- /Breadcrumb -->
|
||||
+1
-1
@@ -766,7 +766,7 @@ class Services_JSON
|
||||
function isError($data, $code = null)
|
||||
{
|
||||
if (class_exists('pear')) {
|
||||
return PEAR::isError($data, $code);
|
||||
return @PEAR::isError($data, $code);
|
||||
} elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
|
||||
is_subclass_of($data, 'services_json_error'))) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user