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
This commit is contained in:
Jerome Nadaud
2013-10-08 18:42:19 +02:00
parent d88857610d f2c6887497
commit b9cfc24922
23 changed files with 756 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+4 -4
View File
@@ -1510,7 +1510,7 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i
display: block;
width: 100%;
height: 27px;
padding: 4px 12px;
padding: 4px 8px;
font-size: 12px;
line-height: 1.42857;
color: #555555;
@@ -1732,7 +1732,7 @@ textarea.input-lg, .input-group-lg > textarea, .input-group-lg > textarea.input-
/* line 10, ../bower_components/sass-bootstrap/lib/_buttons.scss */
.btn {
display: inline-block;
padding: 4px 12px;
padding: 4px 8px;
margin-bottom: 0;
font-size: 12px;
font-weight: normal;
@@ -3170,7 +3170,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
/* line 59, ../bower_components/sass-bootstrap/lib/_input-groups.scss */
.input-group-addon {
padding: 4px 12px;
padding: 4px 8px;
font-size: 12px;
font-weight: normal;
line-height: 1;
@@ -3842,7 +3842,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.pagination > li > a, .pagination > li > span {
position: relative;
float: left;
padding: 4px 12px;
padding: 4px 8px;
line-height: 1.42857;
text-decoration: none;
background-color: white;
admin-dev/themes/default/css/bootstrap/_variables.scss
+1 -1
View File
@@ -64,7 +64,7 @@ $headings-font-weight: 300 ;
// Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 4px ;
// $padding-base-horizontal: 12px ;
$padding-base-horizontal: 8px ;
// $padding-large-vertical: 14px ;
// $padding-large-horizontal: 16px ;
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+6 -6
View File
@@ -63,25 +63,25 @@
</section>
<section class="dash_links panel">
<h4><i class="icon-link"></i>{l s="Useful PrestaShop Links"}</h4>
<h4><i class="icon-link"></i> {l s="Useful PrestaShop Links"}</h4>
<dl>
<dt>{l s="Discover the latest official documentation :"}</dt>
<dt>{l s="Discover the official documentation"}</dt>
<dd><a href="http://doc.prestashop.com/display/PS16?utm_source=backoffice_dashboard" target="_blank">{l s="Go to doc.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="Use the PrestaShop forum & discover a great community :"}</dt>
<dt>{l s="Use the forum & discover a great community"}</dt>
<dd><a href="http://www.prestashop.com/forums?utm_source=backoffice_dashboard" target="_blank">{l s="Go to forums.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="Enhance your Shop with new templates & modules :"}</dt>
<dt>{l s="Enhance your Shop with new templates & modules"}</dt>
<dd><a href="http://addons.prestashop.com?utm_source=backoffice_dashboard" target="_blank">{l s="Go to addons.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="PrestaShop BugTracker :"}</dt>
<dt>{l s="Report issues in the Bug Tracker"}</dt>
<dd><a href="http://forge.prestashop.com?utm_source=backoffice_dashboard" target="_blank">{l s="Go to forge.prestashop.com"}</a></dd>
</dl>
<dl>
<dt>{l s="Contact US :"}</dt>
<dt>{l s="Contact Us"}</dt>
<dd><a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_dashboard" target="_blank">{l s="Go to prestashop.com"}</a></dd>
</dl>
</section>
admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+2 -2
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="form-horizontal">
<div class="form-horizontal well">
<div class="form-group">
<label class="control-label col-lg-3">
{l s='Name'}
@@ -95,7 +95,7 @@
</div>
{/if}
<div class="form-group">
<div class="row">
<div class="col-lg-9 col-lg-offset-3">
<button class="btn btn-default" type="button" id="cancel_add_voucher">
<i class="icon-remove text-danger"></i>
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+2 -2
View File
@@ -48,7 +48,7 @@
</td>
<td style="display:none;">
<div class="form-group">
<div class="row">
<div class="input-group fixed-width-xl">
<div class="input-group-addon">
{$currency->sign}
@@ -57,7 +57,7 @@
<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
</div>
</div>
<div class="form-group">
<div class="row">
<div class="input-group fixed-width-xl">
<div class="input-group-addon">
{$currency->sign}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+595 -571
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+1 -1
View File
@@ -242,7 +242,7 @@
<p>
<span >
{l s='Your product will be saved as a draft.'}</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview.'}</a></span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview'}</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</p>
</div>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+15 -8
View File
@@ -152,10 +152,8 @@
if (submited)
return false;
submited = true;
//add hidden input to emulate submit button click when posting the form -> field name posted
btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
$('#{$table}_form').submit();
return false;
});
@@ -165,7 +163,6 @@
btn_save_and_stay.click(function() {
//add hidden input to emulate submit button click when posting the form -> field name posted
btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
$('#{$table}_form').submit();
return false;
});
@@ -265,11 +262,21 @@
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
</select>
{elseif $params.type == 'date' || $params.type == 'datetime'}
<div class="date_range form-group">
<label>{l s='From'}</label>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
<label>{l s='To'}</label>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
<div class="date_range row">
<div class="input-group fixed-width-xl">
<span class="input-group-addon">{l s='From'}</span>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"/>
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
<div class="input-group fixed-width-xl">
<span class="input-group-addon">{l s='To'}</span>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"/>
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
</div>
{elseif $params.type == 'select'}
{if isset($params.filter_key)}
classes/controller/FrontController.php
+44 -1
View File
@@ -337,7 +337,8 @@ class FrontControllerCore extends Controller
'PS_CATALOG_MODE' => (bool)Configuration::get('PS_CATALOG_MODE') || !(bool)Group::getCurrent()->show_prices,
'b2b_enable' => (bool)Configuration::get('PS_B2B_ENABLE'),
'request' => $link->getPaginationLink(false, false, false, true),
'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT')
'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT'),
'quick_view' => Configuration::get('PS_QUICK_VIEW'),
));
// Add the tpl files directory for mobile
@@ -740,6 +741,12 @@ class FrontControllerCore extends Controller
}
if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
if (Configuration::get('PS_QUICK_VIEW'))
{
$this->addjqueryPlugin('fancybox');
$this->addJS(_THEME_JS_DIR_.'quick-view.js');
}
// Execute Hook FrontController SetMedia
Hook::exec('actionFrontControllerSetMedia', array());
@@ -1142,4 +1149,40 @@ class FrontControllerCore extends Controller
'logo_url' => $logo
);
}
protected function addColorsToProductList(&$products)
{
if (!count($products))
return;
$products_need_cache = array();
foreach ($products as &$product)
if (!$this->isCached(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product'])))
$products_need_cache[] = (int)$product['id_product'];
$colors = false;
if (count($products_need_cache))
$colors = Product::getAttributesColorList($products_need_cache);
Tools::enableCache();
foreach ($products as &$product)
{
$tpl = $this->context->smarty->createTemplate(_PS_THEME_DIR_.'product-list-colors.tpl');
if (isset($colors[$product['id_product']]))
$tpl->assign(array(
'id_product' => $product['id_product'],
'colors_list' => $colors[$product['id_product']]
));
if (!in_array($product['id_product'], $products_need_cache) || isset($colors[$product['id_product']]))
$product['color_list'] = $tpl->fetch(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product']));
else
$product['color_list'] = '';
}
Tools::restoreCacheSettings();
}
protected function getColorsListCacheId($id_product)
{
return 'productlist_colors|'.(int)$id_product.'|'.$this->context->shop->id;
}
}
controllers/admin/AdminDashboardController.php
+1 -1
View File
@@ -149,7 +149,7 @@ class AdminDashboardControllerCore extends AdminController
'translations' => $translations,
'action' => '#',
'warning' => $this->getWarningDomainName(),
'new_version_url' => Tools::getCurrentUrlProtocolPrefix().'api.dev.prestashop.com/version/check_version.php?v='._PS_VERSION_.'&l='.$this->context->language->iso_code,
'new_version_url' => Tools::getCurrentUrlProtocolPrefix().'api.prestashop.com/version/check_version.php?v='._PS_VERSION_.'&lang='.$this->context->language->iso_code,
'dashboard_use_push' => Configuration::get('PS_DASHBOARD_USE_PUSH'),
'datepickerFrom' => Tools::getValue('datepickerFrom', $this->context->employee->stats_date_from),
'datepickerTo' => Tools::getValue('datepickerTo', $this->context->employee->stats_date_to)
controllers/admin/AdminProductsController.php
+6 -6
View File
@@ -2423,7 +2423,7 @@ class AdminProductsControllerCore extends AdminController
<span style="float: left">
'.$this->l('Your product will be saved as a draft.').'
</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview.').'</a></span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
<br class="clear" />
</p>
@@ -2506,7 +2506,7 @@ class AdminProductsControllerCore extends AdminController
$this->toolbar_btn['delete'] = array(
'short' => 'Delete',
'href' => $this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;deleteproduct',
'desc' => $this->l('Delete this product.'),
'desc' => $this->l('Delete this product'),
'confirm' => 1,
'js' => 'if (confirm(\''.$this->l('Delete product?').'\')){return true;}else{event.preventDefault();}'
);
@@ -2614,7 +2614,7 @@ class AdminProductsControllerCore extends AdminController
{
$this->product_exists_in_shop = false;
if ($this->tab_display == 'Informations')
$this->displayWarning($this->l('Warning: The product does not exist in this shop.'));
$this->displayWarning($this->l('Warning: The product does not exist in this shop'));
$default_product = new Product();
$definition = ObjectModel::getDefinition($product);
@@ -2771,7 +2771,7 @@ class AdminProductsControllerCore extends AdminController
);
if ($id_currency <= 0 || ( !($result = Currency::getCurrency($id_currency)) || empty($result) ))
$this->errors[] = Tools::displayError($this->l('The selected currency is not valid.'));
$this->errors[] = Tools::displayError('The selected currency is not valid');
// Save product-supplier data
$product_supplier_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier);
@@ -3177,7 +3177,7 @@ class AdminProductsControllerCore extends AdminController
if (!file_exists($exists_file)
&& !empty($product->productDownload->display_filename)
&& empty($product->cache_default_attribute))
$msg = sprintf(Tools::displayError('This file "%s" is missing.'), $product->productDownload->display_filename);
$msg = sprintf(Tools::displayError('This file "%s" is missing'), $product->productDownload->display_filename);
else
$msg = '';
@@ -4383,7 +4383,7 @@ class AdminProductsControllerCore extends AdminController
<span>
'.$this->l('Your product will be saved as a draft.').'
</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview.').'</a></span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</p>
</div>';
controllers/front/CategoryController.php
+2 -31
View File
@@ -199,45 +199,16 @@ class CategoryControllerCore extends FrontController
// Pagination must be call after "getProducts"
$this->pagination($this->nbProducts);
$products_need_cache = array();
foreach ($this->cat_products as &$product)
{
if ($product['id_product_attribute'] && isset($product['product_attribute_minimal_quantity']))
$product['minimal_quantity'] = $product['product_attribute_minimal_quantity'];
if (!$this->isCached(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product'])))
$products_need_cache[] = (int)$product['id_product'];
}
unset($product);
$colors = false;
if (count($products_need_cache))
$colors = Product::getAttributesColorList($products_need_cache);
Tools::enableCache();
foreach ($this->cat_products as &$product)
{
$tpl = $this->context->smarty->createTemplate(_PS_THEME_DIR_.'product-list-colors.tpl');
if (isset($colors[$product['id_product']]))
$tpl->assign(array(
'id_product' => $product['id_product'],
'colors_list' => $colors[$product['id_product']]
));
if (!in_array($product['id_product'], $products_need_cache) || isset($colors[$product['id_product']]))
$product['color_list'] = $tpl->fetch(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product']));
else
$product['color_list'] = '';
}
Tools::restoreCacheSettings();
$this->addColorsToProductList($this->cat_products);
$this->context->smarty->assign('nb_products', $this->nbProducts);
}
protected function getColorsListCacheId($id_product)
{
return 'productlist_colors|'.(int)$id_product.'|'.$this->context->shop->id;
}
/**
* Get instance of current category
*/
controllers/front/ManufacturerController.php
+5 -1
View File
@@ -97,9 +97,13 @@ class ManufacturerControllerCore extends FrontController
$this->manufacturer->description = Tools::nl2br(trim($this->manufacturer->description));
$nbProducts = $this->manufacturer->getProducts($this->manufacturer->id, null, null, null, $this->orderBy, $this->orderWay, true);
$this->pagination((int)$nbProducts);
$products = $this->manufacturer->getProducts($this->manufacturer->id, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay);
$this->addColorsToProductList($products);
$this->context->smarty->assign(array(
'nb_products' => $nbProducts,
'products' => $this->manufacturer->getProducts($this->manufacturer->id, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
'products' => $products,
'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''),
'manufacturer' => $this->manufacturer,
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
controllers/front/SearchController.php
+11 -2
View File
@@ -75,6 +75,9 @@ class SearchControllerCore extends FrontController
Hook::exec('actionSearch', array('expr' => $query, 'total' => $search['total']));
$nbProducts = $search['total'];
$this->pagination($nbProducts);
$this->addColorsToProductList($search['result']);
$this->context->smarty->assign(array(
'products' => $search['result'], // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
'search_products' => $search['result'],
@@ -83,7 +86,7 @@ class SearchControllerCore extends FrontController
'instant_search' => $this->instant_search,
'homeSize' => Image::getSize(ImageType::getFormatedName('home'))));
}
else if (($query = Tools::getValue('search_query', Tools::getValue('ref'))) && !is_array($query))
elseif (($query = Tools::getValue('search_query', Tools::getValue('ref'))) && !is_array($query))
{
$this->productSort();
$this->n = abs((int)(Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE'))));
@@ -93,6 +96,9 @@ class SearchControllerCore extends FrontController
Hook::exec('actionSearch', array('expr' => $query, 'total' => $search['total']));
$nbProducts = $search['total'];
$this->pagination($nbProducts);
$this->addColorsToProductList($search['result']);
$this->context->smarty->assign(array(
'products' => $search['result'], // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
'search_products' => $search['result'],
@@ -100,12 +106,15 @@ class SearchControllerCore extends FrontController
'search_query' => $query,
'homeSize' => Image::getSize(ImageType::getFormatedName('home'))));
}
else if (($tag = urldecode(Tools::getValue('tag'))) && !is_array($tag))
elseif (($tag = urldecode(Tools::getValue('tag'))) && !is_array($tag))
{
$nbProducts = (int)(Search::searchTag($this->context->language->id, $tag, true));
$this->pagination($nbProducts);
$result = Search::searchTag($this->context->language->id, $tag, false, $this->p, $this->n, $this->orderBy, $this->orderWay);
Hook::exec('actionSearch', array('expr' => $tag, 'total' => count($result)));
$this->addColorsToProductList($search['result']);
$this->context->smarty->assign(array(
'search_tag' => $tag,
'products' => $result, // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
controllers/front/SupplierController.php
+5 -1
View File
@@ -99,9 +99,13 @@ class SupplierControllerCore extends FrontController
$this->supplier->description = Tools::nl2br(trim($this->supplier->description));
$nbProducts = $this->supplier->getProducts($this->supplier->id, null, null, null, $this->orderBy, $this->orderWay, true);
$this->pagination((int)$nbProducts);
$products = $this->supplier->getProducts($this->supplier->id, $this->context->cookie->id_lang, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay);
$this->addColorsToProductList($products);
$this->context->smarty->assign(array(
'nb_products' => $nbProducts,
'products' => $this->supplier->getProducts($this->supplier->id, $this->context->cookie->id_lang, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
'products' => $products,
'path' => ($this->supplier->active ? Tools::safeOutput($this->supplier->name) : ''),
'supplier' => $this->supplier,
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
install-dev/classes/languages.php
+10 -1
View File
@@ -65,6 +65,7 @@ class InstallLanguages
foreach (scandir(_PS_INSTALL_LANGS_PATH_) as $lang)
if ($lang[0] != '.' && is_dir(_PS_INSTALL_LANGS_PATH_.$lang) && $lang != self::DEFAULT_ISO && file_exists(_PS_INSTALL_LANGS_PATH_.$lang.'/install.php'))
$this->languages[$lang] = new InstallLanguage($lang);
uasort($this->languages, 'ps_usort_languages');
}
/**
@@ -76,7 +77,6 @@ class InstallLanguages
{
if (!in_array($iso, $this->getIsoList()))
throw new PrestashopInstallerException('Language '.$iso.' not found');
$this->language = $iso;
}
@@ -202,3 +202,12 @@ class InstallLanguages
return false;
}
}
function ps_usort_languages($a, $b)
{
$aname = $a->getMetaInformation('name');
$bname = $b->getMetaInformation('name');
if ($aname == $bname)
return 0;
return ($aname < $bname) ? -1 : 1;
}
install-dev/theme/js/welcome.js
+1 -1
View File
@@ -1,7 +1,7 @@
$(document).ready(function()
{
// Submit change of language
$('#langList li input').click(function()
$('#langList').change(function()
{
var form = $('#mainForm');
form.attr('action', form.attr('action')+'#licenses-agreement');
install-dev/theme/view.css
+1 -1
View File
@@ -443,7 +443,7 @@ ul#footer a:link, ul#footer a:active, ul#footer a:visited {
#formSetMethod {padding-bottom:20px;}
#formSetMethod p {padding-bottom:0;}
ul#langList {list-style-type:none;}
#langList {margin-bottom:20px}
/* ETAPE 2 - required ******************************************************* */
#sheet_system #req_bt_refresh {float:right;}
install-dev/theme/views/welcome.phtml
+6 -14
View File
@@ -19,22 +19,14 @@
<!-- List of languages -->
<?php if (count($this->language->getIsoList()) > 1): ?>
<h2><?php echo $this->l('Continue the installation in:') ?></h2>
<ul id="langList" style="line-height: 20px;">
<h3><?php echo $this->l('Continue the installation in:') ?></h3>
<select id="langList" name="language">
<?php foreach ($this->language->getIsoList() as $iso): ?>
<li>
<label>
<input type="radio" value="<?php echo $iso ?>" <?php echo ($iso == $this->language->getLanguageIso()) ? 'checked="checked"' : '' ?> name="language" style="vertical-align: middle; margin-right: 0;" />
<?php if (file_exists(_PS_INSTALL_LANGS_PATH_.$iso.'/flag.jpg')): ?>
<img src="langs/<?php echo $iso ?>/flag.jpg" alt="<?php echo $iso ?>" style="vertical-align: middle;" />
<?php else: ?>
<img src="theme/img/noflag.jpg" alt="<?php echo $iso ?>" style="vertical-align: middle;" />
<?php endif; ?>
<?php echo $this->language->getLanguage($iso)->getMetaInformation('name') ?>
</label>
</li>
<option value="<?php echo $iso ?>" <?php if ($iso == $this->language->getLanguageIso()) echo 'selected="selected"' ?>>
<?php echo $this->language->getLanguage($iso)->getMetaInformation('name') ?>
</option>
<?php endforeach; ?>
</ul>
</select>
<?php endif; ?>
<p><?php echo $this->l('The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!', 55); ?> </p>
modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+2 -2
View File
@@ -86,7 +86,7 @@
{/if}
{if $DASHACTIVITY_SHOW_NOTIFICATION}
<section id="dash_notifications" class="loading">
<header><i class="icon-exclamation-sign"></i> {l s='Notification'}</header>
<header><i class="icon-exclamation-sign"></i> {l s='Notifications'}</header>
<ul class="data_list_vertical">
<li>
<span class="data_label">{l s='New Messages'}</span>
@@ -95,7 +95,7 @@
</span>
</li>
<li>
<span class="data_label">{l s='Order Inquires'}</span>
<span class="data_label">{l s='Order Inquiries'}</span>
<span class="data_value size_l">
<span id="order_inquires"></span>
</span>
modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
<section id="dashtrends" class="panel widget">
<header class="panel-heading">
<i class="icon-bar-chart"></i> {l s='Score Trends'}
<i class="icon-bar-chart"></i> {l s='Dashboard'}
<span class="panel-heading-action">
<a class="list-tooolbar-btn" href="javascript:void(0);" title="configure">
<i class="process-icon-configure"></i>
themes/default/js/quick-view.js
+33
View File
@@ -0,0 +1,33 @@
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
$(document).ready(function() {
$('.quick-view').hover(function() {
$.fancybox({
'type': 'iframe',
'href': this.href+'&content_only=1'
});
});
});
themes/default/product-list.tpl
+2 -2
View File
@@ -37,13 +37,13 @@
{/if}
</div>
<div class="center_block">
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}">
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link {if $quick_view}quick-view{/if}" title="{$product.name|escape:'htmlall':'UTF-8'}" data-toto="fuck">
<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}
</a>
<h3>{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h3>
<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}" >{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}</a></p>
{$product.color_list}
{if isset($product.color_list)}{$product.color_list}{/if}
</div>
<div class="right_block">
{if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="on_sale">{l s='On sale!'}</span>