diff options
| author | zottel <github@zottel.net> | 2015-09-18 09:38:55 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-18 09:38:55 +0200 |
| commit | 4d05d477f8363aceb08d533c79d048b4e7be1fa3 (patch) | |
| tree | 3646350c02e363b77ab63a089a6803a4bfdb67ed /view/theme/redbasic/tpl/theme_settings.tpl | |
| parent | 3017dbc8c1058c9a1258a19aff39d3833d5d038c (diff) | |
| parent | cc95c3e9c81a11d96b6670180f53490ec30e0324 (diff) | |
| download | volse-hubzilla-4d05d477f8363aceb08d533c79d048b4e7be1fa3.tar.gz volse-hubzilla-4d05d477f8363aceb08d533c79d048b4e7be1fa3.tar.bz2 volse-hubzilla-4d05d477f8363aceb08d533c79d048b4e7be1fa3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/theme/redbasic/tpl/theme_settings.tpl')
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index bfb489abd..4f5b69beb 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,7 @@ {{include file="field_select.tpl" field=$schema}} +{{include file="field_checkbox.tpl" field=$align_left}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_input.tpl" field=$converse_width}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_gradient_top}} @@ -26,11 +29,7 @@ {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{/if}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$align_left}} -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{if $expert}} + <script> $(function(){ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'}); |