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

issue 2728, added colorpicker in widget layer

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12477 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2012-12-27 06:38:00 +00:00
parent 6544804465
commit cd4078d396
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/widget/tpl/css/widget.css
View file

@ -26,7 +26,7 @@
.widgetButtons .widgetBoxCopy{background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
.widgetButtons .widgetBoxSize{background:transparent url("../images/widget_size.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
.widgetButtons .widgetBoxRemove{background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:2000;position:absolute}
#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:1999;position:absolute}
#pageSizeLayer table{border:0;width:100%;table-layout:fixed}
#pageSizeLayer table th{padding:4px 0 4px 0;background-color:#DEDEDE;text-align:center;color:#888}
#pageSizeLayer table th.line {border-top:1px dotted #eee}

9
modules/widget/tpl/js/widget.js
View file

@ -682,7 +682,14 @@ function doShowWidgetSizeSetup(px, py, obj) {
jQuery.each(opts, function(key, val){
var el = form[0].elements[key];
if (el) el.value = val;
if (el)
{
el.value = val;
if(el.className.match(/\bcolor-indicator\b/))
{
el.style.background = el.value = '#'+el.value;
}
}
if (el.tagName.toLowerCase() == "select")
{
if(el.selectedIndex == -1) {

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

@ -47,7 +47,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
#<input type="text" name="border_top_color" value="" class="color_input" maxlength="6"/>
<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="6"/>
</td>
</tr>
<tr>
@ -57,7 +57,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
#<input type="text" name="border_left_color" value="" class="color_input" maxlength="6"/>
<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="6"/>
</td>
<td class="tRight">
<input type="text" name="border_right_thick" value="" class="small_input" />px
@ -65,7 +65,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
#<input type="text" name="border_right_color" value="" class="color_input" maxlength="6"/>
<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="6"/>
</td>
</tr>
<tr>
@ -75,12 +75,12 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
#<input type="text" name="border_bottom_color" value="" class="color_input" maxlength="6"/>
<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="6"/>
</td>
</tr>
<tr>
<th class="line">{$lang->cmd_widget_background_color}</th>
<td colspan="2" class="line"><input type="text" name="background_color" value="" class="input" /></td>
<td colspan="2" class="line"><input type="text" name="background_color" value="" class="input color-indicator" /></td>
</tr>
<tr>
<th class="line">{$lang->cmd_widget_background_image_url}</th>
@ -108,3 +108,5 @@
</div>
</form>
</div>
<!--%load_js_plugin("ui.colorpicker")-->