diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-11-30 18:57:58 +0000 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-11-30 18:57:58 +0000 |
| commit | 2aaa33c135ae745678d829858def6e7d28d724f5 (patch) | |
| tree | e24729f7002515ff70e0f3461275e1106b733b38 | |
| parent | d67c5a6ffd134602084a6dcb37b316bf768bf715 (diff) | |
| download | volse-hubzilla-2aaa33c135ae745678d829858def6e7d28d724f5.tar.gz volse-hubzilla-2aaa33c135ae745678d829858def6e7d28d724f5.tar.bz2 volse-hubzilla-2aaa33c135ae745678d829858def6e7d28d724f5.zip | |
The other half of 'any theme for any device'. Closes #71
| -rw-r--r-- | mod/settings.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mod/settings.php b/mod/settings.php index ab6638ccb..1643387ea 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -763,13 +763,18 @@ function settings_content(&$a) { $is_experimental = file_exists('view/theme/' . $th . '/experimental'); $unsupported = file_exists('view/theme/' . $th . '/unsupported'); $is_mobile = file_exists('view/theme/' . $th . '/mobile'); + $is_library = file_exists('view/theme/'. $th . '/library'); + if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f); - if($is_mobile) { - $mobile_themes[$f]=$theme_name; - } - else { - $themes[$f]=$theme_name; + + if (! $is_library) { + if($is_mobile) { + $themes[$f]=$theme_name . ' (' . t('mobile') . ')'; + } + else { + $themes[$f]=$theme_name; + } } } } @@ -807,7 +812,7 @@ function settings_content(&$a) { '$uid' => local_user(), '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview'), - '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, ''), + '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $themes, ''), '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, ''), '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), |