issue 2313 set selected value is theme value

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11110 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-08-29 03:01:26 +00:00
parent 5142ab64f8
commit 5505577b67
3 changed files with 19 additions and 4 deletions

View file

@ -183,6 +183,20 @@
$layoutList = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layoutList);
// choice theme file
$theme_file = _XE_PATH_.'files/theme/theme_info.php';
if(is_readable($theme_file))
{
@include($theme_file);
Context::set('current_layout', $theme_info->layout);
}
else
{
$oModuleModel = &getModel('module');
$default_mid = $oModuleModel->getDefaultMid();
Context::set('current_layout', $default_mid->layout_srl);
}
// get default group list
$oMemberModel = &getModel('member');
$output = $oMemberModel->getGroups();

View file

@ -161,7 +161,7 @@ $('form.siteMap')
editForm.find('input[name=menu_name]').val('');
editForm.find('input[name=cType]').attr('checked', false);
editForm.find('input[name=create_menu_url]').val('');
editForm.find('select[name=layout_srl]')[0].options[0].selected = true;
editForm.find('select[name=layout_srl]').val(xe.current_layout);
editForm.find('input[name=menu_url]').val('');
editForm.find('input[name=menu_open_window]')[0].checked = true;
editForm.find('input[name=group_srls\\[\\]]').attr('checked', false);
@ -292,7 +292,7 @@ $('form.siteMap')
}
else if(checkedValue == 'CREATE')
{
$('#layoutSrl').val('0');
$('#layoutSrl').val(xe.current_layout);
}
}

View file

@ -1,5 +1,6 @@
<script>
xe.lang.confirm_delete = "{$lang->confirm_delete}";
xe.current_layout = {$current_layout};
jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMenuGrantZone(); } ); doShowMenuGrantZone() } );
</script>
<load target="./js/menu_admin.js" usecdn="true" />
@ -128,11 +129,11 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
</div>
</li>
<li id="selectLayout">
<p class="q"><label for="layout_list">{$lang->layout} <em>*</em></label></p>
<p class="q"><label for="layoutSrl">{$lang->layout} <em>*</em></label></p>
<div class="a">
<select name="layout_srl" id="layoutSrl">
<option value="0">{$lang->notuse}</option>
<option loop="$layout_list => $key, $val" value="{$val->layout_srl}">{$val->title} ({$val->layout})</option>
<option loop="$layout_list => $key, $val" value="{$val->layout_srl}" <!--@if($val->layout_srl == $current_layout)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
</select>
</div>
</li>