fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

input type=color can not be empty

Browse source 
https://www.w3.org/TR/2012/WD-html5-20120329/states-of-the-type-attribute.html#color-state-type-color
This commit is contained in:
MinSoo Kim 2016-03-13 00:37:04 +09:00
parent 18c5778789
commit f41e3f5907
9 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/js/plugins/spectrum/rx_spectrum.js
View file

@ -12,6 +12,7 @@ jQuery(function($){
$.getScript(request_uri + "./common/js/plugins/spectrum/i18n/jquery.spectrum-"+ xe.current_lang.replace("jp", "ja").toLowerCase() +".js", function() {
var settings = {
showInput: true,
allowEmpty:true,
showInitial: true,
showPalette: true,
showSelectionPalette: true,

2
modules/document/tpl/category_list.html
View file

@ -61,7 +61,7 @@
<div class="x_control-group">
<label class="x_control-label" for="category_color">{$lang->category_color}</label>
<div class="x_controls">
<span class="x_input-append"><input type="color" class="rx-spectrum" name="category_color" id="category_color" value="" /></span>
<span class="x_input-append"><input type="text" class="rx-spectrum" name="category_color" id="category_color" value="" /></span>
<a href="#categoy_color_help" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</div>

4
modules/editor/components/image_gallery/tpl/popup.html
View file

@ -40,13 +40,13 @@
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->gallery_border_color}</label>
<div class="x_controls">
<input type="color" id="border_color_input" class="rx-spectrum" size="7" value="#000000" />
<input type="text" id="border_color_input" class="rx-spectrum" size="7" value="#000000" />
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->gallery_bg_color}</label>
<div class="x_controls">
<input type="color" id="bg_color_input" class="rx-spectrum" size="7" value="#FFFFFF" />
<input type="text" id="bg_color_input" class="rx-spectrum" size="7" value="#FFFFFF" />
</div>
</div>
<div class="x_control-group">

14
modules/layout/tpl/faceoff_layout_menu.html
View file

@ -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="color" id="border-color" size="7" class="rx-spectrum" title="border-color" />
<input type="text" id="border-color" size="7" class="rx-spectrum" 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="color" id="border-top-color" size="7" class="rx-spectrum" title="border-color" />
<input type="text" id="border-top-color" size="7" class="rx-spectrum" 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="color" id="border-right-color" size="7" class="rx-spectrum" title="border-color" />
<input type="text" id="border-right-color" size="7" class="rx-spectrum" 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="color" id="border-bottom-color" size="7" class="rx-spectrum" title="border-color" />
<input type="text" id="border-bottom-color" size="7" class="rx-spectrum" 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="color" id="border-left-color" size="7" class="rx-spectrum" title="border-color" />
<input type="text" id="border-left-color" size="7" class="rx-spectrum" 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="color" id="background-color" size="7" class="rx-spectrum" />
<input type="text" id="background-color" size="7" class="rx-spectrum" />
</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="color" id="color" size="7" class="rx-spectrum" />
<input type="text" id="color" size="7" class="rx-spectrum" />
</div>
</div>
</fieldset>

2
modules/layout/tpl/layout_info_view.html
View file

@ -129,7 +129,7 @@
</block>
<block cond="$var->type == 'colorpicker'">
{@ $use_colorpicker = true; }
<input type="color" class="rx-spectrum" name="{$name}" id="{$name}" value="{$var->value}" />
<input type="text" class="rx-spectrum" 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>

2
modules/module/tpl/skin_config.html
View file

@ -117,7 +117,7 @@
<!--// colorpicker-->
<div cond="$val->type == 'colorpicker'">
{@ $use_colorpicker = true; }
<input type="color" class="rx-spectrum" name="{$val->name}" id="{$val->name}" value="{$val->value}" />
<input type="text" class="rx-spectrum" name="{$val->name}" id="{$val->name}" value="{$val->value}" />
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</div>
<a href="#about_{$val->name}" data-toggle class="x_icon-question-sign" cond="$val->description" style="vertical-align:top;margin-top:5px"|cond="$val->type == 'textarea'">{$lang->help}</a>

2
modules/widget/tpl/widget_generate_code.include.html
View file

@ -49,7 +49,7 @@
<input type="text" name="{$id}" />
</block>
<block cond="$var->type == 'color'">
<input type="color" name="{$id}" value="" id="{$id}" class="rx-spectrum" style="width:178px" />
<input type="text" name="{$id}" value="" id="{$id}" class="rx-spectrum" style="width:178px" />
</block>
<block cond="$var->type == 'textarea'">
<textarea cond="$var->type == 'textarea'" name="{$id}" id="{$id}" rows="8" cols="42"></textarea>

10
modules/widget/tpl/widget_layer.html
View file

@ -62,7 +62,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="color" name="border_top_color" value="" class="color_input rx-spectrum" maxlength="7"/>
<input type="text" name="border_top_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
</tr>
<tr>
@ -72,7 +72,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="color" name="border_left_color" value="" class="color_input rx-spectrum" maxlength="7"/>
<input type="text" name="border_left_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
<td style="text-align:right">
<input type="number" name="border_right_thick" value="" class="small_input" /> px
@ -80,7 +80,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="color" name="border_right_color" value="" class="color_input rx-spectrum" maxlength="7"/>
<input type="text" name="border_right_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
</tr>
<tr>
@ -90,12 +90,12 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="color" name="border_bottom_color" value="" class="color_input rx-spectrum" maxlength="7"/>
<input type="text" name="border_bottom_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
</tr>
<tr>
<th>{$lang->cmd_widget_background_color}</th>
<td colspan="2"><input type="color" name="background_color" value="" class="input rx-spectrum" /></td>
<td colspan="2"><input type="text" name="background_color" value="" class="input rx-spectrum" /></td>
</tr>
<tr>
<th>{$lang->cmd_widget_background_image_url}</th>

2
modules/widget/tpl/widget_style_generate_code_in_page.html
View file

@ -70,7 +70,7 @@
<input type="text" name="{$id}" value="" class="lang_code" />
</div>
<input cond="$var->type == 'color'" type="color" name="{$id}" class="rx-spectrum" />
<input cond="$var->type == 'color'" type="text" name="{$id}" class="rx-spectrum" />
<div cond="$var->type == 'textarea'">
<textarea name="{$id}" rows="8" cols="42" class="lang_code"></textarea>