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

Merge pull request #369 from misol/color-of-no-color

Browse source 
input type=color can not be empty
This commit is contained in:
MinSoo Kim 2016-03-13 00:42:13 +09:00
commit d1a7dfca7e
9 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,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>