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

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/layout/tpl/js/adminList.js
View file

@ -1,8 +1,10 @@
var ConfirmCheck = xe.createPlugin('confirm_check', {
API_BEFORE_VALIDATE: function(sender, params){
return confirm(xe.lang.confirm_delete);
if(params[0].className == 'layout_delete_form'){
return confirm(xe.lang.confirm_delete);
}
}
});
var Validator = xe.getApp('Validator')[0];
Validator.registerPlugin(new ConfirmCheck());
Validator.registerPlugin(new ConfirmCheck());

43
modules/layout/tpl/layout_instance_list.html
View file

@ -38,5 +38,46 @@
</table>
</div>
<div cond="$layout_info->layout != 'faceoff'" class="btnArea">
<span class="btn"><a href="{getUrl('act', 'dispLayoutAdminInsert', 'layout', $layout_info->layout)}">{$lang->cmd_insert}...</a></span>
<span class="btn"><a href="#insertLayout" class="modalAnchor">{$lang->cmd_insert}...</a></span>
</div>
<div id="insertLayout" class="modal">
<div class="fg">
<h2></h2>
<form ruleset="insertLayout" action="./" class="form">
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminInsert" />
<input type="hidden" name="layout" value="{$layout_info->layout}" />
<input type="hidden" name="_layout_type" value="{$type}" />
<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispLayoutAdminInstanceList')}" />
<ul>
<li>
<p class="q">{$lang->layout}</p>
<p class="a">{$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})</p>
</li>
<li cond="$layout_info->path">
<p class="q">{$lang->path}</p>
<p class="a">{$layout_info->path}</p>
</li>
<li cond="$layout_info->description">
<p class="q">{$lang->description}</p>
<p class="a">{$layout_info->description}</p>
</li>
<li>
<p class="q">{$lang->author}</p>
<p class="a"><a href="{$layout_info->author->homepage}" target="_blank">{$layout_info->layout->author->name}</a></p>
</li>
<li>
<p class="q">{$lang->title}</p>
<p class="a">
<input type="text" name="title" value="" />
</p>
<p class="desc">{$lang->about_title}</p>
</li>
</ul>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_insert}" /></span>
</div>
</form>
</div>
</div>

13
modules/layout/tpl/layout_modify.html
View file

@ -2,11 +2,10 @@
<load target="js/layout_modify.js" />
<h2 cond="$act == 'dispLayoutAdminModify'" class="h2">{$selected_layout->layout_title}</h2>
<h2 cond="$act == 'dispLayoutAdminInsert'" class="h2">{$selected_layout->title}</h2>
<form id="config_form" ruleset="updateLayout"|cond="$act == 'dispLayoutAdminModify'" ruleset="insertLayout"|cond="$act == 'dispLayoutAdminInsert'" action="./" class="form" enctype="multipart/form-data" method="post">
<form id="config_form" ruleset="updateLayout"|cond="$act == 'dispLayoutAdminModify'" action="./" class="form" enctype="multipart/form-data" method="post">
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminUpdate"|cond="$act == 'dispLayoutAdminModify'" value="procLayoutAdminInsert"|cond="$act == 'dispLayoutAdminInsert'" />
<input type="hidden" name="act" value="procLayoutAdminUpdate"|cond="$act == 'dispLayoutAdminModify'" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="layout" value="{$selected_layout->layout}" />
<input type="hidden" name="_layout_type" value="{$selected_layout->layout_type}" />
@ -97,6 +96,12 @@
<option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$key == $var->value">{$val->val}</option>
</select>
<block cond="$var->type == 'checkbox'">
<block loop="$var->options => $key, $val">
<label><input type="checkbox" name="{$name}[]" value="{$key}" checked="checked"|cond="@in_array($key, $var->value)" /> {$val->val}</label>
</block>
</block>
<block cond="$var->type == 'radio'">
<block loop="$var->options => $key, $val">
<block cond="$val->thumbnail">
@ -177,4 +182,4 @@
<include target="include.multilang.html" />
<include target="include.multilang.textarea.html" />
</div>
<iframe name="hiddenIframe" src="about:blank" width="0" height="0" frameborder="0"></iframe>
<iframe name="hiddenIframe" src="about:blank" width="1000px" height="1000px" frameborder="0" style="position:absolute;top:-9999px;left:-9999px"></iframe>