aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-31 18:20:34 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-31 18:20:34 +0200
commit02fe2d488155b0907c950eb3118c523940c6827f (patch)
treec1a66683c287609ecceed3c28fd887e86527c125 /boot.php
parent00622779f3fd68bf9ae4860d776c65c82ae1c0c0 (diff)
downloadvolse-hubzilla-02fe2d488155b0907c950eb3118c523940c6827f.tar.gz
volse-hubzilla-02fe2d488155b0907c950eb3118c523940c6827f.tar.bz2
volse-hubzilla-02fe2d488155b0907c950eb3118c523940c6827f.zip
More mobile theme fixes
If user is logged in personal settings are used else use admin settings. Only show toggle link if there is something to switch between.
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php28
1 files changed, 17 insertions, 11 deletions
diff --git a/boot.php b/boot.php
index ae27d65ab..d3412069a 100755
--- a/boot.php
+++ b/boot.php
@@ -2025,25 +2025,28 @@ function current_theme(){
$is_mobile = $a->is_mobile || $a->is_tablet;
+ $standard_system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
+ $standard_theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $standard_system_theme);
+
if($is_mobile) {
if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) {
- $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
- $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+ $system_theme = $standard_system_theme;
+ $theme_name = $standard_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 === '---') {
+ if($theme_name === '' || $theme_name === '---' ) {
// user has selected to have the mobile theme be the same as the normal one
- $system_theme = '';
- $theme_name = '';
+ $system_theme = $standard_system_theme;
+ $theme_name = $standard_theme_name;
}
}
}
else {
- $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
- $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+ $system_theme = $standard_system_theme;
+ $theme_name = $standard_theme_name;
if($page_theme)
$theme_name = $page_theme;
@@ -2464,10 +2467,13 @@ function construct_page(&$a) {
else {
$link = $a->get_baseurl() . '/toggle_mobile?f=&off=1&address=' . curPageURL();
}
- $a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
- '$toggle_link' => $link,
- '$toggle_text' => t('toggle mobile')
- ));
+ if ((isset($_SESSION) && $_SESSION['mobile_theme'] !='' && $_SESSION['mobile_theme'] !='---' ) ||
+ (isset($a->config['system']['mobile_theme']) && !isset($_SESSION['mobile_theme']))) {
+ $a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
+ '$toggle_link' => $link,
+ '$toggle_text' => t('toggle mobile')
+ ));
+ }
}
$page = $a->page;