From 39f2efbef89664f091fb9747c3a8f98790a7698b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 22 Nov 2013 15:48:03 -0500 Subject: [PATCH] closed #540 --- public/src/forum/admin/categories.js | 18 +- public/templates/admin/categories.tpl | 175 ++++--- public/templates/admin/header.tpl | 2 + public/templates/home.tpl | 2 +- public/vendor/colorpicker/colorpicker.css | 162 ++++++ public/vendor/colorpicker/colorpicker.js | 484 ++++++++++++++++++ public/vendor/colorpicker/images/Thumbs.db | Bin 0 -> 19968 bytes public/vendor/colorpicker/images/blank.gif | Bin 0 -> 49 bytes .../images/colorpicker_background.png | Bin 0 -> 1897 bytes .../colorpicker/images/colorpicker_hex.png | Bin 0 -> 532 bytes .../colorpicker/images/colorpicker_hsb_b.png | Bin 0 -> 970 bytes .../colorpicker/images/colorpicker_hsb_h.png | Bin 0 -> 1012 bytes .../colorpicker/images/colorpicker_hsb_s.png | Bin 0 -> 1171 bytes .../colorpicker/images/colorpicker_indic.gif | Bin 0 -> 86 bytes .../images/colorpicker_overlay.png | Bin 0 -> 10355 bytes .../colorpicker/images/colorpicker_rgb_b.png | Bin 0 -> 970 bytes .../colorpicker/images/colorpicker_rgb_g.png | Bin 0 -> 1069 bytes .../colorpicker/images/colorpicker_rgb_r.png | Bin 0 -> 1066 bytes .../colorpicker/images/colorpicker_select.gif | Bin 0 -> 78 bytes .../colorpicker/images/colorpicker_submit.png | Bin 0 -> 984 bytes .../colorpicker/images/custom_background.png | Bin 0 -> 1916 bytes .../vendor/colorpicker/images/custom_hex.png | Bin 0 -> 562 bytes .../colorpicker/images/custom_hsb_b.png | Bin 0 -> 1097 bytes .../colorpicker/images/custom_hsb_h.png | Bin 0 -> 970 bytes .../colorpicker/images/custom_hsb_s.png | Bin 0 -> 1168 bytes .../colorpicker/images/custom_indic.gif | Bin 0 -> 86 bytes .../colorpicker/images/custom_rgb_b.png | Bin 0 -> 1008 bytes .../colorpicker/images/custom_rgb_g.png | Bin 0 -> 1069 bytes .../colorpicker/images/custom_rgb_r.png | Bin 0 -> 1018 bytes .../colorpicker/images/custom_submit.png | Bin 0 -> 997 bytes public/vendor/colorpicker/images/select.png | Bin 0 -> 506 bytes public/vendor/colorpicker/images/select2.png | Bin 0 -> 518 bytes public/vendor/colorpicker/images/slider.png | Bin 0 -> 315 bytes src/upgrade.js | 48 +- 34 files changed, 799 insertions(+), 92 deletions(-) create mode 100644 public/vendor/colorpicker/colorpicker.css create mode 100644 public/vendor/colorpicker/colorpicker.js create mode 100644 public/vendor/colorpicker/images/Thumbs.db create mode 100644 public/vendor/colorpicker/images/blank.gif create mode 100644 public/vendor/colorpicker/images/colorpicker_background.png create mode 100644 public/vendor/colorpicker/images/colorpicker_hex.png create mode 100644 public/vendor/colorpicker/images/colorpicker_hsb_b.png create mode 100644 public/vendor/colorpicker/images/colorpicker_hsb_h.png create mode 100644 public/vendor/colorpicker/images/colorpicker_hsb_s.png create mode 100644 public/vendor/colorpicker/images/colorpicker_indic.gif create mode 100644 public/vendor/colorpicker/images/colorpicker_overlay.png create mode 100644 public/vendor/colorpicker/images/colorpicker_rgb_b.png create mode 100644 public/vendor/colorpicker/images/colorpicker_rgb_g.png create mode 100644 public/vendor/colorpicker/images/colorpicker_rgb_r.png create mode 100644 public/vendor/colorpicker/images/colorpicker_select.gif create mode 100644 public/vendor/colorpicker/images/colorpicker_submit.png create mode 100644 public/vendor/colorpicker/images/custom_background.png create mode 100644 public/vendor/colorpicker/images/custom_hex.png create mode 100644 public/vendor/colorpicker/images/custom_hsb_b.png create mode 100644 public/vendor/colorpicker/images/custom_hsb_h.png create mode 100644 public/vendor/colorpicker/images/custom_hsb_s.png create mode 100644 public/vendor/colorpicker/images/custom_indic.gif create mode 100644 public/vendor/colorpicker/images/custom_rgb_b.png create mode 100644 public/vendor/colorpicker/images/custom_rgb_g.png create mode 100644 public/vendor/colorpicker/images/custom_rgb_r.png create mode 100644 public/vendor/colorpicker/images/custom_submit.png create mode 100644 public/vendor/colorpicker/images/select.png create mode 100644 public/vendor/colorpicker/images/select2.png create mode 100644 public/vendor/colorpicker/images/slider.png diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js index ce3f716312..107d828458 100644 --- a/public/src/forum/admin/categories.js +++ b/public/src/forum/admin/categories.js @@ -10,6 +10,8 @@ define(function() { modified_categories[cid] = modified_categories[cid] || {}; modified_categories[cid][$(el).attr('data-name')] = $(el).val(); } + + console.log(modified_categories); } function save() { @@ -129,7 +131,7 @@ define(function() { update_blockclass(ev.target); }); - jQuery('.category_name, .category_description, .blockclass').on('change', function(ev) { + jQuery('.category_name, .category_description, .blockclass .category_bgColor').on('change', function(ev) { modified(ev.target); }); @@ -156,6 +158,20 @@ define(function() { return false; }); + // Colour Picker + $('[data-name="bgColor"], [data-name="color"]').each(function(idx, inputEl) { + var jinputEl = $(this), + parentEl = jinputEl.parents('[data-cid]'); + jinputEl.ColorPicker({ + color: this.value || '#000', + onChange: function(hsb, hex) { + jinputEl.val('#' + hex); + if (inputEl.getAttribute('data-name') === 'bgColor') parentEl.css('background', '#' + hex); + else if (inputEl.getAttribute('data-name') === 'color') parentEl.css('color', '#' + hex); + modified(inputEl); + } + }); + }); }); }; diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl index 4c4fe8f394..9b3780c83d 100644 --- a/public/templates/admin/categories.tpl +++ b/public/templates/admin/categories.tpl @@ -1,104 +1,101 @@ -

Categories

+
+

Categories

+
-
- - - - -
-
    - -
  • -
    -
    - -
    - - - - - -
    -
  • - - + - - -
+ -