Merge pull request #467 from fermionic/frost-mobile-toggle-mobile

add mobile toggle to frost mobile

boot.php

@@ -1511,14 +1511,20 @@ if(! function_exists('current_theme')) {
 		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 	
 		if($is_mobile) {
-			$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
+			if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-			$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
-
-			if($theme_name === '---') {
-				// user has selected to have the mobile theme be the same as the normal one
 				$system_theme = '';
 				$theme_name = '';
 			}
+			else {
+				$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
+				$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
+
+				if($theme_name === '---') {
+					// user has selected to have the mobile theme be the same as the normal one
+					$system_theme = '';
+					$theme_name = '';
+				}
+			}
 		}
 		if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
 			$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
@@ -1760,3 +1766,20 @@ function build_querystring($params, $name=null) {
     } 
     return $ret;    
 }
+
+/**
+* Returns the complete URL of the current page, e.g.: http(s)://something.com/network
+*
+* Taken from http://webcheatsheet.com/php/get_current_page_url.php
+*/
+function curPageURL() {
+	$pageURL = 'http';
+	if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+	$pageURL .= "://";
+	if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
+		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+	} else {
+		$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+	}
+	return $pageURL;
+}

mod/toggle_mobile.php

@@ -0,0 +1,17 @@
+<?php
+
+function toggle_mobile_init(&$a) {
+
+	if(isset($_GET['off']))
+		$_SESSION['show-mobile'] = false;
+	else
+		$_SESSION['show-mobile'] = true;
+
+	if(isset($_GET['address']))
+		$address = $_GET['address'];
+	else
+		$address = $a->get_baseurl();
+
+	goaway($address);
+}
+

view/theme/frost-mobile/default.php

@@ -21,6 +21,9 @@
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 	</section>
 	</div>
+	<footer>
+	<a href="<?php echo $a->get_baseurl() ?>/toggle_mobile?off=1&address=<?php echo curPageURL() ?>">toggle mobile</a>
+	</footer>
 
 	<?php } else { ?>
 	<div class='main-container'>
@@ -33,7 +36,10 @@
 		</div>
 		<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
 		<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
-		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+		<footer>
+		<a href="<?php echo $a->get_baseurl() ?>/toggle_mobile?off=1&address=<?php echo curPageURL() ?>">toggle mobile</a>
+		<?php if(x($page,'footer')) echo $page['footer']; ?>
+		</footer>
 <!--		</div>-->
 	</div>
 	<?php } ?>

view/theme/frost-mobile/login-style.css

@@ -152,3 +152,9 @@ div.section-wrapper {
 #login-submit-wrapper {
 	text-align: center;
 }
+
+footer {
+	text-align: center;
+	padding-top: 3em;
+	padding-bottom: 1em;
+}

view/theme/frost-mobile/style.css

@@ -393,8 +393,8 @@ section {
 
 /* footer */
 footer {
-    display: none;
+	text-align: center;
-
+	padding-bottom: 1em;
 }
 
 .birthday-today, .event-today {