Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts: admin-dev/themes/default/css/modules.css admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl admin-dev/themes/default/template/controllers/products/images.tpl admin-dev/themes/default/template/controllers/products/prices.tpl admin-dev/themes/default/template/helpers/form/form.tpl admin-dev/themes/default/template/helpers/list/list_header.tpl classes/Autoload.php classes/Carrier.php classes/Product.php classes/ProductSale.php classes/Tools.php classes/Validate.php classes/tax/TaxRulesTaxManager.php controllers/admin/AdminPPreferencesController.php controllers/admin/AdminPerformanceController.php install-dev/install_version.php js/admin_carrier_wizard.js modules/blockcategories/blockcategories.php modules/blocklayered/blocklayered.php modules/statsequipment/statsequipment.php modules/statsproduct/statsproduct.php modules/watermark/watermark.php themes/default/address.tpl themes/default/authentication.tpl themes/default/category.tpl themes/default/contact-form.tpl themes/default/css/history.css themes/default/header.tpl themes/default/js/cart-summary.js themes/default/js/product.js themes/default/mobile/order-detail.tpl themes/default/modules/blocksearch/blocksearch.tpl themes/default/modules/productcomments/productcomments.tpl themes/default/order-carrier.tpl themes/default/order-detail.tpl themes/default/order-opc-new-account.tpl themes/default/product.tpl
This commit is contained in:
Kevin Granger
@@ -0,0 +1,41 @@
|
||||
{*
|
||||
* 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
|
||||
*}
|
||||
|
||||
<!-- Block search module -->
|
||||
<div id="search_block_left" class="block exclusive">
|
||||
<p class="title_block">{l s='Search' mod='blocksearch'}</p>
|
||||
<form method="get" action="{$link->getPageLink('search', true)|escape:'html'}" id="searchbox">
|
||||
<p class="block_content">
|
||||
<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>
|
||||
<input type="hidden" name="orderby" value="position" />
|
||||
<input type="hidden" name="controller" value="search" />
|
||||
<input type="hidden" name="orderway" value="desc" />
|
||||
<input class="search_query" type="text" id="search_query_block" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'|stripslashes}" />
|
||||
<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
{include file="$self/blocksearch-instantsearch.tpl"}
|
||||
<!-- /Block search module -->
|
||||
@@ -0,0 +1,160 @@
|
||||
{*
|
||||
* 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
|
||||
*}
|
||||
<script type="text/javascript">
|
||||
var productcomments_controller_url = '{$productcomments_controller_url}';
|
||||
var confirm_report_message = '{l s='Are you sure you want report this comment?' mod='productcomments' js=1}';
|
||||
var secure_key = '{$secure_key}';
|
||||
var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
|
||||
var productcomment_added = '{l s='Your comment has been added!' mod='productcomments' js=1}';
|
||||
var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments' js=1}';
|
||||
var productcomment_title = '{l s='New comment' mod='productcomments' js=1}';
|
||||
var productcomment_ok = '{l s='OK' mod='productcomments' js=1}';
|
||||
var moderation_active = {$moderation_active};
|
||||
</script>
|
||||
|
||||
<div id="idTab5">
|
||||
<div id="product_comments_block_tab">
|
||||
{if $comments}
|
||||
{foreach from=$comments item=comment}
|
||||
{if $comment.content}
|
||||
<div class="comment clearfix">
|
||||
<div class="comment_author">
|
||||
<span>{l s='Grade' mod='productcomments'} </span>
|
||||
<div class="star_content clearfix">
|
||||
{section name="i" start=0 loop=5 step=1}
|
||||
{if $comment.grade le $smarty.section.i.index}
|
||||
<div class="star"></div>
|
||||
{else}
|
||||
<div class="star star_on"></div>
|
||||
{/if}
|
||||
{/section}
|
||||
</div>
|
||||
<div class="comment_author_infos">
|
||||
<strong>{$comment.customer_name|escape:'html':'UTF-8'}</strong><br/>
|
||||
<em>{dateFormat date=$comment.date_add|escape:'html':'UTF-8' full=0}</em>
|
||||
</div>
|
||||
</div>
|
||||
<div class="comment_details">
|
||||
<p class="title_block">{$comment.title}</p>
|
||||
<p>{$comment.content|escape:'html':'UTF-8'|nl2br}</p>
|
||||
<ul>
|
||||
{if $comment.total_advice > 0}
|
||||
<li>{l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful,$comment.total_advice] mod='productcomments'}</li>
|
||||
{/if}
|
||||
{if $logged == 1}
|
||||
{if !$comment.customer_advice}
|
||||
<li>{l s='Was this comment useful to you?' mod='productcomments'}<button class="usefulness_btn" data-is-usefull="1" data-id-product-comment="{$comment.id_product_comment}">{l s='yes' mod='productcomments'}</button><button class="usefulness_btn" data-is-usefull="0" data-id-product-comment="{$comment.id_product_comment}">{l s='no' mod='productcomments'}</button></li>
|
||||
{/if}
|
||||
{if !$comment.customer_report}
|
||||
<li><span class="report_btn" data-id-product-comment="{$comment.id_product_comment}">{l s='Report abuse' mod='productcomments'}</span></li>
|
||||
{/if}
|
||||
{/if}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{if (!$too_early AND ($logged OR $allow_guests))}
|
||||
<p class="align_center">
|
||||
<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Write your review' mod='productcomments'} !</a>
|
||||
</p>
|
||||
{/if}
|
||||
{else}
|
||||
{if (!$too_early AND ($logged OR $allow_guests))}
|
||||
<p class="align_center">
|
||||
<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Be the first to write your review' mod='productcomments'} !</a>
|
||||
</p>
|
||||
{else}
|
||||
<p class="align_center">{l s='No customer comments for the moment.' mod='productcomments'}</p>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
{if isset($product) && $product}
|
||||
<!-- Fancybox -->
|
||||
<div style="display: none;">
|
||||
<div id="new_comment_form">
|
||||
<form id="id_new_comment_form" action="#">
|
||||
<h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
|
||||
{if isset($product) && $product}
|
||||
<div class="product clearfix">
|
||||
<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
|
||||
<div class="product_desc">
|
||||
<p class="product_name"><strong>{$product->name}</strong></p>
|
||||
{$product->description_short}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="new_comment_form_content">
|
||||
<h2>{l s='Write your review' mod='productcomments'}</h2>
|
||||
|
||||
<div id="new_comment_form_error" class="error" style="display: none; padding: 15px 25px">
|
||||
<ul></ul>
|
||||
</div>
|
||||
|
||||
{if $criterions|@count > 0}
|
||||
<ul id="criterions_list">
|
||||
{foreach from=$criterions item='criterion'}
|
||||
<li>
|
||||
<label>{$criterion.name|escape:'html':'UTF-8'}:</label>
|
||||
<div class="star_content">
|
||||
<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="1" />
|
||||
<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="2" />
|
||||
<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="3" checked="checked" />
|
||||
<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="4" />
|
||||
<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="5" />
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
{/if}
|
||||
|
||||
<label for="comment_title">{l s='Title' mod='productcomments'}: <sup class="required">*</sup></label>
|
||||
<input id="comment_title" name="title" type="text" value=""/>
|
||||
|
||||
<label for="content">{l s='Comment' mod='productcomments'}: <sup class="required">*</sup></label>
|
||||
<textarea id="content" name="content"></textarea>
|
||||
|
||||
{if $allow_guests == true && $logged == 0}
|
||||
<label>{l s='Your name' mod='productcomments'}: <sup class="required">*</sup></label>
|
||||
<input id="commentCustomerName" name="customer_name" type="text" value=""/>
|
||||
{/if}
|
||||
|
||||
<div id="new_comment_form_footer">
|
||||
<input id="id_product_comment_send" name="id_product" type="hidden" value='{$id_product_comment_form}' />
|
||||
<p class="fl required"><sup>*</sup> {l s='Required fields' mod='productcomments'}</p>
|
||||
<p class="fr">
|
||||
<button id="submitNewMessage" name="submitMessage" type="submit">{l s='Send' mod='productcomments'}</button>
|
||||
{l s='or' mod='productcomments'} <a href="#" onclick="$.fancybox.close();">{l s='Cancel' mod='productcomments'}</a>
|
||||
</p>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
</form><!-- /end new_comment_form_content -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- End fancybox -->
|
||||
{/if}
|
||||
Reference in New Issue
Block a user