diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-07 15:12:09 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-07 15:12:09 -0800 |
| commit | 1a77fb4c1d4348ed75ab220f73526294f13606a3 (patch) | |
| tree | 381e9dfc784116447d54cd5c46f8ceb7b75b2e66 /view/theme/redbasic | |
| parent | 76467b5a35111c44ff539146ab0810118b42dc70 (diff) | |
| parent | 6824fb9f935e1e2a5405571a08b4c1a3c43a7768 (diff) | |
| download | volse-hubzilla-1a77fb4c1d4348ed75ab220f73526294f13606a3.tar.gz volse-hubzilla-1a77fb4c1d4348ed75ab220f73526294f13606a3.tar.bz2 volse-hubzilla-1a77fb4c1d4348ed75ab220f73526294f13606a3.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/php/config.php | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 6bea5bddb..66597332c 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -98,6 +98,7 @@ if(feature_enabled(local_channel(),'expert')) $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), + '$theme' => $a->channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 0ca47b1fb..ef1450681 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -215,3 +215,8 @@ if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { if($schemecss) { echo $schemecss; } + +// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. + +if($a->channel['channel_theme'] != 'redbasic') + set_pconfig(local_channel(), 'redbasic', 'schema', '---'); diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index cdc9de489..0ec6d1741 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,6 @@ +{{if $theme == redbasic}} {{include file="field_select.tpl" field=$schema}} +{{/if}} {{include file="field_checkbox.tpl" field=$align_left}} {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} |