Spectrum 컬러피커 추가 등

- MIT 라이선스의 Spectrum 컬러피커 추가. (기존 jPicker를 대체 - 파일은 그대로 두어서 의존성 문제 회피)
- 색상 선택하는 부분을 전반적으로 다듬음
This commit is contained in:
MinSoo Kim 2016-02-06 17:53:53 +09:00
parent 4698bcac3e
commit 3288d504d2
65 changed files with 36275 additions and 28 deletions

View file

@ -1,5 +1,5 @@
<!--%load_js_plugin("ui")-->
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<!--%import("js/ui.hotkey.js",optimized=false)-->
<!--%import("js/ui.toolbar.js",optimized=false)-->
<!--%import("js/faceoff.js",optimized=false)-->
@ -218,7 +218,7 @@
<legend>{$lang->layout_manager[38]}</legend>
<span class="inputall">
<input type="text" id="border-width" size="3" title="border-width+px" />
<input type="text" id="border-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-color" size="7" class="color-indicator" title="border-color" />
<select id="border-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -237,7 +237,7 @@
<div>
<label for="border-top-width">{$lang->layout_manager[34]} : </label>
<input type="text" id="border-top-width" size="3" title="border-width+px" />
<input type="text" id="border-top-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-top-color" size="7" class="color-indicator" title="border-color" />
<select id="border-top-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -254,7 +254,7 @@
<div>
<label for="border-right-width">{$lang->layout_manager[36]} : </label>
<input type="text" id="border-right-width" size="3" title="border-width+px" />
<input type="text" id="border-right-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-right-color" size="7" class="color-indicator" title="border-color" />
<select id="border-right-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -271,7 +271,7 @@
<div>
<label for="border-bottom-width">{$lang->layout_manager[37]} : </label>
<input type="text" id="border-bottom-width" size="3" title="border-width+px" />
<input type="text" id="border-bottom-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-bottom-color" size="7" class="color-indicator" title="border-color" />
<select id="border-bottom-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -288,7 +288,7 @@
<div>
<label for="border-left-width">{$lang->layout_manager[35]} : </label>
<input type="text" id="border-left-width" size="3" title="border-width+px" />
<input type="text" id="border-left-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-left-color" size="7" class="color-indicator" title="border-color" />
<select id="border-left-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -309,7 +309,7 @@
<div class="visible-more">
<div>
<label for="background-color">{$lang->layout_manager[41]} : </label>
<input type="text" id="background-color" size="7" class="color-indicator" />
<input type="color" id="background-color" size="7" class="color-indicator" />
</div>
<div>
<label for="background-image">{$lang->layout_manager[42]} :</label>
@ -335,7 +335,7 @@
</div>
<div>
<label for="color">{$lang->layout_manager[54]} : </label>
<input type="text" id="color" size="7" class="color-indicator" />
<input type="color" id="color" size="7" class="color-indicator" />
</div>
</div>
</fieldset>

View file

@ -129,7 +129,7 @@
</block>
<block cond="$var->type == 'colorpicker'">
{@ $use_colorpicker = true; }
<input type="text" class="color-indicator" name="{$name}" id="{$name}" value="{$var->value}" />
<input type="color" class="color-indicator" name="{$name}" id="{$name}" value="{$var->value}" />
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</block>
<p class="x_help-block">{$var->description}</p>
@ -172,5 +172,5 @@
</section>
<iframe name="hiddenIframe" src="about:blank" hidden></iframe>
<!--@if($use_colorpicker)-->
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<!--@end-->