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 branch 'pr/55' into develop

Browse source 
Conflicts:
	modules/communication/communication.controller.php
This commit is contained in:
bnu 2013-11-23 20:18:20 +09:00
commit bf85de4e26
8 changed files with 109 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/widget/tpl/js/generate_code.js
View file

@ -132,6 +132,7 @@ function doFillWidgetVars() {
else node.value = unescaped_val;
jQuery('#'+name).val(node.value);
break;
case "radio" :
case "checkbox" :
if(selected_node.getAttribute(name)) {
var val = selected_node.getAttribute(name).split(',');

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

@ -2,6 +2,7 @@
<load target="../../module/tpl/js/module_list.js" />
<load target="../../module/tpl/js/mid.js" />
<!--%load_js_plugin("ui.colorpicker")-->
<div class="x_control-group">
<label class="x_control-label" for="skin">{$lang->skin}</label>
<div class="x_controls">
@ -12,6 +13,7 @@
<input type="button" class="x_btn" value="{$lang->cmd_select}" />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="colorset">{$lang->colorset}</label>
<div class="x_controls">
@ -19,6 +21,7 @@
</select>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="widget_cache">{$lang->widget_cache}</label>
<div class="x_controls">
@ -26,6 +29,7 @@
<p class="x_help-inline">{$lang->about_widget_cache}</p>
</div>
</div>
{@$suggestion_id = 0}
<block loop="$widget_info->extra_var => $id, $var">
{@$suggestion_id++}
@ -36,20 +40,25 @@
<h1>{$var->group}</h1>
{@$group = $var->group}
</block>
{@$not_first = true}
<div class="x_control-group <!--@if($var->type == 'mid' || $var->type == 'module_srl_list')-->moduleSearch moduleSearch1 modulefinder<!--@end-->">
<label class="x_control-label" for="{$id}">{$var->name}</label>
<label class="x_control-label" for="{$id}"|cond="$var->type != 'radio' && $var->type != 'checkbox'">{$var->name}</label>
<div class="x_controls">
<div cond="$var->type == 'text'">
<block cond="$var->type == 'text'">
<input type="text" name="{$id}" />
</div>
<input cond="$var->type == 'color'" type="text" name="{$id}" value="" id="{$id}" class="color-indicator" style="width:178px" />
<div cond="$var->type == 'textarea'">
</block>
<block cond="$var->type == 'color'">
<input type="text" name="{$id}" value="" id="{$id}" class="color-indicator" style="width:178px" />
</block>
<block cond="$var->type == 'textarea'">
<textarea cond="$var->type == 'textarea'" name="{$id}" id="{$id}" rows="8" cols="42"></textarea>
</div>
<select cond="$var->type == 'select'" name="{$id}" id="{$id}">
<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
</select>
</block>
<block cond="$var->type == 'select'">
<select name="{$id}" id="{$id}">
<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
</select>
</block>
<block cond="$var->type == 'select-multi-order'">
<!--@if($var->init_options && is_array($var->init_options))-->
{@$inits = array_keys($var->init_options)}
@ -122,15 +131,28 @@
<input type="hidden" name="{$id}" />
<a class="x_btn modalAnchor filebox" href="#modalFilebox">{$lang->cmd_select}</a>
</block>
<select cond="$var->type == 'menu'" name="{$id}">
<option value="">-</option>
<option loop="$menu_list => $key, $val" value="{$val->menu_srl}">{$val->title}</option>
</select>
<block cond="$var->type == 'menu'">
<select name="{$id}">
<option value="">-</option>
<option loop="$menu_list => $key, $val" value="{$val->menu_srl}">{$val->title}</option>
</select>
</block>
<block cond="$var->type == 'radio'">
<label loop="$var->options => $key, $val">
<input type="radio" name="{$id}" id="{$id}_{$key}" value="{$key}" > {$val}
</label>
</block>
<block cond="$var->type == 'checkbox'">
<label loop="$var->options => $key, $val">
<input type="checkbox" name="{$id}" id="{$id}_{$key}" value="{$key}" > {$val}
</label>
</block>
<p cond="$var->description">{$var->description}</p>
</div>
</div>
</block>
</section>
<script>
xe.current_lang = "{$lang_type}";
</script>

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

@ -87,6 +87,14 @@
<a href="#modalFilebox" class="modalAnchor filebox">{$lang->cmd_select}</a>
{@$use_filebox = TRUE}
</block>
<label loop="$var->options => $key, $val" cond="$var->type == 'radio'">
<input type="radio" name="{$id}" id="{$id}_{$key}" value="{$key}" > {$val}
</label>
<label loop="$var->options => $key, $val" cond="$var->type == 'checkbox'">
<input type="checkbox" name="{$id}" id="{$id}_{$key}" value="{$key}" > {$val}
</label>
<span class="x_help-block">{$var->description}</span>
</div>
</div>