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

update 5.11.13

Browse Source
This commit is contained in:
TMMeilleur
2013-11-05 17:17:26 +02:00
parent 55cd7c4c34
commit 21209d799f
38 changed files with 3240 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/address.tpl
+12 -13
View File
@@ -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>
@@ -116,39 +116,39 @@ $(function(){ldelim}
<div class="required form-group">
<label for="firstname">{l s='First name'} <sup>*</sup></label>
<input class="form-control" type="text" name="firstname" id="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{else}{if isset($address->firstname)}{$address->firstname|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="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" name="firstname" id="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{else}{if isset($address->firstname)}{$address->firstname|escape:'html'}{/if}{/if}" />
</div>
{/if}
{if $field_name eq 'lastname'}
<div class="required form-group">
<label for="lastname">{l s='Last name'} <sup>*</sup></label>
<input class="form-control" type="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{else}{if isset($address->lastname)}{$address->lastname|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="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{else}{if isset($address->lastname)}{$address->lastname|escape:'html'}{/if}{/if}" />
</div>
{/if}
{if $field_name eq 'address1'}
<div class="required form-group">
<label for="address1">{l s='Address'} <sup>*</sup></label>
<input class="form-control" type="text" id="address1" name="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{else}{if isset($address->address1)}{$address->address1|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="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="address1" name="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{else}{if isset($address->address1)}{$address->address1|escape:'html'}{/if}{/if}" />
</div>
{/if}
{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="validate form-control" data-validate="{$address_validation.$field_name.validate}" 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}" />
</div>
{/if}
{if $field_name eq 'postcode'}
{assign var="postCodeExist" value="true"}
<div class="required postcode form-group">
<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
<input class="form-control" type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|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="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" />
</div>
{/if}
{if $field_name eq 'city'}
<div class="required form-group">
<label for="city">{l s='City'} <sup>*</sup></label>
<input class="form-control" type="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{else}{if isset($address->city)}{$address->city|escape:'html'}{/if}{/if}" maxlength="64" 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="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{else}{if isset($address->city)}{$address->city|escape:'html'}{/if}{/if}" maxlength="64" />
</div>
{*
if customer hasn't update his layout address, country has to be verified
@@ -200,8 +200,7 @@ $(function(){ldelim}
{if $postCodeExist eq "false"}
<div class="required postcode form-group unvisible">
<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
<input class="form-control" type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());"
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="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
</div>
{/if}
{if $stateExist eq "false"}
@@ -219,7 +218,7 @@ $(function(){ldelim}
</div>
<div class="form-group phone-number">
<label for="phone">{l s='Home phone'}</label>
<input type="tel" id="phone" class="form-control" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone|escape:'html'}{/if}{/if}" onkeyup="if (validate_{$address_validation.phone.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');" />
<input class="{if isset($one_phone_at_least) && $one_phone_at_least}is_required{/if} validate form-control" data-validate="{$address_validation.phone.validate}" type="tel" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone|escape:'html'}{/if}{/if}" />
</div>
{if isset($one_phone_at_least) && $one_phone_at_least}
<p class="inline-infos required">{l s='You must register at least one phone number.'}</p>
@@ -227,11 +226,11 @@ $(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 class="validate form-control" data-validate="{$address_validation.phone_mobile.validate}" type="tel" id="phone_mobile" 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}" />
</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>
<input type="text" id="alias" class="form-control" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'html'}{elseif !$select_address}{l s='My address'}{/if}" onkeyup="if (validate_{$address_validation.alias.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');" />
<input type="text" id="alias" class="is_required validate form-control" data-validate="{$address_validation.alias.validate}" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'html'}{elseif !$select_address}{l s='My address'}{/if}" />
</div>
</fieldset>
<p class="submit2">
themes/default-bootstrap/authentication.tpl
+10 -10
View File
@@ -166,7 +166,7 @@ $(document).ready(function() {
<div class="alert alert-danger" id="create_account_error" style="display:none"></div>
<div class="form-group">
<label for="email_create">{l s='Email address'}</label>
<input type="text" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|stripslashes}{/if}" class="account_input form-control" />
<input type="text" class="is_required validate account_input form-control" data-validate="isEmail" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|stripslashes}{/if}" />
</div>
<div class="submit">
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
@@ -184,11 +184,11 @@ $(document).ready(function() {
<div class="form_content clearfix">
<div class="form-group">
<label for="email">{l s='Email address'}</label>
<input type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|stripslashes}{/if}" class="account_input form-control" />
<input class="is_required validate account_input form-control" data-validate="isEmail" type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|stripslashes}{/if}" />
</div>
<div class="form-group">
<label for="passwd">{l s='Password'}</label>
<span><input type="password" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|stripslashes}{/if}" class="account_input form-control" /></span>
<span><input class="is_required validate account_input form-control" type="password" data-validate="isPasswd" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|stripslashes}{/if}" /></span>
</div>
<p class="lost_password form-group"><a href="{$link->getPageLink('password')|escape:'html'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Forgot your password?'}</a></p>
<p class="submit">
@@ -209,7 +209,7 @@ $(document).ready(function() {
<!-- Account -->
<div class="required form-group">
<label for="guest_email">{l s='Email address'} <sup>*</sup></label>
<input type="text" class="form-control" id="guest_email" name="guest_email" value="{if isset($smarty.post.guest_email)}{$smarty.post.guest_email}{/if}" />
<input type="text" class="is_required validate form-control" data-validate="isEmail" id="guest_email" name="guest_email" value="{if isset($smarty.post.guest_email)}{$smarty.post.guest_email}{/if}" />
</div>
<div class="cleafix gender-line">
<label>{l s='Title'}</label>
@@ -223,12 +223,12 @@ $(document).ready(function() {
</div>
<div class="required form-group">
<label for="firstname">{l s='First name'} <sup>*</sup></label>
<input type="text" class="text form-control" id="firstname" name="firstname" onblur="$('#customer_firstname').val($(this).val());" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" />
<input type="text" class="is_required validate text form-control" data-validate="isName" id="firstname" name="firstname" onblur="$('#customer_firstname').val($(this).val());" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" />
<input type="hidden" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" />
</div>
<div class="required form-group">
<label for="lastname">{l s='Last name'} <sup>*</sup></label>
<input type="text" class="text form-control" id="lastname" name="lastname" onblur="$('#customer_lastname').val($(this).val());" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" />
<input type="text" class="is_required validate text form-control" data-validate="isName" id="lastname" name="lastname" onblur="$('#customer_lastname').val($(this).val());" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" />
<input type="hidden" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" />
</div>
<div class="form-group date-select">
@@ -411,19 +411,19 @@ $(document).ready(function() {
</div>
<div class="required form-group">
<label for="customer_firstname">{l s='First name'} <sup>*</sup></label>
<input onkeyup="$('#firstname').val(this.value);" type="text" class="form-control" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.customer_firstname)}{$smarty.post.customer_firstname}{/if}" />
<input onkeyup="$('#firstname').val(this.value);" type="text" class="is_required validate form-control" data-validate="isName" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.customer_firstname)}{$smarty.post.customer_firstname}{/if}" />
</div>
<div class="required form-group">
<label for="customer_lastname">{l s='Last name'} <sup>*</sup></label>
<input onkeyup="$('#lastname').val(this.value);" type="text" class="form-control" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.customer_lastname)}{$smarty.post.customer_lastname}{/if}" />
<input onkeyup="$('#lastname').val(this.value);" type="text" class="is_required validate form-control" data-validate="isName" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.customer_lastname)}{$smarty.post.customer_lastname}{/if}" />
</div>
<div class="required form-group">
<label for="email">{l s='Email'} <sup>*</sup></label>
<input type="text" class="form-control" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email}{/if}" />
<input type="text" class="is_required validate form-control" data-validate="isEmail" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email}{/if}" />
</div>
<div class="required password form-group">
<label for="passwd">{l s='Password'} <sup>*</sup></label>
<input type="password" class="form-control" name="passwd" id="passwd" />
<input type="password" class="is_required validate form-control" data-validate="isPasswd" name="passwd" id="passwd" />
<span class="form_info">{l s='(Five characters minimum)'}</span>
</div>
<div class="form-group">
themes/default-bootstrap/cache/0f0da2d2bc2e03257c9834699dfa70cd_all.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/1ae16bb27058b8dc4e82819c2954f730.js
Vendored
+435
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/2b88c77a83b1330a0c210f8b3d5fd75f.js
Vendored
+700
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/56ff456ab9df5efacc40c3793e4346cf_all.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/8e3f9687aaeae23454519e61e1b66c05_all.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/a8b3f6474f84d44f57d425274a015dee_all.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/aef53e3e8d4ccf05cb83fb21c7de9fe4.js
Vendored
+592
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/bc419d7ff0f2a43ad0de02ec8815f2b4.js
Vendored
+438
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/c19bf9464f8a765ed2aee963195ede1a.js
Vendored
+440
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/cache/c3ffb3e0fd6f41dd7149263b537a160b_all.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
themes/default-bootstrap/css/comparator.css
+1 -1
View File
@@ -92,7 +92,7 @@ table#product_comparison .product_desc {
padding-bottom: 12px;
}
/* line 93, ../sass/comparator.scss */
table#product_comparison .button-container a {
table#product_comparison .button-container a, table#product_comparison .button-container > span {
margin-bottom: 10px;
}
/* line 97, ../sass/comparator.scss */
themes/default-bootstrap/css/contact-form.css
+3 -3
View File
@@ -20,9 +20,9 @@
padding: 23px 0 0 0;
margin-bottom: 30px;
background: url(../img/contact-form.png) repeat-x white;
-webkit-box-shadow: rgba(0, 0, 0, 0.17) 0px 5px 13px;
-moz-box-shadow: rgba(0, 0, 0, 0.17) 0px 5px 13px;
box-shadow: rgba(0, 0, 0, 0.17) 0px 5px 13px;
-webkit-box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px;
-moz-box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px;
box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px;
/* min 992px max 1199px */
}
/* line 25, ../sass/contact-form.scss */
themes/default-bootstrap/css/global.css
+382 -413
View File
File diff suppressed because it is too large Load Diff
themes/default-bootstrap/css/jquery/jquery.bxslider.css
+1 -1
View File
@@ -194,7 +194,7 @@
bottom: 0;
left: 0;
background: #666\9;
background: rgba(80, 80, 80, 0.75);
background: rgba(80, 80, 80, 0);
width: 100%;
}
/* line 201, ../../sass/jquery/jquery.bxslider.scss */
themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css
+3 -3
View File
@@ -111,9 +111,9 @@
z-index: 99;
width: 220px;
padding: 25px 30px;
-webkit-box-shadow: rgba(0, 0, 0, 0.2) 0px 5px 13px;
-moz-box-shadow: rgba(0, 0, 0, 0.2) 0px 5px 13px;
box-shadow: rgba(0, 0, 0, 0.2) 0px 5px 13px;
-webkit-box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px;
-moz-box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px;
box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px;
}
/* line 91, ../../../../sass/modules/blocktopmenu/css/superfish-modified.scss */
themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css
+1 -1
View File
@@ -30,7 +30,7 @@
display: block;
font-weight: bold;
color: #777777;
text-shadow: 1px 1px rgba(0, 0, 0, 0.2);
text-shadow: 1px 1px rgba(0, 0, 0, 0);
overflow: hidden;
}
@media (min-width: 768px) and (max-width: 991px) {
themes/default-bootstrap/css/product.css
+13 -13
View File
@@ -94,10 +94,10 @@ img {
width: 136px;
text-align: center;
font-weight: bold;
background: rgba(255, 255, 255, 0.5);
-webkit-box-shadow: 0 2px 8px rgba(0, 0, 0, 0.16);
-moz-box-shadow: 0 2px 8px rgba(0, 0, 0, 0.16);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.16);
background: rgba(255, 255, 255, 0);
-webkit-box-shadow: 0 2px 8px rgba(0, 0, 0, 0);
-moz-box-shadow: 0 2px 8px rgba(0, 0, 0, 0);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0);
}
/* line 73, ../sass/product.scss */
#pb-right-column #image-block #view_full_size .span_link:after {
@@ -191,9 +191,9 @@ img {
#thumbs_list li a {
display: block;
border: 3px solid #fff;
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
-webkit-transition: all 0s ease;
-moz-transition: all 0s ease;
-o-transition: all 0s ease;
transition: all 0.3s ease;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -596,9 +596,9 @@ span.view_scroll_spacer {
/* line 477, ../sass/product.scss */
.product_attributes,
.box-cart-bottom {
-webkit-box-shadow: inset 0 6px 6px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 6px 6px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 6px 6px rgba(0, 0, 0, 0.05);
-webkit-box-shadow: inset 0 6px 6px rgba(0, 0, 0, 0);
-moz-box-shadow: inset 0 6px 6px rgba(0, 0, 0, 0);
box-shadow: inset 0 6px 6px rgba(0, 0, 0, 0);
padding: 19px 19px 17px;
}
@@ -692,9 +692,9 @@ span.view_scroll_spacer {
padding: 12px 36px 14px 82px;
color: #fff;
display: block !important;
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
-webkit-transition: all 0s ease;
-moz-transition: all 0s ease;
-o-transition: all 0s ease;
transition: all 0.3s ease;
}
@media (max-width: 1199px) {
themes/default-bootstrap/css/product_list.css
+11 -96
View File
@@ -2,7 +2,6 @@
/*******************************************************
Product list Styles
********************************************************/
/* line 10, ../sass/product_list.scss */
ul.product_list .availability span {
display: inline-block;
color: #fff;
@@ -10,41 +9,33 @@ ul.product_list .availability span {
padding: 3px 8px 4px 8px;
margin-bottom: 20px;
}
/* line 17, ../sass/product_list.scss */
ul.product_list .availability span.available-now {
background: #46a74e;
border: 1px solid #36943e;
}
/* line 22, ../sass/product_list.scss */
ul.product_list .availability span.out-of-stock {
background: #ff7430;
border: 1px solid #ea5e1a;
}
/* line 29, ../sass/product_list.scss */
ul.product_list .color-list-container {
margin-bottom: 12px;
}
/* line 34, ../sass/product_list.scss */
ul.product_list .color-list-container ul li {
display: inline-block;
border: 1px solid #d6d4d4;
}
/* line 38, ../sass/product_list.scss */
ul.product_list .color-list-container ul li a {
display: block;
width: 23px;
height: 23px;
margin: 1px;
}
/* line 47, ../sass/product_list.scss */
ul.product_list .product-image-container {
text-align: center;
}
/* line 50, ../sass/product_list.scss */
ul.product_list .product-image-container img {
margin: 0 auto;
}
/* line 54, ../sass/product_list.scss */
ul.product_list .product-image-container .quick-view {
font: 700 13px/16px Arial, Helvetica, sans-serif;
color: #777676;
@@ -62,13 +53,11 @@ ul.product_list .product-image-container .quick-view {
box-shadow: rgba(0, 0, 0, 0.16) 0 2px 8px;
}
@media (min-width: 1200px) {
/* line 54, ../sass/product_list.scss */
ul.product_list .product-image-container .quick-view {
display: none;
}
}
@media (max-width: 767px) {
/* line 54, ../sass/product_list.scss */
ul.product_list .product-image-container .quick-view {
display: none;
}
@@ -77,25 +66,21 @@ ul.product_list .product-image-container .quick-view {
/*******************************************************
Product list(Grid) Styles
********************************************************/
/* line 83, ../sass/product_list.scss */
ul.product_list.grid > li {
margin-bottom: 20px;
text-align: center;
}
@media (min-width: 480px) and (max-width: 767px) {
/* line 83, ../sass/product_list.scss */
ul.product_list.grid > li {
width: 50%;
float: left;
}
}
/* line 92, ../sass/product_list.scss */
ul.product_list.grid > li .product-container {
background: #fff;
padding: 0;
position: relative;
}
/* line 97, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .product-image-container {
border: 1px solid #d6d4d4;
padding: 9px;
@@ -103,14 +88,12 @@ ul.product_list.grid > li .product-container .product-image-container {
position: relative;
}
@media (max-width: 767px) {
/* line 97, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .product-image-container {
max-width: 290px;
margin-left: auto;
margin-right: auto;
}
}
/* line 109, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .product-image-container .content_price {
position: absolute;
left: 0;
@@ -120,125 +103,100 @@ ul.product_list.grid > li .product-container .product-image-container .content_p
padding: 9px 0;
display: none;
}
/* line 118, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .product-image-container .content_price span {
color: #fff;
}
/* line 124, ../sass/product_list.scss */
ul.product_list.grid > li .product-container h5 {
padding: 0 15px 7px 15px;
min-height: 53px;
}
/* line 129, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .product-desc {
display: none;
}
/* line 133, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .content_price {
padding-bottom: 9px;
line-height: 21px;
}
/* line 135, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .old-price, ul.product_list.grid > li .product-container .price, ul.product_list.grid > li .product-container .price-percent-reduction {
display: inline-block;
}
/* line 137, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .product-flags {
display: none;
}
/* line 139, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .old-price {
margin-right: 5px;
}
/* line 141, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .button-container {
margin-bottom: 14px;
}
@media (min-width: 1200px) {
/* line 141, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .button-container {
display: none;
}
}
/* line 147, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .button-container .ajax_add_to_cart_button, ul.product_list.grid > li .product-container .button-container span.button {
margin-right: 6px;
}
/* line 150, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons {
background: url(../img/functional-bt-shadow.png) repeat-x;
padding: 11px 0 5px;
}
@media (min-width: 1200px) {
/* line 150, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons {
display: none;
}
}
/* line 156, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div {
width: 50%;
float: left;
padding: 3px 0 4px 0;
}
/* line 161, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div a, ul.product_list.grid > li .product-container .functional-buttons div label {
font-weight: bold;
color: #777676;
cursor: pointer;
}
/* line 165, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div a:hover, ul.product_list.grid > li .product-container .functional-buttons div label:hover {
color: #000;
}
/* line 168, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
border-right: 1px solid #d6d4d4;
}
@media (min-width: 992px) and (max-width: 1199px) {
/* line 168, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
border-right: 0;
}
/* line 173, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.wishlist i {
display: none;
}
}
@media (min-width: 480px) and (max-width: 767px) {
/* line 168, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
border-right: 0;
}
/* line 179, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.wishlist i {
display: none;
}
}
/* line 185, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.compare:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare label:before {
content: "";
display: inline-block;
font-family: 'FontAwesome';
}
@media (min-width: 992px) and (max-width: 1199px) {
/* line 185, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.compare:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare label:before {
display: none;
}
}
@media (min-width: 480px) and (max-width: 767px) {
/* line 185, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.compare:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare label:before {
display: none;
}
}
/* line 200, ../sass/product_list.scss */
ul.product_list.grid > li .product-container .functional-buttons div.compare.compare.checked:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare label.checked:before {
content: "";
}
@media (min-width: 1200px) {
/* line 209, ../sass/product_list.scss */
ul.product_list.grid > li .product-container:hover {
-webkit-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
-moz-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
@@ -246,31 +204,25 @@ ul.product_list.grid > li .product-container .functional-buttons div.compare.com
position: relative;
z-index: 2;
}
/* line 214, ../sass/product_list.scss */
ul.product_list.grid > li .product-container:hover .content_price {
display: none;
}
/* line 217, ../sass/product_list.scss */
ul.product_list.grid > li .product-container:hover .product-image-container .content_price {
display: block;
}
/* line 220, ../sass/product_list.scss */
ul.product_list.grid > li .product-container:hover .product-image-container .quick-view {
display: block;
}
/* line 223, ../sass/product_list.scss */
ul.product_list.grid > li .product-container:hover .button-container, ul.product_list.grid > li .product-container:hover .functional-buttons {
display: block;
}
}
@media (min-width: 992px) {
/* line 229, ../sass/product_list.scss */
ul.product_list.grid > li.first-in-line {
clear: left;
}
}
@media (min-width: 480px) and (max-width: 991px) {
/* line 233, ../sass/product_list.scss */
ul.product_list.grid > li.first-item-of-tablet-line {
clear: left;
}
@@ -280,58 +232,47 @@ ul.product_list.grid > li .product-container .functional-buttons div.compare.com
Product list(List) Styles
********************************************************/
@media (max-width: 479px) {
/* line 245, ../sass/product_list.scss */
ul.product_list.list > li .left-block {
width: 100%;
}
}
/* line 250, ../sass/product_list.scss */
ul.product_list.list > li .product-container {
border-top: 1px solid #d6d4d4;
padding: 30px 0 30px;
}
/* line 255, ../sass/product_list.scss */
ul.product_list.list > li .product-image-container {
position: relative;
border: 1px solid #d6d4d4;
padding: 9px;
}
@media (max-width: 479px) {
/* line 255, ../sass/product_list.scss */
ul.product_list.list > li .product-image-container {
max-width: 290px;
margin: 0 auto;
}
}
/* line 263, ../sass/product_list.scss */
ul.product_list.list > li .product-image-container .content_price {
display: none !important;
}
/* line 267, ../sass/product_list.scss */
ul.product_list.list > li .product-flags {
color: #333333;
margin: -5px 0 10px 0;
}
/* line 271, ../sass/product_list.scss */
ul.product_list.list > li .product-flags .discount {
color: #f13340;
}
/* line 275, ../sass/product_list.scss */
ul.product_list.list > li h5 {
padding-bottom: 8px;
}
/* line 277, ../sass/product_list.scss */
ul.product_list.list > li .product-desc {
margin-bottom: 15px;
}
@media (max-width: 479px) {
/* line 279, ../sass/product_list.scss */
ul.product_list.list > li .center-block {
width: 100%;
}
}
@media (min-width: 992px) {
/* line 287, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content {
margin: 0;
border-left: 1px solid #d6d4d4;
@@ -340,79 +281,65 @@ ul.product_list.list > li .product-desc {
}
}
@media (max-width: 991px) {
/* line 287, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content {
padding-top: 20px;
}
}
@media (max-width: 479px) {
/* line 287, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content {
padding-top: 5px;
}
}
/* line 302, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .content_price {
padding-bottom: 10px;
}
@media (max-width: 991px) {
/* line 302, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .content_price {
padding-top: 13px;
padding-bottom: 0;
}
}
@media (max-width: 479px) {
/* line 302, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .content_price {
padding-top: 0;
width: 100%;
}
}
/* line 313, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .content_price span {
display: inline-block;
margin-top: -4px;
margin-bottom: 14px;
}
/* line 318, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .content_price span.old-price {
margin-right: 8px;
}
/* line 323, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .button-container {
overflow: hidden;
padding-bottom: 20px;
}
@media (max-width: 479px) {
/* line 323, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .button-container {
width: 100%;
}
}
/* line 329, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .button-container .btn {
margin-bottom: 10px;
}
@media (min-width: 992px) {
/* line 329, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .button-container .btn {
float: left;
clear: both;
}
}
@media (min-width: 992px) {
/* line 337, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons {
overflow: hidden;
}
}
@media (max-width: 991px) {
/* line 337, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons {
clear: both;
}
/* line 344, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons > div {
float: left;
padding-top: 0 !important;
@@ -420,23 +347,19 @@ ul.product_list.list > li .right-block .right-block-content .button-container .b
}
}
@media (max-width: 479px) {
/* line 337, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons {
float: none;
display: inline-block;
}
/* line 356, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons a i, ul.product_list.list > li .right-block .right-block-content .functional-buttons a:before, ul.product_list.list > li .right-block .right-block-content .functional-buttons label i, ul.product_list.list > li .right-block .right-block-content .functional-buttons label:before {
display: none !important;
}
}
/* line 359, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons a, ul.product_list.list > li .right-block .right-block-content .functional-buttons label {
font-weight: bold;
color: #777676;
cursor: pointer;
}
/* line 364, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons a i, ul.product_list.list > li .right-block .right-block-content .functional-buttons label i {
width: 30px;
height: 30px;
@@ -453,19 +376,15 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
border-radius: 100px;
margin-right: 3px;
}
/* line 376, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons a:hover, ul.product_list.list > li .right-block .right-block-content .functional-buttons label:hover {
color: #333333;
}
/* line 379, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons a:hover i, ul.product_list.list > li .right-block .right-block-content .functional-buttons label:hover i {
background: #333333;
}
/* line 385, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare {
padding-top: 10px;
}
/* line 390, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:before {
content: "";
display: inline-block;
@@ -481,25 +400,27 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
-o-border-radius: 100px;
border-radius: 100px;
margin-right: 3px;
padding: 4px 0 0 0;
padding: 6px 0 0 0;
color: #fff;
}
/* line 405, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:hover {
color: #333333;
}
/* line 408, ../sass/product_list.scss */
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:hover:before {
background: #333333;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label.checked:before {
background: #fff;
border: 1px solid #929292;
color: #929292;
padding-top: 5px;
}
@media (min-width: 1200px) {
/* line 426, ../sass/product_list.scss */
ul.product_list.list > li:hover .product-image-container .quick-view {
display: block;
}
}
@media (max-width: 479px) {
/* line 243, ../sass/product_list.scss */
ul.product_list.list > li {
text-align: center;
}
@@ -508,25 +429,21 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
/*******************************************************
Product list(Index page) Styles
********************************************************/
/* line 443, ../sass/product_list.scss */
#index ul.product_list.tab-pane > li {
padding-bottom: 10px;
margin-bottom: 10px;
}
@media (min-width: 1200px) {
/* line 443, ../sass/product_list.scss */
#index ul.product_list.tab-pane > li {
/* min 1200px */
padding-bottom: 35px;
margin-bottom: 50px;
}
}
/* line 451, ../sass/product_list.scss */
#index ul.product_list.tab-pane > li .availability {
display: none;
}
@media (min-width: 1200px) {
/* line 454, ../sass/product_list.scss */
#index ul.product_list.tab-pane > li.last-line {
border: none;
padding-bottom: 0;
@@ -534,11 +451,9 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
}
}
@media (min-width: 480px) and (max-width: 767px) {
/* line 462, ../sass/product_list.scss */
#index ul.product_list.tab-pane > li.first-item-of-tablet-line {
clear: none;
}
/* line 463, ../sass/product_list.scss */
#index ul.product_list.tab-pane > li.first-item-of-mobile-line {
clear: left;
}
themes/default-bootstrap/header.tpl
+7 -2
View File
@@ -69,11 +69,16 @@
{/foreach}
{/if}
<script src="{$js_dir}/tools/bootstrap.min.js"></script>
<!--[if IE 7]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<script src="{$js_dir}/tools/jquery.total-storage.min.js"></script>
<script src="{$js_dir}/jquery/jquery.uniform-modify.js"></script>
<script src="{$js_dir}/jquery/highdpi.js"></script>
<script src="{$js_dir}/jquery/jquery.bxslider.js"></script>
<script src="{$js_dir}/jquery/footable.js"></script>
<script src="{$js_dir}/jquery/resonsive_utilites.js"></script>
{$HOOK_HEADER}
</head>
@@ -117,7 +122,7 @@
</div>
{/if}
{/foreach}
<ul id="first-languages" class="countries_ul">
<ul id="first-languages" class="countries_ul toogle_content">
{foreach from=$languages key=k item=language name="languages"}
<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
{if $language.iso_code != $lang_iso}
@@ -164,7 +169,7 @@
{if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
{/foreach}
</div>
<ul id="first-currencies" class="currencies_ul">
<ul id="first-currencies" class="currencies_ul toogle_content">
{foreach from=$currencies key=k item=f_currency}
<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
<a href="javascript:setCurrency({$f_currency.id_currency});" title="{$f_currency.name}" rel="nofollow">{$f_currency.name}</a>
themes/default-bootstrap/identity.tpl
+6 -6
View File
@@ -52,15 +52,15 @@
</div>
<div class="required form-group">
<label for="firstname">{l s='First name'} <sup>*</sup></label>
<input class="form-control" type="text" id="firstname" name="firstname" value="{$smarty.post.firstname}" />
<input class="is_required validate form-control" data-validate="isName" type="text" id="firstname" name="firstname" value="{$smarty.post.firstname}" />
</div>
<div class="required form-group">
<label for="lastname">{l s='Last name'} <sup>*</sup></label>
<input class="form-control" type="text" name="lastname" id="lastname" value="{$smarty.post.lastname}" />
<input class="is_required validate form-control" data-validate="isName" type="text" name="lastname" id="lastname" value="{$smarty.post.lastname}" />
</div>
<div class="required form-group">
<label for="email">{l s='E-mail address'} <sup>*</sup></label>
<input class="form-control" type="email" name="email" id="email" value="{$smarty.post.email}" />
<input class="is_required validate form-control" data-validate="isEmail" type="email" name="email" id="email" value="{$smarty.post.email}" />
</div>
<div class="form-group">
<label>{l s='Date of Birth'}</label>
@@ -107,15 +107,15 @@
</div>
<div class="required form-group">
<label for="old_passwd">{l s='Current Password'} <sup>*</sup></label>
<input class="form-control" type="password" name="old_passwd" id="old_passwd" />
<input class="is_required validate form-control" type="password" data-validate="isPasswd" name="old_passwd" id="old_passwd" />
</div>
<div class="password form-group">
<label for="passwd">{l s='New Password'}</label>
<input class="form-control" type="password" name="passwd" id="passwd" />
<input class="is_required validate form-control" type="password" data-validate="isPasswd" name="passwd" id="passwd" />
</div>
<div class="password form-group">
<label for="confirmation">{l s='Confirmation'}</label>
<input class="form-control" type="password" name="confirmation" id="confirmation" />
<input class="is_required validate form-control" type="password" data-validate="isPasswd" name="confirmation" id="confirmation" />
</div>
{if $newsletter}
<div class="checkbox">
themes/default-bootstrap/js/jquery/resonsive_utilites.js
Vendored
+45
View File
@@ -0,0 +1,45 @@
/*********************************************************** TMMenuDropDown **********************************/
function tmDropDown (elementType, elementClick, elementSlide, activeClass){
elementType = elementType; // special if hidden element isn't next (like for cart block here)
elementClick = elementClick; // element to click
elementSlide = elementSlide; // element to show/hide
activeClass = activeClass; // active class for "element to click"
//show/hide elements
$(elementClick).on('click touchstart', function(){
if (elementType != 'cart')
var subUl = $(this).next(elementSlide);
else
var subUl = $(this).parents('#header').find(elementSlide);
if(subUl.is(':hidden')) {
subUl.slideDown(),
$(this).addClass(activeClass)
}
else {
subUl.slideUp(),
$(this).removeClass(activeClass)
}
$(elementClick).not(this).next(elementSlide).slideUp(),
$(elementClick).not(this).removeClass(activeClass);
return false
}),
//enable clicks on showed elements
$(elementSlide).on('click touchstart', function(e){
e.stopPropagation();
});
// hide showed elements on document click
$(document).on('click touchstart', function(){
if (elementType != 'cart')
var elementHide = $(elementClick).next(elementSlide);
else
var elementHide = $(elementClick).parents('#header').find(elementSlide);
$(elementHide).slideUp();
})
};
$(document).ready(function(){
tmDropDown ('', '#header .current', 'ul.toogle_content', 'active'); // all of this should be defined or left empty brackets
//tmDropDown ('cart', 'li#shopping_cart > a', '#cart_block', 'active'); // all of this should be defined or left empty brackets
});
themes/default-bootstrap/js/order-opc.js
+2 -3
View File
@@ -453,6 +453,7 @@ $(function() {
updateState();
updateNeedIDNumber();
updateZipCode();
$("select.form-control,input[type='checkbox']").uniform();
});
}
else if (isGuest)
@@ -726,8 +727,6 @@ function bindInputs()
// Recyclable checkbox
$('#recyclable').click(function() {
updateCarrierSelectionAndGift();
$("select.form-control,input[type='checkbox']").uniform();
});
// Gift checkbox update
@@ -737,7 +736,6 @@ function bindInputs()
else
$('#gift_div').hide();
updateCarrierSelectionAndGift();
$("select.form-control,input[type='checkbox']").uniform();
});
if ($('#gift').is(':checked'))
@@ -755,6 +753,7 @@ function bindInputs()
$('#cgv').click(function() {
updatePaymentMethodsDisplay();
});
$("select.form-control,input[type='checkbox']").uniform();
}
function multishippingMode(it)
themes/default-bootstrap/js/products-comparison.js
+29 -15
View File
@@ -23,14 +23,15 @@
* International Registered Trademark & Property of PrestaShop SA
*/
$('document').ready(function(){
reloadProductComparison();
});
reloadProductComparison = function() {
$('input:checkbox.comparator').each(function() {
var checkedCheckbox = $(this);
if (checkedCheckbox.is(':checked'))
checkedCheckbox.parent().addClass('checked');
});
$('a.cmp_remove').click(function(){
var idProduct = $(this).attr('rel').replace('ajax_id_product_', '');
var idProduct = $(this).prop('rel').replace('ajax_id_product_', '');
$.ajax({
url: 'index.php?controller=products-comparison&ajax=1&action=remove&id_product=' + idProduct,
@@ -41,14 +42,12 @@ reloadProductComparison = function() {
}
});
});
$('input:checkbox.comparator').click(function(){
var idProduct = $(this).attr('value').replace('comparator_item_', '');
var totalValueNow = parseInt($('.bt_compare').next('.compare_product_count').val());
var idProduct = $(this).prop('value').replace('comparator_item_', '');
var checkbox = $(this);
if(checkbox.is(':checked'))
{
{
$.ajax({
url: 'index.php?controller=products-comparison&ajax=1&action=add&id_product=' + idProduct,
async: true,
@@ -56,12 +55,19 @@ reloadProductComparison = function() {
success: function(data){
if (data === '0')
{
checkbox.attr('checked', false);
checkbox.prop('checked', false);
alert(max_item);
}
else {
checkbox.prop('checked', true),
checkbox.parent().addClass('checked'),
totalVal = totalValueNow +1,
$('.bt_compare').next('.compare_product_count').val(totalVal),
totalValue(totalVal)
}
},
error: function(){
checkbox.attr('checked', false);
checkbox.prop('checked', false);
}
});
}
@@ -73,12 +79,20 @@ reloadProductComparison = function() {
cache: false,
success: function(data){
if (data === '0')
checkbox.attr('checked', true);
},
checkbox.prop('checked', true);
checkbox.parent().removeClass('checked');
totalVal = totalValueNow -1;
$('.bt_compare').next('.compare_product_count').val(totalVal),
totalValue(totalVal)
},
error: function(){
checkbox.attr('checked', true);
checkbox.prop('checked', true);
}
});
}
});
}
function totalValue(value) {
$('.bt_compare').find('.total-compare-val').html(value);
}
themes/default-bootstrap/js/tools/respond.min.js
Vendored
+6
View File
@@ -0,0 +1,6 @@
/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.documentElement,e=d.firstElementChild||d.firstChild,f=a.createElement("body"),g=a.createElement("div");return g.id="mq-test-1",g.style.cssText="position:absolute;top:-100em",f.style.background="none",f.appendChild(g),function(a){return g.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',d.insertBefore(f,e),c=42===g.offsetWidth,d.removeChild(f),{matches:c,media:a}}}(document);
/*! Respond.js v1.3.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs */
(function(a){"use strict";function x(){u(!0)}var b={};if(a.respond=b,b.update=function(){},b.mediaQueriesSupported=a.matchMedia&&a.matchMedia("only all").matches,!b.mediaQueriesSupported){var q,r,t,c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=c.getElementsByTagName("base")[0],l=j.getElementsByTagName("link"),m=[],n=function(){for(var b=0;l.length>b;b++){var c=l[b],d=c.href,e=c.media,f=c.rel&&"stylesheet"===c.rel.toLowerCase();d&&f&&!h[d]&&(c.styleSheet&&c.styleSheet.rawCssText?(p(c.styleSheet.rawCssText,d,e),h[d]=!0):(!/^([a-zA-Z:]*\/\/)/.test(d)&&!k||d.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&m.push({href:d,media:e}))}o()},o=function(){if(m.length){var b=m.shift();v(b.href,function(c){p(c,b.href,b.media),h[b.href]=!0,a.setTimeout(function(){o()},0)})}},p=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),g=d&&d.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c;b.length&&(b+="/"),i&&(g=1);for(var j=0;g>j;j++){var k,l,m,n;i?(k=c,f.push(h(a))):(k=d[j].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),m=k.split(","),n=m.length;for(var o=0;n>o;o++)l=m[o],e.push({media:l.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:f.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(/\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(/\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},s=function(){var a,b=c.createElement("div"),e=c.body,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",e||(e=f=c.createElement("body"),e.style.background="none"),e.appendChild(b),d.insertBefore(e,d.firstChild),a=b.offsetWidth,f?d.removeChild(e):e.removeChild(b),a=t=parseFloat(a)},u=function(b){var h="clientWidth",k=d[h],m="CSS1Compat"===c.compatMode&&k||c.body[h]||k,n={},o=l[l.length-1],p=(new Date).getTime();if(b&&q&&i>p-q)return a.clearTimeout(r),r=a.setTimeout(u,i),void 0;q=p;for(var v in e)if(e.hasOwnProperty(v)){var w=e[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?t||s():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?t||s():1)),w.hasquery&&(z&&A||!(z||m>=x)||!(A||y>=m))||(n[w.media]||(n[w.media]=[]),n[w.media].push(f[w.rules]))}for(var C in g)g.hasOwnProperty(C)&&g[C]&&g[C].parentNode===j&&j.removeChild(g[C]);for(var D in n)if(n.hasOwnProperty(D)){var E=c.createElement("style"),F=n[D].join("\n");E.type="text/css",E.media=D,j.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(c.createTextNode(F)),g.push(E)}},v=function(a,b){var c=w();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},w=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}();n(),b.update=n,a.addEventListener?a.addEventListener("resize",x,!1):a.attachEvent&&a.attachEvent("onresize",x)}})(this);
themes/default-bootstrap/js/validate_fields.js
+33
View File
@@ -0,0 +1,33 @@
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
$(document).on('keyup', 'input.validate, textarea.validate', function() {
if ($(this).hasClass('is_required') || $(this).val().length)
{
if (window['validate_'+$(this).attr('data-validate')]($(this).val()))
$(this).parent().removeClass('form-error').addClass('form-ok');
else
$(this).parent().addClass('form-error').removeClass('form-ok');
}
});
themes/default-bootstrap/manufacturer-list.tpl
+2 -2
View File
@@ -46,8 +46,8 @@
{if $nbManufacturers > 0}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix hidden-xs">
<ul class="display">
<div class="sortPagiBar clearfix">
<ul class="display hidden-xs">
<li class="display-title">{l s='View:'}</li>
<li id="grid"><a onclick="display('grid');"><i class="icon-th-large"></i>{l s='Grid'}</a></li>
<li id="list"><a onclick="display('list');"><i class="icon-th-list"></i>{l s='List'}</a></li>
themes/default-bootstrap/modules/blocksearch/blocksearch-top.tpl
-1
View File
@@ -37,7 +37,6 @@
<div id="search_block_top">
<form method="get" action="{$link->getPageLink('search')|escape:'html'}" id="searchbox">
<div>
<label for="search_query_top"><!-- image on background --></label>
<input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" />
themes/default-bootstrap/pagination.tpl
+12 -2
View File
@@ -55,7 +55,6 @@
{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if}
{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'htmlall':'UTF-8'}" />{/if}
<button type="submit" class="btn btn-default button exclusive-medium"><span>{l s='Show all'}</span></button>
<input name="n" id="nb_item" class="hidden" value="{$nb_products}" />
{if is_array($requestNb)}
{foreach from=$requestNb item=requestValue key=requestKey}
{if $requestKey != 'requestUrl'}
@@ -63,6 +62,7 @@
{/if}
{/foreach}
{/if}
<input name="n" id="nb_item" class="hidden" value="{$nb_products}" />
</div>
</form>
{/if}
@@ -113,7 +113,17 @@
{/if}
</div>
<div class="product-count">
Showing 1-12 of 1125 items
{if ($n*$p) < $nb_products }
{assign var='productShowing' value=$n*$p}
{else}
{assign var='productShowing' value=($n*$p-$nb_products-$n*$p)*-1}
{/if}
{if $p==1}
{assign var='productShowingStart' value=1}
{else}
{assign var='productShowingStart' value=$n*$p-$n+1}
{/if}
{l s='Showing'} {$productShowingStart} - {$productShowing} {l s='of'} {$nb_products}{if $nb_products > 1} {l s='items'}{else} {l s='item'}{/if}
</div>
<!-- /Pagination -->
{/if}
themes/default-bootstrap/product-compare.tpl
+2 -1
View File
@@ -34,7 +34,8 @@
{/if}
<form method="post" action="{$link->getPageLink('products-comparison')|escape:'html'}" onsubmit="true" class="compare-form">
<div>
<button type="submit" id="bt_compare{if isset($paginationId)}_{$paginationId}{/if}" class="btn btn-default button button-medium bt_compare"><span>{l s='Compare'} (0)<i class="icon-chevron-right right"></i></span></button>
<button type="submit" id="bt_compare{if isset($paginationId)}_{$paginationId}{/if}" class="btn btn-default button button-medium bt_compare"><span>{l s='Compare'} (<strong class="total-compare-val">{count($compared_products)}</strong>)<i class="icon-chevron-right right"></i></span></button>
<input type="hidden" name="compare_product_count" class="compare_product_count" value="{count($compared_products)}" />
<input type="hidden" name="compare_product_list" class="compare_product_list" value="" />
</div>
</form>
themes/default-bootstrap/product-list.tpl
+7 -1
View File
@@ -34,6 +34,12 @@
{assign var='nbItemsPerLineTablet' value=2}
{assign var='nbItemsPerLineMobile' value=3}
{else}
<script type="text/javascript">
$('document').ready(function(){
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison()
});
</script>
{assign var='nbItemsPerLine' value=4}
{assign var='nbItemsPerLineTablet' value=3}
{assign var='nbItemsPerLineMobile' value=2}
@@ -122,7 +128,7 @@
{if isset($comparator_max_item) && $comparator_max_item}
<div class="compare">
<label for="comparator_item_{$product.id_product}">
<input type="checkbox" class="comparator hidden" id="comparator_item_{$product.id_product}" value="comparator_item_{$product.id_product}" {if isset($compareProducts) && in_array($product.id_product, $compareProducts)}checked="checked"{/if} autocomplete="off"/>
<input type="checkbox" class="comparator hidden" id="comparator_item_{$product.id_product}" value="comparator_item_{$product.id_product}" {if isset($compared_products) && in_array($product.id_product, $compared_products)}checked="checked"{/if} autocomplete="off"/>
{l s='Add to Compare'}</label>
</div>
{/if}
themes/default-bootstrap/product.tpl
+1 -1
View File
@@ -282,7 +282,6 @@ var contentOnly = {if $content_only}true{else}false{/if}
<!-- availability -->
<link itemprop="availability" href="http://schema.org/InStock">
<p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
{*<span id="availability_label">{l s='Availability:'}</span>*}
<span id="availability_value"{if $product->quantity <= 0} class="warning_inline"{/if}>{if $product->quantity <= 0}{if $allow_oosp}{$product->available_later}{else}{l s='This product is no longer in stock'}{/if}{else}{$product->available_now}{/if}</span>
@@ -353,6 +352,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
<div class="price">
<p class="our_price_display" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
<link itemprop="availability" href="http://schema.org/InStock">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
<span id="our_price_display" itemprop="price">{convertPrice price=$productPrice}</span>
<!--{if $tax_enabled && ((isset($display_tax_label) && $display_tax_label == 1) OR !isset($display_tax_label))}
themes/default-bootstrap/products-comparison.tpl
+7 -1
View File
@@ -28,6 +28,12 @@
<h1 class="page-heading">{l s='Product Comparison'}</h1>
{if $hasProduct}
<script type="text/javascript">
$('document').ready(function(){
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison()
});
</script>
<div class="products_block table-responsive">
<table id="product_comparison" class="table table-bordered">
<tr>
@@ -108,7 +114,7 @@
{if ($product->quantity > 0 OR $product->allow_oosp)}
<a class="button ajax_add_to_cart_button btn btn-default" rel="ajax_id_product_{$product->id}" href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$product->id}&amp;token={$static_token}&amp;add")|escape:'html'}" title="{l s='Add to cart'}"><span>{l s='Add to cart'}</span></a>
{else}
<span class="exclusive btn btn-default disabled">{l s='Add to cart'}</span>
<span class="ajax_add_to_cart_button button btn btn-default disabled"><span>{l s='Add to cart'}</span></span>
{/if}
{else}
themes/default-bootstrap/sass/comparator.scss
+1 -1
View File
@@ -90,7 +90,7 @@ table#product_comparison {
}
.button-container {
a {
a, > span {
margin-bottom:10px;
}
}
themes/default-bootstrap/sass/global.scss
+5 -28
View File
@@ -1078,6 +1078,7 @@ ul.footer_links {
.clearfix > span {
padding:3px 0 0 12px;
display:inline-block;
float:left;
}
#uniform-nb_item { float:left;}
@@ -1179,6 +1180,9 @@ ul.footer_links {
}
ul.pagination {
margin:8px 0px 8px 0;
@media (max-width: $screen-sm-max) { // max 991px
float:left;
}
li {
display:inline-block;
@@ -1670,8 +1674,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
background:#484848;
}
}
&:hover {display:block;}
}
}
#contact-link {
@@ -1697,12 +1699,8 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
#contact-link a, .header-row #header_user_info a, #currencies-block-top div.current, #languages-block-top div.current {
cursor:pointer;
&:hover {
&:hover, &.active {
background:#2b2b2b;
+ ul {
display:block;
}
}
}
}
@@ -2627,11 +2625,6 @@ p.cheque-indent {
#pagination {
/* 480 -> 1199 */
@media (min-width: $screen-xs) and (max-width: $screen-md-max) {
width:auto;
text-align:right;
}
.showall {
margin-right:0;
@@ -2641,26 +2634,10 @@ p.cheque-indent {
}
}
}
/* < 480*/
@media (max-width: $screen-xs) {
.product-count, #pagination {
width:100%;
text-align:center;
.showall {
display:none;
}
}
}
}
.top-pagination-content.bottom-line {
border-bottom:1px solid $base-border-color;
/* < 767 */
@media (max-width: $screen-xs-max) {
border-top:1px solid $base-border-color;
}
}
}
/*****************************************************************************************************
themes/default-bootstrap/sass/product_list.scss
+27 -19
View File
@@ -181,27 +181,27 @@ ul.product_list.grid {
}
&.compare {
&:before {
content:"";
display:inline-block;
font-family:'FontAwesome';
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
display:none;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
display:none;
}
}
&.compare.checked {
label {
&:before {
content:"";
content:"";
display:inline-block;
font-family:'FontAwesome';
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
display:none;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
display:none;
}
}
&.checked {
&:before {
content:"";
}
}
}
}
}
}
}
@@ -398,7 +398,7 @@ ul.product_list.list {
background:#929292;
@include border-radius(100px);
margin-right:3px;
padding:4px 0 0 0;
padding:6px 0 0 0;
color:#fff;
}
@@ -409,6 +409,14 @@ ul.product_list.list {
background:#333333;
}
}
&.checked {
&:before {
background:#fff;
border:1px solid #929292;
color:#929292;
padding-top:5px;
}
}
}
}
}
themes/default-bootstrap/supplier-list.tpl
+1 -1
View File
@@ -46,7 +46,7 @@
{if $nbSuppliers > 0}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
<ul class="display">
<ul class="display hidden-xs">
<li class="display-title">{l s='View:'}</li>
<li id="grid"><a onclick="display('grid');"><i class="icon-th-large"></i>{l s='Grid'}</a></li>
<li id="list"><a onclick="display('list');"><i class="icon-th-list"></i>{l s='List'}</a></li>