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

Merge branch 'develop' into pr/new-config-format

Browse source 
Conflicts:
	common/legacy.php
This commit is contained in:
Kijin Sung 2016-02-07 22:15:27 +09:00
commit e55504e1f4
7 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@
'modules/layout/tpl/layout_all_instance_list/1' => 1,
'modules/autoinstall/tpl/uninstall/1' => 1,
'modules/layouts/tpl/layout_edit/1' => 1,
'modules/layout/tpl/lyaout_info_view/1' => 1,
'modules/layout/tpl/layout_info_view/1' => 1,
'modules/layout/tpl/layout_instance_list/1' => 1,
'modules/layout/tpl/layout_instance_list/2' => 1
);

2
modules/layout/tpl/js/layout_modify.js
View file

@ -1,6 +1,6 @@
function doSubmitConfig()
{
var $forms = jQuery('#layout_config').find('input[name][type="hidden"], input[name][type="text"], input[name][type="checkbox"]:checked, select[name], textarea[name], input[name][type="radio"]:checked');
var $forms = jQuery('#layout_config').find('input[name][type="hidden"], input[name][type="text"], input[name][type="color"], input[name][type="checkbox"]:checked, select[name], textarea[name], input[name][type="radio"]:checked');
var $configForm = jQuery('#config_form');
var $container = $configForm.children('div');
$container.empty();

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

@ -5,8 +5,8 @@
<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}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/lyaout_info_view/1" />
<!--// For submit config. Do not delete this division. -->
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/layout_info_view/1" />
<!--// For submit config. Do not delete this division. - TODO: Remove unusual form submit. by misol 2016.02.07- -->
<div></div>
</form>

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

@ -1,3 +1,3 @@
<include target="header.html" />
<load target="js/layout_modify.js" />
{$content}
<include target="header.html" />
{$content}

1
modules/module/module.model.php
View file

@ -966,6 +966,7 @@ class moduleModel extends module
$info->action->{$name}->check_csrf = $check_csrf;
if($action->attrs->menu_name)
{
$info->menu->{$action->attrs->menu_name} = new stdClass();
if($menu_index == 'true')
{
$info->menu->{$action->attrs->menu_name}->index = $name;