aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2014-03-23 21:35:20 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2014-03-23 21:35:20 +0100
commitc972a94b0125bcb82ef3fe8e97adef45f94404f2 (patch)
tree0092c5cbf03c1f94b2ff768ba6f932c6f75f1410
parentff0a07655da0201490fbb51bc9163da53b3d40a2 (diff)
downloadvolse-hubzilla-c972a94b0125bcb82ef3fe8e97adef45f94404f2.tar.gz
volse-hubzilla-c972a94b0125bcb82ef3fe8e97adef45f94404f2.tar.bz2
volse-hubzilla-c972a94b0125bcb82ef3fe8e97adef45f94404f2.zip
Add color picker to theme settings
-rw-r--r--view/theme/redbasic/php/theme_init.php7
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl41
-rw-r--r--view/tpl/field_colorinput.tpl6
3 files changed, 37 insertions, 17 deletions
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 @@
</div>
{{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}}
+<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();
+ $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
+ $('#id_redbasic_item_colour,#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
+ });
+</script>
+
<div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
</div>
diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl
new file mode 100644
index 000000000..a68781698
--- /dev/null
+++ b/view/tpl/field_colorinput.tpl
@@ -0,0 +1,6 @@
+ <div class='field input color'>
+ <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+ <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+ <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
+ <div id='end_{{$field.0}}' class='field_end'></div>
+ </div>