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

//remove mobile theme

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15138 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-05-09 20:57:15 +00:00
parent 0a0f47efbb
commit 4f3e19ed5f
27 changed files with 34 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcms/blockcms.php
-7
View File
@@ -716,13 +716,6 @@ class BlockCms extends Module
return $this->display(__FILE__, 'blockcms.tpl');
}
public function hookDisplayMobileFooterCms()
{
if (!$this->_prepareHook())
return ;
return $this->display(__FILE__, 'blockmobilecms.tpl');
}
protected function updatePositionsDnd()
{
if (Tools::getValue('cms_block_0'))
modules/blockcms/blockmobilecms.tpl
-43
View File
@@ -1,43 +0,0 @@
{*
* 2007-2012 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-2012 PrestaShop SA
* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="block_various_links" id="block_various_links_footer">
<h4>{l s='Informations' mod='blockcms'}</h4>
<ul>
{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales')}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
<li class="item"><a href="{$link->getPageLink($contact_url, true)}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
{foreach from=$cmslinks item=cmslink}
{if $cmslink.meta_title != ''}
<li class="item"><a href="{$cmslink.link|addslashes}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
{/if}
{/foreach}
{if $display_poweredby}<li class="last_item">{l s='Powered by' mod='blockcms'} <a href="http://www.prestashop.com">PrestaShop</a>&trade;</li>{/if}
</ul>
{$footer_text}
</div>
modules/blockcms/translations/fr.php
-7
View File
@@ -44,13 +44,6 @@ $_MODULE['<{blockcms}prestashop>blockcms_9ff0635f5737513b1a6f559ac2bff745'] = 'N
$_MODULE['<{blockcms}prestashop>blockcms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes';
$_MODULE['<{blockcms}prestashop>blockcms_02d4482d332e1aef3437cd61c9bcc624'] = 'Contactez-nous';
$_MODULE['<{blockcms}prestashop>blockcms_7a52e36bf4a1caa031c75a742fb9927a'] = 'Propulsé par';
$_MODULE['<{blockcms}prestashop>blockmobilecms_c4c95c36570d5a8834be5e88e2f0f6b2'] = 'Informations';
$_MODULE['<{blockcms}prestashop>blockmobilecms_d1aa22a3126f04664e0fe3f598994014'] = 'Promotions';
$_MODULE['<{blockcms}prestashop>blockmobilecms_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits';
$_MODULE['<{blockcms}prestashop>blockmobilecms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes';
$_MODULE['<{blockcms}prestashop>blockmobilecms_34c869c542dee932ef8cd96d2f91cae6'] = 'Nos magasins';
$_MODULE['<{blockcms}prestashop>blockmobilecms_02d4482d332e1aef3437cd61c9bcc624'] = 'Contactez-nous';
$_MODULE['<{blockcms}prestashop>blockmobilecms_7a52e36bf4a1caa031c75a742fb9927a'] = 'Propulsé par';
$_MODULE['<{blockcms}prestashop>form_4dabfa54822012dfc78d6ef40f224173'] = 'Blocs à gauche';
$_MODULE['<{blockcms}prestashop>form_d9ca3009e18447d91cd2e324e8e680ce'] = 'Blocs à droite';
$_MODULE['<{blockcms}prestashop>form_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
modules/blockcurrencies/blockcurrencies.php
-6
View File
@@ -80,12 +80,6 @@ class BlockCurrencies extends Module
return;
$this->context->controller->addCSS(($this->_path).'blockcurrencies.css', 'all');
}
public function hookDisplayMobileFooterChoice($params)
{
if ($this->_prepareHook($params))
return $this->display(__FILE__, 'blockmobilecurrencies.tpl');
}
}
modules/blockcurrencies/blockmobilecurrencies.tpl
-41
View File
@@ -1,41 +0,0 @@
{*
* 2007-2012 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-2012 PrestaShop SA
* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- Block Mobile currencies module -->
<div class="ui-block-a">
<div data-role="fieldcontain">
<form id="setCurrency" action="{$request_uri}" method="post">
<select onchange="javascript:setCurrency(this.value)" name="select-choice-1" id="select-choice-1">
{foreach from=$currencies key=k item=f_currency}
<option value="{$f_currency.id_currency}" {if $cookie->id_currency == $f_currency.id_currency}selected="selected"{/if}>{$f_currency.sign} {$f_currency.name}</option>
{/foreach}
</select>
</form>
</div>
</div>
<!-- /Block Mobile currencies module -->
modules/blocklanguages/blocklanguages.php
-7
View File
@@ -107,13 +107,6 @@ class BlockLanguages extends Module
{
$this->context->controller->addCSS($this->_path.'blocklanguages.css', 'all');
}
public function hookDisplayMobileFooterChoice($params)
{
if (!$this->_prepareHook($params))
return;
return $this->display(__FILE__, 'blockmobilelanguages.tpl');
}
}
modules/blocklanguages/blockmobilelanguages.tpl
-39
View File
@@ -1,39 +0,0 @@
{*
* 2007-2012 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-2012 PrestaShop SA
* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- Block Mobile languages module -->
{if count($languages) > 1}
<div class="ui-block-b">
<div data-role="fieldcontain">
<select name="select-choice-1" id="select-choice-1">
{foreach from=$languages key=k item=language name="languages"}
<option value="$language.id_lang" {if $language.iso_code == $lang_iso}selected="selected"{/if}>{$language.name}</option>
{/foreach}
</select>
</div>
</div>
{/if}
modules/blocknewsletter/blocknewsletter.php
-6
View File
@@ -497,10 +497,4 @@ class Blocknewsletter extends Module
{
$this->context->controller->addCSS($this->_path.'blocknewsletter.css', 'all');
}
public function hookDisplayMobileIndex($params)
{
$this->_prepareHook($params);
return $this->display(__FILE__, 'blockmobilenewsletter.tpl');
}
}
modules/blocknewsletter/views/templates/hook/blockmobilenewsletter.tpl
-44
View File
@@ -1,44 +0,0 @@
{*
* 2007-2012 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-2012 PrestaShop SA
* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<hr width="99%" align="center" size="2" />
<!-- Block Mobile Newsletter module-->
<div id="newsletter">
<h4>{l s="Newsletter" mod="blocknewletter"}</h4>
{if isset($msg) && $msg}
<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>
{/if}
<form action="{$link->getPageLink('index')}" method="post">
<fieldset>
<input type="email" name="email"
placeholder="{l s='your e-mail' mod='blocknewsletter'}"
value="{if isset($value) && $value}{$value}{/if}"
class="inputNew" />
<input type="submit" value="OK" data-role="button" data-theme="a" name="submitNewsletter" />
<input type="hidden" name="action" value="0" />
</fieldset>
</form>
</div><!-- /newsletter -->
modules/blocksearch/blocksearch-top.tpl
-13
View File
@@ -23,18 +23,6 @@
* @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">
@@ -49,7 +37,6 @@
</p>
</form>
</div>
{/if}
{if $instantsearch}
<script type="text/javascript">
// <![CDATA[
modules/blocksearch/blocksearch.php
-13
View File
@@ -50,19 +50,6 @@ class BlockSearch extends Module
return false;
return true;
}
public function hookDisplayMobileTop($params)
{
$this->smarty->assign('hook_mobile', true);
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)
{
modules/blockwishlist/blockwishlist.php
-6
View File
@@ -225,12 +225,6 @@ class BlockWishList extends Module
return $this->display(__FILE__, 'my-account.tpl');
}
public function hookDisplayMobileCustomerAccount($params)
{
$this->smarty->assign('mobile_hook', true);
return $this->display(__FILE__, 'my-account.tpl');
}
public function hookMyAccountBlock($params)
{
return $this->hookCustomerAccount($params);
modules/blockwishlist/img/gift.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

modules/blockwishlist/my-account.tpl
+2 -1
View File
@@ -27,7 +27,8 @@
<!-- MODULE WishList -->
<li class="lnk_wishlist">
<a href="{$base_dir_ssl}modules/blockwishlist/mywishlist.php" title="{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'}
<img src="{$module_template_dir}img/gift.gif" alt="{l s='wishlist' mod='blockwishlist'}" class="icon" />
{l s='My wishlists' mod='blockwishlist'}
</a>
</li>
<!-- END : MODULE WishList -->
modules/favoriteproducts/favoriteproducts.php
-6
View File
@@ -88,12 +88,6 @@ class FavoriteProducts extends Module
return $this->display(__FILE__, 'my-account.tpl');
}
public function hookDisplayMobileCustomerAccount($params)
{
$this->smarty->assign('mobile_hook', true);
return $this->hookDisplayCustomerAccount($params);
}
public function hookDisplayMyAccountBlock($params)
{
return $this->hookDisplayCustomerAccount($params);
modules/favoriteproducts/img/favorite.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

modules/favoriteproducts/views/templates/hook/my-account.tpl
+4 -4
View File
@@ -24,9 +24,9 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<li class="favoriteproducts">
<a href="{$link->getModuleLink('favoriteproducts', 'account')}" title="{l s='My favorite products' mod='favoriteproducts'}">
<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'}"/>
{l s='My favorite products' mod='favoriteproducts'}
<li class="favorite products">
<a href="{$link->getModuleLink('favorite products', 'account')}" title="{l s='My favorite products' mod='favorite products'}">
<img src="{$module_template_dir}img/favorites.png" class="icon" />
{l s='My favorite products' mod='favorite products'}
</a>
</li>
modules/homeslider/homemobileslider.tpl
-44
View File
@@ -1,44 +0,0 @@
{*
* 2007-2012 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-2012 PrestaShop SA
* @version Release: $Revision: 13573 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- Module HomeSlider -->
{if isset($homeslider)}
<script type="text/javascript">
var homeslider_loop = true;
var homeslider_speed = {$homeslider.speed};
var homeslider_pause = {$homeslider.pause};
</script>
{/if}
{if isset($homeslider_slides)}
<div id="slider">
{foreach from=$homeslider_slides item=slide}
{if $slide.active}
<img src="{$smarty.const._MODULE_DIR_}/homeslider/images/{$slide.image}" alt="{$slide.legend}" title="{$slide.description}" height="{$homeslider.height}" width="100%">
{/if}
{/foreach}
</div>
{/if}
<!-- /Module HomeSlider -->
modules/homeslider/homeslider.php
-7
View File
@@ -654,13 +654,6 @@ class HomeSlider extends Module
return $this->display(__FILE__, 'homeslider.tpl');
}
public function hookDisplayMobileIndex()
{
if(!$this->_prepareHook())
return;
return $this->display(__FILE__, 'homemobileslider.tpl');
}
public function hookActionShopDataDuplication($params)
{
Db::getInstance()->execute('