From 44b74365ddc828fe9ae83da4870f71dd1daca557 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 5 Mar 2015 17:12:27 +0100 Subject: restructure display settings --- view/js/main.js | 2 +- view/theme/redbasic/css/narrow_navbar.css | 2 +- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/config.php | 6 +- view/theme/redbasic/tpl/theme_settings.tpl | 107 ++++++++++++++++------------- view/tpl/settings_display.tpl | 100 +++++++++++++++++---------- 6 files changed, 131 insertions(+), 88 deletions(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 3a98972f9..eb8c78ef4 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1141,7 +1141,7 @@ Array.prototype.remove = function(item) { function previewTheme(elm) { theme = $(elm).val(); $.getJSON('pretheme?f=&theme=' + theme,function(data) { - $('#theme-preview').html('
' + data.desc + '
' + data.version + '
' + data.credits + '
' + theme + ''); + $('#theme-preview').html('
' + data.desc + '
' + data.version + '
' + data.credits + '
' + theme + ''); }); } diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index cfda9760e..8254825a5 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -26,4 +26,4 @@ nav .badge { top: 30px; right: 15px; } -} \ No newline at end of file +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4a8155d4a..2f96c6e0d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -255,7 +255,7 @@ footer { } #theme-preview { - margin: 15px 0 15px 0px; + margin: 15px 0px; } .fakebutton { diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index b27415557..ba49859c5 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -100,7 +100,7 @@ if(feature_enabled(local_channel(),'expert')) '$baseurl' => $a->get_baseurl(), '$expert' => $expert, '$title' => t("Theme settings"), - '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), + '$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices), '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top color'), $arr['nav_gradient_top']), @@ -120,12 +120,12 @@ if(feature_enabled(local_channel(),'expert')) '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']), - '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), + '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], 'Example: 14px '), '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), - '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']), + '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width'], 'Example: 700px ("center conversation regions" must be set to Yes for this to have an effect)'), '$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center'], '', array(t('No'),t('Yes'))), '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index adf2e632d..972620a43 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,50 +1,65 @@ -{{include file="field_select.tpl" field=$schema}} -
- -
+
+ +
+
+ {{include file="field_select.tpl" field=$schema}} + + {{if $expert}} + {{include file="field_colorinput.tpl" field=$nav_bg}} + {{include file="field_colorinput.tpl" field=$nav_gradient_top}} + {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}} + {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}} + {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}} + {{include file="field_colorinput.tpl" field=$nav_bd}} + {{include file="field_colorinput.tpl" field=$nav_icon_colour}} + {{include file="field_colorinput.tpl" field=$nav_active_icon_colour}} + {{include file="field_input.tpl" field=$nav_min_opacity}} + {{include file="field_colorinput.tpl" field=$bgcolour}} + {{include file="field_colorinput.tpl" field=$background_image}} + {{include file="field_colorinput.tpl" field=$item_colour}} + {{include file="field_colorinput.tpl" field=$comment_item_colour}} + {{include file="field_colorinput.tpl" field=$comment_border_colour}} + {{include file="field_input.tpl" field=$comment_indent}} + {{/if}} + + {{include file="field_input.tpl" field=$body_font_size}} -{{if $expert}} + {{if $expert}} + {{include file="field_input.tpl" field=$font_size}} + {{include file="field_colorinput.tpl" field=$font_colour}} + {{include file="field_colorinput.tpl" field=$link_colour}} + {{include file="field_colorinput.tpl" field=$banner_colour}} + {{include file="field_colorinput.tpl" field=$toolicon_colour}} + {{include file="field_colorinput.tpl" field=$toolicon_activecolour}} + {{include file="field_input.tpl" field=$radius}} + {{include file="field_input.tpl" field=$shadow}} + {{include file="field_input.tpl" field=$top_photo}} + {{include file="field_input.tpl" field=$reply_photo}} + {{include file="field_input.tpl" field=$converse_width}} + {{include file="field_checkbox.tpl" field=$converse_center}} + {{/if}} -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{include file="field_colorinput.tpl" field=$nav_bg}} -{{include file="field_colorinput.tpl" field=$nav_gradient_top}} -{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}} -{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}} -{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}} -{{include file="field_colorinput.tpl" field=$nav_bd}} -{{include file="field_colorinput.tpl" field=$nav_icon_colour}} -{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}} -{{include file="field_colorinput.tpl" field=$banner_colour}} -{{include file="field_colorinput.tpl" field=$link_colour}} -{{include file="field_colorinput.tpl" field=$bgcolour}} -{{include file="field_colorinput.tpl" field=$background_image}} -{{include file="field_colorinput.tpl" field=$item_colour}} -{{include file="field_colorinput.tpl" field=$comment_item_colour}} -{{include file="field_colorinput.tpl" field=$comment_border_colour}} -{{include file="field_input.tpl" field=$comment_indent}} -{{include file="field_colorinput.tpl" field=$toolicon_colour}} -{{include file="field_colorinput.tpl" field=$toolicon_activecolour}} -{{include file="field_input.tpl" field=$body_font_size}} -{{include file="field_input.tpl" field=$font_size}} -{{include file="field_colorinput.tpl" field=$font_colour}} -{{include file="field_input.tpl" field=$radius}} -{{include file="field_input.tpl" field=$shadow}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$converse_center}} -{{include file="field_input.tpl" field=$nav_min_opacity}} -{{include file="field_input.tpl" field=$top_photo}} -{{include file="field_input.tpl" field=$reply_photo}} -{{*include file="field_checkbox.tpl" field=$sloppy_photos*}} - + {{include file="field_checkbox.tpl" field=$narrow_navbar}} -
- + {{if $expert}} + + {{/if}} +
+ +
+
+
-{{/if}} diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 93cee94d6..1dbf4381a 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,38 +1,66 @@ -
-

{{$ptitle}}

+
+
+

{{$ptitle}}

+
+
+ - - -{{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}} -{{include file="field_input.tpl" field=$ajaxint}} -{{include file="field_input.tpl" field=$itemspage}} -{{include file="field_input.tpl" field=$channel_divmore_height}} -{{include file="field_input.tpl" field=$network_divmore_height}} -{{include file="field_checkbox.tpl" field=$nosmile}} -{{include file="field_checkbox.tpl" field=$title_tosource}} -{{include file="field_checkbox.tpl" field=$channel_list_mode}} -{{include file="field_checkbox.tpl" field=$network_list_mode}} - -
- -
-{{if $expert}} -
-{{$layout_editor}} -
-{{/if}} -{{if $theme_config}} -

Theme settings

-{{$theme_config}} -{{/if}} - -
+
+
+ +
+
+ {{if $theme}} + {{include file="field_themeselect.tpl" field=$theme}} + {{/if}} + {{if $mobile_theme}} + {{include file="field_themeselect.tpl" field=$mobile_theme}} + {{/if}} +
+ +
+
+
+
+ {{if $theme_config}} + {{$theme_config}} + {{/if}} +
+ +
+
+ {{include file="field_input.tpl" field=$ajaxint}} + {{include file="field_input.tpl" field=$itemspage}} + {{include file="field_input.tpl" field=$channel_divmore_height}} + {{include file="field_input.tpl" field=$network_divmore_height}} + {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$title_tosource}} + {{include file="field_checkbox.tpl" field=$channel_list_mode}} + {{include file="field_checkbox.tpl" field=$network_list_mode}} + {{include file="field_checkbox.tpl" field=$user_scalable}} + {{if $expert}} +
+ {{$layout_editor}} +
+ {{/if}} +
+ +
+
+
+
+
+
-- cgit v1.2.3