issue 70 menu setup name change to admin setup

default log showing.
empty admin title apply.


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8905 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-08-26 02:55:45 +00:00
parent 2763f31306
commit ce6b3690d2
4 changed files with 13 additions and 10 deletions

View file

@ -218,6 +218,7 @@
$oAdminConfig->adminLogo = $target_filename;
}
if($adminTitle) $oAdminConfig->adminTitle = strip_tags($adminTitle);
else unset($oAdminConfig->adminTitle);
if($oAdminConfig)
{
@ -227,7 +228,7 @@
$this->setMessage('success_updated', 'info');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminMenuSetup');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
$this->setRedirectUrl($returnUrl);
return;
}
@ -249,7 +250,7 @@
$this->setMessage('success_deleted', 'info');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminMenuSetup');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
$this->setRedirectUrl($returnUrl);
return;
}

View file

@ -325,7 +325,7 @@
* @brief Display Admin Menu Configuration(settings) page
* @return none
**/
function dispAdminMenuSetup()
function dispAdminSetup()
{
$oModuleModel = &getModel('module');
$configObject = $oModuleModel->getModuleConfig('admin');
@ -335,7 +335,7 @@
Context::set('menu_srl', $output->menu_srl);
Context::set('config_object', $configObject);
$this->setTemplateFile('menu_setup');
$this->setTemplateFile('admin_setup');
}

View file

@ -6,7 +6,7 @@
<action name="dispAdminIndex" type="view" standalone="true" index="true" />
<action name="dispAdminConfig" type="view" standalone="true" />
<action name="dispAdminTheme" type="view" standalone="true" menu_name="theme" menu_index="true" />
<action name="dispAdminMenuSetup" type="view" standalone="true" menu_name="adminMenuSetup" menu_index="true" />
<action name="dispAdminSetup" type="view" standalone="true" menu_name="adminMenuSetup" menu_index="true" />
<action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
<action name="procAdminLogout" type="controller" standalone="true" />

View file

@ -9,20 +9,22 @@
<fieldset class="section">
<h2 class="h2">{$lang->title}</h2>
<ul class="form">
<li>
<p class="q"><label for="adminTitle">관리자 페이지 제목</label></p>
<p class="a"><input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" /></p>
</li>
<li>
<p class="q"><label for="adminLogo">관리자 페이지 로고</label></p>
<p class="a">
<!--@if($config_object->adminLogo)-->
<img src="{getUrl('').$config_object->adminLogo}" />
<button type="submit" value="procAdminDeleteLogo" name="act" class="text">{$lang->cmd_delete}</button>
<!--@else-->
<img src="{getUrl('')}{$gnb_title_info->adminLogo}" />
<!--@end-->
</p>
<p class="a"><input type="file" name="adminLogo" id="adminLogo" /></p>
</li>
<li>
<p class="q"><label for="adminTitle">관리자 페이지 제목</label></p>
<p class="a"><input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" /></p>
</li>
</ul>
<p class="btnArea"><span class="btn small"><button value="procAdminUpdateConfig" name="act" type="submit">{$lang->cmd_save}</button></span></p>
</fieldset>
@ -31,7 +33,7 @@
<input type="hidden" name="act" value="procMenuAdminDeleteItem" />
<input type="hidden" name="menu_srl" value="{$menu_srl}" />
<input type="hidden" name="menu_item_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispAdminMenuSetup')}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispAdminSetup')}" />
<fieldset class="section">
<h1 class="h1">{$lang->menu_gnb_sub['adminMenuSetup']}</h1>
<div class="adminMenu portlet">