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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
This commit is contained in:
Kevin Granger
2013-11-05 16:42:09 +01:00
parent 533ebc0f6d 4a6cb5075e
commit e702af6a67
86 changed files with 2924 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/scss/admin-theme/_admin-modules.sass
+1
View File
@@ -66,6 +66,7 @@
@include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset)
border: solid 1px #ccc
background-color: #eee
cursor: n-resize
.module_col_icon
display: table-cell
width: 50px
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+8 -10
View File
@@ -27,11 +27,11 @@
{block name="label"}
{if $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<label class="control-label col-lg-3">{l s='Authorized modules:'}</label>
</div>
{elseif $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
{$smarty.block.parent}
</div>
{else}
@@ -39,10 +39,9 @@
{/if}
{/block}
{block name="field"}
{if $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<script type="text/javascript">
$(document).ready(function() {
$("#group_discount_category").fancybox({
@@ -143,7 +142,7 @@
</tr>
{/foreach}
</table>
</div>
<div style="display:none" id="group_discount_category_fancybox">
<div class="panel form-horizontal">
<div class="col-lg-12">
@@ -168,8 +167,7 @@
</div>
</div>
{elseif $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div class="margin-form">
<div {if !$form_id}class="hide"{/if}>
<script type="text/javascript">
$(document).ready(function() {
$('#authorized-modules').find('[value="0"]').click(function() {
@@ -185,7 +183,7 @@
<div class="col-lg-9" id="authorized-modules">
{foreach $input['values']['auth_modules'] key=key item=module }
<div class="form-group">
<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1" checked="checked">
@@ -200,7 +198,7 @@
{/foreach}
{foreach $input['values']['unauth_modules'] key=key item=module }
<div class="form-group">
<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1">
@@ -218,4 +216,4 @@
{else}
{$smarty.block.parent}
{/if}
{/block}
{/block}
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+52 -48
View File
@@ -26,58 +26,62 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
<div class="row">
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions}
<div class="alert alert-warning">{l s='None'}</div>
{else}
<table class="table">
<thead>
<tr>
<th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th>
</tr>
</thead>
<tbody>
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
<tbody>
</table>
{/if}
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions}
<div class="alert alert-warning">{l s='None'}</div>
{else}
<table class="table">
<thead>
<tr>
<th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th>
</tr>
</thead>
<tbody>
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
<tbody>
</table>
{/if}
</div>
</div>
</div>
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
<div class="row">
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
</div>
</div>
{/block}
classes/controller/AdminController.php
+5 -6
View File
@@ -1973,14 +1973,13 @@ class AdminControllerCore extends Controller
* @param boolean $htmlentities if set to true(default), the return value will pass through htmlentities($string, ENT_QUOTES, 'utf-8')
* @return string the translation if available, or the english default text.
*/
protected function l($string, $class = 'AdminTab', $addslashes = false, $htmlentities = true)
protected function l($string, $class = null, $addslashes = false, $htmlentities = true)
{
// classname has changed, from AdminXXX to AdminXXXController
// So we remove 10 characters and we keep same keys
if (strtolower(substr($class, -10)) == 'controller')
$class = substr($class, 0, -10);
elseif ($class == 'AdminTab')
if ($class === null || $class == 'AdminTab')
$class = substr(get_class($this), 0, -10);
// classname has changed, from AdminXXX to AdminXXXController, so we remove 10 characters and we keep same keys
elseif (strtolower(substr($class, -10)) == 'controller')
$class = substr($class, 0, -10);
return Translate::getAdminTranslation($string, $class, $addslashes, $htmlentities);
}
controllers/admin/AdminCategoriesController.php
+4 -4
View File
@@ -356,7 +356,7 @@ class AdminCategoriesControllerCore extends AdminController
$helper->id = 'box-disabled-categories';
$helper->icon = 'icon-off';
$helper->color = 'color1';
$helper->title = $this->l('Disabled Categories');
$helper->title = $this->l('Disabled Categories', null, null, false);
if (ConfigurationKPI::get('DISABLED_CATEGORIES') !== false)
$helper->value = ConfigurationKPI::get('DISABLED_CATEGORIES');
if (ConfigurationKPI::get('DISABLED_CATEGORIES_EXPIRE') < $time)
@@ -367,7 +367,7 @@ class AdminCategoriesControllerCore extends AdminController
$helper->id = 'box-empty-categories';
$helper->icon = 'icon-bookmark-empty';
$helper->color = 'color2';
$helper->title = $this->l('Empty Categories');
$helper->title = $this->l('Empty Categories', null, null, false);
if (ConfigurationKPI::get('EMPTY_CATEGORIES') !== false)
$helper->value = ConfigurationKPI::get('EMPTY_CATEGORIES');
if (ConfigurationKPI::get('EMPTY_CATEGORIES_EXPIRE') < $time)
@@ -378,8 +378,8 @@ class AdminCategoriesControllerCore extends AdminController
$helper->id = 'box-top-category';
$helper->icon = 'icon-money';
$helper->color = 'color3';
$helper->title = $this->l('Top Category');
$helper->subtitle = $this->l('30 days');
$helper->title = $this->l('Top Category', null, null, false);
$helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang) !== false)
$helper->value = ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang);
if (ConfigurationKPI::get('TOP_CATEGORY_EXPIRE', $this->context->employee->id_lang) < $time)
controllers/admin/AdminCustomerThreadsController.php
+5 -5
View File
@@ -478,7 +478,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$helper->id = 'box-pending-messages';
$helper->icon = 'icon-envelope';
$helper->color = 'color1';
$helper->title = $this->l('Pending Messages');
$helper->title = $this->l('Pending Messages', null, null, false);
if (ConfigurationKPI::get('PENDING_MESSAGES') !== false)
$helper->value = ConfigurationKPI::get('PENDING_MESSAGES');
if (ConfigurationKPI::get('PENDING_MESSAGES_EXPIRE') < $time)
@@ -489,8 +489,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
$helper->id = 'box-age';
$helper->icon = 'icon-time';
$helper->color = 'color2';
$helper->title = $this->l('Average Response Time');
$helper->subtitle = $this->l('30 days');
$helper->title = $this->l('Average Response Time', null, null, false);
$helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME') !== false)
$helper->value = ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME');
if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME_EXPIRE') < $time)
@@ -501,8 +501,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
$helper->id = 'box-messages-per-thread';
$helper->icon = 'icon-copy';
$helper->color = 'color3';
$helper->title = $this->l('Messages per Thread');
$helper->subtitle = $this->l('30 day');
$helper->title = $this->l('Messages per Thread', null, null, false);
$helper->subtitle = $this->l('30 day', null, null, false);
if (ConfigurationKPI::get('MESSAGES_PER_THREAD') !== false)
$helper->value = ConfigurationKPI::get('MESSAGES_PER_THREAD');
if (ConfigurationKPI::get('MESSAGES_PER_THREAD_EXPIRE') < $time)
controllers/admin/AdminCustomersController.php
+8 -8
View File
@@ -545,8 +545,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-gender';
$helper->icon = 'icon-male';
$helper->color = 'color1';
$helper->title = $this->l('Customers');
$helper->subtitle = $this->l('All Time');
$helper->title = $this->l('Customers', null, null, false);
$helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER') !== false)
$helper->value = ConfigurationKPI::get('CUSTOMER_MAIN_GENDER');
if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER_EXPIRE') < $time)
@@ -557,8 +557,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-age';
$helper->icon = 'icon-calendar';
$helper->color = 'color2';
$helper->title = $this->l('Average Age');
$helper->subtitle = $this->l('All Time');
$helper->title = $this->l('Average Age', 'AdminTab', null, false);
$helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('AVG_CUSTOMER_AGE') !== false)
$helper->value = ConfigurationKPI::get('AVG_CUSTOMER_AGE');
if (ConfigurationKPI::get('AVG_CUSTOMER_AGE_EXPIRE') < $time)
@@ -569,8 +569,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-orders';
$helper->icon = 'icon-retweet';
$helper->color = 'color3';
$helper->title = $this->l('Orders per Customer');
$helper->subtitle = $this->l('All Time');
$helper->title = $this->l('Orders per Customer', null, null, false);
$helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER') !== false)
$helper->value = ConfigurationKPI::get('ORDERS_PER_CUSTOMER');
if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER_EXPIRE') < $time)
@@ -581,8 +581,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-newsletter';
$helper->icon = 'icon-envelope';
$helper->color = 'color4';
$helper->title = $this->l('Newsletter Registrations');
$helper->subtitle = $this->l('All Time');
$helper->title = $this->l('Newsletter Registrations', null, null, false);
$helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS') !== false)
$helper->value = ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS');
if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS_EXPIRE') < $time)
controllers/admin/AdminGroupsController.php
+7 -6
View File
@@ -246,7 +246,7 @@ class AdminGroupsControllerCore extends AdminController
'input' => array(
array(
'type' => 'text',
'label' => $this->l('Name:'),
'label' => $this->l('Name'),
'name' => 'name',
'required' => true,
'lang' => true,
@@ -255,14 +255,15 @@ class AdminGroupsControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Discount (%):'),
'label' => $this->l('Discount'),
'name' => 'reduction',
'col' => 2,
'suffix' => '%',
'col' => 1,
'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.')
),
array(
'type' => 'select',
'label' => $this->l('Price display method:'),
'label' => $this->l('Price display method'),
'name' => 'price_display_method',
'col' => 2,
'hint' => $this->l('How prices are displayed in the order summary for this customer group.'),
@@ -283,7 +284,7 @@ class AdminGroupsControllerCore extends AdminController
),
array(
'type' => 'switch',
'label' => $this->l('Show prices:'),
'label' => $this->l('Show prices'),
'name' => 'show_prices',
'required' => false,
'class' => 't',
@@ -310,7 +311,7 @@ class AdminGroupsControllerCore extends AdminController
),
array(
'type' => 'modules',
'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')),
'label' => $this->l('Modules Authorization'),
'name' => 'auth_modules',
'values' => $this->formatModuleListAuth($group->id)
)
controllers/admin/AdminModulesController.php
+3 -3
View File
@@ -987,7 +987,7 @@ class AdminModulesControllerCore extends AdminController
$helper->id = 'box-installed-modules';
$helper->icon = 'icon-puzzle-piece';
$helper->color = 'color1';
$helper->title = html_entity_decode($this->l('Installed Modules'));
$helper->title = $this->l('Installed Modules', null, null, false);
if (ConfigurationKPI::get('INSTALLED_MODULES') !== false)
$helper->value = ConfigurationKPI::get('INSTALLED_MODULES');
if (ConfigurationKPI::get('INSTALLED_MODULES_EXPIRE') < $time)
@@ -998,7 +998,7 @@ class AdminModulesControllerCore extends AdminController
$helper->id = 'box-disabled-modules';
$helper->icon = 'icon-off';
$helper->color = 'color2';
$helper->title = html_entity_decode($this->l('Disabled Modules'));
$helper->title = $this->l('Disabled Modules', null, null, false);
if (ConfigurationKPI::get('DISABLED_MODULES') !== false)
$helper->value = ConfigurationKPI::get('DISABLED_MODULES');
if (ConfigurationKPI::get('DISABLED_MODULES_EXPIRE') < $time)
@@ -1009,7 +1009,7 @@ class AdminModulesControllerCore extends AdminController
$helper->id = 'box-update-modules';
$helper->icon = 'icon-refresh';
$helper->color = 'color3';
$helper->title = html_entity_decode($this->l('Modules to update'));
$helper->title = $this->l('Modules to update', null, null, false);
if (ConfigurationKPI::get('UPDATE_MODULES') !== false)
$helper->value = ConfigurationKPI::get('UPDATE_MODULES');
if (ConfigurationKPI::get('UPDATE_MODULES_EXPIRE') < $time)
controllers/admin/AdminOrdersController.php
+8 -8
View File
@@ -1263,8 +1263,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->icon = 'icon-sort-by-attributes-alt';
//$helper->chart = true;
$helper->color = 'color1';
$helper->title = $this->l('Conversion Rate');
$helper->subtitle = $this->l('30 days');
$helper->title = $this->l('Conversion Rate', null, null, false);
$helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('CONVERSION_RATE') !== false)
$helper->value = ConfigurationKPI::get('CONVERSION_RATE');
if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false)
@@ -1277,8 +1277,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-carts';
$helper->icon = 'icon-shopping-cart';
$helper->color = 'color2';
$helper->title = $this->l('Abandoned Carts');
$helper->subtitle = $this->l('Today');
$helper->title = $this->l('Abandoned Carts', null, null, false);
$helper->subtitle = $this->l('Today', null, null, false);
$helper->href = $this->context->link->getAdminLink('AdminCarts');
if (ConfigurationKPI::get('ABANDONED_CARTS') !== false)
$helper->value = ConfigurationKPI::get('ABANDONED_CARTS');
@@ -1290,8 +1290,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-average-order';
$helper->icon = 'icon-money';
$helper->color = 'color3';
$helper->title = $this->l('Average Order Value');
$helper->subtitle = $this->l('30 days');
$helper->title = $this->l('Average Order Value', null, null, false);
$helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('AVG_ORDER_VALUE') !== false)
$helper->value = ConfigurationKPI::get('AVG_ORDER_VALUE');
if (ConfigurationKPI::get('AVG_ORDER_VALUE_EXPIRE') < $time)
@@ -1302,8 +1302,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-net-profit-visitor';
$helper->icon = 'icon-user';
$helper->color = 'color4';
$helper->title = $this->l('Net Profit per Visitor');
$helper->subtitle = $this->l('30 days');
$helper->title = $this->l('Net Profit per Visitor', null, null, false);
$helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('NETPROFIT_VISITOR') !== false)
$helper->value = ConfigurationKPI::get('NETPROFIT_VISITOR');
if (ConfigurationKPI::get('NETPROFIT_VISITOR_EXPIRE') < $time)
controllers/admin/AdminProductsController.php
+5 -5
View File
@@ -2311,7 +2311,7 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-products-stock';
$helper->icon = 'icon-archive';
$helper->color = 'color1';
$helper->title = $this->l('Items in Stock');
$helper->title = $this->l('Items in Stock', null, null, false);
if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK') !== false)
$helper->value = ConfigurationKPI::get('PERCENT_PRODUCT_STOCK');
if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK_EXPIRE') < $time)
@@ -2323,7 +2323,7 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-avg-gross-margin';
$helper->icon = 'icon-tags';
$helper->color = 'color2';
$helper->title = $this->l('Average Gross Margin');
$helper->title = $this->l('Average Gross Margin', null, null, false);
if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN') !== false)
$helper->value = ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN');
if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN_EXPIRE') < $time)
@@ -2334,8 +2334,8 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-8020-sales-catalog';
$helper->icon = 'icon-beaker';
$helper->color = 'color3';
$helper->title = $this->l('80% of your sales');
$helper->subtitle = $this->l('30 days');
$helper->title = $this->l('80% of your sales', null, null, false);
$helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('8020_SALES_CATALOG') !== false)
$helper->value = ConfigurationKPI::get('8020_SALES_CATALOG');
if (ConfigurationKPI::get('8020_SALES_CATALOG_EXPIRE') < $time)
@@ -2346,7 +2346,7 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-disabled-products';
$helper->icon = 'icon-off';
$helper->color = 'color4';
$helper->title = $this->l('Disabled Products');
$helper->title = $this->l('Disabled Products', null, null, false);
if (ConfigurationKPI::get('DISABLED_PRODUCTS') !== false)
$helper->value = ConfigurationKPI::get('DISABLED_PRODUCTS');
if (ConfigurationKPI::get('DISABLED_PRODUCTS_EXPIRE') < $time)
controllers/admin/AdminTranslationsController.php
+4 -4
View File
@@ -1294,7 +1294,7 @@ class AdminTranslationsControllerCore extends AdminController
$helper->id = 'box-languages';
$helper->icon = 'icon-microphone';
$helper->color = 'color1';
$helper->title = $this->l('Enabled Languages');
$helper->title = $this->l('Enabled Languages', null, null, false);
if (ConfigurationKPI::get('ENABLED_LANGUAGES') !== false)
$helper->value = ConfigurationKPI::get('ENABLED_LANGUAGES');
if (ConfigurationKPI::get('ENABLED_LANGUAGES_EXPIRE') < $time)
@@ -1305,8 +1305,8 @@ class AdminTranslationsControllerCore extends AdminController
$helper->id = 'box-country';
$helper->icon = 'icon-home';
$helper->color = 'color2';
$helper->title = $this->l('Main Country');
$helper->subtitle = $this->l('30 Days');
$helper->title = $this->l('Main Country', null, null, false);
$helper->subtitle = $this->l('30 Days', null, null, false);
if (ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id) !== false)
$helper->value = ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id);
if (ConfigurationKPI::get('MAIN_COUNTRY_EXPIRE', $this->context->language->id) < $time)
@@ -1317,7 +1317,7 @@ class AdminTranslationsControllerCore extends AdminController
$helper->id = 'box-translations';
$helper->icon = 'icon-list';
$helper->color = 'color3';
$helper->title = $this->l('Front Office Translations');
$helper->title = $this->l('Front Office Translations', null, null, false);
if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS') !== false)
$helper->value = ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS');
if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS_EXPIRE') < $time)
js/validate.js
+64 -58
View File
@@ -11,63 +11,69 @@ var unicode_hack = (function() {
Extracted from Unicode specification, version 5.0.0, source:
http://unicode.org/versions/Unicode5.0.0/
*/
var unicodeCategories = {
Pi:'[\u00ab\u2018\u201b\u201c\u201f\u2039\u2e02\u2e04\u2e09\u2e0c\u2e1c]',
Sk:'[\u005e\u0060\u00a8\u00af\u00b4\u00b8\u02c2-\u02c5\u02d2-\u02df\u02e5-\u02ed\u02ef-\u02ff\u0374\u0375\u0384\u0385\u1fbd\u1fbf-\u1fc1\u1fcd-\u1fcf\u1fdd-\u1fdf\u1fed-\u1fef\u1ffd\u1ffe\u309b\u309c\ua700-\ua716\ua720\ua721\uff3e\uff40\uffe3]',
Sm:'[\u002b\u003c-\u003e\u007c\u007e\u00ac\u00b1\u00d7\u00f7\u03f6\u2044\u2052\u207a-\u207c\u208a-\u208c\u2140-\u2144\u214b\u2190-\u2194\u219a\u219b\u21a0\u21a3\u21a6\u21ae\u21ce\u21cf\u21d2\u21d4\u21f4-\u22ff\u2308-\u230b\u2320\u2321\u237c\u239b-\u23b3\u23dc-\u23e1\u25b7\u25c1\u25f8-\u25ff\u266f\u27c0-\u27c4\u27c7-\u27ca\u27d0-\u27e5\u27f0-\u27ff\u2900-\u2982\u2999-\u29d7\u29dc-\u29fb\u29fe-\u2aff\ufb29\ufe62\ufe64-\ufe66\uff0b\uff1c-\uff1e\uff5c\uff5e\uffe2\uffe9-\uffec]',
So:'[\u00a6\u00a7\u00a9\u00ae\u00b0\u00b6\u0482\u060e\u060f\u06e9\u06fd\u06fe\u07f6\u09fa\u0b70\u0bf3-\u0bf8\u0bfa\u0cf1\u0cf2\u0f01-\u0f03\u0f13-\u0f17\u0f1a-\u0f1f\u0f34\u0f36\u0f38\u0fbe-\u0fc5\u0fc7-\u0fcc\u0fcf\u1360\u1390-\u1399\u1940\u19e0-\u19ff\u1b61-\u1b6a\u1b74-\u1b7c\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211e-\u2123\u2125\u2127\u2129\u212e\u213a\u213b\u214a\u214c\u214d\u2195-\u2199\u219c-\u219f\u21a1\u21a2\u21a4\u21a5\u21a7-\u21ad\u21af-\u21cd\u21d0\u21d1\u21d3\u21d5-\u21f3\u2300-\u2307\u230c-\u231f\u2322-\u2328\u232b-\u237b\u237d-\u239a\u23b4-\u23db\u23e2-\u23e7\u2400-\u2426\u2440-\u244a\u249c-\u24e9\u2500-\u25b6\u25b8-\u25c0\u25c2-\u25f7\u2600-\u266e\u2670-\u269c\u26a0-\u26b2\u2701-\u2704\u2706-\u2709\u270c-\u2727\u2729-\u274b\u274d\u274f-\u2752\u2756\u2758-\u275e\u2761-\u2767\u2794\u2798-\u27af\u27b1-\u27be\u2800-\u28ff\u2b00-\u2b1a\u2b20-\u2b23\u2ce5-\u2cea\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u2ffb\u3004\u3012\u3013\u3020\u3036\u3037\u303e\u303f\u3190\u3191\u3196-\u319f\u31c0-\u31cf\u3200-\u321e\u322a-\u3243\u3250\u3260-\u327f\u328a-\u32b0\u32c0-\u32fe\u3300-\u33ff\u4dc0-\u4dff\ua490-\ua4c6\ua828-\ua82b\ufdfd\uffe4\uffe8\uffed\uffee\ufffc\ufffd]',
Po:'[\u0021-\u0023\u0025-\u0027\u002a\u002c\u002e\u002f\u003a\u003b\u003f\u0040\u005c\u00a1\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f85\u0fd0\u0fd1\u104a-\u104f\u10fb\u1361-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u19de\u19df\u1a1e\u1a1f\u1b5a-\u1b60\u2016\u2017\u2020-\u2027\u2030-\u2038\u203b-\u203e\u2041-\u2043\u2047-\u2051\u2053\u2055-\u205e\u2cf9-\u2cfc\u2cfe\u2cff\u2e00\u2e01\u2e06-\u2e08\u2e0b\u2e0e-\u2e16\u3001-\u3003\u303d\u30fb\ua874-\ua877\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]',
Mn:'[\u0300-\u036f\u0483-\u0486\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u0615\u064b-\u065e\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0901\u0902\u093c\u0941-\u0948\u094d\u0951-\u0954\u0962\u0963\u0981\u09bc\u09c1-\u09c4\u09cd\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a70\u0a71\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3f\u0b41-\u0b43\u0b4d\u0b56\u0b82\u0bc0\u0bcd\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0cbc\u0cbf\u0cc6\u0ccc\u0ccd\u0ce2\u0ce3\u0d41-\u0d43\u0d4d\u0dca\u0dd2-\u0dd4\u0dd6\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032\u1036\u1037\u1039\u1058\u1059\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1dc0-\u1dca\u1dfe\u1dff\u20d0-\u20dc\u20e1\u20e5-\u20ef\u302a-\u302f\u3099\u309a\ua806\ua80b\ua825\ua826\ufb1e\ufe00-\ufe0f\ufe20-\ufe23]',
Ps:'[\u0028\u005b\u007b\u0f3a\u0f3c\u169b\u201a\u201e\u2045\u207d\u208d\u2329\u2768\u276a\u276c\u276e\u2770\u2772\u2774\u27c5\u27e6\u27e8\u27ea\u2983\u2985\u2987\u2989\u298b\u298d\u298f\u2991\u2993\u2995\u2997\u29d8\u29da\u29fc\u3008\u300a\u300c\u300e\u3010\u3014\u3016\u3018\u301a\u301d\ufd3e\ufe17\ufe35\ufe37\ufe39\ufe3b\ufe3d\ufe3f\ufe41\ufe43\ufe47\ufe59\ufe5b\ufe5d\uff08\uff3b\uff5b\uff5f\uff62]',
Cc:'[\u0000-\u001f\u007f-\u009f]',
Cf:'[\u00ad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u202a-\u202e\u2060-\u2063\u206a-\u206f\ufeff\ufff9-\ufffb]',
Ll:'[\u0061-\u007a\u00aa\u00b5\u00ba\u00df-\u00f6\u00f8-\u00ff\u0101\u0103\u0105\u0107\u0109\u010b\u010d\u010f\u0111\u0113\u0115\u0117\u0119\u011b\u011d\u011f\u0121\u0123\u0125\u0127\u0129\u012b\u012d\u012f\u0131\u0133\u0135\u0137\u0138\u013a\u013c\u013e\u0140\u0142\u0144\u0146\u0148\u0149\u014b\u014d\u014f\u0151\u0153\u0155\u0157\u0159\u015b\u015d\u015f\u0161\u0163\u0165\u0167\u0169\u016b\u016d\u016f\u0171\u0173\u0175\u0177\u017a\u017c\u017e-\u0180\u0183\u0185\u0188\u018c\u018d\u0192\u0195\u0199-\u019b\u019e\u01a1\u01a3\u01a5\u01a8\u01aa\u01ab\u01ad\u01b0\u01b4\u01b6\u01b9\u01ba\u01bd-\u01bf\u01c6\u01c9\u01cc\u01ce\u01d0\u01d2\u01d4\u01d6\u01d8\u01da\u01dc\u01dd\u01df\u01e1\u01e3\u01e5\u01e7\u01e9\u01eb\u01ed\u01ef\u01f0\u01f3\u01f5\u01f9\u01fb\u01fd\u01ff\u0201\u0203\u0205\u0207\u0209\u020b\u020d\u020f\u0211\u0213\u0215\u0217\u0219\u021b\u021d\u021f\u0221\u0223\u0225\u0227\u0229\u022b\u022d\u022f\u0231\u0233-\u0239\u023c\u023f\u0240\u0242\u0247\u0249\u024b\u024d\u024f-\u0293\u0295-\u02af\u037b-\u037d\u0390\u03ac-\u03ce\u03d0\u03d1\u03d5-\u03d7\u03d9\u03db\u03dd\u03df\u03e1\u03e3\u03e5\u03e7\u03e9\u03eb\u03ed\u03ef-\u03f3\u03f5\u03f8\u03fb\u03fc\u0430-\u045f\u0461\u0463\u0465\u0467\u0469\u046b\u046d\u046f\u0471\u0473\u0475\u0477\u0479\u047b\u047d\u047f\u0481\u048b\u048d\u048f\u0491\u0493\u0495\u0497\u0499\u049b\u049d\u049f\u04a1\u04a3\u04a5\u04a7\u04a9\u04ab\u04ad\u04af\u04b1\u04b3\u04b5\u04b7\u04b9\u04bb\u04bd\u04bf\u04c2\u04c4\u04c6\u04c8\u04ca\u04cc\u04ce\u04cf\u04d1\u04d3\u04d5\u04d7\u04d9\u04db\u04dd\u04df\u04e1\u04e3\u04e5\u04e7\u04e9\u04eb\u04ed\u04ef\u04f1\u04f3\u04f5\u04f7\u04f9\u04fb\u04fd\u04ff\u0501\u0503\u0505\u0507\u0509\u050b\u050d\u050f\u0511\u0513\u0561-\u0587\u1d00-\u1d2b\u1d62-\u1d77\u1d79-\u1d9a\u1e01\u1e03\u1e05\u1e07\u1e09\u1e0b\u1e0d\u1e0f\u1e11\u1e13\u1e15\u1e17\u1e19\u1e1b\u1e1d\u1e1f\u1e21\u1e23\u1e25\u1e27\u1e29\u1e2b\u1e2d\u1e2f\u1e31\u1e33\u1e35\u1e37\u1e39\u1e3b\u1e3d\u1e3f\u1e41\u1e43\u1e45\u1e47\u1e49\u1e4b\u1e4d\u1e4f\u1e51\u1e53\u1e55\u1e57\u1e59\u1e5b\u1e5d\u1e5f\u1e61\u1e63\u1e65\u1e67\u1e69\u1e6b\u1e6d\u1e6f\u1e71\u1e73\u1e75\u1e77\u1e79\u1e7b\u1e7d\u1e7f\u1e81\u1e83\u1e85\u1e87\u1e89\u1e8b\u1e8d\u1e8f\u1e91\u1e93\u1e95-\u1e9b\u1ea1\u1ea3\u1ea5\u1ea7\u1ea9\u1eab\u1ead\u1eaf\u1eb1\u1eb3\u1eb5\u1eb7\u1eb9\u1ebb\u1ebd\u1ebf\u1ec1\u1ec3\u1ec5\u1ec7\u1ec9\u1ecb\u1ecd\u1ecf\u1ed1\u1ed3\u1ed5\u1ed7\u1ed9\u1edb\u1edd\u1edf\u1ee1\u1ee3\u1ee5\u1ee7\u1ee9\u1eeb\u1eed\u1eef\u1ef1\u1ef3\u1ef5\u1ef7\u1ef9\u1f00-\u1f07\u1f10-\u1f15\u1f20-\u1f27\u1f30-\u1f37\u1f40-\u1f45\u1f50-\u1f57\u1f60-\u1f67\u1f70-\u1f7d\u1f80-\u1f87\u1f90-\u1f97\u1fa0-\u1fa7\u1fb0-\u1fb4\u1fb6\u1fb7\u1fbe\u1fc2-\u1fc4\u1fc6\u1fc7\u1fd0-\u1fd3\u1fd6\u1fd7\u1fe0-\u1fe7\u1ff2-\u1ff4\u1ff6\u1ff7\u2071\u207f\u210a\u210e\u210f\u2113\u212f\u2134\u2139\u213c\u213d\u2146-\u2149\u214e\u2184\u2c30-\u2c5e\u2c61\u2c65\u2c66\u2c68\u2c6a\u2c6c\u2c74\u2c76\u2c77\u2c81\u2c83\u2c85\u2c87\u2c89\u2c8b\u2c8d\u2c8f\u2c91\u2c93\u2c95\u2c97\u2c99\u2c9b\u2c9d\u2c9f\u2ca1\u2ca3\u2ca5\u2ca7\u2ca9\u2cab\u2cad\u2caf\u2cb1\u2cb3\u2cb5\u2cb7\u2cb9\u2cbb\u2cbd\u2cbf\u2cc1\u2cc3\u2cc5\u2cc7\u2cc9\u2ccb\u2ccd\u2ccf\u2cd1\u2cd3\u2cd5\u2cd7\u2cd9\u2cdb\u2cdd\u2cdf\u2ce1\u2ce3\u2ce4\u2d00-\u2d25\ufb00-\ufb06\ufb13-\ufb17\uff41-\uff5a]',
Lm:'[\u02b0-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ee\u037a\u0559\u0640\u06e5\u06e6\u07f4\u07f5\u07fa\u0e46\u0ec6\u10fc\u17d7\u1843\u1d2c-\u1d61\u1d78\u1d9b-\u1dbf\u2090-\u2094\u2d6f\u3005\u3031-\u3035\u303b\u309d\u309e\u30fc-\u30fe\ua015\ua717-\ua71a\uff70\uff9e\uff9f]',
Lo:'[\u01bb\u01c0-\u01c3\u0294\u05d0-\u05ea\u05f0-\u05f2\u0621-\u063a\u0641-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u076d\u0780-\u07a5\u07b1\u07ca-\u07ea\u0904-\u0939\u093d\u0950\u0958-\u0961\u097b-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d60\u0d61\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e45\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0edc\u0edd\u0f00\u0f40-\u0f47\u0f49-\u0f6a\u0f88-\u0f8b\u1000-\u1021\u1023-\u1027\u1029\u102a\u1050-\u1055\u10d0-\u10fa\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17dc\u1820-\u1842\u1844-\u1877\u1880-\u18a8\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19a9\u19c1-\u19c7\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u2135-\u2138\u2d30-\u2d65\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3006\u303c\u3041-\u3096\u309f\u30a1-\u30fa\u30ff\u3105-\u312c\u3131-\u318e\u31a0-\u31b7\u31f0-\u31ff\u3400\u4db5\u4e00\u9fbb\ua000-\ua014\ua016-\ua48c\ua800\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\uac00\ud7a3\uf900-\ufa2d\ufa30-\ufa6a\ufa70-\ufad9\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff66-\uff6f\uff71-\uff9d\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]',
Co:'[\ue000\uf8ff]',
Nd:'[\u0030-\u0039\u0660-\u0669\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1b50-\u1b59\uff10-\uff19]',
Lt:'[\u01c5\u01c8\u01cb\u01f2\u1f88-\u1f8f\u1f98-\u1f9f\u1fa8-\u1faf\u1fbc\u1fcc\u1ffc]',
Lu:'[\u0041-\u005a\u00c0-\u00d6\u00d8-\u00de\u0100\u0102\u0104\u0106\u0108\u010a\u010c\u010e\u0110\u0112\u0114\u0116\u0118\u011a\u011c\u011e\u0120\u0122\u0124\u0126\u0128\u012a\u012c\u012e\u0130\u0132\u0134\u0136\u0139\u013b\u013d\u013f\u0141\u0143\u0145\u0147\u014a\u014c\u014e\u0150\u0152\u0154\u0156\u0158\u015a\u015c\u015e\u0160\u0162\u0164\u0166\u0168\u016a\u016c\u016e\u0170\u0172\u0174\u0176\u0178\u0179\u017b\u017d\u0181\u0182\u0184\u0186\u0187\u0189-\u018b\u018e-\u0191\u0193\u0194\u0196-\u0198\u019c\u019d\u019f\u01a0\u01a2\u01a4\u01a6\u01a7\u01a9\u01ac\u01ae\u01af\u01b1-\u01b3\u01b5\u01b7\u01b8\u01bc\u01c4\u01c7\u01ca\u01cd\u01cf\u01d1\u01d3\u01d5\u01d7\u01d9\u01db\u01de\u01e0\u01e2\u01e4\u01e6\u01e8\u01ea\u01ec\u01ee\u01f1\u01f4\u01f6-\u01f8\u01fa\u01fc\u01fe\u0200\u0202\u0204\u0206\u0208\u020a\u020c\u020e\u0210\u0212\u0214\u0216\u0218\u021a\u021c\u021e\u0220\u0222\u0224\u0226\u0228\u022a\u022c\u022e\u0230\u0232\u023a\u023b\u023d\u023e\u0241\u0243-\u0246\u0248\u024a\u024c\u024e\u0386\u0388-\u038a\u038c\u038e\u038f\u0391-\u03a1\u03a3-\u03ab\u03d2-\u03d4\u03d8\u03da\u03dc\u03de\u03e0\u03e2\u03e4\u03e6\u03e8\u03ea\u03ec\u03ee\u03f4\u03f7\u03f9\u03fa\u03fd-\u042f\u0460\u0462\u0464\u0466\u0468\u046a\u046c\u046e\u0470\u0472\u0474\u0476\u0478\u047a\u047c\u047e\u0480\u048a\u048c\u048e\u0490\u0492\u0494\u0496\u0498\u049a\u049c\u049e\u04a0\u04a2\u04a4\u04a6\u04a8\u04aa\u04ac\u04ae\u04b0\u04b2\u04b4\u04b6\u04b8\u04ba\u04bc\u04be\u04c0\u04c1\u04c3\u04c5\u04c7\u04c9\u04cb\u04cd\u04d0\u04d2\u04d4\u04d6\u04d8\u04da\u04dc\u04de\u04e0\u04e2\u04e4\u04e6\u04e8\u04ea\u04ec\u04ee\u04f0\u04f2\u04f4\u04f6\u04f8\u04fa\u04fc\u04fe\u0500\u0502\u0504\u0506\u0508\u050a\u050c\u050e\u0510\u0512\u0531-\u0556\u10a0-\u10c5\u1e00\u1e02\u1e04\u1e06\u1e08\u1e0a\u1e0c\u1e0e\u1e10\u1e12\u1e14\u1e16\u1e18\u1e1a\u1e1c\u1e1e\u1e20\u1e22\u1e24\u1e26\u1e28\u1e2a\u1e2c\u1e2e\u1e30\u1e32\u1e34\u1e36\u1e38\u1e3a\u1e3c\u1e3e\u1e40\u1e42\u1e44\u1e46\u1e48\u1e4a\u1e4c\u1e4e\u1e50\u1e52\u1e54\u1e56\u1e58\u1e5a\u1e5c\u1e5e\u1e60\u1e62\u1e64\u1e66\u1e68\u1e6a\u1e6c\u1e6e\u1e70\u1e72\u1e74\u1e76\u1e78\u1e7a\u1e7c\u1e7e\u1e80\u1e82\u1e84\u1e86\u1e88\u1e8a\u1e8c\u1e8e\u1e90\u1e92\u1e94\u1ea0\u1ea2\u1ea4\u1ea6\u1ea8\u1eaa\u1eac\u1eae\u1eb0\u1eb2\u1eb4\u1eb6\u1eb8\u1eba\u1ebc\u1ebe\u1ec0\u1ec2\u1ec4\u1ec6\u1ec8\u1eca\u1ecc\u1ece\u1ed0\u1ed2\u1ed4\u1ed6\u1ed8\u1eda\u1edc\u1ede\u1ee0\u1ee2\u1ee4\u1ee6\u1ee8\u1eea\u1eec\u1eee\u1ef0\u1ef2\u1ef4\u1ef6\u1ef8\u1f08-\u1f0f\u1f18-\u1f1d\u1f28-\u1f2f\u1f38-\u1f3f\u1f48-\u1f4d\u1f59\u1f5b\u1f5d\u1f5f\u1f68-\u1f6f\u1fb8-\u1fbb\u1fc8-\u1fcb\u1fd8-\u1fdb\u1fe8-\u1fec\u1ff8-\u1ffb\u2102\u2107\u210b-\u210d\u2110-\u2112\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u2130-\u2133\u213e\u213f\u2145\u2183\u2c00-\u2c2e\u2c60\u2c62-\u2c64\u2c67\u2c69\u2c6b\u2c75\u2c80\u2c82\u2c84\u2c86\u2c88\u2c8a\u2c8c\u2c8e\u2c90\u2c92\u2c94\u2c96\u2c98\u2c9a\u2c9c\u2c9e\u2ca0\u2ca2\u2ca4\u2ca6\u2ca8\u2caa\u2cac\u2cae\u2cb0\u2cb2\u2cb4\u2cb6\u2cb8\u2cba\u2cbc\u2cbe\u2cc0\u2cc2\u2cc4\u2cc6\u2cc8\u2cca\u2ccc\u2cce\u2cd0\u2cd2\u2cd4\u2cd6\u2cd8\u2cda\u2cdc\u2cde\u2ce0\u2ce2\uff21-\uff3a]',
Cs:'[\ud800\udb7f\udb80\udbff\udc00\udfff]',
Zl:'[\u2028]',
Nl:'[\u16ee-\u16f0\u2160-\u2182\u3007\u3021-\u3029\u3038-\u303a]',
Zp:'[\u2029]',
No:'[\u00b2\u00b3\u00b9\u00bc-\u00be\u09f4-\u09f9\u0bf0-\u0bf2\u0f2a-\u0f33\u1369-\u137c\u17f0-\u17f9\u2070\u2074-\u2079\u2080-\u2089\u2153-\u215f\u2460-\u249b\u24ea-\u24ff\u2776-\u2793\u2cfd\u3192-\u3195\u3220-\u3229\u3251-\u325f\u3280-\u3289\u32b1-\u32bf]',
Zs:'[\u0020\u00a0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000]',
Sc:'[\u0024\u00a2-\u00a5\u060b\u09f2\u09f3\u0af1\u0bf9\u0e3f\u17db\u20a0-\u20b5\ufdfc\ufe69\uff04\uffe0\uffe1\uffe5\uffe6]',
Pc:'[\u005f\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f]',
Pd:'[\u002d\u058a\u1806\u2010-\u2015\u2e17\u301c\u3030\u30a0\ufe31\ufe32\ufe58\ufe63\uff0d]',
Pe:'[\u0029\u005d\u007d\u0f3b\u0f3d\u169c\u2046\u207e\u208e\u232a\u2769\u276b\u276d\u276f\u2771\u2773\u2775\u27c6\u27e7\u27e9\u27eb\u2984\u2986\u2988\u298a\u298c\u298e\u2990\u2992\u2994\u2996\u2998\u29d9\u29db\u29fd\u3009\u300b\u300d\u300f\u3011\u3015\u3017\u3019\u301b\u301e\u301f\ufd3f\ufe18\ufe36\ufe38\ufe3a\ufe3c\ufe3e\ufe40\ufe42\ufe44\ufe48\ufe5a\ufe5c\ufe5e\uff09\uff3d\uff5d\uff60\uff63]',
Pf:'[\u00bb\u2019\u201d\u203a\u2e03\u2e05\u2e0a\u2e0d\u2e1d]',
Me:'[\u0488\u0489\u06de\u20dd-\u20e0\u20e2-\u20e4]',
Mc:'[\u0903\u093e-\u0940\u0949-\u094c\u0982\u0983\u09be-\u09c0\u09c7\u09c8\u09cb\u09cc\u09d7\u0a03\u0a3e-\u0a40\u0a83\u0abe-\u0ac0\u0ac9\u0acb\u0acc\u0b02\u0b03\u0b3e\u0b40\u0b47\u0b48\u0b4b\u0b4c\u0b57\u0bbe\u0bbf\u0bc1\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcc\u0bd7\u0c01-\u0c03\u0c41-\u0c44\u0c82\u0c83\u0cbe\u0cc0-\u0cc4\u0cc7\u0cc8\u0cca\u0ccb\u0cd5\u0cd6\u0d02\u0d03\u0d3e-\u0d40\u0d46-\u0d48\u0d4a-\u0d4c\u0d57\u0d82\u0d83\u0dcf-\u0dd1\u0dd8-\u0ddf\u0df2\u0df3\u0f3e\u0f3f\u0f7f\u102c\u1031\u1038\u1056\u1057\u17b6\u17be-\u17c5\u17c7\u17c8\u1923-\u1926\u1929-\u192b\u1930\u1931\u1933-\u1938\u19b0-\u19c0\u19c8\u19c9\u1a19-\u1a1b\u1b04\u1b35\u1b3b\u1b3d-\u1b41\u1b43\u1b44\ua802\ua823\ua824\ua827]'
};
/* Also supports the general category (only the first letter) */
var firstLetters = {};
for ( var p in unicodeCategories ) {
if ( firstLetters[p[0]] )
firstLetters[p[0]] = unicodeCategories[p].substring(0,unicodeCategories[p].length-1) + firstLetters[p[0]].substring(1);
else
firstLetters[p[0]] = unicodeCategories[p];
}
for ( var p in firstLetters )
unicodeCategories[p] = firstLetters[p];
/* Gets a regex written in a dialect that supports unicode categories and
translates it to a dialect supported by JavaScript. */
return function(regexpString) {
var modifiers = "";
if ( regexpString instanceof RegExp ) {
modifiers = (regexpString.global ? "g" : "") +
(regexpString.ignoreCase ? "i" : "") +
(regexpString.multiline ? "m" : "");
regexpString = regexpString.source;
}
regexpString = regexpString.replace(/\\p\{(..?)\}/g, function(match,group) {
return unicodeCategories[group] || match;
});
return new RegExp(regexpString,modifiers);
};
var unicodeCategories = {
Pi:'[\u00ab\u2018\u201b\u201c\u201f\u2039\u2e02\u2e04\u2e09\u2e0c\u2e1c]',
Sk:'[\u005e\u0060\u00a8\u00af\u00b4\u00b8\u02c2-\u02c5\u02d2-\u02df\u02e5-\u02ed\u02ef-\u02ff\u0374\u0375\u0384\u0385\u1fbd\u1fbf-\u1fc1\u1fcd-\u1fcf\u1fdd-\u1fdf\u1fed-\u1fef\u1ffd\u1ffe\u309b\u309c\ua700-\ua716\ua720\ua721\uff3e\uff40\uffe3]',
Sm:'[\u002b\u003c-\u003e\u007c\u007e\u00ac\u00b1\u00d7\u00f7\u03f6\u2044\u2052\u207a-\u207c\u208a-\u208c\u2140-\u2144\u214b\u2190-\u2194\u219a\u219b\u21a0\u21a3\u21a6\u21ae\u21ce\u21cf\u21d2\u21d4\u21f4-\u22ff\u2308-\u230b\u2320\u2321\u237c\u239b-\u23b3\u23dc-\u23e1\u25b7\u25c1\u25f8-\u25ff\u266f\u27c0-\u27c4\u27c7-\u27ca\u27d0-\u27e5\u27f0-\u27ff\u2900-\u2982\u2999-\u29d7\u29dc-\u29fb\u29fe-\u2aff\ufb29\ufe62\ufe64-\ufe66\uff0b\uff1c-\uff1e\uff5c\uff5e\uffe2\uffe9-\uffec]',
So:'[\u00a6\u00a7\u00a9\u00ae\u00b0\u00b6\u0482\u060e\u060f\u06e9\u06fd\u06fe\u07f6\u09fa\u0b70\u0bf3-\u0bf8\u0bfa\u0cf1\u0cf2\u0f01-\u0f03\u0f13-\u0f17\u0f1a-\u0f1f\u0f34\u0f36\u0f38\u0fbe-\u0fc5\u0fc7-\u0fcc\u0fcf\u1360\u1390-\u1399\u1940\u19e0-\u19ff\u1b61-\u1b6a\u1b74-\u1b7c\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211e-\u2123\u2125\u2127\u2129\u212e\u213a\u213b\u214a\u214c\u214d\u2195-\u2199\u219c-\u219f\u21a1\u21a2\u21a4\u21a5\u21a7-\u21ad\u21af-\u21cd\u21d0\u21d1\u21d3\u21d5-\u21f3\u2300-\u2307\u230c-\u231f\u2322-\u2328\u232b-\u237b\u237d-\u239a\u23b4-\u23db\u23e2-\u23e7\u2400-\u2426\u2440-\u244a\u249c-\u24e9\u2500-\u25b6\u25b8-\u25c0\u25c2-\u25f7\u2600-\u266e\u2670-\u269c\u26a0-\u26b2\u2701-\u2704\u2706-\u2709\u270c-\u2727\u2729-\u274b\u274d\u274f-\u2752\u2756\u2758-\u275e\u2761-\u2767\u2794\u2798-\u27af\u27b1-\u27be\u2800-\u28ff\u2b00-\u2b1a\u2b20-\u2b23\u2ce5-\u2cea\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u2ffb\u3004\u3012\u3013\u3020\u3036\u3037\u303e\u303f\u3190\u3191\u3196-\u319f\u31c0-\u31cf\u3200-\u321e\u322a-\u3243\u3250\u3260-\u327f\u328a-\u32b0\u32c0-\u32fe\u3300-\u33ff\u4dc0-\u4dff\ua490-\ua4c6\ua828-\ua82b\ufdfd\uffe4\uffe8\uffed\uffee\ufffc\ufffd]',
Po:'[\u0021-\u0023\u0025-\u0027\u002a\u002c\u002e\u002f\u003a\u003b\u003f\u0040\u005c\u00a1\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f85\u0fd0\u0fd1\u104a-\u104f\u10fb\u1361-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u19de\u19df\u1a1e\u1a1f\u1b5a-\u1b60\u2016\u2017\u2020-\u2027\u2030-\u2038\u203b-\u203e\u2041-\u2043\u2047-\u2051\u2053\u2055-\u205e\u2cf9-\u2cfc\u2cfe\u2cff\u2e00\u2e01\u2e06-\u2e08\u2e0b\u2e0e-\u2e16\u3001-\u3003\u303d\u30fb\ua874-\ua877\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]',
Mn:'[\u0300-\u036f\u0483-\u0486\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u0615\u064b-\u065e\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0901\u0902\u093c\u0941-\u0948\u094d\u0951-\u0954\u0962\u0963\u0981\u09bc\u09c1-\u09c4\u09cd\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a70\u0a71\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3f\u0b41-\u0b43\u0b4d\u0b56\u0b82\u0bc0\u0bcd\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0cbc\u0cbf\u0cc6\u0ccc\u0ccd\u0ce2\u0ce3\u0d41-\u0d43\u0d4d\u0dca\u0dd2-\u0dd4\u0dd6\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032\u1036\u1037\u1039\u1058\u1059\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1dc0-\u1dca\u1dfe\u1dff\u20d0-\u20dc\u20e1\u20e5-\u20ef\u302a-\u302f\u3099\u309a\ua806\ua80b\ua825\ua826\ufb1e\ufe00-\ufe0f\ufe20-\ufe23]',
Ps:'[\u0028\u005b\u007b\u0f3a\u0f3c\u169b\u201a\u201e\u2045\u207d\u208d\u2329\u2768\u276a\u276c\u276e\u2770\u2772\u2774\u27c5\u27e6\u27e8\u27ea\u2983\u2985\u2987\u2989\u298b\u298d\u298f\u2991\u2993\u2995\u2997\u29d8\u29da\u29fc\u3008\u300a\u300c\u300e\u3010\u3014\u3016\u3018\u301a\u301d\ufd3e\ufe17\ufe35\ufe37\ufe39\ufe3b\ufe3d\ufe3f\ufe41\ufe43\ufe47\ufe59\ufe5b\ufe5d\uff08\uff3b\uff5b\uff5f\uff62]',
Cc:'[\u0000-\u001f\u007f-\u009f]',
Cf:'[\u00ad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u202a-\u202e\u2060-\u2063\u206a-\u206f\ufeff\ufff9-\ufffb]',
Ll:'[\u0061-\u007a\u00aa\u00b5\u00ba\u00df-\u00f6\u00f8-\u00ff\u0101\u0103\u0105\u0107\u0109\u010b\u010d\u010f\u0111\u0113\u0115\u0117\u0119\u011b\u011d\u011f\u0121\u0123\u0125\u0127\u0129\u012b\u012d\u012f\u0131\u0133\u0135\u0137\u0138\u013a\u013c\u013e\u0140\u0142\u0144\u0146\u0148\u0149\u014b\u014d\u014f\u0151\u0153\u0155\u0157\u0159\u015b\u015d\u015f\u0161\u0163\u0165\u0167\u0169\u016b\u016d\u016f\u0171\u0173\u0175\u0177\u017a\u017c\u017e-\u0180\u0183\u0185\u0188\u018c\u018d\u0192\u0195\u0199-\u019b\u019e\u01a1\u01a3\u01a5\u01a8\u01aa\u01ab\u01ad\u01b0\u01b4\u01b6\u01b9\u01ba\u01bd-\u01bf\u01c6\u01c9\u01cc\u01ce\u01d0\u01d2\u01d4\u01d6\u01d8\u01da\u01dc\u01dd\u01df\u01e1\u01e3\u01e5\u01e7\u01e9\u01eb\u01ed\u01ef\u01f0\u01f3\u01f5\u01f9\u01fb\u01fd\u01ff\u0201\u0203\u0205\u0207\u0209\u020b\u020d\u020f\u0211\u0213\u0215\u0217\u0219\u021b\u021d\u021f\u0221\u0223\u0225\u0227\u0229\u022b\u022d\u022f\u0231\u0233-\u0239\u023c\u023f\u0240\u0242\u0247\u0249\u024b\u024d\u024f-\u0293\u0295-\u02af\u037b-\u037d\u0390\u03ac-\u03ce\u03d0\u03d1\u03d5-\u03d7\u03d9\u03db\u03dd\u03df\u03e1\u03e3\u03e5\u03e7\u03e9\u03eb\u03ed\u03ef-\u03f3\u03f5\u03f8\u03fb\u03fc\u0430-\u045f\u0461\u0463\u0465\u0467\u0469\u046b\u046d\u046f\u0471\u0473\u0475\u0477\u0479\u047b\u047d\u047f\u0481\u048b\u048d\u048f\u0491\u0493\u0495\u0497\u0499\u049b\u049d\u049f\u04a1\u04a3\u04a5\u04a7\u04a9\u04ab\u04ad\u04af\u04b1\u04b3\u04b5\u04b7\u04b9\u04bb\u04bd\u04bf\u04c2\u04c4\u04c6\u04c8\u04ca\u04cc\u04ce\u04cf\u04d1\u04d3\u04d5\u04d7\u04d9\u04db\u04dd\u04df\u04e1\u04e3\u04e5\u04e7\u04e9\u04eb\u04ed\u04ef\u04f1\u04f3\u04f5\u04f7\u04f9\u04fb\u04fd\u04ff\u0501\u0503\u0505\u0507\u0509\u050b\u050d\u050f\u0511\u0513\u0561-\u0587\u1d00-\u1d2b\u1d62-\u1d77\u1d79-\u1d9a\u1e01\u1e03\u1e05\u1e07\u1e09\u1e0b\u1e0d\u1e0f\u1e11\u1e13\u1e15\u1e17\u1e19\u1e1b\u1e1d\u1e1f\u1e21\u1e23\u1e25\u1e27\u1e29\u1e2b\u1e2d\u1e2f\u1e31\u1e33\u1e35\u1e37\u1e39\u1e3b\u1e3d\u1e3f\u1e41\u1e43\u1e45\u1e47\u1e49\u1e4b\u1e4d\u1e4f\u1e51\u1e53\u1e55\u1e57\u1e59\u1e5b\u1e5d\u1e5f\u1e61\u1e63\u1e65\u1e67\u1e69\u1e6b\u1e6d\u1e6f\u1e71\u1e73\u1e75\u1e77\u1e79\u1e7b\u1e7d\u1e7f\u1e81\u1e83\u1e85\u1e87\u1e89\u1e8b\u1e8d\u1e8f\u1e91\u1e93\u1e95-\u1e9b\u1ea1\u1ea3\u1ea5\u1ea7\u1ea9\u1eab\u1ead\u1eaf\u1eb1\u1eb3\u1eb5\u1eb7\u1eb9\u1ebb\u1ebd\u1ebf\u1ec1\u1ec3\u1ec5\u1ec7\u1ec9\u1ecb\u1ecd\u1ecf\u1ed1\u1ed3\u1ed5\u1ed7\u1ed9\u1edb\u1edd\u1edf\u1ee1\u1ee3\u1ee5\u1ee7\u1ee9\u1eeb\u1eed\u1eef\u1ef1\u1ef3\u1ef5\u1ef7\u1ef9\u1f00-\u1f07\u1f10-\u1f15\u1f20-\u1f27\u1f30-\u1f37\u1f40-\u1f45\u1f50-\u1f57\u1f60-\u1f67\u1f70-\u1f7d\u1f80-\u1f87\u1f90-\u1f97\u1fa0-\u1fa7\u1fb0-\u1fb4\u1fb6\u1fb7\u1fbe\u1fc2-\u1fc4\u1fc6\u1fc7\u1fd0-\u1fd3\u1fd6\u1fd7\u1fe0-\u1fe7\u1ff2-\u1ff4\u1ff6\u1ff7\u2071\u207f\u210a\u210e\u210f\u2113\u212f\u2134\u2139\u213c\u213d\u2146-\u2149\u214e\u2184\u2c30-\u2c5e\u2c61\u2c65\u2c66\u2c68\u2c6a\u2c6c\u2c74\u2c76\u2c77\u2c81\u2c83\u2c85\u2c87\u2c89\u2c8b\u2c8d\u2c8f\u2c91\u2c93\u2c95\u2c97\u2c99\u2c9b\u2c9d\u2c9f\u2ca1\u2ca3\u2ca5\u2ca7\u2ca9\u2cab\u2cad\u2caf\u2cb1\u2cb3\u2cb5\u2cb7\u2cb9\u2cbb\u2cbd\u2cbf\u2cc1\u2cc3\u2cc5\u2cc7\u2cc9\u2ccb\u2ccd\u2ccf\u2cd1\u2cd3\u2cd5\u2cd7\u2cd9\u2cdb\u2cdd\u2cdf\u2ce1\u2ce3\u2ce4\u2d00-\u2d25\ufb00-\ufb06\ufb13-\ufb17\uff41-\uff5a]',
Lm:'[\u02b0-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ee\u037a\u0559\u0640\u06e5\u06e6\u07f4\u07f5\u07fa\u0e46\u0ec6\u10fc\u17d7\u1843\u1d2c-\u1d61\u1d78\u1d9b-\u1dbf\u2090-\u2094\u2d6f\u3005\u3031-\u3035\u303b\u309d\u309e\u30fc-\u30fe\ua015\ua717-\ua71a\uff70\uff9e\uff9f]',
Lo:'[\u01bb\u01c0-\u01c3\u0294\u05d0-\u05ea\u05f0-\u05f2\u0621-\u063a\u0641-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u076d\u0780-\u07a5\u07b1\u07ca-\u07ea\u0904-\u0939\u093d\u0950\u0958-\u0961\u097b-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d60\u0d61\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e45\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0edc\u0edd\u0f00\u0f40-\u0f47\u0f49-\u0f6a\u0f88-\u0f8b\u1000-\u1021\u1023-\u1027\u1029\u102a\u1050-\u1055\u10d0-\u10fa\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17dc\u1820-\u1842\u1844-\u1877\u1880-\u18a8\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19a9\u19c1-\u19c7\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u2135-\u2138\u2d30-\u2d65\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3006\u303c\u3041-\u3096\u309f\u30a1-\u30fa\u30ff\u3105-\u312c\u3131-\u318e\u31a0-\u31b7\u31f0-\u31ff\u3400\u4db5\u4e00\u9fbb\ua000-\ua014\ua016-\ua48c\ua800\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\uac00\ud7a3\uf900-\ufa2d\ufa30-\ufa6a\ufa70-\ufad9\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff66-\uff6f\uff71-\uff9d\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]',
Co:'[\ue000\uf8ff]',
Nd:'[\u0030-\u0039\u0660-\u0669\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1b50-\u1b59\uff10-\uff19]',
Lt:'[\u01c5\u01c8\u01cb\u01f2\u1f88-\u1f8f\u1f98-\u1f9f\u1fa8-\u1faf\u1fbc\u1fcc\u1ffc]',
Lu:'[\u0041-\u005a\u00c0-\u00d6\u00d8-\u00de\u0100\u0102\u0104\u0106\u0108\u010a\u010c\u010e\u0110\u0112\u0114\u0116\u0118\u011a\u011c\u011e\u0120\u0122\u0124\u0126\u0128\u012a\u012c\u012e\u0130\u0132\u0134\u0136\u0139\u013b\u013d\u013f\u0141\u0143\u0145\u0147\u014a\u014c\u014e\u0150\u0152\u0154\u0156\u0158\u015a\u015c\u015e\u0160\u0162\u0164\u0166\u0168\u016a\u016c\u016e\u0170\u0172\u0174\u0176\u0178\u0179\u017b\u017d\u0181\u0182\u0184\u0186\u0187\u0189-\u018b\u018e-\u0191\u0193\u0194\u0196-\u0198\u019c\u019d\u019f\u01a0\u01a2\u01a4\u01a6\u01a7\u01a9\u01ac\u01ae\u01af\u01b1-\u01b3\u01b5\u01b7\u01b8\u01bc\u01c4\u01c7\u01ca\u01cd\u01cf\u01d1\u01d3\u01d5\u01d7\u01d9\u01db\u01de\u01e0\u01e2\u01e4\u01e6\u01e8\u01ea\u01ec\u01ee\u01f1\u01f4\u01f6-\u01f8\u01fa\u01fc\u01fe\u0200\u0202\u0204\u0206\u0208\u020a\u020c\u020e\u0210\u0212\u0214\u0216\u0218\u021a\u021c\u021e\u0220\u0222\u0224\u0226\u0228\u022a\u022c\u022e\u0230\u0232\u023a\u023b\u023d\u023e\u0241\u0243-\u0246\u0248\u024a\u024c\u024e\u0386\u0388-\u038a\u038c\u038e\u038f\u0391-\u03a1\u03a3-\u03ab\u03d2-\u03d4\u03d8\u03da\u03dc\u03de\u03e0\u03e2\u03e4\u03e6\u03e8\u03ea\u03ec\u03ee\u03f4\u03f7\u03f9\u03fa\u03fd-\u042f\u0460\u0462\u0464\u0466\u0468\u046a\u046c\u046e\u0470\u0472\u0474\u0476\u0478\u047a\u047c\u047e\u0480\u048a\u048c\u048e\u0490\u0492\u0494\u0496\u0498\u049a\u049c\u049e\u04a0\u04a2\u04a4\u04a6\u04a8\u04aa\u04ac\u04ae\u04b0\u04b2\u04b4\u04b6\u04b8\u04ba\u04bc\u04be\u04c0\u04c1\u04c3\u04c5\u04c7\u04c9\u04cb\u04cd\u04d0\u04d2\u04d4\u04d6\u04d8\u04da\u04dc\u04de\u04e0\u04e2\u04e4\u04e6\u04e8\u04ea\u04ec\u04ee\u04f0\u04f2\u04f4\u04f6\u04f8\u04fa\u04fc\u04fe\u0500\u0502\u0504\u0506\u0508\u050a\u050c\u050e\u0510\u0512\u0531-\u0556\u10a0-\u10c5\u1e00\u1e02\u1e04\u1e06\u1e08\u1e0a\u1e0c\u1e0e\u1e10\u1e12\u1e14\u1e16\u1e18\u1e1a\u1e1c\u1e1e\u1e20\u1e22\u1e24\u1e26\u1e28\u1e2a\u1e2c\u1e2e\u1e30\u1e32\u1e34\u1e36\u1e38\u1e3a\u1e3c\u1e3e\u1e40\u1e42\u1e44\u1e46\u1e48\u1e4a\u1e4c\u1e4e\u1e50\u1e52\u1e54\u1e56\u1e58\u1e5a\u1e5c\u1e5e\u1e60\u1e62\u1e64\u1e66\u1e68\u1e6a\u1e6c\u1e6e\u1e70\u1e72\u1e74\u1e76\u1e78\u1e7a\u1e7c\u1e7e\u1e80\u1e82\u1e84\u1e86\u1e88\u1e8a\u1e8c\u1e8e\u1e90\u1e92\u1e94\u1ea0\u1ea2\u1ea4\u1ea6\u1ea8\u1eaa\u1eac\u1eae\u1eb0\u1eb2\u1eb4\u1eb6\u1eb8\u1eba\u1ebc\u1ebe\u1ec0\u1ec2\u1ec4\u1ec6\u1ec8\u1eca\u1ecc\u1ece\u1ed0\u1ed2\u1ed4\u1ed6\u1ed8\u1eda\u1edc\u1ede\u1ee0\u1ee2\u1ee4\u1ee6\u1ee8\u1eea\u1eec\u1eee\u1ef0\u1ef2\u1ef4\u1ef6\u1ef8\u1f08-\u1f0f\u1f18-\u1f1d\u1f28-\u1f2f\u1f38-\u1f3f\u1f48-\u1f4d\u1f59\u1f5b\u1f5d\u1f5f\u1f68-\u1f6f\u1fb8-\u1fbb\u1fc8-\u1fcb\u1fd8-\u1fdb\u1fe8-\u1fec\u1ff8-\u1ffb\u2102\u2107\u210b-\u210d\u2110-\u2112\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u2130-\u2133\u213e\u213f\u2145\u2183\u2c00-\u2c2e\u2c60\u2c62-\u2c64\u2c67\u2c69\u2c6b\u2c75\u2c80\u2c82\u2c84\u2c86\u2c88\u2c8a\u2c8c\u2c8e\u2c90\u2c92\u2c94\u2c96\u2c98\u2c9a\u2c9c\u2c9e\u2ca0\u2ca2\u2ca4\u2ca6\u2ca8\u2caa\u2cac\u2cae\u2cb0\u2cb2\u2cb4\u2cb6\u2cb8\u2cba\u2cbc\u2cbe\u2cc0\u2cc2\u2cc4\u2cc6\u2cc8\u2cca\u2ccc\u2cce\u2cd0\u2cd2\u2cd4\u2cd6\u2cd8\u2cda\u2cdc\u2cde\u2ce0\u2ce2\uff21-\uff3a]',
Cs:'[\ud800\udb7f\udb80\udbff\udc00\udfff]',
Zl:'[\u2028]',
Nl:'[\u16ee-\u16f0\u2160-\u2182\u3007\u3021-\u3029\u3038-\u303a]',
Zp:'[\u2029]',
No:'[\u00b2\u00b3\u00b9\u00bc-\u00be\u09f4-\u09f9\u0bf0-\u0bf2\u0f2a-\u0f33\u1369-\u137c\u17f0-\u17f9\u2070\u2074-\u2079\u2080-\u2089\u2153-\u215f\u2460-\u249b\u24ea-\u24ff\u2776-\u2793\u2cfd\u3192-\u3195\u3220-\u3229\u3251-\u325f\u3280-\u3289\u32b1-\u32bf]',
Zs:'[\u0020\u00a0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000]',
Sc:'[\u0024\u00a2-\u00a5\u060b\u09f2\u09f3\u0af1\u0bf9\u0e3f\u17db\u20a0-\u20b5\ufdfc\ufe69\uff04\uffe0\uffe1\uffe5\uffe6]',
Pc:'[\u005f\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f]',
Pd:'[\u002d\u058a\u1806\u2010-\u2015\u2e17\u301c\u3030\u30a0\ufe31\ufe32\ufe58\ufe63\uff0d]',
Pe:'[\u0029\u005d\u007d\u0f3b\u0f3d\u169c\u2046\u207e\u208e\u232a\u2769\u276b\u276d\u276f\u2771\u2773\u2775\u27c6\u27e7\u27e9\u27eb\u2984\u2986\u2988\u298a\u298c\u298e\u2990\u2992\u2994\u2996\u2998\u29d9\u29db\u29fd\u3009\u300b\u300d\u300f\u3011\u3015\u3017\u3019\u301b\u301e\u301f\ufd3f\ufe18\ufe36\ufe38\ufe3a\ufe3c\ufe3e\ufe40\ufe42\ufe44\ufe48\ufe5a\ufe5c\ufe5e\uff09\uff3d\uff5d\uff60\uff63]',
Pf:'[\u00bb\u2019\u201d\u203a\u2e03\u2e05\u2e0a\u2e0d\u2e1d]',
Me:'[\u0488\u0489\u06de\u20dd-\u20e0\u20e2-\u20e4]',
Mc:'[\u0903\u093e-\u0940\u0949-\u094c\u0982\u0983\u09be-\u09c0\u09c7\u09c8\u09cb\u09cc\u09d7\u0a03\u0a3e-\u0a40\u0a83\u0abe-\u0ac0\u0ac9\u0acb\u0acc\u0b02\u0b03\u0b3e\u0b40\u0b47\u0b48\u0b4b\u0b4c\u0b57\u0bbe\u0bbf\u0bc1\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcc\u0bd7\u0c01-\u0c03\u0c41-\u0c44\u0c82\u0c83\u0cbe\u0cc0-\u0cc4\u0cc7\u0cc8\u0cca\u0ccb\u0cd5\u0cd6\u0d02\u0d03\u0d3e-\u0d40\u0d46-\u0d48\u0d4a-\u0d4c\u0d57\u0d82\u0d83\u0dcf-\u0dd1\u0dd8-\u0ddf\u0df2\u0df3\u0f3e\u0f3f\u0f7f\u102c\u1031\u1038\u1056\u1057\u17b6\u17be-\u17c5\u17c7\u17c8\u1923-\u1926\u1929-\u192b\u1930\u1931\u1933-\u1938\u19b0-\u19c0\u19c8\u19c9\u1a19-\u1a1b\u1b04\u1b35\u1b3b\u1b3d-\u1b41\u1b43\u1b44\ua802\ua823\ua824\ua827]'
};
/* Also supports the general category (only the first letter) */
var firstLetters = {};
for (var p in unicodeCategories)
{
if (firstLetters[p[0]])
firstLetters[p[0]] = unicodeCategories[p].substring(0,unicodeCategories[p].length-1) + firstLetters[p[0]].substring(1);
else
firstLetters[p[0]] = unicodeCategories[p];
}
for (var p in firstLetters)
unicodeCategories[p] = firstLetters[p];
/* Gets a regex written in a dialect that supports unicode categories and
translates it to a dialect supported by JavaScript. */
return function(regexpString, classes)
{
var modifiers = "";
if ( regexpString instanceof RegExp ) {
modifiers = (regexpString.global ? "g" : "") +
(regexpString.ignoreCase ? "i" : "") +
(regexpString.multiline ? "m" : "");
regexpString = regexpString.source;
}
regexpString = regexpString.replace(/\\p\{(..?)\}/g, function(match,group) {
var unicode_categorie = unicodeCategories[group];
if (!classes)
unicode_category = unicode_categorie.replace(/\[(.*?)\]/g,"$1")
return unicode_category || match;
});
return new RegExp(regexpString,modifiers);
};
})();
/*
* 2007-2013 PrestaShop
@@ -143,7 +149,7 @@ function validate_isDniLite(s)
function validate_isEmail(s)
{
var reg = unicode_hack('^[a-z\p{L}0-9!#$%&\'*+\/=?^`{}|~_-]+[.a-z\p{L}0-9!#$%&\'*+\/=?^`{}|~_-]*@[a-z\p{L}0-9]+[._a-z\p{L}0-9-]*\.[a-z0-9]+$');
var reg = unicode_hack(/^[a-z\p{L}0-9!#$%&'*+\/=?^`{}|~_-]+[.a-z\p{L}0-9!#$%&'*+\/=?^`{}|~_-]*@[a-z\p{L}0-9]+[._a-z\p{L}0-9-]*\.[a-z\p{L}0-9]+$/i, false);
return reg.test(s);
}
modules/blockcontact/blockcontact.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

modules/blockcontact/logo.gif
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 983 B

modules/blocksocial/logo.gif
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 983 B

modules/dashactivity/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1018 B

modules/dashgoals/controllers/admin/ajax.php → modules/dashgoals/controllers/admin/AdminDashgoalsController.php
+15 -6
View File
@@ -25,12 +25,21 @@
* International Registered Trademark & Property of PrestaShop SA
*/
class DashGoalsAjaxModuleAdminController extends ModuleAdminController
class AdminDashgoalsController extends ModuleAdminController
{
public function initContent()
{
parent::initContent();
die ('Todo');
public function ajaxProcessChangeConfYear()
{
$year = (int)Tools::getValue('year');
Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', $year);
$months = $this->module->setMonths($year);
$this->context->smarty->assign(array(
'currency' => $this->context->currency,
'goals_year' => $year,
'goals_months' => $months,
'link' => $this->context->link
));
echo $this->module->display(_PS_MODULE_DIR_.$this->module->name.DIRECTORY_SEPARATOR.$this->module->name.'.php', 'config.tpl');
}
}
modules/dashgoals/dashgoals.php
+40 -8
View File
@@ -60,6 +60,7 @@ class Dashgoals extends Module
public function install()
{
Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', date('Y'));
for ($month = '01'; $month <= 12; $month = sprintf('%02d', $month + 1))
{
$key = strtoupper('dashgoals_traffic_'.$month.'_'.date('Y'));
@@ -73,23 +74,44 @@ class Dashgoals extends Module
ConfigurationKPI::updateValue($key, 80);
}
// Prepare tab
$tab = new Tab();
$tab->active = 1;
$tab->class_name = "AdminDashgoals";
$tab->name = array();
foreach (Language::getLanguages(true) as $lang)
$tab->name[$lang['id_lang']] = 'Dashgoals';
$tab->id_parent = -1;
$tab->module = $this->name;
return (
parent::install()
$tab->add()
&& parent::install()
&& $this->registerHook('dashboardZoneTwo')
&& $this->registerHook('dashboardData')
&& $this->registerHook('displayBackOfficeHeader')
);
}
public function uninstall()
{
$id_tab = (int)Tab::getIdFromClassName('AdminDashgoals');
if ($id_tab)
{
$tab = new Tab($id_tab);
$tab->delete();
}
return parent::uninstall();
}
public function hookDisplayBackOfficeHeader()
{
if (get_class($this->context->controller) == 'AdminDashboardController')
$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
}
public function hookDashboardZoneTwo($params)
public function setMonths($year)
{
$year = date('Y');
$months = array();
for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1))
$months[$i.'_'.$year] = array('label' => Dashgoals::$month_labels[$i], 'values' => array());
@@ -102,16 +124,26 @@ class Dashgoals extends Module
ConfigurationKPI::updateValue(strtoupper($key), (float)Tools::getValue($key));
$month_row['values'][$type] = ConfigurationKPI::get(strtoupper($key));
}
return $months;
}
$this->context->smarty->assign('currency', $this->context->currency);
$this->context->smarty->assign('goals_year', $year);
$this->context->smarty->assign('goals_months', $months);
public function hookDashboardZoneTwo($params)
{
$year = Configuration::get('PS_DASHGOALS_CURRENT_YEAR');
$months = $this->setMonths($year);
$this->context->smarty->assign(array(
'currency' => $this->context->currency,
'goals_year' => $year,
'goals_months' => $months,
'dashgoals_ajax_link' => $this->context->link->getAdminLink('AdminDashgoals')
));
return $this->display(__FILE__, 'dashboard_zone_two.tpl');
}
public function hookDashboardData($params)
{
$year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : date('Y'));
$year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : Configuration::get('PS_DASHGOALS_CURRENT_YEAR'));
return array('data_chart' => array('dash_goals_chart1' => $this->getChartData($year)));
}
modules/dashgoals/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

modules/dashgoals/views/js/dashgoals.js
+21 -15
View File
@@ -35,24 +35,30 @@ function dashgoals_changeYear(xward)
new_year = dashgoals_year + 1;
else if (xward == 'backward')
new_year = dashgoals_year - 1;
$('#dashgoals_title').text($('#dashgoals_title').text().replace(dashgoals_year, new_year));
dashgoals_year = new_year;
refreshDashboard('dashgoals', false, dashgoals_year);
}
function dashgoals_changeConfYear(xward)
{
// Todo
// getModuleLink('dashgoals', 'ajax', array('year' => $('#dashgoals_conftitle').text()), $ssl = null, $id_lang = null, $id_shop = null)
if (xward == 'forward')
$('#dashgoals_conftitle').text(parseInt($('#dashgoals_conftitle').text()) + 1);
else if (xward == 'backward')
$('#dashgoals_conftitle').text(parseInt($('#dashgoals_conftitle').text()) - 1);
$.ajax({
url: dashgoals_ajax_link,
data: {
ajax: true,
action: 'changeconfyear',
year: new_year
},
success : function(result){
$('#dashgoals_title').text($('#dashgoals_title').text().replace(dashgoals_year, new_year));
var hide_conf = $('#dashgoals_config').hasClass('hide');
$('#dashgoals_config').replaceWith(result);
dashgoals_calc_sales();
if (!hide_conf)
$('#dashgoals_config').removeClass('hide');
$('.dashgoals_config_input').off();
$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
dashgoals_year = new_year;
refreshDashboard('dashgoals', false, dashgoals_year);
}
});
}
$(document).ready(function() {
$('.dashgoals_config_input').keyup(function() {
dashgoals_calc_sales();
});
$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
dashgoals_calc_sales();
});
modules/dashgoals/views/templates/hook/config.tpl
+73
View File
@@ -0,0 +1,73 @@
{*
* 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
*}
<section id="dashgoals_config" class="dash_config hide">
<header><i class="icon-wrench"></i> {l s='Configuration' mod='dashgoals'}</header>
<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')}">
<table class="table table-condensed table-striped table-bordered">
<thead>
<tr>
<th>{$goals_year}</th>
<th>{l s='Traffic' mod='dashgoals'}</th>
<th>{l s='Conversion Rate' mod='dashgoals'}</th>
<th>{l s='Average Cart Value' mod='dashgoals'}</th>
<th>{l s='Sales' mod='dashgoals'}</th>
</tr>
</thead>
<tbody>
{foreach $goals_months as $month}
<tr>
<td>
{$month.label}
</td>
<td>
<div class="input-group">
<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.traffic|intval}" />
</div>
</td>
<td>
<div class="input-group">
<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.conversion|floatval}" />
<span class="input-group-addon">%</span>
</div>
</td>
<td>
<div class="input-group">
<span class="input-group-addon">{$currency->iso_code|escape}</span>
<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.avg_cart_value|intval}" />
</div>
</td>
<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
</td>
</tr>
{/foreach}
</tbody>
</table>
<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
</form>
</section>
modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl
+3 -52
View File
@@ -30,6 +30,8 @@
var priceDisplayPrecision = 0;
var dashgoals_year = {$goals_year|intval};
var dashgoals_ajax_link = '{$dashgoals_ajax_link|addslashes}';
</script>
<section id="dashgoals" class="panel widget">
@@ -46,58 +48,7 @@
</a>
</span>
</header>
<section id="dashgoals_config" class="dash_config hide">
<header><i class="icon-wrench"></i> {l s='Configuration' mod='dashgoals'}</header>
<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')}">
<table class="table table-condensed table-striped table-bordered">
<thead>
<tr>
<th>
<a href="javascript:void(0);" onclick="dashgoals_changeConfYear('backward');" class="icon-backward"></a>
<span id="dashgoals_conftitle">{$goals_year}</span>
<a href="javascript:void(0);" onclick="dashgoals_changeConfYear('forward');" class="icon-forward"></a>
</th>
<th>{l s='Traffic' mod='dashgoals'}</th>
<th>{l s='Conversion Rate' mod='dashgoals'}</th>
<th>{l s='Average Cart Value' mod='dashgoals'}</th>
<th>{l s='Sales' mod='dashgoals'}</th>
</tr>
</thead>
<tbody>
{foreach $goals_months as $month}
<tr>
<td>
{$month.label}
</td>
<td>
<div class="input-group">
<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.traffic|intval}" />
</div>
</td>
<td>
<div class="input-group">
<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.conversion|floatval}" />
<span class="input-group-addon">%</span>
</div>
</td>
<td>
<div class="input-group">
<span class="input-group-addon">{$currency->iso_code|escape}</span>
<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.avg_cart_value|intval}" />
</div>
</td>
<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
</td>
</tr>
{/foreach}
</tbody>
</table>
<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
</form>
</section>
{include file='./config.tpl'}
<section class="loading">
<div id="dash_goals_chart1" class="chart with-transitions">
<svg></svg>
modules/dashproducts/dashproducts.php
+1 -1
View File
@@ -178,7 +178,7 @@ class Dashproducts extends Module
'.Shop::addSqlRestriction(false, 'o').'
GROUP BY product_id
ORDER BY total DESC
LIMIT '.(int)Confiuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10));
LIMIT '.(int)Configuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10));
$body = array();
foreach ($products as $product)
modules/dashproducts/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 964 B

modules/dashtrends/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 973 B

themes/default-bootstrap/address.tpl
+3 -1
View File
@@ -114,9 +114,11 @@ $(function(){ldelim}
{/if}
{if $field_name eq 'firstname'}
<div class="required form-group">
<label for="firstname">{l s='First name'} <sup>*</sup></label>
<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>
</div>
{/if}
{if $field_name eq 'lastname'}
<div class="required form-group">
themes/default-bootstrap/authentication.tpl
+1 -2
View File
@@ -211,9 +211,8 @@ $(document).ready(function() {
<label for="guest_email">{l s='Email address'} <sup>*</sup></label>
<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">
<div class="cleafix gender-line">
<label>{l s='Title'}</label>
<br />
{foreach from=$genders key=k item=gender}
<div class="radio-inline">
<label for="id_gender{$gender->id}" class="top">
themes/default-bootstrap/css/bootstrap_lib/bootstrap.css
Vendored
+1362 -113
View File
File diff suppressed because it is too large Load Diff
themes/default-bootstrap/css/comparator.css
+1 -1
View File
@@ -73,7 +73,7 @@ table#product_comparison .product_discount .reduced-price {
table#product_comparison .product_desc {
padding-bottom: 12px;
}
table#product_comparison .button-container a {
table#product_comparison .button-container a, table#product_comparison .button-container > span {
margin-bottom: 10px;
}
table#product_comparison .comparison_unit_price {
themes/default-bootstrap/css/global.css
+173 -66
View File
@@ -888,22 +888,41 @@ table.table_block td {
***************************************************************************************************/
#home-page-tabs {
border: none;
margin: 0 0 0 -18px;
padding: 10px 0;
}
@media (min-width: 768px) {
#home-page-tabs {
padding: 10px 0;
margin: 0 0 0 -18px;
}
}
#home-page-tabs > li {
border-left: 1px solid #d6d4d4;
margin: 0 0px 0 9px;
padding: 0 0px 0 9px;
margin-bottom: 0;
}
@media (min-width: 768px) {
#home-page-tabs > li {
border-left: 1px solid #d6d4d4;
margin: 0 0px 0 9px;
padding: 0 0px 0 9px;
}
}
@media (max-width: 479px) {
#home-page-tabs > li {
width: 100%;
}
}
#home-page-tabs > li a {
font: 600 21px/24px "Open Sans", sans-serif;
color: #555454;
text-transform: uppercase;
padding: 1px 10px;
border: none;
outline: none;
margin: 0;
padding: 10px;
}
@media (min-width: 768px) {
#home-page-tabs > li a {
padding: 1px 10px;
}
}
#home-page-tabs > li:first-child {
border: none;
@@ -911,9 +930,13 @@ table.table_block td {
#home-page-tabs > li.active a, #home-page-tabs > li a:hover {
background: #333333;
color: #fff;
margin: -10px 0;
padding: 10px;
}
@media (min-width: 768px) {
#home-page-tabs > li.active a, #home-page-tabs > li a:hover {
margin: -10px 0;
}
}
#index .tab-content {
margin-top: 35px;
@@ -929,9 +952,14 @@ table.table_block td {
background: #f6f6f6;
border-top: 5px solid #333;
text-transform: uppercase;
padding: 14px 0 17px 20px;
padding: 14px 5px 17px 20px;
margin-bottom: 20px;
}
@media (min-width: 768px) and (max-width: 991px) {
.block .title_block, .block h4 {
font-size: 14px;
}
}
.block .title_block a, .block h4 a {
color: #555454;
}
@@ -989,6 +1017,14 @@ table.table_block td {
border: 1px solid #d6d4d4;
margin-right: 19px;
}
@media (min-width: 768px) and (max-width: 991px) {
.block .products-block li .products-block-image {
float: none;
display: inline-block;
margin: 0 auto 10px;
text-align: center;
}
}
.block .products-block li .product-content {
overflow: hidden;
}
@@ -1168,6 +1204,7 @@ ul.footer_links li + li {
.content_sortPagiBar .sortPagiBar .nbrItemPage .clearfix > span {
padding: 3px 0 0 12px;
display: inline-block;
float: left;
}
.content_sortPagiBar .sortPagiBar .nbrItemPage #uniform-nb_item {
float: left;
@@ -1226,8 +1263,6 @@ ul.footer_links li + li {
float: right;
width: 530px;
text-align: center;
/* min 992px max 1199px */
/* max 991px */
}
@media (min-width: 992px) and (max-width: 1199px) {
.top-pagination-content div.pagination, .bottom-pagination-content div.pagination {
@@ -1243,8 +1278,6 @@ ul.footer_links li + li {
.top-pagination-content div.pagination .showall, .bottom-pagination-content div.pagination .showall {
float: right;
margin: 8px 53px 8px 14px;
/* min 992px max 1199px */
/* max 991px */
}
@media (min-width: 992px) and (max-width: 1199px) {
.top-pagination-content div.pagination .showall, .bottom-pagination-content div.pagination .showall {
@@ -1264,6 +1297,11 @@ ul.footer_links li + li {
.top-pagination-content ul.pagination, .bottom-pagination-content ul.pagination {
margin: 8px 0px 8px 0;
}
@media (max-width: 991px) {
.top-pagination-content ul.pagination, .bottom-pagination-content ul.pagination {
float: left;
}
}
.top-pagination-content ul.pagination li, .bottom-pagination-content ul.pagination li {
display: inline-block;
float: left;
@@ -1315,7 +1353,6 @@ ul.footer_links li + li {
}
.top-pagination-content .compare-form, .bottom-pagination-content .compare-form {
float: right;
/* max 479px */
}
@media (max-width: 479px) {
.top-pagination-content .compare-form, .bottom-pagination-content .compare-form {
@@ -1329,7 +1366,6 @@ ul.footer_links li + li {
.top-pagination-content .product-count, .bottom-pagination-content .product-count {
padding: 11px 0 0 0;
float: left;
/* max 991px */
}
@media (max-width: 991px) {
.top-pagination-content .product-count, .bottom-pagination-content .product-count {
@@ -1345,7 +1381,6 @@ ul.footer_links li + li {
ul.step {
margin-bottom: 30px;
overflow: hidden;
/*min 480px*/
}
@media (min-width: 480px) {
ul.step {
@@ -1365,7 +1400,6 @@ ul.step li {
border-bottom-color: #9a9a9a;
border-right-color: #b7b7b7;
border-left-width: 0px;
/* max 480px */
}
@media (max-width: 479px) {
ul.step li {
@@ -1382,7 +1416,6 @@ ul.step li a, ul.step li span, ul.step li.step_current span, ul.step li.step_cur
font-weight: bold;
text-shadow: 1px 1px white;
position: relative;
/* min 991px */
}
@media (min-width: 992px) {
ul.step li a:after, ul.step li span:after, ul.step li.step_current span:after, ul.step li.step_current_end span:after {
@@ -1405,7 +1438,6 @@ ul.step li a:focus, ul.step li span:focus, ul.step li.step_current span:focus, u
ul.step li.first {
border-left-width: 1px;
border-left-color: #b7b7b7;
/*min 480px*/
}
@media (min-width: 480px) {
ul.step li.first {
@@ -1420,7 +1452,6 @@ ul.step li.first {
ul.step li.first span, ul.step li.first a {
z-index: 5;
padding-left: 13px !important;
/*min 480px*/
}
@media (min-width: 480px) {
ul.step li.first span, ul.step li.first a {
@@ -1441,9 +1472,6 @@ ul.step li.third span, ul.step li.third a {
ul.step li.four span, ul.step li.four a {
z-index: 2;
}
ul.step li.last {
/*min 480px*/
}
ul.step li.last span {
z-index: 1;
}
@@ -1483,7 +1511,6 @@ ul.step li.step_current span {
border: 1px solid;
border-color: #73ca77 #74c776 #74c175 #74c776;
position: relative;
/* min 991px */
}
@media (min-width: 992px) {
ul.step li.step_current span {
@@ -1510,7 +1537,6 @@ ul.step li.step_todo span {
border: 1px solid;
border-color: #fff;
position: relative;
/* min 991px */
}
@media (min-width: 992px) {
ul.step li.step_todo span {
@@ -1536,7 +1562,6 @@ ul.step li.step_done a {
background: -ms-linear-gradient(top, #727171 0%, #666666 100%);
background: linear-gradient(to bottom, #727171 0%, #666666 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#727171', endColorstr='#666666',GradientType=0 );
/* min 991px */
}
@media (min-width: 992px) {
ul.step li.step_done a {
@@ -1546,17 +1571,11 @@ ul.step li.step_done a {
background: url(../img/order-step-done.png) right 0 no-repeat;
}
}
ul.step li.step_done.step_done_last {
/* min 991px */
}
@media (min-width: 992px) {
ul.step li.step_done.step_done_last a:after {
background: url(../img/order-step-done-last.png) right 0 no-repeat;
}
}
ul.step li#step_end span {
/* min 991px */
}
@media (min-width: 992px) {
ul.step li#step_end span:after {
display: none;
@@ -1564,7 +1583,6 @@ ul.step li#step_end span {
}
ul.step li em {
font-style: normal;
/* min 480px max 767px */
}
@media (min-width: 480px) and (max-width: 767px) {
ul.step li em {
@@ -1685,6 +1703,11 @@ div.star_hover a, div.star a:hover {
display: block;
padding: 5px 0 10px;
}
@media (max-width: 767px) {
#header .header-row .shop-phone {
display: none;
}
}
#header .header-row .shop-phone i {
font-size: 21px;
line-height: 21px;
@@ -1699,12 +1722,23 @@ div.star_hover a, div.star a:hover {
border-left: 1px solid #515151;
border-right: 1px solid #515151;
}
@media (max-width: 479px) {
#header .header-row #header_user_info {
width: 25%;
text-align: center;
}
}
#header .header-row #header_user_info a {
color: #fff;
font-weight: bold;
display: block;
padding: 8px 9px 11px 8px;
}
@media (max-width: 479px) {
#header .header-row #header_user_info a {
font-size: 11px;
}
}
#header .header-row-2 {
position: relative;
z-index: 1;
@@ -1715,6 +1749,27 @@ div.star_hover a, div.star a:hover {
top: 27px;
z-index: 1;
}
@media (min-width: 768px) and (max-width: 991px) {
#header #header_logo {
width: 250px;
top: 35px;
}
}
@media (min-width: 480px) and (max-width: 767px) {
#header #header_logo {
width: 174px;
left: 15px;
top: 48px;
}
}
@media (max-width: 479px) {
#header #header_logo {
width: 200px;
left: 50%;
margin-left: -100px;
top: 20px;
}
}
#header #header_right {
position: relative;
}
@@ -1723,6 +1778,11 @@ div.star_hover a, div.star a:hover {
border-left: 1px solid #515151;
position: relative;
}
@media (max-width: 479px) {
#header #currencies-block-top, #header #languages-block-top {
width: 25%;
}
}
#header #currencies-block-top span.firstWord, #header #languages-block-top span.firstWord {
display: none;
}
@@ -1732,6 +1792,13 @@ div.star_hover a, div.star a:hover {
color: #fff;
text-shadow: 1px 1px rgba(0, 0, 0, 0);
}
@media (max-width: 479px) {
#header #currencies-block-top div.current, #header #languages-block-top div.current {
text-align: center;
padding: 9px 5px 10px;
font-size: 11px;
}
}
#header #currencies-block-top div.current strong, #header #languages-block-top div.current strong {
color: #777777;
}
@@ -1744,6 +1811,19 @@ div.star_hover a, div.star a:hover {
vertical-align: -2px;
padding-left: 12px;
}
@media (max-width: 479px) {
#header #currencies-block-top div.current:after, #header #languages-block-top div.current:after {
padding-left: 2px;
font-size: 13px;
line-height: 13px;
vertical-align: 0;
}
}
@media (max-width: 479px) {
#header #currencies-block-top div.current .cur-label, #header #languages-block-top div.current .cur-label {
display: none;
}
}
#header #currencies-block-top ul, #header #languages-block-top ul {
display: none;
position: absolute;
@@ -1766,13 +1846,16 @@ div.star_hover a, div.star a:hover {
#header #currencies-block-top ul li.selected, #header #currencies-block-top ul li:hover a, #header #languages-block-top ul li.selected, #header #languages-block-top ul li:hover a {
background: #484848;
}
#header #currencies-block-top ul:hover, #header #languages-block-top ul:hover {
display: block;
}
#header #contact-link {
float: right;
border-left: 1px solid #515151;
}
@media (max-width: 479px) {
#header #contact-link {
width: 25%;
text-align: center;
}
}
#header #contact-link a {
display: block;
color: #FFF;
@@ -1780,15 +1863,19 @@ div.star_hover a, div.star a:hover {
padding: 8px 10px 11px 10px;
text-shadow: 1px 1px rgba(0, 0, 0, 0);
}
@media (max-width: 479px) {
#header #contact-link a {
font-size: 11px;
padding-left: 5px;
padding-right: 5px;
}
}
#header #contact-link a, #header .header-row #header_user_info a, #header #currencies-block-top div.current, #header #languages-block-top div.current {
cursor: pointer;
}
#header #contact-link a:hover, #header .header-row #header_user_info a:hover, #header #currencies-block-top div.current:hover, #header #languages-block-top div.current:hover {
#header #contact-link a:hover, #header #contact-link a.active, #header .header-row #header_user_info a:hover, #header .header-row #header_user_info a.active, #header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active, #header #languages-block-top div.current:hover, #header #languages-block-top div.current.active {
background: #2b2b2b;
}
#header #contact-link a:hover + ul, #header .header-row #header_user_info a:hover + ul, #header #currencies-block-top div.current:hover + ul, #header #languages-block-top div.current:hover + ul {
display: block;
}
/* ************************************************************************************************
BREADCRUMB
@@ -1874,7 +1961,11 @@ div.star_hover a, div.star a:hover {
************************************************************************************************ */
.footer-container {
padding: 0 0 100px 0;
background: url(../img/footer-bg.gif) repeat-x;
}
@media (min-width: 768px) {
.footer-container {
background: url(../img/footer-bg.gif) repeat-x;
}
}
.footer-container #footer {
color: #777;
@@ -1907,9 +1998,19 @@ div.star_hover a, div.star a:hover {
.footer-container #footer #block_contact_infos {
border-left: 1px solid #515151;
}
@media (max-width: 767px) {
.footer-container #footer #block_contact_infos {
border: none;
}
}
.footer-container #footer #block_contact_infos > div {
padding: 0 0 0 5px;
}
@media (max-width: 767px) {
.footer-container #footer #block_contact_infos > div {
padding-left: 0;
}
}
.footer-container #footer #block_contact_infos > div ul li {
padding: 0 0 7px 4px;
overflow: hidden;
@@ -1933,11 +2034,24 @@ div.star_hover a, div.star a:hover {
.footer-container #footer #social_block {
float: left;
width: 50%;
padding: 23px 30px 0 0;
padding: 23px 30px 16px 0;
background: #3F3F3F;
}
@media (max-width: 767px) {
.footer-container #footer #social_block {
width: 100%;
float: left;
padding-top: 5px;
}
}
.footer-container #footer #social_block ul {
float: right;
}
@media (max-width: 767px) {
.footer-container #footer #social_block ul {
float: none;
}
}
.footer-container #footer #social_block ul li {
float: left;
width: 40px;
@@ -1976,6 +2090,12 @@ div.star_hover a, div.star a:hover {
text-transform: none;
padding: 0 10px 0 0;
}
@media (max-width: 767px) {
.footer-container #footer #social_block h4 {
display: none;
text-align: center;
}
}
.footer-container #footer .bottom-footer {
position: absolute;
bottom: -55px;
@@ -2516,6 +2636,18 @@ p.cheque-indent {
margin-bottom: 0;
}
}
#address .gender-line, #identity .gender-line, #account-creation_form .gender-line, #new_account_form .gender-line, #opc_account_form .gender-line, #authentication .gender-line {
margin-bottom: 4px;
padding-top: 4px;
}
#address .gender-line > label, #identity .gender-line > label, #account-creation_form .gender-line > label, #new_account_form .gender-line > label, #opc_account_form .gender-line > label, #authentication .gender-line > label {
margin-right: 10px;
margin-bottom: 0;
}
#address .gender-line .radio-inline label, #identity .gender-line .radio-inline label, #account-creation_form .gender-line .radio-inline label, #new_account_form .gender-line .radio-inline label, #opc_account_form .gender-line .radio-inline label, #authentication .gender-line .radio-inline label {
font-weight: normal;
color: #777;
}
#identity #center_column form.std .row, #authentication #center_column form.std .row, #order-opc #center_column form.std .row {
margin-left: -5px;
@@ -2708,16 +2840,6 @@ p.cheque-indent {
}
#manufacturer .bottom-pagination-content, #manufacturer .top-pagination-content, #supplier .bottom-pagination-content, #supplier .top-pagination-content {
min-height: 69px;
/* < 480*/
}
#manufacturer .bottom-pagination-content #pagination, #manufacturer .top-pagination-content #pagination, #supplier .bottom-pagination-content #pagination, #supplier .top-pagination-content #pagination {
/* 480 -> 1199 */
}
@media (min-width: 480px) and (max-width: 1199px) {
#manufacturer .bottom-pagination-content #pagination, #manufacturer .top-pagination-content #pagination, #supplier .bottom-pagination-content #pagination, #supplier .top-pagination-content #pagination {
width: auto;
text-align: right;
}
}
#manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
margin-right: 0;
@@ -2728,23 +2850,8 @@ p.cheque-indent {
margin-right: 201px;
}
}
@media (max-width: 480px) {
#manufacturer .bottom-pagination-content .product-count, #manufacturer .bottom-pagination-content #pagination, #manufacturer .top-pagination-content .product-count, #manufacturer .top-pagination-content #pagination, #supplier .bottom-pagination-content .product-count, #supplier .bottom-pagination-content #pagination, #supplier .top-pagination-content .product-count, #supplier .top-pagination-content #pagination {
width: 100%;
text-align: center;
}
#manufacturer .bottom-pagination-content .product-count .showall, #manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content .product-count .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content .product-count .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content .product-count .showall, #supplier .top-pagination-content #pagination .showall {
display: none;
}
}
#manufacturer .top-pagination-content.bottom-line, #supplier .top-pagination-content.bottom-line {
border-bottom: 1px solid #d6d4d4;
/* < 767 */
}
@media (max-width: 767px) {
#manufacturer .top-pagination-content.bottom-line, #supplier .top-pagination-content.bottom-line {
border-top: 1px solid #d6d4d4;
}
}
/*****************************************************************************************************
themes/default-bootstrap/css/history.css
+3
View File
@@ -27,6 +27,9 @@
.table td.history_detail a + a {
margin-left: 14px;
}
.table td.step-by-step-date {
width: 105px;
}
.table tfoot strong {
color: #333;
}
themes/default-bootstrap/css/jquery/uniform.default.css
+99
View File
@@ -9,23 +9,28 @@ http://uniformjs.com/
*/
/* General settings */
/* line 178, ../../sass/jquery/_uniform._base.scss */
div.selector, div.selector span, div.checker span, div.radio span, div.uploader, div.uploader span.action, div.button, div.button span {
background-image: url("../../../img/jquery/uniform/sprite.png");
background-repeat: no-repeat;
-webkit-font-smoothing: antialiased;
}
/* line 188, ../../sass/jquery/_uniform._base.scss */
div.selector, div.checker, div.button, div.radio, div.uploader {
vertical-align: middle;
/* Keeping this as :focus to remove browser styles */
}
/* line 193, ../../sass/jquery/_uniform._base.scss */
div.selector:focus, div.checker:focus, div.button:focus, div.radio:focus, div.uploader:focus {
outline: 0;
}
/* line 203, ../../sass/jquery/_uniform._base.scss */
div.selector, div.selector *, div.radio, div.radio *, div.checker, div.checker *, div.uploader, div.uploader *, div.button, div.button * {
margin: 0;
padding: 0;
}
/* line 210, ../../sass/jquery/_uniform._base.scss */
.highContrastDetect {
background: url("../../../img/jquery/uniform/bg-input.png") repeat-x 0 0;
width: 0px;
@@ -33,6 +38,7 @@ div.selector, div.selector *, div.radio, div.radio *, div.checker, div.checker *
}
/* Input & Textarea */
/* line 220, ../../sass/jquery/_uniform._base.scss */
input.uniform-input,
select.uniform-multiselect,
textarea.uniform {
@@ -43,6 +49,7 @@ textarea.uniform {
/* Remove default webkit and possible mozilla .search styles.
* Keeping this as :active to remove browser styles */
/* line 234, ../../sass/jquery/_uniform._base.scss */
div.checker input,
input[type="search"],
input[type="search"]:active {
@@ -51,6 +58,7 @@ input[type="search"]:active {
}
/* Select */
/* line 240, ../../sass/jquery/_uniform._base.scss */
div.selector {
background-position: 0 -54px;
line-height: 27px;
@@ -59,6 +67,7 @@ div.selector {
position: relative;
overflow: hidden;
}
/* line 247, ../../sass/jquery/_uniform._base.scss */
div.selector span {
text-overflow: ellipsis;
display: block;
@@ -72,12 +81,15 @@ div.selector span {
width: 100%;
display: block;
}
/* line 258, ../../sass/jquery/_uniform._base.scss */
div.selector.fixedWidth {
width: 190px;
}
/* line 260, ../../sass/jquery/_uniform._base.scss */
div.selector.fixedWidth span {
width: 150px;
}
/* line 265, ../../sass/jquery/_uniform._base.scss */
div.selector select {
opacity: 0;
filter: alpha(opacity=0);
@@ -90,96 +102,124 @@ div.selector select {
left: 0px;
width: 100%;
}
/* line 275, ../../sass/jquery/_uniform._base.scss */
div.selector.active span {
background-position: right -27px;
}
/* line 281, ../../sass/jquery/_uniform._base.scss */
div.selector.hover span, div.selector.focus span {
background-position: right -27px;
}
/* line 286, ../../sass/jquery/_uniform._base.scss */
div.selector.hover.active span, div.selector.focus.active span {
background-position: right -27px;
}
/* line 294, ../../sass/jquery/_uniform._base.scss */
div.selector.disabled span, div.selector.disabled.active span {
background-position: right 0;
}
/* Select1 */
/* line 302, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div {
background-position: 0 -135px;
}
/* line 304, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div span {
background-position: right -81px;
}
/* line 309, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div.active span {
background-position: right -108px;
}
/* line 315, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div.hover span, div.selector1 > div.focus span {
background-position: right -108px;
}
/* line 320, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div.hover.active span, div.selector1 > div.focus.active span {
background-position: right -108px;
}
/* line 93, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div.disabled, div.selector1 > div.disabled.active {
background-position: 0 -135px;
}
/* line 328, ../../sass/jquery/_uniform._base.scss */
div.selector1 > div.disabled span, div.selector1 > div.disabled.active span {
background-position: right -81px;
}
/* Select2 */
/* line 338, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div {
background-position: 0 -216px;
}
/* line 340, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div span {
background-position: right -162px;
}
/* line 345, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div.active span {
background-position: right -189px;
}
/* line 351, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div.hover span, div.selector2 > div.focus span {
background-position: right -189px;
}
/* line 356, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div.hover.active span, div.selector2 > div.focus.active span {
background-position: right -189px;
}
/* line 93, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div.disabled, div.selector2 > div.disabled.active {
background-position: 0 -216px;
}
/* line 364, ../../sass/jquery/_uniform._base.scss */
div.selector2 > div.disabled span, div.selector2 > div.disabled.active span {
background-position: right -162px;
}
/* Select3 */
/* line 373, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div {
background-position: 0 -351px;
}
/* line 375, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div span {
background-position: right -297px;
}
/* line 380, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div.active span {
background-position: right -324px;
}
/* line 386, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div.hover span, div.selector3 > div.focus span {
background-position: right -324px;
}
/* line 391, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div.hover.active span, div.selector3 > div.focus.active span {
background-position: right -324px;
}
/* line 93, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div.disabled, div.selector3 > div.disabled.active {
background-position: 0 -351px;
}
/* line 399, ../../sass/jquery/_uniform._base.scss */
div.selector3 > div.disabled span, div.selector3 > div.disabled.active span {
background-position: right -297px;
}
/* Checkbox */
/* line 411, ../../sass/jquery/_uniform._base.scss */
div.checker {
position: relative;
}
/* line 414, ../../sass/jquery/_uniform._base.scss */
div.checker, div.checker span, div.checker input {
width: 15px;
height: 15px;
}
/* line 419, ../../sass/jquery/_uniform._base.scss */
div.checker span {
display: -moz-inline-box;
display: inline-block;
@@ -188,9 +228,11 @@ div.checker span {
text-align: center;
background-position: 0 -257px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.checker span.checked {
background-position: -15px -257px;
}
/* line 428, ../../sass/jquery/_uniform._base.scss */
div.checker input {
opacity: 0;
filter: alpha(opacity=0);
@@ -202,40 +244,51 @@ div.checker input {
*display: inline;
zoom: 1;
}
/* line 434, ../../sass/jquery/_uniform._base.scss */
div.checker.active span {
background-position: -15px -257px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.checker.active span.checked {
background-position: -15px -257px;
}
/* line 444, ../../sass/jquery/_uniform._base.scss */
div.checker.hover span, div.checker.focus span {
background-position: -30px -257px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.checker.hover span.checked, div.checker.focus span.checked {
background-position: -15px -257px;
}
/* line 453, ../../sass/jquery/_uniform._base.scss */
div.checker.hover.active span, div.checker.focus.active span {
background-position: -15px -257px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.checker.hover.active span.checked, div.checker.focus.active span.checked {
background-position: -15px -257px;
}
/* line 93, ../../sass/jquery/_uniform._base.scss */
div.checker.disabled, div.checker.disabled.active {
background-position: 0 -257px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.checker.disabled span.checked, div.checker.disabled.active span.checked {
background-position: 0 -257px;
}
/* Radio */
/* line 477, ../../sass/jquery/_uniform._base.scss */
div.radio {
position: relative;
display: inline;
}
/* line 480, ../../sass/jquery/_uniform._base.scss */
div.radio, div.radio span, div.radio input {
width: 13px;
height: 13px;
}
/* line 484, ../../sass/jquery/_uniform._base.scss */
div.radio span {
display: -moz-inline-box;
display: inline-block;
@@ -244,9 +297,11 @@ div.radio span {
text-align: center;
background-position: 0 -243px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.radio span.checked {
background-position: -13px -243px;
}
/* line 494, ../../sass/jquery/_uniform._base.scss */
div.radio input {
opacity: 0;
filter: alpha(opacity=0);
@@ -259,32 +314,41 @@ div.radio input {
zoom: 1;
text-align: center;
}
/* line 501, ../../sass/jquery/_uniform._base.scss */
div.radio.active span {
background-position: -13px -243px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.radio.active span.checked {
background-position: -13px -243px;
}
/* line 511, ../../sass/jquery/_uniform._base.scss */
div.radio.hover span, div.radio.focus span {
background-position: -13px -36px -243px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.radio.hover span.checked, div.radio.focus span.checked {
background-position: -13px -243px;
}
/* line 520, ../../sass/jquery/_uniform._base.scss */
div.radio.hover.active span, div.radio.focus.active span {
background-position: -13px -243px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.radio.hover.active span.checked, div.radio.focus.active span.checked {
background-position: -13px -243px;
}
/* line 531, ../../sass/jquery/_uniform._base.scss */
div.radio.disabled span, div.radio.disabled.active span {
background-position: 0 -243px;
}
/* line 99, ../../sass/jquery/_uniform._base.scss */
div.radio.disabled span.checked, div.radio.disabled.active span.checked {
background-position: 0 -243px;
}
/* Uploader */
/* line 543, ../../sass/jquery/_uniform._base.scss */
div.uploader {
background: none;
height: 27px;
@@ -293,6 +357,7 @@ div.uploader {
position: relative;
overflow: hidden;
}
/* line 551, ../../sass/jquery/_uniform._base.scss */
div.uploader span.action {
background-position: 0 -378px;
height: 27px;
@@ -304,6 +369,7 @@ div.uploader span.action {
overflow: hidden;
cursor: pointer;
}
/* line 563, ../../sass/jquery/_uniform._base.scss */
div.uploader span.filename {
text-overflow: ellipsis;
display: block;
@@ -317,6 +383,7 @@ div.uploader span.filename {
width: 172px;
padding: 0 10px;
}
/* line 574, ../../sass/jquery/_uniform._base.scss */
div.uploader input {
opacity: 0;
filter: alpha(opacity=0);
@@ -333,6 +400,7 @@ div.uploader input {
}
/* Buttons */
/* line 588, ../../sass/jquery/_uniform._base.scss */
div.button {
background-position: 0 -634px;
height: 30px;
@@ -340,6 +408,7 @@ div.button {
position: relative;
/* Keep buttons barely visible so they can get focus */
}
/* line 595, ../../sass/jquery/_uniform._base.scss */
div.button a, div.button button, div.button input {
opacity: 0.01;
filter: alpha(opacity=1);
@@ -351,6 +420,7 @@ div.button a, div.button button, div.button input {
bottom: 0;
position: absolute;
}
/* line 605, ../../sass/jquery/_uniform._base.scss */
div.button span {
display: -moz-inline-box;
display: inline-block;
@@ -363,22 +433,28 @@ div.button span {
margin-left: 13px;
padding: 0;
}
/* line 81, ../../sass/jquery/_uniform._base.scss */
div.button.active {
background-position: 0 -664px;
}
/* line 618, ../../sass/jquery/_uniform._base.scss */
div.button.active span {
background-position: right -544px;
cursor: default;
}
/* line 87, ../../sass/jquery/_uniform._base.scss */
div.button.hover, div.button.focus {
background-position: 0 -694px;
}
/* line 627, ../../sass/jquery/_uniform._base.scss */
div.button.hover span, div.button.focus span {
background-position: right -574px;
}
/* line 93, ../../sass/jquery/_uniform._base.scss */
div.button.disabled, div.button.disabled.active {
background-position: 0 -724px;
}
/* line 635, ../../sass/jquery/_uniform._base.scss */
div.button.disabled span, div.button.disabled.active span {
background-position: right -604px;
cursor: default;
@@ -388,6 +464,7 @@ div.button.disabled span, div.button.disabled.active span {
/* ************************************************************************************************
uniform
************************************************************************************************ */
/* line 24, ../../sass/jquery/uniform.default.scss */
input.uniform-input,
select.uniform-multiselect,
textarea.uniform {
@@ -398,6 +475,7 @@ textarea.uniform {
color: #777;
border: solid 1px #d6d4d4;
}
/* line 87, ../../sass/jquery/_uniform._base.scss */
input.uniform-input.hover, input.uniform-input.focus,
select.uniform-multiselect.hover,
select.uniform-multiselect.focus,
@@ -411,6 +489,7 @@ textarea.uniform.focus {
/* PRESENTATION */
/* Buttons */
/* line 44, ../../sass/jquery/uniform.default.scss */
div.button span {
font-weight: bold;
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
@@ -418,75 +497,92 @@ div.button span {
letter-spacing: 1px;
text-transform: uppercase;
}
/* line 53, ../../sass/jquery/uniform.default.scss */
div.button.hover span, div.button.focus span {
color: #555;
}
/* line 59, ../../sass/jquery/uniform.default.scss */
div.button.disabled span, div.button.disabled.active span {
color: #bbb;
}
/* Select */
/* line 68, ../../sass/jquery/uniform.default.scss */
#compare_shipping .form-group label {
display: block;
}
/* line 69, ../../sass/jquery/uniform.default.scss */
div.selector {
font-size: 12px;
}
/* line 72, ../../sass/jquery/uniform.default.scss */
div.selector span {
color: #666;
text-shadow: 0 1px 0 #fff;
}
/* line 78, ../../sass/jquery/uniform.default.scss */
div.selector select {
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
font-size: 12px;
}
/* line 84, ../../sass/jquery/uniform.default.scss */
div.selector.disabled span, div.selector.disabled.active span {
color: #bbb;
}
/* line 90, ../../sass/jquery/uniform.default.scss */
.checker span input {
margin: 0 !important;
}
/* line 92, ../../sass/jquery/uniform.default.scss */
.radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] {
margin: 0 !important;
}
/* line 94, ../../sass/jquery/uniform.default.scss */
.radio-inline, .checkbox-inline {
cursor: default;
}
/* Checker */
/* line 97, ../../sass/jquery/uniform.default.scss */
div.checker {
cursor: pointer;
margin-right: 5px;
}
/* line 100, ../../sass/jquery/uniform.default.scss */
div.checker span {
position: relative;
top: -2px;
}
/* line 103, ../../sass/jquery/uniform.default.scss */
#layered_form div.checker {
display: inline;
}
/* Radio */
/* line 109, ../../sass/jquery/uniform.default.scss */
div.radio {
margin-right: 3px;
}
/* line 111, ../../sass/jquery/uniform.default.scss */
div.radio span {
position: relative;
top: -2px;
}
/* Uploader */
/* line 115, ../../sass/jquery/uniform.default.scss */
div.uploader span.action {
text-shadow: rgba(0, 0, 0, 0.1) 0px 1px 0px;
font-size: 13px;
font-weight: bold;
color: #fff;
}
/* line 122, ../../sass/jquery/uniform.default.scss */
div.uploader span.filename {
color: #777;
border: solid 1px #d6d4d4;
@@ -494,14 +590,17 @@ div.uploader span.filename {
background: #fbfbfb;
margin-right: 2px;
}
/* line 131, ../../sass/jquery/uniform.default.scss */
div.uploader.disabled span.action, div.uploader.disabled.active span.action {
color: #aaa;
}
/* line 135, ../../sass/jquery/uniform.default.scss */
div.uploader.disabled span.filename, div.uploader.disabled.active span.filename {
border-color: #ddd;
color: #aaa;
}
/* line 143, ../../sass/jquery/uniform.default.scss */
input.uniform-input, input.uniform-input:focus {
background-color: #fff;
}
themes/default-bootstrap/css/modules/blockcart/blockcart.css
+12
View File
@@ -106,6 +106,18 @@
background: #484848;
color: #fff;
}
@media (min-width: 480px) and (max-width: 767px) {
#header #cart_block {
top: 69px;
}
}
@media (max-width: 479px) {
#header #cart_block {
top: 44px;
left: 50%;
margin-left: -135px;
}
}
#header #cart_block a {
color: #fff;
}
themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
+5
View File
@@ -1,19 +1,24 @@
/* block CONTACT ******************************************************************************* */
/* line 4, ../../../sass/modules/blockcontact/blockcontact.scss */
#contact_block .label {
display: none;
}
/* line 6, ../../../sass/modules/blockcontact/blockcontact.scss */
#contact_block .block_content {
color: #888888;
padding: 0 20px 20px;
}
/* line 11, ../../../sass/modules/blockcontact/blockcontact.scss */
#contact_block p {
margin-bottom: 4px;
}
/* line 13, ../../../sass/modules/blockcontact/blockcontact.scss */
#contact_block p.tel {
font: 400 17px/21px Arial, Helvetica, sans-serif;
color: #fff;
margin-bottom: 6px;
}
/* line 18, ../../../sass/modules/blockcontact/blockcontact.scss */
#contact_block p.tel i {
font-size: 25px;
vertical-align: -2px;
themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css
+6
View File
@@ -85,6 +85,12 @@
#layered_block_left .layered_filter_ul {
padding: 0 20px 5px;
}
@media (min-width: 768px) and (max-width: 991px) {
#layered_block_left .layered_filter_ul {
padding-left: 0;
padding-right: 0;
}
}
#layered_block_left .layered_filter_ul li {
padding-bottom: 7px;
}
themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
+12
View File
@@ -8,6 +8,12 @@
display: inline-block;
margin-right: 6px;
}
@media (min-width: 768px) and (max-width: 1199px) {
#columns #newsletter_block_left .form-group .form-control {
margin-bottom: 10px;
margin-right: 0;
}
}
#columns #newsletter_block_left .success_inline, #columns #newsletter_block_left .warning_inline {
text-align: left;
padding: 1px 0 0 0;
@@ -28,6 +34,12 @@
padding: 13px 15px 7px 15px;
margin-bottom: 0;
}
@media (max-width: 767px) {
#footer #newsletter_block_left {
background: #3F3F3F;
width: 100%;
}
}
#footer #newsletter_block_left h4 {
background: none;
float: left;
themes/default-bootstrap/css/modules/blocksearch/blocksearch.css
+39
View File
@@ -5,6 +5,30 @@
right: 420px;
top: 50px;
}
@media (min-width: 992px) and (max-width: 1199px) {
#search_block_top {
right: 295px;
}
}
@media (min-width: 768px) and (max-width: 991px) {
#search_block_top {
right: 207px;
}
}
@media (min-width: 480px) and (max-width: 767px) {
#search_block_top {
right: 0;
top: 85px;
}
}
@media (max-width: 479px) {
#search_block_top {
top: 56px;
right: 50%;
width: 270px;
margin-right: -135px;
}
}
#search_block_top .btn.button-search {
background: #333;
float: left;
@@ -34,6 +58,21 @@
float: left;
margin-right: 1px;
}
@media (min-width: 768px) and (max-width: 991px) {
#search_block_top #search_query_top {
width: 180px;
}
}
@media (min-width: 480px) and (max-width: 767px) {
#search_block_top #search_query_top {
width: 212px;
}
}
@media (max-width: 479px) {
#search_block_top #search_query_top {
width: 212px;
}
}
.ac_results {
background: #fff;
themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css
+14 -4
View File
@@ -17,6 +17,16 @@
border-bottom: 3px solid #e9e9e9;
background: #f6f6f6;
}
@media (min-width: 480px) and (max-width: 767px) {
.sf-menu {
margin-top: 80px;
}
}
@media (max-width: 479px) {
.sf-menu {
margin-top: 70px;
}
}
.sf-menu ul {
position: absolute;
@@ -52,7 +62,7 @@
padding: 17px 20px;
border-bottom: 3px solid #e9e9e9;
}
.sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce a {
.sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
background: #333;
border-bottom-color: #666666;
color: #fff;
@@ -85,9 +95,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;
}
ul.sf-menu li:hover li ul,
themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css
+27 -2
View File
@@ -1,18 +1,43 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* block top user information */
#header_right #header_user {
clear: both;
float: right;
margin-top: 50px;
}
@media (min-width: 480px) and (max-width: 767px) {
#header_right #header_user {
margin-top: 25px;
}
}
@media (max-width: 479px) {
#header_right #header_user {
float: none;
margin-left: auto;
margin-right: auto;
margin-top: 95px;
width: 270px;
}
}
#header_right #header_user #shopping_cart a {
padding: 7px 10px 14px 16px;
background: #333333;
min-width: 270px;
/* 200 */
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) {
#header_right #header_user #shopping_cart a {
min-width: 190px;
}
}
@media (min-width: 768px) and (max-width: 991px) {
#header_right #header_user #shopping_cart a span.ajax_cart_product_txt, #header_right #header_user #shopping_cart a span.ajax_cart_product_txt_s {
display: none !important;
}
}
#header_right #header_user #shopping_cart a b {
color: #fff;
themes/default-bootstrap/css/modules/blockviewed/blockviewed.css
+1
View File
@@ -1,4 +1,5 @@
/* Block Viewed Products */
/* line 4, ../../../sass/modules/blockviewed/blockviewed.scss */
#viewed-products_block_left li.last_item {
padding-bottom: 0;
margin-bottom: 0;
themes/default-bootstrap/css/modules/carriercompare/style.css
+19
View File
@@ -1,73 +1,92 @@
/* line 3, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .form-group {
line-height: normal;
margin-bottom: 10px;
}
/* line 7, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .form-group label {
margin-bottom: 6px;
}
/* line 9, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .form-group .form-control {
width: 263px;
}
/* line 13, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .form-group.last {
margin-bottom: 20px;
}
/* line 15, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .form-group.last input {
margin-bottom: 3px;
}
/* line 19, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .table {
background: #fff;
}
/* line 26, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .table thead tr th {
background: #fff;
padding: 4px 10px 3px 10px;
}
/* line 34, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .table tbody td {
margin: 0;
}
/* line 37, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .table tbody td.carrier_action {
width: 54px;
padding-left: 0;
padding-right: 0;
text-align: center;
}
/* line 43, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping .table tbody td.carrier_action input {
margin: 0;
}
/* line 53, ../../../sass/modules/carriercompare/style.scss */
#availableCarriers .table {
margin-bottom: 20px;
}
/* line 57, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping ul#carriercompare_errors_list {
color: red;
}
/* line 60, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping_form {
padding-bottom: 20px;
}
/* line 61, ../../../sass/modules/carriercompare/style.scss */
#compare_shipping ul#carriercompare_errors_list li {
margin-left: 30px;
text-decoration: none;
list-style: none;
}
/* line 68, ../../../sass/modules/carriercompare/style.scss */
#SE_AjaxDisplay {
text-align: center;
display: none;
}
/* line 74, ../../../sass/modules/carriercompare/style.scss */
#SE_AjaxDisplay img {
width: 15px;
}
/* line 79, ../../../sass/modules/carriercompare/style.scss */
.SE_SubmitRefreshCard button {
float: left;
}
/* line 82, ../../../sass/modules/carriercompare/style.scss */
.SE_SubmitRefreshCard button#carriercompare_submit {
margin-right: 10px;
}
/* line 87, ../../../sass/modules/carriercompare/style.scss */
#carriercompare_errors {
display: none;
}
themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css
+9
View File
@@ -1,3 +1,4 @@
/* line 1, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
#favoriteproducts_block_account .favoriteproduct {
position: relative;
margin-bottom: 14px;
@@ -6,6 +7,7 @@
border-radius: 3px 3px 3px 3px;
}
/* line 9, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
.favoriteproduct a.product_img_link {
border: 1px solid #CCCCCC;
display: block;
@@ -15,35 +17,41 @@
position: relative;
}
/* line 17, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
.favoriteproduct p.product_desc {
line-height: 16px;
overflow: hidden;
padding: 0;
}
/* line 23, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
.favoriteproduct .remove {
position: absolute;
top: 10px;
right: 10px;
}
/* line 28, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
.favoriteproduct .remove .icon {
cursor: pointer;
}
/* lnk fiche produit */
/* line 33, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
#usefull_link_block li#favoriteproducts_block_extra_add {
padding-left: 20px;
background: url(img/add_favorite.gif) no-repeat 0 0;
cursor: pointer;
}
/* line 39, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
#usefull_link_block li#favoriteproducts_block_extra_remove {
padding-left: 20px;
background: url(img/del_favorite.gif) no-repeat 0 0;
cursor: pointer;
}
/* line 45, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
ul#usefull_link_block li#favoriteproducts_block_extra_added {
padding-left: 20px;
background: url(img/add_favorite.gif) no-repeat 0 0;
@@ -51,6 +59,7 @@ ul#usefull_link_block li#favoriteproducts_block_extra_added {
display: none;
}
/* line 51, ../../../sass/modules/favoriteproducts/favoriteproducts.scss */
ul#usefull_link_block li#favoriteproducts_block_extra_removed {
padding-left: 20px;
background: url(img/add_favorite.gif) no-repeat 0 0;
themes/default-bootstrap/css/modules/homeslider/bx_styles.css
+31
View File
@@ -12,6 +12,7 @@
/******************************************************************************
Home Page Slider
*******************************************************************************/
/* line 18, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider {
padding-left: 0;
padding-right: 0;
@@ -21,6 +22,7 @@
position: relative;
z-index: 1;
}
/* line 27, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider #homeslider {
margin: 0 auto;
padding: 0;
@@ -31,6 +33,7 @@
********************************************************************************/
/** RESET AND LAYOUT
===================================*/
/* line 37, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider {
/** THEME
===================================*/
@@ -41,27 +44,33 @@
/* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */
/* IMAGE CAPTIONS */
}
/* line 38, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper {
position: relative;
padding: 0;
*zoom: 1;
}
/* line 43, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper a {
display: block;
}
/* line 45, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper img {
display: block;
max-width: 100%;
}
/* line 55, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-viewport {
width: 100%;
}
/* line 61, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-pager,
#homepage-slider .bx-wrapper .bx-controls-auto {
position: absolute;
bottom: -30px;
width: 100%;
}
/* line 69, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-loading {
min-height: 50px;
background: url(images/bx_loader.gif) center center no-repeat white;
@@ -72,6 +81,7 @@
left: 0;
z-index: 2000;
}
/* line 82, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-pager {
text-align: center;
font-size: .85em;
@@ -80,12 +90,14 @@
color: #666;
padding-top: 20px;
}
/* line 92, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-pager .bx-pager-item,
#homepage-slider .bx-wrapper .bx-controls-auto .bx-controls-auto-item {
display: inline-block;
*zoom: 1;
*display: inline;
}
/* line 98, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-pager.bx-default-pager a {
background: #666;
text-indent: -9999px;
@@ -98,22 +110,28 @@
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 112, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-pager.bx-default-pager a:hover,
#homepage-slider .bx-wrapper .bx-pager.bx-default-pager a.active {
background: #000;
}
/* line 118, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-prev {
right: 60px;
}
/* line 121, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-prev:after {
content: "";
}
/* line 126, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-next {
right: 10px;
}
/* line 129, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-next:after {
content: "";
}
/* line 134, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-direction a {
position: absolute;
bottom: 10px;
@@ -124,6 +142,7 @@
z-index: 9999;
border: 2px solid #fff;
}
/* line 144, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-direction a:before {
height: 48px;
width: 48px;
@@ -137,6 +156,7 @@
top: 0;
z-index: 1;
}
/* line 158, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-direction a:after {
display: block;
width: 48px;
@@ -152,16 +172,20 @@
z-index: 2;
padding: 16px 0 0 0;
}
/* line 176, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-direction a:hover:before {
background: #333;
opacity: 0.83;
}
/* line 183, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-direction a.disabled {
display: none;
}
/* line 189, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-auto {
text-align: center;
}
/* line 193, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-auto .bx-start {
display: block;
text-indent: -9999px;
@@ -171,10 +195,12 @@
background: url(images/controls.png) -86px -11px no-repeat;
margin: 0 3px;
}
/* line 204, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-auto .bx-start:hover,
#homepage-slider .bx-wrapper .bx-controls-auto .bx-start.active {
background-position: -86px 0;
}
/* line 208, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-auto .bx-stop {
display: block;
text-indent: -9999px;
@@ -184,18 +210,22 @@
background: url(images/controls.png) -86px -44px no-repeat;
margin: 0 3px;
}
/* line 219, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls-auto .bx-stop:hover,
#homepage-slider .bx-wrapper .bx-controls-auto .bx-stop.active {
background-position: -86px -33px;
}
/* line 225, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
text-align: left;
width: 80%;
}
/* line 230, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
right: 0;
width: 35px;
}
/* line 237, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-caption {
position: absolute;
bottom: 0;
@@ -204,6 +234,7 @@
background: rgba(80, 80, 80, 0.75);
width: 100%;
}
/* line 246, ../../../sass/modules/homeslider/bx_styles.scss */
#homepage-slider .bx-wrapper .bx-caption span {
color: #fff;
font-family: Arial;
themes/default-bootstrap/css/product_list.css
+46 -11
View File
@@ -30,6 +30,12 @@ ul.product_list .color-list-container ul li a {
height: 23px;
margin: 1px;
}
ul.product_list .product-image-container {
text-align: center;
}
ul.product_list .product-image-container img {
margin: 0 auto;
}
ul.product_list .product-image-container .quick-view {
font: 700 13px/16px Arial, Helvetica, sans-serif;
color: #777676;
@@ -67,6 +73,7 @@ ul.product_list.grid > li {
@media (min-width: 480px) and (max-width: 767px) {
ul.product_list.grid > li {
width: 50%;
float: left;
}
}
ul.product_list.grid > li .product-container {
@@ -171,22 +178,22 @@ ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
display: none;
}
}
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) {
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) {
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;
}
}
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) {
@@ -324,6 +331,11 @@ ul.product_list.list > li .right-block .right-block-content .button-container .b
clear: both;
}
}
@media (min-width: 992px) {
ul.product_list.list > li .right-block .right-block-content .functional-buttons {
overflow: hidden;
}
}
@media (max-width: 991px) {
ul.product_list.list > li .right-block .right-block-content .functional-buttons {
clear: both;
@@ -388,7 +400,7 @@ 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;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:hover {
@@ -397,6 +409,12 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
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) {
ul.product_list.list > li:hover .product-image-container .quick-view {
display: block;
@@ -412,14 +430,31 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
Product list(Index page) Styles
********************************************************/
#index ul.product_list.tab-pane > li {
padding-bottom: 35px;
margin-bottom: 50px;
padding-bottom: 10px;
margin-bottom: 10px;
}
@media (min-width: 1200px) {
#index ul.product_list.tab-pane > li {
/* min 1200px */
padding-bottom: 35px;
margin-bottom: 50px;
}
}
#index ul.product_list.tab-pane > li .availability {
display: none;
}
#index ul.product_list.tab-pane > li.last-line {
border: none;
padding-bottom: 0;
margin-bottom: 0;
@media (min-width: 1200px) {
#index ul.product_list.tab-pane > li.last-line {
border: none;
padding-bottom: 0;
margin-bottom: 0;
}
}
@media (min-width: 480px) and (max-width: 767px) {
#index ul.product_list.tab-pane > li.first-item-of-tablet-line {
clear: none;
}
#index ul.product_list.tab-pane > li.first-item-of-mobile-line {
clear: left;
}
}
themes/default-bootstrap/css/rtl.css
+2
View File
@@ -1,7 +1,9 @@
/* line 1, ../sass/rtl.scss */
* {
direction: rtl !important;
}
/* line 2, ../sass/rtl.scss */
#page {
text-align: right !important;
}
themes/default-bootstrap/css/scenes.css
+22
View File
@@ -1,4 +1,5 @@
/*TMP*/
/* line 3, ../sass/scenes.scss */
#scenes .cluetip span {
background: transparent url(../img/icon/cible.gif) no-repeat scroll center center;
color: black;
@@ -12,6 +13,7 @@
}
/*TMP*/
/* line 15, ../sass/scenes.scss */
.thumbs_banner {
margin: 10px auto;
padding: 2px 0;
@@ -21,6 +23,7 @@
border-bottom: 1px solid #ccc;
}
/* line 24, ../sass/scenes.scss */
.thumbs_banner .space-keeper {
width: 21px;
float: left;
@@ -28,6 +31,7 @@
height: 100%;
}
/* line 31, ../sass/scenes.scss */
.thumbs_banner .space-keeper a.prev {
display: none;
width: 21px;
@@ -37,24 +41,29 @@
background: url(../img/icon/serial_scroll_left.gif) no-repeat 0 0 #eeeeee;
}
/* line 39, ../sass/scenes.scss */
#scenes_list {
overflow: hidden;
float: left;
width: 478px;
}
/* line 44, ../sass/scenes.scss */
#scenes_list ul {
list-style-type: none;
}
/* line 48, ../sass/scenes.scss */
#scenes_list li {
float: left;
}
/* line 52, ../sass/scenes.scss */
#scenes_list a {
display: block;
}
/* line 56, ../sass/scenes.scss */
.thumbs_banner a.next {
float: left;
display: block;
@@ -66,16 +75,19 @@
}
/* Cluetip design ****************************************************************************** */
/* line 67, ../sass/scenes.scss */
#scenes .screen_scene {
margin: 0 auto;
}
/* line 71, ../sass/scenes.scss */
#scenes a.cluetip {
display: block;
position: absolute;
text-decoration: none;
}
/* line 77, ../sass/scenes.scss */
.cluetip-product_scene {
padding: 10px;
border: 7px solid #999;
@@ -87,17 +99,20 @@
opacity: 0.95;
}
/* line 88, ../sass/scenes.scss */
.cluetip-product_scene #cluetip-close {
text-align: right;
float: right;
}
/* line 93, ../sass/scenes.scss */
.cluetip-product_scene img {
float: left;
margin-right: 10px;
border: 1px solid #cccccc;
}
/* line 98, ../sass/scenes.scss */
.cluetip-product_scene .title_block {
display: inline-block;
margin-bottom: 5px;
@@ -105,16 +120,19 @@
font-size: 12px;
}
/* line 105, ../sass/scenes.scss */
.cluetip-product_scene .clear {
margin: 0;
padding: 0;
}
/* line 106, ../sass/scenes.scss */
.cluetip-product_scene .clear a {
/*float:left;*/
margin-top: 2px;
}
/* line 111, ../sass/scenes.scss */
.cluetip-product_scene p.description {
float: left;
padding: 0;
@@ -122,6 +140,7 @@
color: #666666;
}
/* line 118, ../sass/scenes.scss */
.cluetip-product_scene div.prices {
float: right;
position: relative;
@@ -129,6 +148,7 @@
text-align: right;
}
/* line 124, ../sass/scenes.scss */
.cluetip-product_scene .new {
position: absolute;
top: 0;
@@ -142,6 +162,7 @@
background: none repeat scroll 0 0 #9b0000;
}
/* line 136, ../sass/scenes.scss */
.cluetip-product_scene .price {
padding-top: 18px;
font-weight: bold;
@@ -149,6 +170,7 @@
color: #990000;
}
/* line 142, ../sass/scenes.scss */
.cluetip-product_scene .on_sale, .cluetip-product_scene .discount {
display: block;
font-weight: bold;
themes/default-bootstrap/guest-tracking.tpl
+1 -1
View File
@@ -109,7 +109,7 @@
<i>{l s='For example: QIIXJXNUI or QIIXJXNUI#1'}</i>
</div>
<div class="text form-group">
<label>{l s='Email'}</label>
<label>{l s='Email:'}</label>
<input class="form-control" type="text" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'}{/if}{/if}" />
</div>
<p>
themes/default-bootstrap/header.tpl
+9 -4
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}
@@ -159,12 +164,12 @@
<div class="current">
<input type="hidden" name="id_currency" id="id_currency" value=""/>
<input type="hidden" name="SubmitCurrency" value="" />
{l s='Currency' mod='blockcurrencies'} :
<span class="cur-label">{l s='Currency' mod='blockcurrencies'} :</span>
{foreach from=$currencies key=k item=f_currency}
{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>
@@ -184,7 +189,7 @@
</div>
<div class="container header-row-2">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
<img class="logo" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
</a>
<div id="header_right">
{$HOOK_TOP}
themes/default-bootstrap/history.tpl
+3 -3
View File
@@ -39,7 +39,7 @@
<th class="first_item">{l s='Order reference'}</th>
<th class="item">{l s='Date'}</th>
<th data-hide="phone" class="item">{l s='Total price'}</th>
<th data-hide="phone,tablet" class="item">{l s='Payment: '}</th>
<th data-hide="phone,tablet" class="item">{l s='Payment'}</th>
<th class="item">{l s='Status'}</th>
<th data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
<th data-hide="phone,tablet" class="last_item">&nbsp;</th>
@@ -55,14 +55,14 @@
<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
<td class="history_method">{$order.payment|escape:'htmlall':'UTF-8'}</td>
<td class="history_state">{if isset($order.order_state)}{$order.order_state|escape:'htmlall':'UTF-8'}{/if}</td>
<td class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
<td class="history_invoice">
{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
<a class="link-button" href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}" title="{l s='Invoice'}" class="_blank"><i class="icon-file-text large"></i>{l s='PDF'}</a>
{else}-{/if}
</td>
<td class="history_detail">
<a class="btn btn-default button button-small" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');"><span>{l s='details'}<i class="icon-chevron-right right"></i></span></a>
<a class="btn btn-default button button-small" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');"><span>{l s='Details'}<i class="icon-chevron-right right"></i></span></a>
{if isset($opc) && $opc}
<a class="link-button" href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}" title="{l s='Reorder'}">
{else}
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
+9 -1
View File
@@ -441,6 +441,7 @@ $(function() {
updateState();
updateNeedIDNumber();
updateZipCode();
$("select.form-control,input[type='checkbox'],input[type='radio']").uniform();
});
$('#opc_guestCheckout').click(function() {
$('.is_customer_param').hide();
@@ -452,6 +453,7 @@ $(function() {
updateState();
updateNeedIDNumber();
updateZipCode();
$("select.form-control,input[type='checkbox']").uniform();
});
}
else if (isGuest)
@@ -667,7 +669,7 @@ $(function() {
$('#submitAccount').show();
}
});
$("select.form-control,input[type='checkbox']").uniform();
});
function bindCheckbox()
@@ -683,6 +685,7 @@ function bindCheckbox()
}
else
$('#opc_invoice_address').slideUp('slow');
$("select.form-control,input[type='checkbox']").uniform();
}
function bindInputs()
@@ -718,6 +721,7 @@ function bindInputs()
$('#opc_delivery_methods-overlay').fadeOut('slow');
}
});
$("select.form-control,input[type='checkbox']").uniform();
});
// Recyclable checkbox
@@ -736,6 +740,7 @@ function bindInputs()
if ($('#gift').is(':checked'))
$('#gift_div').show();
else
$('#gift_div').hide();
@@ -748,6 +753,7 @@ function bindInputs()
$('#cgv').click(function() {
updatePaymentMethodsDisplay();
});
$("select.form-control,input[type='checkbox']").uniform();
}
function multishippingMode(it)
@@ -854,6 +860,7 @@ function multishippingMode(it)
}
});
}
$("select.form-control,input[type='checkbox']").uniform();
}
$(document).ready(function() {
@@ -867,4 +874,5 @@ $(document).ready(function() {
}
if (typeof(open_multishipping_fancybox) !== 'undefined' && open_multishipping_fancybox)
$('#link_multishipping_form').click();
$("select.form-control,input[type='checkbox']").uniform();
});
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/lang/en.php
+1 -1
View File
@@ -202,7 +202,7 @@ $_LANG['order-follow_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['order-opc-new-account_936ccdb97115e9f35a11d35e3d5b5cad'] = 'Click here';
$_LANG['order-opc-new-account_b357b524e740bc85b9790a0712d84a30'] = 'Email address';
$_LANG['order-opc-new-account_01a569ddc6cf67ddec2a683f0a5f5956'] = 'Forgot your password?';
$_LANG['order-opc-new-account_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
$_LANG['order-opc-new-account_99dea78007133396a7b8ed70578ac6ae'] = 'Sign in';
$_LANG['order-opc-new-account_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant checkout';
$_LANG['order-opc-new-account_ce8ae9da5b7cd6c3df2929543a9af92d'] = 'Email';
$_LANG['order-opc-new-account_b78a3223503896721cca1303f776159b'] = 'Title';
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/blockcategories/blockcategories_footer.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
*}
<!-- Block categories module -->
<section class="blockcategories_footer footer-block col-xs-12 col-md-2">
<section class="blockcategories_footer footer-block col-xs-12 col-sm-2">
<h4>{l s='Categories' mod='blockcategories'}</h4>
<div class="category_footer">
<div class="list">
themes/default-bootstrap/modules/blockcms/blockcms.tpl
+1 -1
View File
@@ -46,7 +46,7 @@
<!-- /Block CMS module -->
{else}
<!-- MODULE Block footer -->
<section class="footer-block col-xs-12 col-md-2" id="block_various_links_footer">
<section class="footer-block col-xs-12 col-sm-2" id="block_various_links_footer">
<h4>{l s='Information' mod='blockcms'}</h4>
<ul>
{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
*}
<!-- MODULE Block contact infos -->
<section id="block_contact_infos" class="footer-block col-xs-12 col-md-4">
<section id="block_contact_infos" class="footer-block col-xs-12 col-sm-4">
<div>
<h4>{l s='Store Information' mod='blockcontactinfos'}</h4>
<ul>
themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
*}
<!-- Block myaccount module -->
<section class="footer-block col-xs-12 col-md-4">
<section class="footer-block col-xs-12 col-sm-4">
<h4><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
<div class="block_content">
<ul class="bullet">
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/modules/blocksocial/blocksocial.tpl
+1
View File
@@ -32,3 +32,4 @@
</ul>
<h4>{l s='Follow us:' mod='blocksocial'}</h4>
</section>
<div class="clearfix"></div>
themes/default-bootstrap/modules/productcomments/productcomments-extra.tpl
+3 -2
View File
@@ -37,7 +37,7 @@ $(function(){
{if ($logged == 1 || $nbComments != 0) && !$content_only}
</div><!-- Close the OosHook -->
<div id="product_comments_block_extra">
<div id="product_comments_block_extra" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
{if $nbComments != 0}
<div class="comments_note clearfix">
<span>{l s='Rating' mod='productcomments'}&nbsp</span>
@@ -49,13 +49,14 @@ $(function(){
<div class="star star_on"></div>
{/if}
{/section}
<span class="hidden" itemprop="ratingValue">{$averageTotal}</span>
</div>
</div>
{/if}
<ul class="comments_advices">
{if $nbComments != 0}
<li><a href="#idTab5" class="reviews">{l s='Read reviews' mod='productcomments'} ({$nbComments})</a></li>
<li><a href="#idTab5" class="reviews">{l s='Read reviews' mod='productcomments'} (<span itemprop="reviewCount">{$nbComments}</span>)</a></li>
{/if}
{if ($too_early == false AND ($logged OR $allow_guests))}
<li><a class="open-comment-form" href="#new_comment_form">{l s='Write a review' mod='productcomments'}</a></li>
themes/default-bootstrap/order-detail.tpl
+22 -22
View File
@@ -64,8 +64,8 @@
<tbody>
{foreach from=$order_history item=state name="orderStates"}
<tr class="{if $smarty.foreach.orderStates.first}first_item{elseif $smarty.foreach.orderStates.last}last_item{/if} {if $smarty.foreach.orderStates.index % 2}alternate_item{else}item{/if}">
<td>{dateFormat date=$state.date_add full=1}</td>
<td>{$state.ostate_name|escape:'htmlall':'UTF-8'}</td>
<td class="step-by-step-date">{dateFormat date=$state.date_add full=0}</td>
<td><span class="label{if $state.id_order_state == 1 || $state.id_order_state == 10 || $state.id_order_state == 11} label-info{elseif $state.id_order_state == 5 || $state.id_order_state == 2 || $state.id_order_state == 12} label-success{elseif $state.id_order_state == 6 || $state.id_order_state == 7 || $state.id_order_state == 8} label-danger{elseif $state.id_order_state == 3 || $state.id_order_state == 9 || $state.id_order_state == 4} label-warning{/if}">{$state.ostate_name|escape:'htmlall':'UTF-8'}</span></td>
</tr>
{/foreach}
</tbody>
@@ -80,9 +80,23 @@
<div class="adresses_bloc">
<div class="row">
<div class="col-xs-12 col-sm-6">
<ul class="address alternate_item box" {if $order->isVirtual()}style="display:none;"{/if}>
<li><h3 class="page-subheading">{l s='Delivery address'} ({$address_delivery->alias})</h3></li>
{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</li>
{else}
{assign var=address_words value=" "|explode:$field_item}
<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
{/if}
{/foreach}
</ul>
</div>
<div class="col-xs-12 col-sm-6">
<ul class="address item {if $order->isVirtual()}full_width{/if} box">
<li><h3 class="page-subheading">{l s='Billing'}</h3></li>
<li><h3 class="page-subheading">{l s='Invoice address'} ({$address_invoice->alias})</h3></li>
{foreach from=$inv_adr_fields name=inv_loop item=field_item}
{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</li>
@@ -95,20 +109,6 @@
{/foreach}
</ul>
</div>
<div class="col-xs-12 col-sm-6">
<ul class="address alternate_item box" {if $order->isVirtual()}style="display:none;"{/if}>
<li><h3 class="page-subheading">{l s='Delivery'}</h3></li>
{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</li>
{else}
{assign var=address_words value=" "|explode:$field_item}
<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
{/if}
{/foreach}
</ul>
</div>
</div>
</div>
{$HOOK_ORDERDETAILDISPLAYED}
@@ -132,7 +132,7 @@
{if $priceDisplay && $use_tax}
<tr class="item">
<td colspan="{if $return_allowed}2{else}1{/if}">
<strong>{l s='Total products (tax excl.)'}</strong>
<strong>{l s='Items (tax excl.)'}</strong>
</td>
<td colspan="{if $order->hasProductReturned()}5{else}4{/if}">
<span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithoutTaxes() currency=$currency}</span>
@@ -141,7 +141,7 @@
{/if}
<tr class="item">
<td colspan="{if $return_allowed}2{else}1{/if}">
<strong>{l s='Total products'} {if $use_tax}{l s='(tax incl.)'}{/if}: </strong>
<strong>{l s='Items'} {if $use_tax}{l s='(tax incl.)'}{/if} </strong>
</td>
<td colspan="{if $order->hasProductReturned()}5{else}4{/if}">
<span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithTaxes() currency=$currency}</span>
@@ -150,7 +150,7 @@
{if $order->total_discounts > 0}
<tr class="item">
<td colspan="{if $return_allowed}2{else}1{/if}">
<strong>{l s='Total vouchers:'}</strong>
<strong>{l s='Total vouchers'}</strong>
</td>
<td colspan="{if $order->hasProductReturned()}5{else}4{/if}">
<span class="price-discount">{displayWtPriceWithCurrency price=$order->total_discounts currency=$currency convert=1}</span>
@@ -160,7 +160,7 @@
{if $order->total_wrapping > 0}
<tr class="item">
<td colspan="{if $return_allowed}2{else}1{/if}">
<strong>{l s='Total gift wrapping cost:'}</strong>
<strong>{l s='Total gift wrapping cost'}</strong>
</td>
<td colspan="{if $order->hasProductReturned()}5{else}4{/if}">
<span class="price-wrapping">{displayWtPriceWithCurrency price=$order->total_wrapping currency=$currency}</span>
@@ -169,7 +169,7 @@
{/if}
<tr class="item">
<td colspan="{if $return_allowed}2{else}1{/if}">
<strong>{l s='Total shipping'} {if $use_tax}{l s='(tax incl.)'}{/if}: </strong>
<strong>{l s='Shipping & handling'} {if $use_tax}{l s='(tax incl.)'}{/if} </strong>
</td>
<td colspan="{if $order->hasProductReturned()}5{else}4{/if}">
<span class="price-shipping">{displayWtPriceWithCurrency price=$order->total_shipping currency=$currency}</span>
themes/default-bootstrap/order-follow.tpl
+1 -1
View File
@@ -71,7 +71,7 @@
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
<td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
<td class="history_method"><span class="label label-info">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
<td class="bold">{dateFormat date=$return.date_add full=0}</td>
<td class="history_invoice">
{if $return.state == 2}
themes/default-bootstrap/order-opc-new-account.tpl
+2 -2
View File
@@ -116,8 +116,8 @@
<input type="password" class="text form-control" name="passwd" id="passwd" />
<span class="form_info">{l s='(five characters min.)'}</span>
</div>
<div class="required clearfix">
<label>{l s='Title'}</label><br />
<div class="required clearfix gender-line">
<label>{l s='Title'}</label>
{foreach from=$genders key=k item=gender}
<div class="radio-inline">
<label for="id_gender{$gender->id_gender}" class="top">
themes/default-bootstrap/order-payment.tpl
+16 -16
View File
@@ -62,9 +62,9 @@
<tr>
<th class="cart_product first_item">{l s='Product'}</th>
<th class="cart_description item">{l s='Description'}</th>
<th class="cart_availability item">{l s='Ref.'}</th>
<th class="cart_availability item">{l s='Avail.'}</th>
<th class="cart_unit item">{l s='Unit price'}</th>
<th class="cart_quantity item">{l s='Qty'}</th>
<!--th class="cart_quantity item">{l s='Qty'}</th-->
<th class="cart_total last_item">{l s='Total'}</th>
</tr>
</thead>
@@ -72,23 +72,23 @@
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_price">
<td colspan="4" class="text-right">{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}</td>
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}</td>
<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products}</td>
</tr>
{else}
<tr class="cart_total_price">
<td colspan="4" class="text-right">{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}</td>
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}</td>
<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products_wt}</td>
</tr>
{/if}
{else}
<tr class="cart_total_price">
<td colspan="4" class="text-right">{l s='Total products'}</td>
<td colspan="3" class="text-right">{l s='Total products'}</td>
<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products}</td>
</tr>
{/if}
<tr class="cart_total_voucher" {if $total_wrapping == 0}style="display:none"{/if}>
<td colspan="4" class="text-right">
<td colspan="3" class="text-right">
{if $use_taxes}
{if $priceDisplay}
{if $display_tax_label}{l s='Total gift wrapping (tax excl.):'}{else}{l s='Total gift wrapping cost:'}{/if}
@@ -113,31 +113,31 @@
</tr>
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery">
<td colspan="4" class="text-right">{l s='Shipping:'}</td>
<td colspan="3" class="text-right">{l s='Shipping:'}</td>
<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $use_taxes && $total_shipping_tax_exc != $total_shipping}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none"{/if}>
<td colspan="4" class="text-right">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="2" class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none"{/if}>
<td colspan="4" class="text-right">{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
</tr>
{/if}
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none"{/if}>
<td colspan="4" class="text-right">{l s='Total shipping'}</td>
<td colspan="3" class="text-right">{l s='Total shipping'}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{/if}
{/if}
<tr class="cart_total_voucher" {if $total_discounts == 0}style="display:none"{/if}>
<td colspan="4" class="text-right">
<td colspan="3" class="text-right">
{if $use_taxes}
{if $priceDisplay}
{if $display_tax_label}{l s='Total vouchers (tax excl.)'}{else}{l s='Total vouchers'}{/if}
@@ -163,12 +163,12 @@
{if $use_taxes}
{if $priceDisplay && $total_tax != 0}
<tr class="cart_total_tax">
<td colspan="4" class="text-right">{l s='Total tax:'}</td>
<td colspan="3" class="text-right">{l s='Total tax:'}</td>
<td colspan="2" class="price" id="total_tax" >{displayPrice price=$total_tax}</td>
</tr>
{/if}
<tr class="cart_total_price">
<td colspan="4" class="total_price_container text-right"><span>{l s='Total'}</span></td>
<td colspan="3" class="total_price_container text-right"><span>{l s='Total'}</span></td>
<td colspan="2" class="price" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price}</span>
</td>
@@ -206,10 +206,10 @@
</div>
</td>
{/if}
<td colspan="{if !$voucherAllowed}4{else}2{/if}" class="text-right total_price_container">
<td colspan="{if !$voucherAllowed}3{else}2{/if}" class="text-right total_price_container">
<span>{l s='Total'}</span>
</td>
<td colspan="2" class="price total_price_container" id="total_price_container">
<td colspan="1" class="price total_price_container" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price_without_tax}</span>
</td>
</tr>
@@ -229,7 +229,7 @@
{if isset($customizedDatas.$productId.$productAttributeId)}
{foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization'}
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" class="alternate_item cart_item">
<td colspan="4">
<td colspan="3">
{foreach from=$customization.datas key='type' item='datas'}
{if $type == $CUSTOMIZE_FILE}
<div class="customizationUploaded">
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
+18 -7
View File
@@ -31,11 +31,20 @@
{if $page_name !='index' && $page_name !='product'}
{assign var='nbItemsPerLine' value=3}
{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}
{/if}
{*define numbers of product per line in other page for tablet*}
{assign var='nbItemsPerLineTablet' value=2}
{assign var='nbLi' value=$products|@count}
{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
{math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
@@ -44,9 +53,11 @@
{foreach from=$products item=product name=products}
{math equation="(total%perLine)" total=$smarty.foreach.products.total perLine=$nbItemsPerLine assign=totModulo}
{math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
{math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineMobile assign=totModuloMobile}
{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
{if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
<li class="ajax_block_product col-xs-3 {if $smarty.foreach.products.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.products.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.products.iteration > ($smarty.foreach.products.total - $totModulo)}last-line{/if} {if $smarty.foreach.products.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.products.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.products.iteration > ($smarty.foreach.products.total - $totModuloTablet)}last-tablet-line{/if}">
{if $totModuloMobile == 0}{assign var='totModuloMobile' value=$nbItemsPerLineMobile}{/if}
<li class="ajax_block_product {if $page_name == 'index' || $page_name == 'product'}col-xs-12 col-sm-4 col-md-3{/if} {if $smarty.foreach.products.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.products.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.products.iteration > ($smarty.foreach.products.total - $totModulo)}last-line{/if} {if $smarty.foreach.products.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.products.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.products.iteration%$nbItemsPerLineMobile == 0}last-item-of-mobile-line{elseif $smarty.foreach.products.iteration%$nbItemsPerLineMobile == 1}first-item-of-mobile-line{/if} {if $smarty.foreach.products.iteration > ($smarty.foreach.products.total - $totModuloMobile)}last-mobile-line{/if}">
<div class="product-container">
<div class="left-block">
<div class="product-image-container">
@@ -117,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}
@@ -133,8 +144,8 @@
<script type="text/javascript"><!--
function display(view) {
if (view == 'list') {
$('ul.product_list').removeClass('grid row').addClass('list row');
$('.product_list > li').removeClass('col-xs-12 col-xs-4 col-sm-6 col-md-4').addClass('col-xs-12');
$('ul.product_list').removeClass('grid').addClass('list row');
$('.product_list > li').removeClass('col-xs-12 col-sm-6 col-md-4').addClass('col-xs-12');
$('.product_list > li').each(function(index, element) {
html = '';
html = '<div class="product-container"><div class="row">';
@@ -170,8 +181,8 @@
if (typeof quick_view != 'undefined') // qick view button reload
quick_view();
} else {
$('ul.product_list').removeClass('list row').addClass('grid row');
$('.product_list > li').removeClass('col-xs-12 col-xs-4').addClass('col-xs-12 col-sm-6 col-md-4');
$('ul.product_list').removeClass('list').addClass('grid row');
$('.product_list > li').removeClass('col-xs-12').addClass('col-xs-12 col-sm-6 col-md-4');
$('.product_list > li').each(function(index, element) {
html = '';
html += '<div class="product-container">';
themes/default-bootstrap/product.tpl
+13 -10
View File
@@ -158,7 +158,8 @@ var isLoggedWishlist = {if $logged}true{else}false{/if};
var contentOnly = {if $content_only}true{else}false{/if}
//]]>
</script>
<div id="primary_block" class="row">
<div id="primary_block" class="row" itemscope itemtype="http://schema.org/Product">
{if !$content_only}<div class="container"><div class="top-hr"></div></div>{/if}
@@ -187,6 +188,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
<div id="image-block">
{if $product->on_sale}
<span class="sale-box"><span class="sale">{l s='Sale!'}</span></span>
{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice}
@@ -195,12 +197,12 @@ var contentOnly = {if $content_only}true{else}false{/if}
{if $have_image}
<span id="view_full_size">
<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
<img itemprop="image" src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
{if !$content_only}<span class="span_link">{l s='View larger'}</span>{/if}
</span>
{else}
<span id="view_full_size">
<img src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
<img itemprop="image" src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
{if !$content_only}<span class="span_link">{l s='View larger'}</span>{/if}
</span>
{/if}
@@ -208,7 +210,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
{if isset($images) && count($images) > 0}
<!-- thumbnails -->
<div id="views_block" class="clearfix {if isset($images) && count($images) < 2}hidden{/if}">
{if isset($images) && count($images) > 3}<span class="view_scroll_spacer"><a id="view_scroll_left" class="" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Previous'}</a></span>{/if}
{if isset($images) && count($images) > 4}<span class="view_scroll_spacer"><a id="view_scroll_left" class="" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Previous'}</a></span>{/if}
<div id="thumbs_list">
<ul id="thumbs_list_frame">
{if isset($images)}
@@ -223,7 +225,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
{/if}
</ul>
</div>
{if isset($images) && count($images) > 3}<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Next'}</a>{/if}
{if isset($images) && count($images) > 4}<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Next'}</a>{/if}
</div>
{/if}
{if isset($images) && count($images) > 1}<p class="resetimg clear"><span id="wrapResetImages" style="display: none;">
@@ -239,15 +241,15 @@ var contentOnly = {if $content_only}true{else}false{/if}
<p class="online_only">{l s='Online only'}</p>
{/if}
<h1>{$product->name|escape:'htmlall':'UTF-8'}</h1>
<h1 itemprop="name">{$product->name|escape:'htmlall':'UTF-8'}</h1>
<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}>
<label>{l s='Model'} </label>
<span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span>
<span class="editable" itemprop="sku">{$product->reference|escape:'htmlall':'UTF-8'}</span>
</p>
{if $product->description_short OR $packItems|@count > 0}
<div id="short_description_block">
{if $product->description_short}
<div id="short_description_content" class="rte align_justify">{$product->description_short}</div>
<div id="short_description_content" class="rte align_justify" itemprop="description">{$product->description_short}</div>
{/if}
{if $product->description}
<p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p>
@@ -349,9 +351,10 @@ var contentOnly = {if $content_only}true{else}false{/if}
{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
<div class="price">
<p class="our_price_display">
<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">{convertPrice price=$productPrice}</span>
<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))}
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}-->
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/bootstrap_lib/_labels.scss
+2
View File
@@ -48,6 +48,7 @@
.label-info {
@include label-variant($label-info-bg);
border:1px solid $label-info-border;
}
.label-warning {
@@ -57,4 +58,5 @@
.label-danger {
@include label-variant($label-danger-bg);
border:1px solid $label-danger-border;
}
themes/default-bootstrap/sass/bootstrap_lib/_variables.scss
+5 -3
View File
@@ -22,7 +22,7 @@ $brand-primary: #428bca !default;
$brand-success: #46a74e !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default;
$brand-info: #5bc0de !default;
$brand-info: #5192f3 !default;
// Scaffolding
// -------------------------
@@ -414,12 +414,14 @@ $label-primary-bg: $brand-primary !default;
$label-success-bg: $state-success-bg !default;
$label-info-bg: $brand-info !default;
$label-warning-bg: $state-warning-bg !default;
$label-danger-bg: $brand-danger !default;
$label-danger-bg: $state-danger-bg !default;
$label-color: #fff !default;
$label-link-hover-color: #fff !default;
$label-success-border: #36943e !default;
$label-warning-border: $state-warning-border !default;
$label-warning-border: $state-warning-border !default;
$label-info-border: $state-info-border !default;
$label-danger-border: $state-danger-border !default;
// Modals
// -------------------------
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
+362 -260
View File
@@ -773,54 +773,79 @@ table.table_block td {
***************************************************************************************************/
#home-page-tabs {
border:none;
margin:0 0 0 -18px;
padding:10px 0;
@media (min-width: $screen-sm) { // min 768px
padding:10px 0;
margin:0 0 0 -18px;
}
> li {
border-left:1px solid $base-border-color;
margin:0 0px 0 9px;
padding:0 0px 0 9px;
a {
font:600 21px/24px 'Open Sans', sans-serif;
color:#555454;
text-transform:uppercase;
padding:1px 10px;
border:none;
outline:none;
margin:0;
}
margin-bottom:0;
@media (min-width: $screen-sm) { // min 768px
border-left:1px solid $base-border-color;
margin:0 0px 0 9px;
padding:0 0px 0 9px;
}
@media (max-width: $screen-xs - 1) { // max 479px
width:100%;
}
a {
font:600 21px/24px 'Open Sans', sans-serif;
color:#555454;
text-transform:uppercase;
border:none;
outline:none;
margin:0;
padding:10px;
@media (min-width: $screen-sm) { // min 768px
padding:1px 10px;
}
}
&:first-child {border:none;}
}
> li.active a, >li a:hover {
background:#333333;
color:#fff;
margin:-10px 0;
padding:10px;
@media (min-width: $screen-sm) { // min 768px
margin:-10px 0;
}
}
}
#index {
.tab-content {
margin-top:35px;
}
}
.block {margin-bottom:30px}
.block {
.title_block, h4 {
font:600 18px/22px 'Open Sans', sans-serif;
color:#555454;
background:#f6f6f6;
border-top:5px solid #333;
text-transform:uppercase;
padding:14px 0 17px 20px;
padding:14px 5px 17px 20px;
margin-bottom:20px;
a {
color:#555454;
&:hover {
color:#333;
}
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
font-size:14px;
}
a {
color:#555454;
&:hover {
color:#333;
}
}
}
&#contact_block {
background:#333;
.title_block {
border-color:#e4e3e3;
background:#333;
@@ -831,11 +856,14 @@ table.table_block td {
}
.list-block {
margin-top:-8px;
li {
padding:5px 0 6px 20px;
border-top:1px solid $base-border-color;
a {
i {display:none;}
&:before {
content:"";
display:inline;
@@ -843,26 +871,39 @@ table.table_block td {
color:#333;
padding-right:8px;
}
&:hover {
color:#333333;
font-weight:bold;
}
}
&:first-child {border-top:none;}
}
.form-group { padding-top:20px; border-top:1px solid $base-border-color;}
.btn {margin-top:12px;}
}
.products-block {
li {
padding:0 0 20px 0;
margin-bottom:20px;
border-bottom:1px solid $base-border-color;
.products-block-image {
float:left;
border:1px solid $base-border-color;
margin-right:19px;
margin-right:19px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
float:none;
display:inline-block;
margin:0 auto 10px;
text-align:center;
}
}
.product-content {
overflow:hidden;
h5 {
@@ -870,8 +911,11 @@ table.table_block td {
}
}
}
.product-name {font-size:15px; line-height:18px;}
.product-description {margin-bottom:14px;}
.price-percent-reduction {
font:700 14px/17px Arial, Helvetica, sans-serif;
padding:1px 6px;
@@ -880,11 +924,14 @@ table.table_block td {
}
/*************** Block CATEGORIES ***************/
#categories_block_left {
.block_content > ul {
border-top:1px solid $base-border-color;
}
li {
position:relative;
a {
font-weight:bold;
color:#333333;
@@ -894,6 +941,7 @@ table.table_block td {
padding:0 30px 0 19px;
border-bottom:1px solid $base-border-color;
}
span.grower {
display:block;
background:#f6f6f6;
@@ -904,37 +952,43 @@ table.table_block td {
text-align:center;
font-family:'FontAwesome';
font-size:14px;
&.OPEN, &.CLOSE {
&:before {
content:"";
display:block;
vertical-align:middle;
width:30px;
height:30px;
color:#333;
line-height:30px;
}
}
&.CLOSE:before {
content:"";
color:#c0c0c0;
&.OPEN, &.CLOSE {
&:before {
content:"";
display:block;
vertical-align:middle;
width:30px;
height:30px;
color:#333;
line-height:30px;
}
}
&.CLOSE:before {
content:"";
color:#c0c0c0;
}
}
& span.grower:hover + a, a:hover, a.selected {
background:#f6f6f6;
}
li {
a {
font-weight:normal;
color:#777777;
&:before {
content:"";
font-family:'FontAwesome';
line-height:29px;
padding-right:8px;
}
}
li {
a {
font-weight:normal;
color:#777777;
&:before {
content:"";
font-family:'FontAwesome';
line-height:29px;
padding-right:8px;
}
}
}
}
}
/*************************************************************************************************/
@@ -952,12 +1006,13 @@ table.table_block td {
float:right;
color:#333;
text-transform:none;
@media (max-width:$screen-xs) {
float:none;
display:block;
padding-top:5px;
}
@media (max-width:$screen-xs) {
float:none;
display:block;
padding-top:5px;
}
}
span.lighter {color:#9c9c9c}
&.bottom-indent { margin-bottom:16px;}
@@ -1023,6 +1078,7 @@ ul.footer_links {
.clearfix > span {
padding:3px 0 0 12px;
display:inline-block;
float:left;
}
#uniform-nb_item { float:left;}
@@ -1093,29 +1149,24 @@ ul.footer_links {
float:right;
width:530px;
text-align:center;
/* min 992px max 1199px */
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
width:380px;
}
/* max 991px */
@media (max-width: $screen-sm-max) {
float:left;
width:auto;
}
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
width:380px;
}
@media (max-width: $screen-sm-max) { // max 991px
float:left;
width:auto;
}
.showall {
float:right;
margin:8px 53px 8px 14px;
/* min 992px max 1199px */
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
margin-right:11px;
}
/* max 991px */
@media (max-width: $screen-sm-max) {
margin-right:0;
}
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
margin-right:11px;
}
@media (max-width: $screen-sm-max) { // max 991px
margin-right:0;
}
.btn {
@@ -1129,72 +1180,84 @@ ul.footer_links {
}
ul.pagination {
margin:8px 0px 8px 0;
li {
display:inline-block;
float:left;
> a, > span {
margin:0 1px 0 0px;
padding:0;
font-weight:bold;
border:1px solid;
border-color:#dfdede #d2d0d0 #b0afaf #d2d0d0;
@media (max-width: $screen-sm-max) { // max 991px
float:left;
}
li {
display:inline-block;
float:left;
> a, > span {
margin:0 1px 0 0px;
padding:0;
font-weight:bold;
border:1px solid;
border-color:#dfdede #d2d0d0 #b0afaf #d2d0d0;
display:block;
span {
border:1px solid #fff;
padding:2px 8px;
display:block;
span {
border:1px solid #fff;
padding:2px 8px;
display:block;
background:url(../img/pagination-li.gif) 0 0 repeat-x #fbfbfb;
}
}
> a:hover {
span {
background:#f6f6f6;
}
}
&.pagination_previous, &.pagination_next {
color:#777676;
font-weight:bold;
> a, > span {
border:none;
background:none;
display:block;
padding:4px 0;
span { border:none; padding:0; background:none;}
}
}
&.pagination_previous { margin-right:10px;}
&.pagination_next { margin-left:10px;}
&.active {
> span {
color:#333333;
border-color:#dfdede #d2d0d0 #b0afaf #d2d0d0;
span {background:#f6f6f6;}
}
background:url(../img/pagination-li.gif) 0 0 repeat-x #fbfbfb;
}
}
> a:hover {
span {
background:#f6f6f6;
}
}
&.pagination_previous, &.pagination_next {
color:#777676;
font-weight:bold;
> a, > span {
border:none;
background:none;
display:block;
padding:4px 0;
span { border:none; padding:0; background:none;}
}
}
&.pagination_previous { margin-right:10px;}
&.pagination_next { margin-left:10px;}
&.active {
> span {
color:#333333;
border-color:#dfdede #d2d0d0 #b0afaf #d2d0d0;
span {background:#f6f6f6;}
}
}
}
.compare-form {
float:right;
/* max 479px */
@media (max-width: $screen-xs - 1) {
float:left;
width:100%;
text-align:left;
padding-bottom:10px;
clear:both;
}
}
.compare-form {
float:right;
@media (max-width: $screen-xs - 1) { // max 479px
float:left;
width:100%;
text-align:left;
padding-bottom:10px;
clear:both;
}
}
.product-count {
padding:11px 0 0 0;
float:left;
/* max 991px */
@media (max-width: $screen-sm-max) {
clear:left;
}
@media (max-width: $screen-sm-max) { // max 991px
clear:left;
}
}
}
.bottom-pagination-content {border-top:1px solid $base-border-color;}
@@ -1202,11 +1265,9 @@ ul.footer_links {
ul.step {
margin-bottom:30px;
overflow:hidden;
/*min 480px*/
@media (min-width: $screen-xs) {
@include border-radius(4px);
}
@media (min-width: $screen-xs) { //min 480px
@include border-radius(4px);
}
li {
float:left;
@@ -1217,12 +1278,10 @@ ul.step {
border-bottom-color:#9a9a9a;
border-right-color:#b7b7b7;
border-left-width:0px;
/* max 480px */
@media (max-width: $screen-xs - 1) {
width:100%;
border-left-width:1px;
}
@media (max-width: $screen-xs - 1) { // max 480px
width:100%;
border-left-width:1px;
}
a, span, &.step_current span, &.step_current_end span {
display:block;
@@ -1233,22 +1292,21 @@ ul.step {
font-weight:bold;
text-shadow:1px 1px rgba(255,255,255,1);
position:relative;
/* min 991px */
@media (min-width: $screen-md) {
&:after {
content:".";
position:absolute;
top:0;
right:-31px;
z-index:0;
text-indent:-5000px;
display:block;
width:31px;
height:52px;
margin-top:-2px;
}
}
@media (min-width: $screen-md) { // min 991px
&:after {
content:".";
position:absolute;
top:0;
right:-31px;
z-index:0;
text-indent:-5000px;
display:block;
width:31px;
height:52px;
margin-top:-2px;
}
}
&:focus {text-decoration:none; outline:none;}
}
@@ -1256,22 +1314,18 @@ ul.step {
&.first {
border-left-width:1px;
border-left-color:#b7b7b7;
/*min 480px*/
@media (min-width: $screen-xs) {
@include border-top-left-radius(4px);
@include border-bottom-left-radius(4px);
}
@media (min-width: $screen-xs) { //min 480px
@include border-top-left-radius(4px);
@include border-bottom-left-radius(4px);
}
span, a {
z-index:5;
padding-left:13px !important;
/*min 480px*/
@media (min-width: $screen-xs) {
@include border-top-left-radius(4px);
@include border-bottom-left-radius(4px);
}
@media (min-width: $screen-xs) { //min 480px
@include border-top-left-radius(4px);
@include border-bottom-left-radius(4px);
}
}
}
&.second {
@@ -1287,17 +1341,15 @@ ul.step {
span {
z-index:1;
}
/*min 480px*/
@media (min-width: $screen-xs) {
@include border-top-right-radius(4px);
@include border-bottom-right-radius(4px);
span {
@include border-top-right-radius(4px);
@include border-bottom-right-radius(4px);
}
}
@media (min-width: $screen-xs) { //min 480px
@include border-top-right-radius(4px);
@include border-bottom-right-radius(4px);
span {
@include border-top-right-radius(4px);
@include border-bottom-right-radius(4px);
}
}
}
&.step_current {
font-weight:bold;
@@ -1317,15 +1369,13 @@ ul.step {
border:1px solid;
border-color:#73ca77 #74c776 #74c175 #74c776;
position:relative;
/* min 991px */
@media (min-width: $screen-md) {
padding-left:38px;
&:after {
background:url(../img/order-step-a.png) right 0 no-repeat;
}
}
@media (min-width: $screen-md) { //min 991px
padding-left:38px;
&:after {
background:url(../img/order-step-a.png) right 0 no-repeat;
}
}
}
}
&.step_current_end {
@@ -1347,15 +1397,13 @@ ul.step {
border:1px solid;
border-color:#fff;
position:relative;
/* min 991px */
@media (min-width: $screen-md) {
padding-left:38px;
&:after {
background:url(../img/order-step-current.png) right 0 no-repeat;
}
}
@media (min-width: $screen-md) { // min 991px
padding-left:38px;
&:after {
background:url(../img/order-step-current.png) right 0 no-repeat;
}
}
}
}
&.step_done {
@@ -1374,45 +1422,40 @@ ul.step {
background: -ms-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: linear-gradient(to bottom, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#727171', endColorstr='#666666',GradientType=0 );
/* min 991px */
@media (min-width: $screen-md) {
padding-left:38px;
&:after {
background:url(../img/order-step-done.png) right 0 no-repeat;
}
}
@media (min-width: $screen-md) { // min 991px */
padding-left:38px;
&:after {
background:url(../img/order-step-done.png) right 0 no-repeat;
}
}
}
}
&.step_done.step_done_last {
/* min 991px */
@media (min-width: $screen-md) {
a:after {
background:url(../img/order-step-done-last.png) right 0 no-repeat;
}
}
@media (min-width: $screen-md) { // min 991px
a:after {
background:url(../img/order-step-done-last.png) right 0 no-repeat;
}
}
}
&#step_end {
span {
/* min 991px */
@media (min-width: $screen-md) {
&:after {
display:none;
}
}
@media (min-width: $screen-md) { // min 991px
&:after {
display:none;
}
}
}
}
em {
font-style:normal;
/* min 480px max 767px */
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) {
display:none;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
display:none;
}
}
}
}
@@ -1502,6 +1545,9 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
.shop-phone {
display:block;
padding:5px 0 10px;
@media (max-width: $screen-xs-max) { // max 767px
display:none;
}
i {
font-size:21px;
@@ -1512,16 +1558,23 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
strong {color:#fff;}
}
#header_user_info {
float:right;
border-left:1px solid #515151;
border-right:1px solid #515151;
@media (max-width: $screen-xs - 1) { // max 479px
width:25%;
text-align:center;
}
a {
color:#fff;
font-weight:bold;
display:block;
padding:8px 9px 11px 8px;
@media (max-width: $screen-xs - 1) { // max 479px
font-size:11px;
}
}
}
}
@@ -1530,7 +1583,22 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
position: absolute;
left:0;
top: 27px;
z-index: 1;
z-index: 1;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:250px;
top:35px;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
width:174px;
left:15px;
top:48px;
}
@media (max-width: $screen-xs - 1) { // max 479px
width:200px;
left:50%;
margin-left:-100px;
top:20px;
}
}
#header_right {
position:relative;
@@ -1540,7 +1608,10 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
float:right;
border-left:1px solid #515151;
position:relative;
@media (max-width: $screen-xs - 1) { // max 479px
width:25%;
}
span.firstWord {display:none;}
div.current {
@@ -1548,7 +1619,11 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
padding:8px 10px 10px 10px;
color:#fff;
text-shadow:1px 1px rgba(0,0,0,0.2);
@media (max-width: $screen-xs - 1) { // max 479px
text-align:center;
padding:9px 5px 10px;
font-size:11px;
}
strong {
color:#777777;
}
@@ -1561,7 +1636,18 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
color:#686666;
vertical-align:-2px;
padding-left:12px;
@media (max-width: $screen-xs - 1) { // max 479px
padding-left:2px;
font-size:13px;
line-height:13px;
vertical-align:0;
}
}
.cur-label {
@media (max-width: $screen-xs - 1) { // max 479px
display:none;
}
}
}
ul {
@@ -1588,31 +1674,33 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
background:#484848;
}
}
&:hover {display:block;}
}
}
#contact-link {
float:right;
border-left:1px solid #515151;
@media (max-width: $screen-xs - 1) { // max 479px
width:25%;
text-align:center;
}
a {
display:block;
color:#FFF;
font-weight:bold;
padding:8px 10px 11px 10px;
text-shadow:1px 1px rgba(0,0,0,0.2);
text-shadow:1px 1px rgba(0,0,0,0.2);
@media (max-width: $screen-xs - 1) { // max 479px
font-size:11px;
padding-left:5px;
padding-right:5px;
}
}
}
#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;
}
}
}
}
@@ -1690,7 +1778,9 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
************************************************************************************************ */
.footer-container {
padding:0 0 100px 0;
background:url(../img/footer-bg.gif) repeat-x;
@media (min-width: $screen-sm) { // min 768px
background:url(../img/footer-bg.gif) repeat-x;
}
#footer {
color:#777;
@@ -1727,8 +1817,14 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
#block_contact_infos {
border-left:1px solid #515151;
@media (max-width: $screen-xs-max) { // max 767px
border:none;
}
> div {
padding:0 0 0 5px;
@media (max-width: $screen-xs-max) { // max 767px
padding-left:0;
}
ul {
@@ -1751,10 +1847,18 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
#social_block {
float:left;
width:50%;
padding:23px 30px 0 0;
padding:23px 30px 16px 0;
background:#3F3F3F;
@media (max-width: $screen-xs-max) { // max 767px
width:100%;
float:left;
padding-top:5px;
}
ul {
float:right;
@media (max-width: $screen-xs-max) { // max 767px
float:none;
}
li {
float:left;
@@ -1803,7 +1907,11 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
font-size:21px;
line-height:25px;
text-transform:none;
padding:0 10px 0 0;
padding:0 10px 0 0;
@media (max-width: $screen-xs-max) { // max 767px
display:none;
text-align:center;
}
}
}
.bottom-footer {
@@ -2301,6 +2409,21 @@ p.cheque-indent {
}
}
}
.gender-line {
margin-bottom:4px;
padding-top:4px;
> label {
margin-right:10px;
margin-bottom:0;
}
.radio-inline {
label {
font-weight:normal;
color:#777;
}
}
}
}
#identity, #authentication, #order-opc {
#center_column {
@@ -2502,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;
@@ -2516,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/history.scss
+3 -1
View File
@@ -36,7 +36,9 @@
margin-left:14px;
}
}
td.step-by-step-date {
width:105px;
}
tfoot {
strong {
themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+8
View File
@@ -128,6 +128,14 @@
width: 270px;
background:#484848;
color:#fff;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
top:69px;
}
@media (max-width: $screen-xs - 1) { // max 479px
top:44px;
left:50%;
margin-left:270px/2*-1;
}
a {
color:#fff;
themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
+4
View File
@@ -104,6 +104,10 @@
.layered_filter_ul {
padding:0 20px 5px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
padding-left:0;
padding-right:0;
}
li {
padding-bottom:7px;
themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+9 -1
View File
@@ -9,6 +9,10 @@
max-width:222px;
display:inline-block;
margin-right:6px;
@media (min-width: $screen-sm) and (max-width: $screen-md-max) { // min 768px max 1199px
margin-bottom:10px;
margin-right:0;
}
}
}
@@ -35,6 +39,10 @@
float:left;
padding:13px 15px 7px 15px;
margin-bottom:0;
@media (max-width: $screen-xs-max) { // max 767px
background:#3F3F3F;
width:100%;
}
h4 {
background:none;
@@ -43,7 +51,7 @@
text-transform:none;
font-size:21px;
line-height:25px;
border:none;
border:none;
}
.block_content {overflow:hidden;}
themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss
+26 -1
View File
@@ -3,7 +3,23 @@
#search_block_top {
position:absolute;
right: 420px;
top: 50px;
top: 50px;
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
right:295px;
}
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
right:207px;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
right:0;
top:85px;
}
@media (max-width: $screen-xs - 1) { // max 479px
top:56px;
right:50%;
width:270px;
margin-right:270px/2*-1;
}
.btn.button-search {
background:#333;
@@ -33,6 +49,15 @@
background:#fbfbfb;
float: left;
margin-right:1px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:180px;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
width:212px;
}
@media (max-width: $screen-xs - 1) { // max 479px
width:212px;
}
}
}
.ac_results {
themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss
+7 -1
View File
@@ -16,6 +16,12 @@
width: 100%;
border-bottom: 3px solid #e9e9e9;
background: #f6f6f6;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:80px;
}
@media (max-width: $screen-xs - 1) { // max 479px
margin-top:70px;
}
}
.sf-menu ul {
position: absolute;
@@ -46,7 +52,7 @@
border-bottom: 3px solid #e9e9e9;
}
&.sfHover > a, > a:hover, &.sfHoverForce a {
&.sfHover > a, > a:hover, &.sfHoverForce > a {
background: #333;
border-bottom-color: #666666;
color: #fff;
themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
+21 -1
View File
@@ -1,3 +1,4 @@
@import '../../_theme_variables';
/* block top user information */
#header_right {
@@ -6,17 +7,36 @@
clear:both;
float: right;
margin-top:50px;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:25px;
}
@media (max-width: $screen-xs - 1) { // max 479px
float: none;
margin-left: auto;
margin-right: auto;
margin-top: 95px;
width: 270px;
}
#shopping_cart {
a {
padding:7px 10px 14px 16px;
background:#333333;
min-width: 270px;/* 200 */
min-width: 270px;
display:block;
font-weight:bold;
color:#777777;
text-shadow:1px 1px rgba(0,0,0,0.2);
overflow:hidden;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
min-width:190px;
}
span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
display:none !important;
}
}
b {
color:#fff;
themes/default-bootstrap/sass/product_list.scss
+53 -25
View File
@@ -45,6 +45,11 @@ ul.product_list {
}
}
.product-image-container {
text-align:center;
img {
margin:0 auto;
}
.quick-view {
font:700 13px/16px Arial, Helvetica, sans-serif;
@@ -81,6 +86,7 @@ ul.product_list.grid {
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
width:50%;
float:left;
}
.product-container {
@@ -175,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:"";
}
}
}
}
}
}
}
@@ -329,6 +335,9 @@ ul.product_list.list {
}
}
.functional-buttons {
@media (min-width: $screen-md) { // min 991px
overflow:hidden;
}
@media (max-width: $screen-sm-max) { // max 991px
clear:both;
@@ -389,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;
}
@@ -400,6 +409,14 @@ ul.product_list.list {
background:#333333;
}
}
&.checked {
&:before {
background:#fff;
border:1px solid #929292;
color:#929292;
padding-top:5px;
}
}
}
}
}
@@ -432,15 +449,26 @@ ul.product_list.list {
#index {
ul.product_list.tab-pane {
> li {
padding-bottom:35px;
margin-bottom:50px;
padding-bottom:10px;
margin-bottom:10px;
@media (min-width: $screen-lg) { /* min 1200px */
padding-bottom:35px;
margin-bottom:50px;
}
.availability {display:none;}
&.last-line {
border:none;
padding-bottom:0;
margin-bottom:0;
@media (min-width: $screen-lg) { // min 1200px
&.last-line {
border:none;
padding-bottom:0;
margin-bottom:0;
}
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
&.first-item-of-tablet-line {clear:none;}
&.first-item-of-mobile-line {clear:left;}
}
}
}
themes/default-bootstrap/shopping-cart-product-line.tpl
+2
View File
@@ -52,6 +52,7 @@
{/if}
</span>
</td>
{if !isset($cannotModify)}
<td class="cart_quantity {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} text-center{/if}">
{if isset($cannotModify) AND $cannotModify == 1}
<span>
@@ -83,6 +84,7 @@
{/if}
{/if}
</td>
{/if}
<td class="cart_total">
<span class="price" id="total_product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
{if !empty($product.gift)}
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>