fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 70 site map admin bug fix

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9082 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-09-07 08:24:46 +00:00
parent 2d8a72a00f
commit f1c0f00ccc
7 changed files with 116 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/admin/lang/lang.xml
View file

@ -16,6 +16,22 @@
<value xml:lang="ko"><![CDATA[기타]]></value>
<value xml:lang="en"><![CDATA[etc]]></value>
</item>
<item name="current_state">
<value xml:lang="ko"><![CDATA[현황]]></value>
<value xml:lang="en"><![CDATA[current state]]></value>
</item>
<item name="latest_document">
<value xml:lang="ko"><![CDATA[최근 글]]></value>
<value xml:lang="en"><![CDATA[Latest Document]]></value>
</item>
<item name="latest_comment">
<value xml:lang="ko"><![CDATA[최근 댓글]]></value>
<value xml:lang="en"><![CDATA[Latest Comment]]></value>
</item>
<item name="latest_trackback">
<value xml:lang="ko"><![CDATA[최근 엮인글]]></value>
<value xml:lang="en"><![CDATA[Latest Trackback]]></value>
</item>
<item name="admin_info">
<value xml:lang="ko"><![CDATA[관리자 정보]]></value>
<value xml:lang="en"><![CDATA[Administrator Info]]></value>

12
modules/admin/tpl/index.html
View file

@ -30,7 +30,7 @@
<!--@end-->
<div class="section">
<div class="portlet">
<h2 class="h2">Current State</h2>
<h2 class="h2">{$lang->current_state}</h2>
<ul class="lined">
<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList')}">{$lang->menu_gnb['user']}</a> <span class="side">{number_format($status->member->totalCount)}(<!--@if($status->member->todayCount > 0)-->+<!--@end-->{number_format($status->member->todayCount)})</span></li>
<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">{$lang->menu_gnb_sub['document']}</a> <span class="side">{number_format($status->document->totalCount)}(<!--@if($status->document->todayCount > 0)-->+<!--@end-->{number_format($status->document->todayCount)})</span></li>
@ -40,7 +40,7 @@
</ul>
</div>
<div class="portlet">
<h2 class="h2">Latest Document</h2>
<h2 class="h2">{$lang->latest_document}</h2>
<ul class="lined">
<!--@foreach($latestDocumentList AS $key=>$value)-->
{@$document = $value->variables}
@ -61,7 +61,7 @@
</ul>
</div>
<div class="portlet">
<h2 class="h2">Latest Comment</h2>
<h2 class="h2">{$lang->latest_comment}</h2>
<ul class="lined">
<!--@foreach($latestCommentList AS $key=>$value)-->
<li>
@ -81,7 +81,7 @@
</ul>
</div>
<div class="portlet">
<h2 class="h2">Latest Trackback</h2>
<h2 class="h2">{$lang->latest_trackback}</h2>
<ul class="lined">
<!--@foreach($latestTrackbackList AS $key=>$value)-->
<li>
@ -100,7 +100,7 @@
</ul>
</div>
<div class="portlet">
<h2 class="h2">XE Team Notice</h2>
<h2 class="h2">{$lang->notice}</h2>
<ul class="lined">
<!--@foreach($news AS $key=>$value)-->
<li><a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{zdate($value->date, 'Y-m-d')}</span></li>
@ -108,7 +108,7 @@
</ul>
</div>
<div class="portlet">
<h2 class="h2">Your Favorite</h2>
<h2 class="h2">{$lang->favorite}</h2>
<ul class="lined">
<li loop="$favorite_list => $favorite">
<a href="{getUrl('act', $favorite->admin_index_act)}">{$favorite->title}</a>

42
modules/menu/lang/lang.xml
View file

@ -58,6 +58,42 @@
<value xml:lang="tr"><![CDATA[Menü Yönetimi]]></value>
<value xml:lang="vi"><![CDATA[Quản lý Menu]]></value>
</item>
<item name="collapsing">
<value xml:lang="ko"><![CDATA[접기]]></value>
<value xml:lang="en"><![CDATA[Collapse]]></value>
</item>
<item name="expanding">
<value xml:lang="ko"><![CDATA[펼치기]]></value>
<value xml:lang="en"><![CDATA[Expand]]></value>
</item>
<item name="add_menu">
<value xml:lang="ko"><![CDATA[메뉴 추가...]]></value>
<value xml:lang="en"><![CDATA[Add Menu...]]></value>
</item>
<item name="add_new_sitemap">
<value xml:lang="ko"><![CDATA[새 사이트맵 추가...]]></value>
<value xml:lang="en"><![CDATA[Add New Site Map...]]></value>
</item>
<item name="module_or_url">
<value xml:lang="ko"><![CDATA[모듈 또는 URL]]></value>
<value xml:lang="en"><![CDATA[Module or URL]]></value>
</item>
<item name="create_module_in_menu">
<value xml:lang="ko"><![CDATA[모듈 생성]]></value>
<value xml:lang="en"><![CDATA[Create Module]]></value>
</item>
<item name="select_module_in_menu">
<value xml:lang="ko"><![CDATA[모듈 선택]]></value>
<value xml:lang="en"><![CDATA[Select Module]]></value>
</item>
<item name="create_mid_in_menu">
<value xml:lang="ko"><![CDATA[모듈 아이디 생성]]></value>
<value xml:lang="en"><![CDATA[Create Module ID]]></value>
</item>
<item name="select_mid_in_menu">
<value xml:lang="ko"><![CDATA[모듈 아이디 선택]]></value>
<value xml:lang="en"><![CDATA[Select Module ID]]></value>
</item>
<item name="depth">
<value xml:lang="ko"><![CDATA[단계]]></value>
<value xml:lang="en"><![CDATA[Step]]></value>
@ -140,6 +176,10 @@
<value xml:lang="tr"><![CDATA[Yeni pencere aç]]></value>
<value xml:lang="vi"><![CDATA[Mở ra trang mới]]></value>
</item>
<item name="menu_self_window">
<value xml:lang="ko"><![CDATA[현재창 열기]]></value>
<value xml:lang="en"><![CDATA[Open a self window]]></value>
</item>
<item name="menu_expand">
<value xml:lang="ko"><![CDATA[펼침]]></value>
<value xml:lang="en"><![CDATA[Expand]]></value>
@ -510,4 +550,4 @@ Menu không phải là người quản lý, nhiệm vụ của nó chỉ là li
<value xml:lang="tr"><![CDATA[Sadece resim dosyaları kaydedilebilir.]]></value>
<value xml:lang="vi"><![CDATA[Chỉ được phép sử dụng File hình ảnh.]]></value>
</item>
</lang>
</lang>

16
modules/menu/menu.admin.controller.php
View file

@ -127,6 +127,22 @@
if($btnOutput['hover_btn']) $args->hover_btn = $btnOutput['hover_btn'];
if($btnOutput['active_btn']) $args->active_btn = $btnOutput['active_btn'];
$args->group_srls = $source_args->group_srls;
// if cType is CREATE, create module
if($source_args->cType == 'CREATE')
{
$site_module_info = Context::get('site_module_info');
$cmArgs->site_srl = (int)$site_module_info->site_srl;
$cmArgs->mid = $source_args->create_menu_url;
$cmArgs->browser_title = $source_args->menu_name;
//$cmArgs->layout_srl = $this->selected_layout->layout_srl;
$cmArgs->module = $source_args->module_type;
$cmArgs->menu_srl = $source_args->menu_srl;
$oModuleController = &getController('module');
$output = $oModuleController->insertModule($cmArgs);
if(!$output->toBool()) return Object(-1, 'fail_module_regist');
}
// Check if already exists
$oMenuModel = &getAdminModel('menu');
$item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);

31
modules/menu/tpl/js/sitemap.js
View file

@ -92,6 +92,15 @@ $('form.siteMap')
menuForm.submit();
});
var kindModuleLayer = $('#kindModule');
var createModuleLayer = $('#createModule');
var selectModuleLayer = $('#selectModule');
var insertUrlLayer = $('#insertUrl');
kindModuleLayer.hide();
createModuleLayer.hide();
selectModuleLayer.hide();
insertUrlLayer.hide();
$('a._add').click(function()
{
editForm.find('.h2').html('Add Menu');
@ -104,28 +113,8 @@ $('form.siteMap')
editForm.find('input=[name=menu_url]').val('');
editForm.find('input=[name=menu_open_window]').attr('checked', false);
editForm.find('input=[name=group_srls\\[\\]]').attr('checked', false);
/*var htmlBuffer = '';
for(x in menuItem.groupList.item)
{
var groupObj = menuItem.groupList.item[x];
htmlBuffer += '<input type="checkbox" name="group_srls[]" id="group_srls_'+groupObj.group_srl+'" value="'+groupObj.group_srl+'"';
if(groupObj.isChecked) htmlBuffer += ' checked="checked" ';
htmlBuffer += '/> <label for="group_srls_'+groupObj.group_srl+'">'+groupObj.title+'</label>'
}
$('#groupList').html(htmlBuffer);*/
});
var kindModuleLayer = $('#kindModule');
var createModuleLayer = $('#createModule');
var selectModuleLayer = $('#selectModule');
var insertUrlLayer = $('#insertUrl');
kindModuleLayer.hide();
createModuleLayer.hide();
selectModuleLayer.hide();
insertUrlLayer.hide();
$('input._typeCheck').click(typeCheck);
function typeCheck()
@ -165,7 +154,7 @@ $('form.siteMap')
}
}
$('#kModule').change(getModuleList);
$('#kModule').change(getModuleList).change();
function getModuleList()
{
var params = new Array();

44
modules/menu/tpl/sitemap.html
View file

@ -6,7 +6,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">Site Map</h1>
<h1 class="h1">{$lang->menu_gnb_sub['siteMap']}</h1>
<block loop="$menu_list=>$key,$value">
{@$menuSrl = $value->menuSrl}
@ -17,14 +17,14 @@
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
<h2 class="h2"><input name="title" value="{$value->title}" /></h2>
<a href="#nav_{$key}" class="tgMap">접기/펼치기</a>
<a href="#nav_{$key}" class="tgMap">{$lang->collapsing}/{$lang->expanding}</a>
<ul class="lined" id="nav_{$key}" cond="count($value->menuItems->list > 0)">
<block loop="$value->menuItems->list=>$key2,$value2">
{@$item = $value2}
<include target="sitemap.item.html" />
</block>
</ul>
<p class="btnArea"><span class="btn small"><a href="#editMenu" class="modalAnchor _add">Add Menu...</a></span> <span class="btn small"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span><span class="btn small"><a href="#remakeCache" onclick="doReloadTreeMenu('{$menuSrl}');return false;">{$lang->cmd_remake_cache}</a></span></p>
<p class="btnArea"><span class="btn small"><a href="#editMenu" class="modalAnchor _add">{$lang->add_menu}</a></span> <span class="btn small"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span><span class="btn small"><a href="#remakeCache" onclick="doReloadTreeMenu('{$menuSrl}');return false;">{$lang->cmd_remake_cache}</a></span></p>
</form>
</block>
@ -33,7 +33,7 @@
<input type="hidden" name="title" value="untitled" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
<div class="btnArea">
<span class="btn medium"><button type="submit">Add New Site Map...</button></span>
<span class="btn medium"><button type="submit">{$lang->add_new_sitemap}</button></span>
</div>
</form>
<div class="modal" id="editMenu">
@ -46,7 +46,7 @@
<h2 class="h2"></h2>
<ul>
<li>
<p class="q"><label for="name">Name</label></p>
<p class="q"><label for="name">{$lang->menu_name}</label></p>
<div class="a multiLangEdit">
<input type="hidden" class="vLang" name="menu_name_key" />
<input type="text" class="vLang" id="name" name="menu_name" />
@ -90,61 +90,61 @@
</div>
</li>
<li>
<p class="q">Module or URL?</p>
<p class="q">{$lang->module_or_url}?</p>
<p class="a">
<input type="radio" name="cType" id="cModule" class="_typeCheck" value="CREATE" /> <label for="cModule">Create Module</label>
<input type="radio" name="cType" id="sModule" class="_typeCheck" value="SELECT" /> <label for="sModule">Select Module</label>
<input type="radio" name="cType" id="url" class="_typeCheck" value="URL" /> <label for="url">URL</label>
<input type="radio" name="cType" id="cModule" class="_typeCheck" value="CREATE" /> <label for="cModule">{$lang->create_module_in_menu}</label>
<input type="radio" name="cType" id="sModule" class="_typeCheck" value="SELECT" /> <label for="sModule">{$lang->select_module_in_menu}</label>
<input type="radio" name="cType" id="url" class="_typeCheck" value="URL" /> <label for="url">{$lang->menu_url}</label>
</p>
</li>
<li id="kindModule">
<p class="q"><label for="kModule">What kind of module?</label></p>
<p class="q"><label for="kModule">{$lang->select_module}</label></p>
<p class="a">
<select style="width:290px" id="kModule">
<select style="width:290px" id="kModule" name="module_type">
<option loop="$module_list=>$key,$value" value="{$value}">{$value}</option>
</select>
</p>
</li>
<li id="createModule">
<p class="q"><label for="cModule_id">Create module ID.</label></p>
<p class="q"><label for="cModule_id">{$lang->create_mid_in_menu}.</label></p>
<div class="a">
<input type="text" id="cModule_id" name="create_menu_url" />
<span class="desc"><button type="button" class="text">Validation Check</button></span>
</div>
</li>
<li id="selectModule">
<p class="q"><label for="sModule_id">Select module ID.</label></p>
<p class="q"><label for="sModule_id">{$lang->select_mid_in_menu}</label></p>
<p class="a">
<select style="width:290px" id="sModule_id" name="select_menu_url">
</select>
</p>
</li>
<li id="insertUrl">
<p class="q"><label for="link_url">Insert URL.</label></p>
<p class="q"><label for="link_url">{$lang->menu_url}</label></p>
<div class="a">
<input type="text" id="link_url" name="menu_url" value="http://" />
</div>
</li>
<li>
<p class="q">Which window should be open?</p>
<p class="q">{$lang->about_menu_open_window}</p>
<p class="a">
<input type="radio" name="menu_open_window" id="self" value="N" /> <label for="self">Self</label>
<input type="radio" name="menu_open_window" id="blank" value="Y" /> <label for="blank">Blank</label>
<input type="radio" name="menu_open_window" id="self" value="N" /> <label for="self">{$lang->menu_self_window}</label>
<input type="radio" name="menu_open_window" id="blank" value="Y" /> <label for="blank">{$lang->menu_open_window}</label>
</p>
</li>
<li>
<p class="q">Display image.</p>
<p class="q">{$lang->menu_img_btn}</p>
<p class="a">
<span id="normal_btn_preview"></span>
<input type="file" name="menu_normal_btn" id="menu_normal_btn" /> <label for="menu_normal_btn">Normal Image</label><br />
<input type="file" name="menu_normal_btn" id="menu_normal_btn" /> <label for="menu_normal_btn">{$lang->menu_normal_btn}</label><br />
<span id="hover_btn_preview"></span>
<input type="file" name="menu_hover_btn" id="menu_hover_btn" /> <label for="menu_hover_btn">Hover Image</label><br />
<input type="file" name="menu_hover_btn" id="menu_hover_btn" /> <label for="menu_hover_btn">{$lang->menu_hover_btn}</label><br />
<span id="active_btn_preview"></span>
<input type="file" name="menu_active_btn" id="menu_active_btn" /> <label for="menu_active_btn">Active Image</label>
<input type="file" name="menu_active_btn" id="menu_active_btn" /> <label for="menu_active_btn">{$lang->menu_active_btn}</label>
</p>
</li>
<li>
<p class="q">Authority for access.</p>
<p class="q">{$lang->menu_group_srls}</p>
<p class="a" id="groupList">
<block loop="$group_list=>$key,$value"><input type="checkbox" name="group_srls[]" id="group_srls_{$value->group_srl}" value="{$value->group_srl}" /> <label for="group_srls_{$value->group_srl}">{$value->title}</label></block>
</p>

6
modules/module/lang/lang.xml
View file

@ -936,4 +936,8 @@ Le module [Administration des Modules] montera tous les modules installés et vo
<value xml:lang="tr"><![CDATA[Yalnızca %s uzantı(ları) mevucut.]]></value>
<value xml:lang="vi"><![CDATA[Chỉ cho phép những phần mở rộng là: %s.]]></value>
</item>
</lang>
<item name="fail_module_regist">
<value xml:lang="ko"><![CDATA[모듈 등록에 실패하였습니다.]]></value>
<value xml:lang="en"><![CDATA[Fail Regist Module]]></value>
</item>
</lang>