From c972a94b0125bcb82ef3fe8e97adef45f94404f2 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 23 Mar 2014 21:35:20 +0100 Subject: Add color picker to theme settings --- view/theme/redbasic/php/theme_init.php | 7 ++++- view/theme/redbasic/tpl/theme_settings.tpl | 41 ++++++++++++++++++------------ 2 files changed, 31 insertions(+), 17 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 12f49efa7..552399329 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -5,10 +5,15 @@ head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); head_add_css('library/bootstrap/css/bootstrap.min.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); - +//head_add_css('library/colorpicker/css/colorpicker.css'); +head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); require_once('view/php/theme_init.php'); head_add_js('library/bootstrap/js/bootstrap.min.js'); head_add_js('library/bootstrap/js/bootbox.min.js'); head_add_js('library/bootstrap-datetimepicker/js/moment.js'); head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); +//head_add_js('library/colorpicker/js/colorpicker.js'); +head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); +head_add_js('library/bootstrap-colorpicker/src/js/docs.js'); + diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index fc9388f2e..ccd183049 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -4,26 +4,27 @@ {{if $expert}} + {{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{include file="field_input.tpl" field=$nav_bg}} -{{include file="field_input.tpl" field=$nav_gradient_top}} -{{include file="field_input.tpl" field=$nav_gradient_bottom}} -{{include file="field_input.tpl" field=$nav_active_gradient_top}} -{{include file="field_input.tpl" field=$nav_active_gradient_bottom}} -{{include file="field_input.tpl" field=$nav_bd}} -{{include file="field_input.tpl" field=$nav_icon_colour}} -{{include file="field_input.tpl" field=$nav_active_icon_colour}} -{{include file="field_input.tpl" field=$banner_colour}} -{{include file="field_input.tpl" field=$link_colour}} -{{include file="field_input.tpl" field=$bgcolour}} -{{include file="field_input.tpl" field=$background_image}} -{{include file="field_input.tpl" field=$item_colour}} +{{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_input.tpl" field=$item_opacity}} -{{include file="field_input.tpl" field=$toolicon_colour}} -{{include file="field_input.tpl" field=$toolicon_activecolour}} +{{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_input.tpl" field=$font_colour}} +{{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}} @@ -31,6 +32,14 @@ {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} {{include file="field_checkbox.tpl" field=$sloppy_photos}} + +
-- cgit v1.2.3