//remove mobile theme

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15138 b9a71923-0436-4b27-9f14-aed3839534dd

classes/Context.php

@@ -95,58 +95,6 @@ class ContextCore
 	 */
 	public $smarty;
 
-	/**
-	 * @var boolean|string mobile device of the customer
-	 */
-	protected $mobile_device;
-
-	/**
-	 * @var boolean|string touch pad device of the customer
-	 */
-	protected $touchpad_device;
-
-	public function getMobileDevice()
-	{
-		if (is_null($this->mobile_device))
-		{
-			$this->mobile_device = false;
-			if ($this->checkMobileContext())
-				if (preg_match('/(alcatel|amoi|android|avantgo|blackberry|benq|cell|cricket|docomo|elaine|htc|iemobile|iphone|ipaq|ipod|j2me|java|midp|mini|mmp|mobi\s|motorola|nec-|nokia|palm|panasonic|philips|phone|sagem|sharp|sie-|smartphone|sony|symbian|t-mobile|telus|up\.browser|up\.link|vodafone|wap|webos|wireless|xda|zte)/i', $_SERVER['HTTP_USER_AGENT'], $out))
-					$this->mobile_device = $out[0];
-		}
-
-		return $this->mobile_device;
-	}
-
-	protected function checkMobileContext()
-	{
-		return file_exists(_PS_THEME_MOBILE_DIR_)
-			&& Configuration::get('PS_ALLOW_MOBILE_DEVICE')
-			&& isset($_SERVER['HTTP_USER_AGENT']);
-	}
-
-	protected function getTouchPadDevice()
-	{
-		if (is_null($this->touchpad_device))
-		{
-			$this->touchpad_device = false;
-			if ($this->checkMobileContext())
-			{
-				if (preg_match('/(xoom|ipad)/i', $_SERVER['HTTP_USER_AGENT'], $out))
-					$this->touchpad_device = $out[0];
-				if (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'android') && !strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mobile'))
-					$this->touchpad_device = 'android';
-
-				// for Galaxy tab
-				if (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'android')
-					&& (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'sch-i800')
-						|| strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'gt-p1000')))
-					$this->touchpad_device = 'android';
-			}
-		}
-		return $this->touchpad_device;
-	}
-
 	/**
 	 * Get a singleton context
 	 *

classes/controller/FrontController.php

@@ -305,8 +305,6 @@ class FrontControllerCore extends Controller
 			$meta_language[] = $lang['iso_code'];
 
 		$this->context->smarty->assign(array(
-			// Usefull for layout.tpl
-			'mobile_device' => $this->context->getMobileDevice(),
 			'link' => $link,
 			'cart' => $cart,
 			'currency' => $currency,
@@ -337,12 +335,6 @@ class FrontControllerCore extends Controller
 			'request' => $link->getPaginationLink(false, false, false, true)
 		));
 
-		// Add the tpl files directory for mobile
-		if ($this->context->getMobileDevice() != false)
-			$this->context->smarty->assign(array(
-				'tpl_mobile_uri' => _PS_THEME_MOBILE_DIR_,
-			));
-
 		// Deprecated
 		$this->context->smarty->assign(array(
 			'id_currency_cookie' => (int)$currency->id,
@@ -366,14 +358,6 @@ class FrontControllerCore extends Controller
 			'pic_dir' => _THEME_PROD_PIC_DIR_
 		);
 
-		// Add the images directory for mobile
-		if ($this->context->getMobileDevice() != false)
-			$assign_array['img_mobile_dir'] = _THEME_MOBILE_IMG_DIR_;
-
-		// Add the CSS directory for mobile
-		if ($this->context->getMobileDevice() != false)
-			$assign_array['css_mobile_dir'] = _THEME_MOBILE_CSS_DIR_;
-
 		foreach ($assign_array as $assign_key => $assign_value)
 			if (substr($assign_value, 0, 1) == '/' || $protocol_content == 'https://')
 				$this->context->smarty->assign($assign_key, $protocol_content.Tools::getMediaServer($assign_value).$assign_value);
@@ -431,24 +415,12 @@ class FrontControllerCore extends Controller
 	public function initContent()
 	{
 		$this->process();
-
-		if ($this->context->getMobileDevice() == false)
-		{
-			// These hooks aren't used for the mobile theme.
-			// Needed hooks are called in the tpl files.
-			$this->context->smarty->assign(array(
-				'HOOK_HEADER' => Hook::exec('displayHeader'),
-				'HOOK_TOP' => Hook::exec('displayTop'),
-				'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''),
-				'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''),
-			));
-		}
-		else
-		{
-			$this->context->smarty->assign(array(
-				'HOOK_MOBILE_HEADER' => Hook::exec('displayMobileHeader'),
-			));
-		}
+		$this->context->smarty->assign(array(
+			'HOOK_HEADER' => Hook::exec('displayHeader'),
+			'HOOK_TOP' => Hook::exec('displayTop'),
+			'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''),
+			'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''),
+		));
 	}
 
 	/**
@@ -543,11 +515,9 @@ class FrontControllerCore extends Controller
 			'display_footer' => $this->display_footer,
 		));
 
-		// Don't use live edit if on mobile device
-		if ($this->context->getMobileDevice() == false && Tools::isSubmit('live_edit'))
+		if (Tools::isSubmit('live_edit'))
 			$this->context->smarty->assign('live_edit', $this->getLiveEditFooter());
 
-
         $layout = $this->getLayout();
 		if ($layout)
 		{
@@ -597,9 +567,7 @@ class FrontControllerCore extends Controller
 		{
 			header('HTTP/1.1 503 temporarily overloaded');
 			$this->context->smarty->assign('favicon_url', _PS_IMG_.Configuration::get('PS_FAVICON'));
-
-			$template_dir = ($this->context->getMobileDevice() == true ? _PS_THEME_MOBILE_DIR_ : _PS_THEME_DIR_);
-			$this->context->smarty->display($template_dir.'maintenance.tpl');
+			$this->context->smarty->display(_PS_THEME_DIR_.'maintenance.tpl');
 			exit;
 		}
 	}
@@ -699,28 +667,8 @@ class FrontControllerCore extends Controller
 		return false;
 	}
 
-	/**
-	 * Specific medias for mobile device.
-	 */
-	public function setMobileMedia()
-	{
-		$this->addCSS(_THEME_MOBILE_CSS_DIR_.'global.css', 'all');
-		$this->addCSS(_THEME_MOBILE_CSS_DIR_.'jqm-docs.css', 'all');
-		$this->addJS(_THEME_MOBILE_JS_DIR_.'jqm-docs.js');
-		$this->addJS(_PS_JS_DIR_.'tools.js');
-		$this->addJS(_THEME_MOBILE_JS_DIR_.'global.js');
-			$this->addjqueryPlugin('fancybox');
-	}
-
 	public function setMedia()
 	{
-		// if website is accessed by mobile device
-		// @see FrontControllerCore::setMobileMedia()
-		if ($this->context->getMobileDevice() != false)
-		{
-			$this->setMobileMedia();
-			return true;
-		}
 		$this->addCSS(_THEME_CSS_DIR_.'global.css', 'all');
 		$this->addjquery();
 		$this->addjqueryPlugin('easing');
@@ -991,21 +939,15 @@ class FrontControllerCore extends Controller
 
 	/**
 	 * This is overrided to manage is behaviour
-	 * if a customer access to the site with mobile device.
 	 */
 	public function setTemplate($default_template)
 	{
-		if ($this->context->getMobileDevice() != false)
-			$this->setMobileTemplate($default_template);
-		else
-        {
-            $template = $this->getOverrideTemplate();
+        $template = $this->getOverrideTemplate();
 
-            if ($template)
-			    parent::setTemplate($template);
-            else
-                parent::setTemplate($default_template);
-        }
+        if ($template)
+		    parent::setTemplate($template);
+        else
+            parent::setTemplate($default_template);
 	}
 
     /**
@@ -1039,12 +981,6 @@ class FrontControllerCore extends Controller
 
 		$layout_dir = _PS_THEME_DIR_;
 		$layout_override_dir  = _PS_THEME_OVERRIDE_DIR_;
-		if ($this->context->getMobileDevice() != false)
-		{
-			$layout_dir = _PS_THEME_MOBILE_DIR_;
-			$layout_override_dir = _PS_THEME_MOBILE_OVERRIDE_DIR_;
-		}
-
 		$layout = false;
 		if ($entity)
 		{
@@ -1059,44 +995,4 @@ class FrontControllerCore extends Controller
 
 		return $layout;
     }
-
-	/**
-	 * This checks if the template set is available for mobile themes,
-	 * otherwise the front template is choosen.
-	 */
-	public function setMobileTemplate($template)
-	{
-		// Needed for site map
-		$blockmanufacturer = Module::getInstanceByName('blockmanufacturer');
-		$blocksupplier = Module::getInstanceByName('blocksupplier');
-		$this->context->smarty->assign('categoriesTree', Category::getRootCategory()->recurseLiteCategTree(0));
-		$this->context->smarty->assign('categoriescmsTree', CMSCategory::getRecurseCategory($this->context->language->id, 1, 1, 1));
-		$this->context->smarty->assign('voucherAllowed', (int)Configuration::get('PS_VOUCHERS'));
-		$this->context->smarty->assign('display_manufacturer_link', (((int)$blockmanufacturer->id) ? true : false));
-		$this->context->smarty->assign('display_supplier_link', (((int)$blocksupplier->id) ? true : false));
-		$this->context->smarty->assign('PS_DISPLAY_SUPPLIERS', Configuration::get('PS_DISPLAY_SUPPLIERS'));
-		$this->context->smarty->assign('display_store', Configuration::get('PS_STORES_DISPLAY_SITEMAP'));
-
-		$mobile_template = '';
-		$tpl_file = basename($template);
-		$dirname = dirname($template).(substr(dirname($template), -1, 1) == '/' ? '' : '/');
-
-		if ($dirname == _PS_THEME_DIR_)
-		{
-			if (file_exists(_PS_THEME_MOBILE_DIR_.$tpl_file))
-				$template = _PS_THEME_MOBILE_DIR_.$tpl_file;
-		}
-		elseif ($dirname == _PS_THEME_MOBILE_DIR_)
-		{
-			if (!file_exists(_PS_THEME_MOBILE_DIR_.$tpl_file) && file_exists(_PS_THEME_DIR_.$tpl_file))
-				$template = _PS_THEME_DIR_.$tpl_file;
-		}
-		$assign = array();
-		$assign['tpl_file'] = basename($tpl_file, '.tpl');
-		if (isset($this->php_self))
-			$assign['controller_name'] = $this->php_self;
-
-		$this->context->smarty->assign($assign);
-		$this->template = $template;
-	}
 }

config/defines_uri.inc.php

@@ -34,28 +34,6 @@ define('_THEME_CSS_DIR_',  _THEME_DIR_.'css/');
 define('_THEME_JS_DIR_',   _THEME_DIR_.'js/');
 define('_PS_THEME_OVERRIDE_DIR_', _PS_THEME_DIR_.'override/');
 
-/* For mobile devices */
-if (file_exists(_PS_THEME_DIR_.'mobile/'))
-{
-	define('_PS_THEME_MOBILE_DIR_', _PS_THEME_DIR_.'mobile/');
-	define('_THEME_MOBILE_DIR_', _THEMES_DIR_._THEME_NAME_.'/mobile/');
-	define('_PS_THEME_MOBILE_OVERRIDE_DIR_', _PS_THEME_MOBILE_DIR_.'override/');
-}
-else
-{
-	define('_PS_THEME_MOBILE_DIR_', _PS_ROOT_DIR_.'/themes/default/mobile/');
-	define('_THEME_MOBILE_DIR_', __PS_BASE_URI__.'themes/default/mobile/');
-}
-define('_THEME_MOBILE_IMG_DIR_', _THEME_MOBILE_DIR_.'img/');
-define('_THEME_MOBILE_CSS_DIR_', _THEME_MOBILE_DIR_.'css/');
-define('_THEME_MOBILE_JS_DIR_', _THEME_MOBILE_DIR_.'js/');
-
-/* For touch pad devices */
-define('_PS_THEME_TOUCHPAD_DIR_', _PS_THEME_DIR_.'touchpad/');
-define('_THEME_TOUCHPAD_DIR_', _THEMES_DIR_._THEME_NAME_.'/touchpad/');
-define('_THEME_TOUCHPAD_CSS_DIR_', _THEME_MOBILE_DIR_.'css/');
-define('_THEME_TOUCHPAD_JS_DIR_', _THEME_MOBILE_DIR_.'js/');
-
 /* Image URLs */
 define('_PS_IMG_',         __PS_BASE_URI__.'img/');
 define('_PS_ADMIN_IMG_',   			_PS_IMG_.'admin/');

controllers/front/ContactController.php

@@ -194,9 +194,7 @@ class ContactControllerCore extends FrontController
 	public function setMedia()
 	{
 		parent::setMedia();
-		// These CSS isn't used for the mobile theme.
-		if ($this->context->getMobileDevice() == false)
-			$this->addCSS(_THEME_CSS_DIR_.'contact-form.css');
+		$this->addCSS(_THEME_CSS_DIR_.'contact-form.css');
 	}
 
 	/**

controllers/front/IdentityController.php

@@ -131,8 +131,7 @@ class IdentityControllerCore extends FrontController
 	public function setMedia()
 	{
 		parent::setMedia();
-		if ($this->context->getMobileDevice() == false)
-			$this->addCSS(_THEME_CSS_DIR_.'identity.css');
+		$this->addCSS(_THEME_CSS_DIR_.'identity.css');
 	}
 
 }

controllers/front/ProductController.php

@@ -41,21 +41,13 @@ class ProductControllerCore extends FrontController
 	{
 		parent::setMedia();
 
-		if ($this->context->getMobileDevice() == false)
-		{
-			$this->addCSS(_THEME_CSS_DIR_.'product.css');
-			$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
-			$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
-			$this->addJS(array(
-				_THEME_JS_DIR_.'tools.js',
-				_THEME_JS_DIR_.'product.js'
-			));
-		}
-		else
-			$this->addJS(array(
-				_THEME_JS_DIR_.'tools.js',
-				_THEME_MOBILE_JS_DIR_.'product.js'
-			));
+		$this->addCSS(_THEME_CSS_DIR_.'product.css');
+		$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
+		$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
+		$this->addJS(array(
+			_THEME_JS_DIR_.'tools.js',
+			_THEME_JS_DIR_.'product.js'
+		));
 
 		if (Configuration::get('PS_DISPLAY_JQZOOM') == 1)
 			$this->addJqueryPlugin('jqzoom');

controllers/front/StoresController.php

@@ -175,17 +175,6 @@ class StoresControllerCore extends FrontController
 	 */
 	protected function displayAjax()
 	{
-		if ($this->context->getMobileDevice() == true)
-		{
-			$stores = $this->getStores();
-			foreach ($stores as &$store)
-			{
-				if (file_exists(_PS_STORE_IMG_DIR_.(int)$store['id_store'].'.jpg'))
-					$store['picture'] = (int)$store['id_store'].'.jpg';
-			}
-			die(Tools::jsonEncode($stores));
-		}
-
 		$stores = $this->getStores();
 		$dom = new DOMDocument('1.0');
 		$node = $dom->createElement('markers');
@@ -269,17 +258,9 @@ class StoresControllerCore extends FrontController
 	public function setMedia()
 	{
 		parent::setMedia();
-
+		$this->addCSS(_THEME_CSS_DIR_.'stores.css');
+		if (!Configuration::get('PS_STORES_SIMPLIFIED'))
+			$this->addJS(_THEME_JS_DIR_.'stores.js');
 		$this->addJS('http://maps.google.com/maps/api/js?sensor=true');
-		if ($this->context->getMobileDevice() == false)
-		{
-			$this->addCSS(_THEME_CSS_DIR_.'stores.css');
-			if (!Configuration::get('PS_STORES_SIMPLIFIED'))
-				$this->addJS(_THEME_JS_DIR_.'stores.js');
-		}
-		else // mobile device
-			$this->addJS(array(
-				_THEME_MOBILE_JS_DIR_.'stores.js'
-			));
 	}
 }

modules/blockcms/blockcms.php

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/my-account.tpl

@@ -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

@@ -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/views/templates/hook/my-account.tpl

@@ -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

@@ -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

@@ -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('

themes/default/layout.tpl

@@ -23,23 +23,16 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{assign var='header_file' value='./header.tpl'}
-{assign var='footer_file' value='./footer.tpl'}
-{if $mobile_device != false}
-	{assign var='header_file' value='./mobile/header.tpl'}
-	{assign var='footer_file' value='./mobile/footer.tpl'}
-	{assign var='HOOK_HEADER' value=''}
-{/if}
 
 {if !empty($display_header)}
-	{include file=$header_file HOOK_HEADER=$HOOK_HEADER}
+	{include file='./header.tpl' HOOK_HEADER=$HOOK_HEADER}
 {/if}
 {if !empty($template)}
 	{$template}
 {/if}
 {if !empty($display_footer)}
-	{include file=$footer_file}
+	{include file='./footer.tpl'}
 {/if}
 {if !empty($live_edit)}
 	{$live_edit}
-{/if}
+{/if}