This commit is contained in:
Kevin Granger
2013-12-06 17:25:23 +01:00
6 changed files with 712 additions and 554 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
<form action="{$link->getPageLink('search')|escape:'html'}" method="post" class="std">
<fieldset>
<div>
<label for="search">{l s='Search our product catalog:'}</label>
<label for="search_query">{l s='Search our product catalog:'}</label>
<input id="search_query" name="search_query" type="text" class="form-control grey" />
<button type="submit" name="Submit" value="OK" class="btn btn-default button button-small"><span>{l s='Ok'}</span></button>
</div>
+72 -57
View File
@@ -25,46 +25,61 @@
{capture name=path}{l s='Contact'}{/capture}
<h1 class="page-heading bottom-indent">{l s='Customer service'} - {if isset($customerThread) && $customerThread}{l s='Your reply'}{else}{l s='Contact us'}{/if}</h1>
<h1 class="page-heading bottom-indent">
{l s='Customer service'} - {if isset($customerThread) && $customerThread}{l s='Your reply'}{else}{l s='Contact us'}{/if}
</h1>
{if isset($confirmation)}
<p class="alert alert-success">{l s='Your message has been successfully sent to our team.'}</p>
<ul class="footer_links">
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i>{l s='Home'}</span></a></li>
<li>
<a class="btn btn-default button button-small" href="{$base_dir}">
<span>
<i class="icon-chevron-left"></i>{l s='Home'}
</span>
</a>
</li>
</ul>
{elseif isset($alreadySent)}
<p class="alert alert-warning">{l s='Your message has already been sent.'}</p>
<ul class="footer_links">
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i>{l s='Home'}</span></a></li>
<li>
<a class="btn btn-default button button-small" href="{$base_dir}">
<span>
<i class="icon-chevron-left"></i>{l s='Home'}
</span>
</a>
</li>
</ul>
{else}
<p class="contact-title"><i class="icon-comment-alt"></i>{l s='For questions about an order or for more information about our products'}.</p>
<p class="contact-title">
<i class="icon-comment-alt"></i>{l s='For questions about an order or for more information about our products'}.
</p>
{include file="$tpl_dir./errors.tpl"}
<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="contact-form-box" enctype="multipart/form-data">
<fieldset>
<h3 class="page-subheading">{l s='send a message'}</h3>
<div class="clearfix">
<div class="col-xs-12 col-md-3">
<div class="form-group selector1">
<label for="id_contact">{l s='Subject Heading'}</label>
{if isset($customerThread.id_contact)}
{foreach from=$contacts item=contact}
{if $contact.id_contact == $customerThread.id_contact}
<input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
<input type="hidden" name="id_contact" value="{$contact.id_contact}" />
{/if}
{/foreach}
</div>
{foreach from=$contacts item=contact}
{if $contact.id_contact == $customerThread.id_contact}
<input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
<input type="hidden" name="id_contact" value="{$contact.id_contact}" />
{/if}
{/foreach}
</div> <!-- .selector1 -->
{else}
<select id="id_contact" class="form-control" name="id_contact" onchange="showElemFromSelect('id_contact', 'desc_contact')">
<option value="0">{l s='-- Choose --'}</option>
{foreach from=$contacts item=contact}
<option value="{$contact.id_contact|intval}" {if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}</option>
{/foreach}
{foreach from=$contacts item=contact}
<option value="{$contact.id_contact|intval}" {if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
</div>
<p id="desc_contact0" class="desc_contact">&nbsp;</p>
</div> <!-- .col-xs-12 .col-md-3 -->
<p id="desc_contact0" class="desc_contact">&nbsp;</p>
{foreach from=$contacts item=contact}
<p id="desc_contact{$contact.id_contact|intval}" class="desc_contact" style="display:none;">
{$contact.description|escape:'html':'UTF-8'}
@@ -79,49 +94,49 @@
<input class="form-control grey" type="text" id="email" name="from" value="{$email|escape:'html':'UTF-8'}" />
{/if}
</p>
{if !$PS_CATALOG_MODE}
{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
<div class="form-group selector1">
<label for="id_order">{l s='Order reference'}</label>
{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
<select name="id_order" class="form-control">
<option value="0">{l s='-- Choose --'}</option>
{foreach from=$orderList item=order}
<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
{elseif !isset($customerThread.id_order) && !isset($isLogged)}
<input class="form-control grey" type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order|intval > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order) && !empty($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
{elseif $customerThread.id_order|intval > 0}
<input class="form-control grey" type="text" name="id_order" id="id_order" value="{$customerThread.id_order|intval}" readonly="readonly" />
{if !$PS_CATALOG_MODE}
{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
<div class="form-group selector1">
<label>{l s='Order reference'}</label>
{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
<select name="id_order" class="form-control">
<option value="0">{l s='-- Choose --'}</option>
{foreach from=$orderList item=order}
<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
{elseif !isset($customerThread.id_order) && !isset($isLogged)}
<input class="form-control grey" type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order|intval > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order) && !empty($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
{elseif $customerThread.id_order|intval > 0}
<input class="form-control grey" type="text" name="id_order" id="id_order" value="{$customerThread.id_order|intval}" readonly="readonly" />
{/if}
</div>
{/if}
</div>
{/if}
{if isset($isLogged) && $isLogged}
<div class="form-group selector1">
<label for="id_product">{l s='Product'}</label>
{if !isset($customerThread.id_product)}
{foreach from=$orderedProductList key=id_order item=products name=products}
<select name="id_product" id="{$id_order}_order_products" class="product_select form-control" style="{if !$smarty.foreach.products.first} display:none; {/if}" {if !$smarty.foreach.products.first}disabled="disabled" {/if}>
<option value="0">{l s='-- Choose --'}</option>
{foreach from=$products item=product}
<option value="{$product.value|intval}">{$product.label|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
{/foreach}
{elseif $customerThread.id_product > 0}
<input class="form-control grey" type="text" name="id_product" id="id_product" value="{$customerThread.id_product|intval}" readonly="readonly" />
{if isset($isLogged) && $isLogged}
<div class="form-group selector1">
<label>{l s='Product'}</label>
{if !isset($customerThread.id_product)}
{foreach from=$orderedProductList key=id_order item=products name=products}
<select name="id_product" id="{$id_order}_order_products" class="product_select form-control" style="{if !$smarty.foreach.products.first} display:none; {/if}" {if !$smarty.foreach.products.first}disabled="disabled" {/if}>
<option value="0">{l s='-- Choose --'}</option>
{foreach from=$products item=product}
<option value="{$product.value|intval}">{$product.label|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
{/foreach}
{elseif $customerThread.id_product > 0}
<input class="form-control grey" type="text" name="id_product" id="id_product" value="{$customerThread.id_product|intval}" readonly="readonly" />
{/if}
</div>
{/if}
</div>
{/if}
{/if}
{if $fileupload == 1}
<p class="form-group">
<label for="fileUpload">{l s='Attach File'}</label>
<input type="hidden" name="MAX_FILE_SIZE" value="2000000" />
<input type="file" name="fileUpload" id="fileUpload" class="form-control" />
</p>
{/if}
{if $fileupload == 1}
<p class="form-group">
<label for="fileUpload">{l s='Attach File'}</label>
<input type="hidden" name="MAX_FILE_SIZE" value="2000000" />
<input type="file" name="fileUpload" id="fileUpload" class="form-control" />
</p>
{/if}
</div>
<div class="col-xs-12 col-md-9">
<div class="form-group">
File diff suppressed because it is too large Load Diff
@@ -1137,6 +1137,7 @@ h3.page-product-heading{
ul.footer_links {
padding:20px 0 0px 0;
border-top:1px solid $base-border-color;
height: 65px;
li {
float:left;
+150 -34
View File
@@ -25,48 +25,146 @@
{capture name=path}{l s='Sitemap'}{/capture}
<h1 class="page-heading">{l s='Sitemap'}</h1>
<h1 class="page-heading">
{l s='Sitemap'}
</h1>
<div id="sitemap_content" class="row">
<div class="col-xs-12 col-sm-6">
<div class="sitemap_block box">
<h3 class="page-subheading">{l s='Our offers'}</h3>
<ul>
<li><a href="{$link->getPageLink('new-products')|escape:'html'}" title="{l s='View a new product'}">{l s='New products'}</a></li>
{if !$PS_CATALOG_MODE}
<li><a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='View top-selling products'}">{l s='Best sellers'}</a></li>
<li><a href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='View products with a price drop'}">{l s='Price drop'}</a></li>
{/if}
{if $display_manufacturer_link OR $PS_DISPLAY_SUPPLIERS}<li><a href="{$link->getPageLink('manufacturer')|escape:'html'}" title="{l s='View a list of manufacturers'}">{l s='Manufacturers:'}</a></li>{/if}
{if $display_supplier_link OR $PS_DISPLAY_SUPPLIERS}<li><a href="{$link->getPageLink('supplier')|escape:'html'}" title="{l s='View a list of suppliers'}">{l s='Suppliers:'}</a></li>{/if}
</ul>
</div>
<h3 class="page-subheading">{l s='Our offers'}</h3>
<ul>
<li>
<a
href="{$link->getPageLink('new-products')|escape:'html'}"
title="{l s='View a new product'}">
{l s='New products'}
</a>
</li>
{if !$PS_CATALOG_MODE}
<li>
<a
href="{$link->getPageLink('best-sales')|escape:'html'}"
title="{l s='View top-selling products'}">
{l s='Best sellers'}
</a>
</li>
<li>
<a
href="{$link->getPageLink('prices-drop')|escape:'html'}"
title="{l s='View products with a price drop'}">
{l s='Price drop'}
</a>
</li>
{/if}
{if $display_manufacturer_link OR $PS_DISPLAY_SUPPLIERS}
<li>
<a
href="{$link->getPageLink('manufacturer')|escape:'html'}"
title="{l s='View a list of manufacturers'}">
{l s='Manufacturers:'}
</a>
</li>
{/if}
{if $display_supplier_link OR $PS_DISPLAY_SUPPLIERS}
<li>
<a
href="{$link->getPageLink('supplier')|escape:'html'}"
title="{l s='View a list of suppliers'}">
{l s='Suppliers:'}
</a>
</li>
{/if}
</ul>
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="sitemap_block box">
<h3 class="page-subheading">{l s='Your Account'}</h3>
<ul>
{if $logged}
<li><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Manage your customer account'}" rel="nofollow">{l s='Your Account'}</a></li>
<li><a href="{$link->getPageLink('identity', true)|escape:'html'}" title="{l s='Manage your personal information'}" rel="nofollow">{l s='Personal information'}</a></li>
<li><a href="{$link->getPageLink('addresses', true)|escape:'html'}" title="{l s='View a list of my addresses'}" rel="nofollow">{l s='Addresses'}</a></li>
{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html'}" title="{l s='View a list of my discounts'}" rel="nofollow">{l s='Discounts'}</a></li>{/if}
<li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='View a list of my orders'}" rel="nofollow">{l s='Order history'}</a></li>
{else}
<li><a href="{$link->getPageLink('authentication', true)|escape:'html'}" title="{l s='Authentication'}" rel="nofollow">{l s='Authentication'}</a></li>
<li><a href="{$link->getPageLink('authentication', true)|escape:'html'}" title="{l s='Create new account'}" rel="nofollow">{l s='Create new account'}</a></li>
{/if}
{if $logged}
<li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Log out'}" rel="nofollow">{l s='Log out'}</a></li>
{/if}
</ul>
</div>
<h3 class="page-subheading">
{l s='Your Account'}
</h3>
<ul>
{if $logged}
<li>
<a
href="{$link->getPageLink('my-account', true)|escape:'html'}"
rel="nofollow"
title="{l s='Manage your customer account'}">
{l s='Your Account'}
</a>
</li>
<li>
<a
href="{$link->getPageLink('identity', true)|escape:'html'}"
rel="nofollow"
title="{l s='Manage your personal information'}">
{l s='Personal information'}
</a>
</li>
<li>
<a
href="{$link->getPageLink('addresses', true)|escape:'html'}"
rel="nofollow"
title="{l s='View a list of my addresses'}">
{l s='Addresses'}
</a>
</li>
{if $voucherAllowed}
<li>
<a
href="{$link->getPageLink('discount', true)|escape:'html'}"
rel="nofollow"
title="{l s='View a list of my discounts'}">
{l s='Discounts'}
</a>
</li>
{/if}
<li>
<a
href="{$link->getPageLink('history', true)|escape:'html'}"
rel="nofollow"
title="{l s='View a list of my orders'}" >
{l s='Order history'}
</a>
</li>
{else}
<li>
<a
href="{$link->getPageLink('authentication', true)|escape:'html'}"
rel="nofollow"
title="{l s='Authentication'}" >
{l s='Authentication'}
</a>
</li>
<li>
<a
href="{$link->getPageLink('authentication', true)|escape:'html'}"
rel="nofollow"
title="{l s='Create new account'}" >
{l s='Create new account'}
</a>
</li>
{/if}
{if $logged}
<li>
<a
href="{$link->getPageLink('index')}?mylogout"
rel="nofollow"
title="{l s='Log out'}" >
{l s='Log out'}
</a>
</li>
{/if}
</ul>
</div>
</div>
</div>
<div id="listpage_content" class="row">
<div class="col-xs-12 col-sm-6">
<div class="categTree box">
<h3 class="page-subheading">{l s='Categories'}</h3>
<div class="tree_top"><a href="{$base_dir_ssl}" title="{$categoriesTree.name|escape:'html':'UTF-8'}"></a></div>
<div class="tree_top">
<a href="{$base_dir_ssl}" title="{$categoriesTree.name|escape:'html':'UTF-8'}"></a>
</div>
<ul class="tree">
{if isset($categoriesTree.children)}
{foreach $categoriesTree.children as $child}
@@ -84,7 +182,11 @@
<div class="sitemap_block box">
<h3 class="page-subheading">{l s='Pages'}</h3>
<ul>
<li><a href="{$categoriescmsTree.link}" title="{$categoriescmsTree.name|escape:'html':'UTF-8'}">{$categoriescmsTree.name|escape:'html':'UTF-8'}</a></li>
<li>
<a href="{$categoriescmsTree.link|escape:'html':'UTF-8'}" title="{$categoriescmsTree.name|escape:'html':'UTF-8'}">
{$categoriescmsTree.name|escape:'html':'UTF-8'}
</a>
</li>
{if isset($categoriescmsTree.children)}
{foreach $categoriescmsTree.children as $child}
{if (isset($child.children) && $child.children|@count > 0) || $child.cms|@count > 0}
@@ -93,10 +195,24 @@
{/foreach}
{/if}
{foreach from=$categoriescmsTree.cms item=cms name=cmsTree}
<li><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
<li>
<a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}">
{$cms.meta_title|escape:'html':'UTF-8'}
</a>
</li>
{/foreach}
<li><a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='Contact'}">{l s='Contact'}</a></li>
{if $display_store}<li class="last"><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='List of our stores'}">{l s='Our stores'}</a></li>{/if}
<li>
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='Contact'}">
{l s='Contact'}
</a>
</li>
{if $display_store}
<li class="last">
<a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='List of our stores'}">
{l s='Our stores'}
</a>
</li>
{/if}
</ul>
</div>
</div>
+51 -26
View File
@@ -25,13 +25,19 @@
{capture name=path}{l s='Our stores'}{/capture}
<h1 class="page-heading">{l s='Our stores'}</h1>
<h1 class="page-heading">
{l s='Our stores'}
</h1>
{if $simplifiedStoresDiplay}
{if $stores|@count}
<p class="store-title"><strong class="dark">{l s='Here you can find our store locations. Please feel free to contact us:'}</strong></p>
<table class="table table-bordered">
<thead>
<p class="store-title">
<strong class="dark">
{l s='Here you can find our store locations. Please feel free to contact us:'}
</strong>
</p>
<table class="table table-bordered">
<thead>
<tr>
<th class="logo">{l s='Logo'}</th>
<th class="name">{l s='Store name'}</th>
@@ -39,24 +45,31 @@
<th class="store-hours">{l s='Working hours'}</th>
</tr>
</thead>
{foreach $stores as $store}
<tr class="store-small">
<td class="logo">{if $store.has_picture}<div class="store-image"><img src="{$img_store_dir}{$store.id_store}.jpg" alt="" /></div>{/if}</td>
<td class="name">{$store.name|escape:'html':'UTF-8'}</td>
<td class="address">
{$store.address1|escape:'html':'UTF-8'}
{if $store.address2}{$store.address2|escape:'html':'UTF-8'}{/if}
{$store.postcode} {$store.city|escape:'html':'UTF-8'}{if $store.state}, {$store.state}{/if}
{$store.country|escape:'html':'UTF-8'}
{if $store.phone}{l s='Phone:' js=0} {$store.phone}{/if}
</td>
<td class="store-hours">
{if isset($store.working_hours)}{$store.working_hours}{/if}
</td>
</tr>
{/foreach}
</table>
{foreach $stores as $store}
<tr class="store-small">
<td class="logo">
{if $store.has_picture}
<div class="store-image">
<img src="{$img_store_dir}{$store.id_store}.jpg" alt="" />
</div>
{/if}
</td>
<td class="name">
{$store.name|escape:'html':'UTF-8'}
</td>
<td class="address">
{$store.address1|escape:'html':'UTF-8'}
{if $store.address2}{$store.address2|escape:'html':'UTF-8'}{/if}
{$store.postcode} {$store.city|escape:'html':'UTF-8'}{if $store.state}, {$store.state}{/if}
{$store.country|escape:'html':'UTF-8'}
{if $store.phone}{l s='Phone:' js=0} {$store.phone}{/if}
</td>
<td class="store-hours">
{if isset($store.working_hours)}{$store.working_hours}{/if}
</td>
</tr>
{/foreach}
</table>
{/if}
{else}
<script type="text/javascript">
@@ -85,7 +98,11 @@
//]]>
</script>
<div id="map"></div>
<p class="store-title"><strong class="dark">{l s='Enter a location (e.g. zip/postal code, address, city or country) in order to find the nearest stores.'}</strong></p>
<p class="store-title">
<strong class="dark">
{l s='Enter a location (e.g. zip/postal code, address, city or country) in order to find the nearest stores.'}
</strong>
</p>
<div class="store-content">
<div class="address-input">
<label for="addressInput">{l s='Your location:'}</label>
@@ -102,12 +119,20 @@
<img src="{$img_ps_dir}loader.gif" class="middle" alt="" id="stores_loader" />
</div>
<div>
<button onclick="searchLocations();" class="button btn btn-default button-small"><span>{l s='Search'}<i class="icon-chevron-right right"></i></span></button>
<button onclick="searchLocations();" class="button btn btn-default button-small">
<span>
{l s='Search'}<i class="icon-chevron-right right"></i>
</span>
</button>
</div>
</div>
<div class="store-content-select selector3"><select id="locationSelect" class="form-control"><option></option></select></div>
<div class="store-content-select selector3">
<select id="locationSelect" class="form-control">
<option>-</option>
</select>
</div>
<table cellpadding="0" cellspacing="0" border="0" id="stores-table" class="table table-bordered">
<table id="stores-table" class="table table-bordered">
<thead>
<tr>
<th class="num">{l s='#'}</th>