implemented mobile template switcher (closes #2)

selfthinker · Sep 10, 2012 · dbe362d · dbe362d
1 parent 3a2e5e4
commit dbe362d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 11 deletions.
diff --git a/action.php b/action.php
@@ -60,8 +60,13 @@ function _defineConstants(&$event, $param) {
     function _handleConf(&$event, $param) {
         global $conf;
 
-        $tpl = $this->getTpl();
+        // store original template in cookie
+        $tplOrigCookie = $_SESSION[DOKU_COOKIE]['loadskinOrig'];
+        if ((!$tplOrigCookie) || ($tplOrigCookie != $conf['template']))
+            $_SESSION[DOKU_COOKIE]['loadskinOrig'] = $conf['template'];
 
+        // set template
+        $tpl = $this->getTpl();
         if($tpl && $_REQUEST['do'] != 'admin') {
             $conf['template'] = $tpl;
         }
@@ -127,36 +132,47 @@ function _getTplPerUser() {
         $helper = $this->loadHelper('loadskin', true);
         $tpls   = $helper->getTemplates();
 
+        $mobileSwitch = $this->getConf('mobileSwitch');
         $user = $_SERVER['REMOTE_USER'];
 
         $tplRequest = $_REQUEST['tpl'];
         $actSelect  = $_REQUEST['act'] && ($_REQUEST['act']=='select');
 
+        // if template switcher was used
         if ($tplRequest && $actSelect && (in_array($tplRequest, $tpls) || ($tplRequest == '*') )) {
             // "secret" way of deleting the cookie and config values
             if ($tplRequest == '*')
                 $tplRequest = '';
             // store in cookie
             $_SESSION[DOKU_COOKIE]['loadskinTpl'] = $tplRequest;
-            // if registered user, store also in conf file
-            if ($user)
+            // if registered user, store also in conf file (not for mobile switcher)
+            if ($user && !$mobileSwitch)
                 $this->_tplUserConfig('set', $user, $tplRequest);
             return $tplRequest;
         }
 
         $tplUser   = $this->_tplUserConfig('get', $user);// from user conf file
         $tplCookie = $_SESSION[DOKU_COOKIE]['loadskinTpl'];
-        // if logged in and user is in conf
-        if ($user && $tplUser && in_array($tplUser, $tpls)){
+        // if logged in and user is in conf (not for mobile)
+        if ($user && $tplUser && in_array($tplUser, $tpls) && !$mobileSwitch){
             if ($tplCookie && ($tplCookie == $tplUser))
                 return $tplCookie;
             // store in cookie
             $_SESSION[DOKU_COOKIE]['loadskinTpl'] = $tplUser;
             return $tplUser;
         }
+        // if template is stored in cookie
         if ($tplCookie && in_array($tplCookie, $tpls))
             return $tplCookie;
 
+        // if viewed on a mobile and mobile switcher is used, set mobile template as default
+        global $INFO;
+        $mobileTpl = $this->getConf('mobileTemplate');
+        if ($mobileTpl && $INFO['ismobile']) {
+            $_SESSION[DOKU_COOKIE]['loadskinTpl'] = $mobileTpl;
+            return $mobileTpl;
+        }
+
         return false;
     }
 

diff --git a/conf/default.php b/conf/default.php
@@ -6,3 +6,5 @@
 
 $conf['automaticOutput']  = 0;
 $conf['excludeTemplates'] = '';
+$conf['mobileSwitch']     = 0;
+$conf['mobileTemplate']   = '';
diff --git a/conf/metadata.php b/conf/metadata.php
@@ -6,3 +6,5 @@
 
 $meta['automaticOutput']  = array('onoff');
 $meta['excludeTemplates'] = array('string');
+$meta['mobileSwitch']     = array('onoff');
+$meta['mobileTemplate']   = array('dirchoice', '_dir' => DOKU_INC.'lib/tpl/', '_pattern' => '/^[\w-]+$/');
diff --git a/helper.php b/helper.php
@@ -37,14 +37,27 @@ function getTemplates() {
     /**
      * Builds a select box with all available templates
      *  (unless excluded in 'excludeTemplates')
+     *  or show only two templates for mobile switcher: standard plus mobile template
      *
      * @author Anika Henke <anika@selfthinker.org>
      */
     function showTemplateSwitcher() {
         global $conf;
         global $ID;
-        $excludeTemplates = array_map('trim', explode(",", $this->getConf('excludeTemplates')));
-        $templates        = array_diff($this->getTemplates(),$excludeTemplates);
+
+        $mobileSwitch = $this->getConf('mobileSwitch');
+        $mobileTpl = $this->getConf('mobileTemplate');
+        if ($mobileSwitch && $mobileTpl) {
+            // templates for mobile switcher
+            $templates = array(
+                $mobileTpl                             => $this->getLang('switchMobile'),
+                $_SESSION[DOKU_COOKIE]['loadskinOrig'] => $this->getLang('switchFull')
+            );
+        } else {
+            // all templates (minus excluded templates)
+            $excludeTemplates = array_map('trim', explode(",", $this->getConf('excludeTemplates')));
+            $templates        = array_diff($this->getTemplates(),$excludeTemplates);
+        }
 
         $form = new Doku_Form(array(
             'id' => 'tpl__switcher',

diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -3,7 +3,9 @@
  * English language file for DokuWiki Plugin Loadskin
  */
 
-$lang['template']  = 'Template';
-$lang['menu']      = 'LoadSkin Template Manager';
-$lang['switchTpl'] = 'Switch template';
-$lang['switch']    = 'Switch';
+$lang['template']     = 'Template';
+$lang['menu']         = 'LoadSkin Template Manager';
+$lang['switchTpl']    = 'Switch template';
+$lang['switch']       = 'Switch';
+$lang['switchFull']   = 'Full version';
+$lang['switchMobile'] = 'Mobile version';
diff --git a/lang/en/settings.php b/lang/en/settings.php
@@ -6,3 +6,5 @@
 
 $lang['automaticOutput']  = 'Automatically output the template switcher on every page';
 $lang['excludeTemplates'] = 'Exclude templates from template switcher (comma-separated list)';
+$lang['mobileSwitch']     = 'Show mobile template switcher (with only 1 normal and 1 mobile template)?';
+$lang['mobileTemplate']   = 'Mobile template (if showing mobile template switcher)';