Integrate mobile view switch

Change viewDesktop to desktop

Author: betweenbrain

elements/logic.php

@@ -36,6 +36,7 @@
 $default = $menu->getActive() == $menu->getDefault($lang->getTag());
 
 // Define shortcuts for template parameters
+$allowMobileUrl          = $this->params->get('allowMobileUrl');
 $customStyleSheet        = $this->params->get('customStyleSheet');
 $customStyleSheetVersion = htmlspecialchars($this->params->get('customStyleSheetVersion'));
 $detectTablets           = $this->params->get('detectTablets');

index.php

@@ -28,12 +28,21 @@
 $results = $layoutOverride->getIncludeFile();
 
 // Check if mobile device has opted for desktop version
-if (isset($_GET['viewDesktop'])) {
-    $_SESSION['viewDesktop'] = $_GET['viewDesktop'];
+if (isset($_GET['desktop'])) {
+    $_SESSION['desktop'] = $_GET['desktop'];
+}
+
+// Check if url is requesting mobile, and enabled in templateDetails.xml
+if (isset($_GET['mobile']) && $allowMobileUrl) {
+    $_SESSION['mobile'] = $_GET['mobile'];
+    // unset view desktop session
+    if (isset($_SESSION['desktop'])) {
+        unset($_SESSION['desktop']);
+    }
 }
 
 // Check if mobile device detection is turned on and, test if visitor is a mobile device, and if so, load mobile sub-template
-if ((($mdetect && $isMobile) || ($mdetect && $detectTablets && $isTablet)) && (!isset($_SESSION['viewDesktop']))) {
+if ((($mdetect && $isMobile) || ($mdetect && $detectTablets && $isTablet) || (isset($_SESSION['mobile']) && $allowMobileUrl)) && (!isset($_SESSION['desktop']))) {
     if (JFile::exists($mTemplate)) {
         include_once $mTemplate;
     }

language/en-GB/en-GB.tpl_construct.ini

@@ -58,6 +58,8 @@ padding-bottom:0;
 <p>Allowing even greater flexibility of your design is the ability to add article, menu item, category, section and component specific extended template overrides. Place these appropriately named files in the right folder and the template will load them automatically. For example, to create an extended template override for article 37, add your new layout named <code>article-37.php</code> to <em>/layouts/article</em> and CSS named <code>article-37.css</code> to <em>/css/article</em>.</p>
 <p>Joomla! Template Development Framework &copy; 2009 - 2012 Matt Thomas</p>
 <p>For more information and support, visit <a href="_QQ_"http://construct-framework.com/"_QQ_" target="_QQ_"_blank"_QQ_">Construct Framework</a></p>"
+TPL_CONSTRUCT5_ALLOW_MOBILE_URL_LABEL="Allow Mobile URL"
+TPL_CONSTRUCT5_ALLOW_MOBILE_URL_DESC="Allow mobile view to load with url query site.com/index.php?mobile"
 TPL_CONSTRUCT_DETECT_TABLETS_DESC="Include tablet devices in the mobile detection and load the mobile version of the temeplate."
 TPL_CONSTRUCT_DETECT_TABLETS_LABEL="Include Tablet Devices"
 TPL_CONSTRUCT_ENABLE_SWITCHER_DESC="Enable the ajax style sheet switcher. Defaults to diagnostic and normal options for a visual layout aid."

layouts/mobile-offline.php

@@ -84,7 +84,7 @@
     <?php endif ?>
 
     <div id="footer" data-role="footer" data-theme="<?php echo $mFooterDataTheme ?>">
-        <a class="view-desktop" href="<?php echo JURI::current() ?>?viewDesktop=true">View Desktop Version</a>
+        <a class="view-desktop" href="<?php echo JURI::current() ?>?desktop">View Desktop Version</a>
         <?php if ($this->countModules('footer')) : ?>
         <jdoc:include type="modules" name="footer" style="xhtml" />
         <?php endif ?>

layouts/mobile.php

@@ -95,7 +95,7 @@
     <?php endif ?>
 
     <div id="footer" data-role="footer" data-theme="<?php echo $mFooterDataTheme ?>">
-        <a class="view-desktop" href="<?php echo JURI::current() ?>?viewDesktop=true">View Desktop Version</a>
+        <a class="view-desktop" href="<?php echo JURI::current() ?>?desktop">View Desktop Version</a>
         <?php if ($this->countModules('footer')) : ?>
         <jdoc:include type="modules" name="footer" style="xhtml" />
         <?php endif ?>

mobile-offline.php

@@ -93,7 +93,7 @@
     <?php endif ?>
 
     <div id="footer" data-role="footer" data-theme="<?php echo $mFooterDataTheme ?>">
-        <a class="view-desktop" href="<?php echo JURI::current() ?>?viewDesktop=true">View Desktop Version</a>
+        <a class="view-desktop" href="<?php echo JURI::current() ?>?desktop">View Desktop Version</a>
         <?php if ($this->countModules('footer')) : ?>
         <jdoc:include type="modules" name="footer" style="xhtml" />
         <?php endif ?>

mobile.php

@@ -102,7 +102,7 @@
     <?php endif ?>
 
     <div id="footer" data-role="footer" data-theme="<?php echo $mFooterDataTheme ?>">
-        <a class="view-desktop" href="<?php echo JURI::current() ?>?viewDesktop=true">View Desktop Version</a>
+        <a class="view-desktop" href="<?php echo JURI::current() ?>?desktop">View Desktop Version</a>
         <?php if ($this->countModules('footer')) : ?>
         <jdoc:include type="modules" name="footer" style="xhtml" />
         <?php endif ?>

templateDetails.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
-<extension version="1.6" type="template" client="site" method="upgrade">
+<extension version="1.6"
+           type="template"
+           client="site"
+           method="upgrade">
 	<name>construct</name>
 	<creationDate>December 11, 2012</creationDate>
 	<author>Matt Thomas</author>
@@ -315,6 +318,14 @@
 					<option value="1">Yes</option>
 					<option value="0">No</option>
 				</field>
+				<field name="allowMobileUrl"
+				       type="radio"
+				       default="1"
+				       label="TPL_CONSTRUCT_ALLOW_MOBILE_URL_LABEL"
+				       description="TPL_CONSTRUCT_ALLOW_MOBILE_URL_DESC">
+					<option value="1">Yes</option>
+					<option value="0">No</option>
+				</field>
 				<field name="mNavPosition"
 				       type="radio"
 				       default="0"