aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/settings.php4
-rwxr-xr-xview/tpl/settings_display.tpl5
2 files changed, 6 insertions, 3 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 59a4b1f42..bb0bfacbd 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -848,8 +848,8 @@ function settings_content(&$a) {
'$baseurl' => $a->get_baseurl(true),
'$uid' => local_channel(),
- '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview'),
- '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, ''),
+ '$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false),
+ '$mobile_theme' => (($mobile_themes) ? array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, '') : false),
'$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no),
'$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')),
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 6d4267905..93cee94d6 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -3,9 +3,12 @@
<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
+{{if $theme}}
{{include file="field_themeselect.tpl" field=$theme}}
+{{/if}}
+{{if $mobile_theme}}
{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{/if}}
{{if $expert}}
{{include file="field_checkbox.tpl" field=$user_scalable}}
{{/if}}