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

[+] FO : mobile theme re-included in the trunk

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17060 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-28 15:47:12 +00:00
parent caccf77b10
commit 85f8e3db2f
97 changed files with 8534 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocksearch/blocksearch-top.tpl
+12
View File
@@ -23,6 +23,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- block seach mobile -->
{if isset($hook_mobile)}
<div class="input_search" data-role="fieldcontain">
<form method="get" action="{$link->getPageLink('search')}" id="searchbox">
<input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search'}" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
</form>
</div>
{else}
<!-- Block search module TOP -->
<div id="search_block_top">
@@ -38,4 +49,5 @@
</form>
</div>
{include file="$self/blocksearch-instantsearch.tpl"}
{/if}
<!-- /Block search module TOP -->
modules/blocksearch/blocksearch.php
+16 -1
View File
@@ -46,11 +46,26 @@ class BlockSearch extends Module
public function install()
{
if (!parent::install() || !$this->registerHook('top') || !$this->registerHook('header'))
if (!parent::install() || !$this->registerHook('top') || !$this->registerHook('header') || !$this->registerHook('displayMobileTopSiteMap'))
return false;
return true;
}
public function hookdisplayMobileTopSiteMap($params)
{
$this->smarty->assign(array('hook_mobile' => true, 'instantsearch' => false));
return $this->hookTop($params);
}
/*
public function hookDisplayMobileHeader($params)
{
if (Configuration::get('PS_SEARCH_AJAX'))
$this->context->controller->addJqueryPlugin('autocomplete');
$this->context->controller->addCSS(_THEME_CSS_DIR_.'product_list.css');
}
*/
public function hookHeader($params)
{
if (Configuration::get('PS_SEARCH_AJAX'))
modules/blockwishlist/my-account.tpl
+1 -2
View File
@@ -27,8 +27,7 @@
<!-- MODULE WishList -->
<li class="lnk_wishlist">
<a href="{$wishlist_link}" title="{l s='My wishlists' mod='blockwishlist'}">
<img src="{$module_template_dir}img/gift.gif" alt="{l s='wishlist' mod='blockwishlist'}" class="icon" />
{l s='My wishlists' mod='blockwishlist'}
<img {if isset($mobile_hook)} src="{$module_template_dir}img/gift.png" class="ui-li-icon ui-li-thumb" {else} src="{$module_template_dir}img/gift.gif" class="icon"{/if} alt="{l s='wishlist' mod='blockwishlist'}" /> {l s='My wishlists' mod='blockwishlist'}
</a>
</li>
<!-- END : MODULE WishList -->
modules/favoriteproducts/views/templates/hook/my-account.tpl
+2 -2
View File
@@ -24,9 +24,9 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<li class="favorite products">
<li class="favoriteproducts">
<a href="{$link->getModuleLink('favoriteproducts', 'account')|escape:'htmlall':'UTF-8'}" title="{l s='My favorite products' mod='favoriteproducts'}">
{if !$in_footer}<img src="{$module_template_dir}img/favorites.png" class="icon" />{/if}
{if !$in_footer}<img {if isset($mobile_hook)}src="{$module_template_dir}img/favorites.png" class="ui-li-icon ui-li-thumb"{else}src="{$module_template_dir}img/favorites.png" class="icon"{/if} alt="{l s='My favorite products' mod='favoriteproducts'}"/>{/if}
{l s='My favorite products' mod='favoriteproducts'}
</a>
</li>