diff --git a/common/js/plugins/spectrum/plugin.load b/common/js/plugins/spectrum/plugin.load index aa50ef57a..7398fdfdd 100644 --- a/common/js/plugins/spectrum/plugin.load +++ b/common/js/plugins/spectrum/plugin.load @@ -1,3 +1,3 @@ spectrum.css spectrum.js -xe_spectrum.js \ No newline at end of file +rx_spectrum.js \ No newline at end of file diff --git a/common/js/plugins/spectrum/xe_spectrum.js b/common/js/plugins/spectrum/rx_spectrum.js similarity index 88% rename from common/js/plugins/spectrum/xe_spectrum.js rename to common/js/plugins/spectrum/rx_spectrum.js index 3fe8652f3..39e788732 100644 --- a/common/js/plugins/spectrum/xe_spectrum.js +++ b/common/js/plugins/spectrum/rx_spectrum.js @@ -3,12 +3,12 @@ * @author MinSoo Kim **/ jQuery(function($){ - $.fn.xe_spectrum = function(settings){ + $.fn.rx_spectrum = function(settings){ return this.spectrum(settings); } - // 컬러 피커가 내장된 브라우저에서는 내장된 컬러피커 이용 by misol 2016.02.05 - if ( $("input.color-indicator").prop('type') != 'color' ) { + // 컬러 피커가 내장된 브라우저에서는 내장된 컬러피커 이용 + if ( $("input.rx-spectrum").prop('type') != 'color' ) { $.getScript(request_uri + "./common/js/plugins/spectrum/i18n/jquery.spectrum-"+ xe.current_lang.replace("jp", "ja").toLowerCase() +".js", function() { var settings = { showInput: true, @@ -42,7 +42,7 @@ jQuery(function($){ ["#660000","#783f04","#7f6000","#274e13","#0c343d","#073763","#20124d","#4c1130"] ] } - $('input.color-indicator').xe_spectrum(settings); + $('input.rx-spectrum').rx_spectrum(settings); }); } }); \ No newline at end of file diff --git a/modules/document/tpl/category_list.html b/modules/document/tpl/category_list.html index ee98c9ad7..e9f03e0ad 100644 --- a/modules/document/tpl/category_list.html +++ b/modules/document/tpl/category_list.html @@ -61,7 +61,7 @@
- + {$lang->help}
diff --git a/modules/document/tpl/js/document_category.js b/modules/document/tpl/js/document_category.js index 3a9344c63..0cdf72dc3 100644 --- a/modules/document/tpl/js/document_category.js +++ b/modules/document/tpl/js/document_category.js @@ -150,6 +150,7 @@ function clearValue(){ $w.find('input[type="checkbox"]').removeAttr('checked'); $w.find('.lang_code').trigger('reload-multilingual'); $w.find('.color-indicator').trigger('keyup'); + $w.find('.rx-spectrum').trigger('keyup'); } function addNode(node,e){ diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html index aecf11574..d8cd62292 100644 --- a/modules/editor/components/image_gallery/tpl/popup.html +++ b/modules/editor/components/image_gallery/tpl/popup.html @@ -40,13 +40,13 @@
- +
- +
diff --git a/modules/layout/tpl/faceoff_layout_menu.html b/modules/layout/tpl/faceoff_layout_menu.html index 4f6c435e3..13bc6d802 100644 --- a/modules/layout/tpl/faceoff_layout_menu.html +++ b/modules/layout/tpl/faceoff_layout_menu.html @@ -218,7 +218,7 @@ {$lang->layout_manager[38]} - + - + - + - + - + +
@@ -335,7 +335,7 @@
- +
diff --git a/modules/layout/tpl/layout_info_view.html b/modules/layout/tpl/layout_info_view.html index 7b8b51e4f..2e15be302 100644 --- a/modules/layout/tpl/layout_info_view.html +++ b/modules/layout/tpl/layout_info_view.html @@ -129,7 +129,7 @@ {@ $use_colorpicker = true; } - +

{$var->description}

diff --git a/modules/module/tpl/skin_config.html b/modules/module/tpl/skin_config.html index 4b338d3ac..a2de640b0 100644 --- a/modules/module/tpl/skin_config.html +++ b/modules/module/tpl/skin_config.html @@ -117,7 +117,7 @@
{@ $use_colorpicker = true; } - +
{$lang->help} diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js index 02ccbe67c..68dea693c 100644 --- a/modules/widget/tpl/js/widget.js +++ b/modules/widget/tpl/js/widget.js @@ -669,7 +669,7 @@ function doShowWidgetSizeSetup(px, py, obj) { if(el) { $el.val(val); - if($el.hasClass('color-indicator')) { + if($el.hasClass('color-indicator') || $el.hasClass('rx-spectrum')) { if(val != 'transparent') { val = val.toUpperCase(); $el.css('background', '#' + val); diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html index 0dc42a323..8d931af62 100644 --- a/modules/widget/tpl/widget_generate_code.include.html +++ b/modules/widget/tpl/widget_generate_code.include.html @@ -49,7 +49,7 @@ - + diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html index 0b2fb1df1..6f1a2c911 100644 --- a/modules/widget/tpl/widget_layer.html +++ b/modules/widget/tpl/widget_layer.html @@ -62,7 +62,7 @@ - + @@ -72,7 +72,7 @@ - + px @@ -80,7 +80,7 @@ - + @@ -90,12 +90,12 @@ - + {$lang->cmd_widget_background_color} - + {$lang->cmd_widget_background_image_url} diff --git a/modules/widget/tpl/widget_style_generate_code_in_page.html b/modules/widget/tpl/widget_style_generate_code_in_page.html index 24b5a9607..ab3d1327e 100644 --- a/modules/widget/tpl/widget_style_generate_code_in_page.html +++ b/modules/widget/tpl/widget_style_generate_code_in_page.html @@ -72,7 +72,7 @@ - +