issue 70 admin langauge apply

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9086 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-09-07 09:35:47 +00:00
parent d00f84fe03
commit 56a2ae027c
16 changed files with 75 additions and 103 deletions

View file

@ -274,7 +274,6 @@
foreach($output AS $key=>$value)
{
$value->content = strip_tags($value->content);
if(!trim($value->content)) $value->content = '...';
}
}
Context::set('latestCommentList', $output);

View file

@ -119,46 +119,50 @@
'subMenu'=>array('importer'),
),
10=>array(
'module'=>'trash',
'subMenu'=>array('trash'),
),
11=>array(
'module'=>'admin',
'subMenu'=>array('theme'),
),
11=>array(
12=>array(
'module'=>'autoinstall',
'subMenu'=>array('easyInstall'),
),
12=>array(
13=>array(
'module'=>'layout',
'subMenu'=>array('installedLayout'),
),
13=>array(
14=>array(
'module'=>'module',
'subMenu'=>array('installedModule'),
),
14=>array(
15=>array(
'module'=>'widget',
'subMenu'=>array('installedWidget'),
),
15=>array(
16=>array(
'module'=>'addon',
'subMenu'=>array('installedAddon'),
),
16=>array(
17=>array(
'module'=>'editor',
'subMenu'=>array('editor'),
),
17=>array(
18=>array(
'module'=>'spamfilter',
'subMenu'=>array('spamFilter'),
),
18=>array(
19=>array(
'module'=>'admin',
'subMenu'=>array('adminConfiguration', 'adminMenuSetup'),
),
19=>array(
20=>array(
'module'=>'file',
'subMenu'=>array('fileUpload'),
),
20=>array(
21=>array(
'module'=>'module',
'subMenu'=>array('filebox'),
),
@ -222,6 +226,7 @@
case 'rss':
case 'multilingual':
case 'importer':
case 'trash':
return 'content';
break;
case 'theme':

View file

@ -65,7 +65,7 @@
<ul class="lined">
<!--@foreach($latestCommentList AS $key=>$value)-->
<li>
<a href="{getUrl('', 'document_srl', $value->document_srl)}#comment_{$value->comment_srl}" target="_blank">{$value->content}</a> <span class="side">{$value->nick_name}</span>
<a href="{getUrl('', 'document_srl', $value->document_srl)}#comment_{$value->comment_srl}" target="_blank"><!--@if(trim($value->content))-->{$value->content}<!--@else--><strong>{$lang->no_text_comment}</strong><!--@end--></a> <span class="side">{$value->nick_name}</span>
<span class="action">
<form>
<input type="hidden" name="module" value="admin" />

View file

@ -6,15 +6,14 @@
<h1 class="h1">{$lang->comment}</h1>
<div class="table even">
<div class="cnb">
<a href="{getUrl('','act','dispCommentAdminList', 'Y')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>All</a>
<a href="{getUrl('','act','dispCommentAdminList', 'Y')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>{$lang->all}</a>
| <a href="{getUrl('search_target','is_secret','search_keyword', 'N')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'N')-->class="active"<!--@end-->>{$secret_name_list['N']}</a>
| <a href="{getUrl('search_target','is_secret','search_keyword', 'Y')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$secret_name_list['Y']}</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', 'comment')}">{$lang->trash}</a>
</div>
<table width="100%" border="1" cellspacing="0" id="commentListTable">
<caption>
<!--@if($search_keyword == '')-->
All
{$lang->all}
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'N')-->
{$secret_name_list['N']}
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'Y')-->

View file

@ -7,16 +7,15 @@
<h1 class="h1">{$lang->document}</h1>
<div class="table even">
<div class="cnb">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>All</a>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>{$lang->all}</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'N')-->class="active"<!--@end-->>{$status_name_list['PUBLIC']}</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$status_name_list['SECRET']}</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'temp')-->class="active"<!--@end-->>{$status_name_list['TEMP']}</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', 'document')}">{$lang->cmd_trash}</a>
</div>
<table width="100%" border="1" cellspacing="0" id="documentListTable">
<caption>
<!--@if($search_keyword == '')-->
All
{$lang->all}
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'N')-->
{$status_name_list['PUBLIC']}
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'Y')-->

View file

@ -332,6 +332,9 @@ Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http:
<value xml:lang="ko"><![CDATA[방명록 데이터의 목적지를 선택하세요.]]></value>
<value xml:lang="en"><![CDATA[방명록 데이터의 목적지를 선택하세요.]]></value>
</item>
<item name="import_desc">
<value xml:lang="ko"><![CDATA[가상 사이트의 도메인을 입력한 후 <em>사이트 찾기</em>를 클릭하면 됩니다. 도메인을 빈 칸으로 남겨두면 모든 사이트의 목록을 보여줍니다.]]></value>
</item>
<item name="msg_sync_member">
<value xml:lang="ko"><![CDATA[동기화 버튼을 클릭하시면 회원정보와 게시물 정보의 동기화를 시작합니다.]]></value>
<value xml:lang="en"><![CDATA[Please click on Synchronize button to start data synchronization.]]></value>

View file

@ -21,7 +21,7 @@
</p>
</li>
<li class="xml ttxml modulefinder">
<p class="q">{$lang->data_destination} <br />가상 사이트의 도메인을 입력한 후 <em>사이트 찾기</em>를 클릭하면 됩니다. 도메인을 빈 칸으로 남겨두면 모든 사이트의 목록을 보여줍니다.</p>
<p class="q">{$lang->data_destination} <br />{$lang->import_desc}</p>
<div class="a">
<input type="text" name="site_keyword" /> <a href="#suggestion1" class="tgAnchor findsite">{$lang->find_site}</a>
<div id="suggestion1" class="tgContent suggestion">
@ -105,7 +105,6 @@
<span class="btn"><input type="submit" value="{$lang->importer}" /></span>
</div>
</form>
<!-- process 진행 상황 -->
<a href="#process" class="modalAnchor"></a>
<div class="modal" id="process" style="display:none;">
<form action="./" method="get" onsubmit="return doImport()" id="fo_process" class="fg">
@ -136,4 +135,3 @@ jQuery('a.modalAnchor')
return false;
});
</script>
<!--// process 진행상황 끝 -->

View file

@ -5,7 +5,7 @@
<!--@if($item['setup_index_act'])-->
<a href="{getUrl('', 'module', 'admin', 'act', $item['setup_index_act'], 'module_srl', $item['module_srl'])}" class="wPreview">Preview</a>
<!--@end-->
<span class="side"><a href="#editMenu" class="modalAnchor _edit">Edit...</a> | <a href="#delete" class="_delete">Delete</a></span>
<span class="side"><a href="#editMenu" class="modalAnchor _edit">{$lang->cmd_edit}</a> | <a href="#delete" class="_delete">{$lang->cmd_delete}</a></span>
<ul cond="count($item['list']>0)">
<block loop="$item['list']=>$idx,$val">
{@$item = $val}

View file

@ -940,4 +940,11 @@ Le module [Administration des Modules] montera tous les modules installés et vo
<value xml:lang="ko"><![CDATA[모듈 등록에 실패하였습니다.]]></value>
<value xml:lang="en"><![CDATA[Fail Regist Module]]></value>
</item>
<item name="multilingual_desc">
<value xml:lang="ko"><![CDATA[현재 12 종류의 다국어 문자를 지원할 수 있습니다. 다른 종류의 다국어 지원을 원하는 경우 /common/lang/ 폴더의 다국어 가운데 하나의 세트를 번역해서 XE 개발자(contact@xpressengine.com)에게 보내주세요.]]></value>
</item>
<item name="add_word">
<value xml:lang="ko"><![CDATA[새로운 단어 또는 문장 추가...]]></value>
<value xml:lang="en"><![CDATA[Add New Word...]]></value>
</item>
</lang>

View file

@ -2,16 +2,16 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">Multilingual</h1>
<p>현재 12 종류의 다국어 문자를 지원할 수 있습니다. 다른 종류의 다국어 지원을 원하는 경우 /common/lang/ 폴더의 다국어 가운데 하나의 세트를 번역해서 XE 개발자(contact@xpressengine.com)에게 보내주세요.</p>
<h1 class="h1">{$lang->menu_gnb_sub['multilingual']}</h1>
<p>{$lang->multilingual_desc}</p>
<div class="mLangEdit ko form"><!-- class="mLangEdit LANGCODE" -->
<div class="btnArea">
<span class="btn"><a href="#addWord" class="modalAnchor">새로운 단어 또는 문장 추가...</a></span>
<span class="btn"><a href="#addWord" class="modalAnchor">{$lang->add_word}</a></span>
</div>
<ul id="langList">
<li loop="$lang_code_list=>$key,$value">
{@$langName = $value->name}
<strong>{$value->value}</strong> <button type="button" class="side text _edit">Edit</button>
<strong>{$value->value}</strong> <button type="button" class="side text _edit">{$lang->cmd_edit}</button>
<form action="./" method="post" id="langForm_{$langName}" >
<input type="hidden" name="act" value="procModuleAdminInsertLang" />
<input type="hidden" name="lang_name" value="{$langName}" />
@ -26,18 +26,18 @@
</li>
</ul>
<div class="btnArea">
<span class="btn"><a href="#addWord" class="modalAnchor">새로운 단어 또는 문장 추가...</a></span>
<span class="btn"><a href="#addWord" class="modalAnchor">{$lang->add_word}</a></span>
</div>
</div>
<div class="modal" id="addWord">
<form action="./" method="post" class="form mLangEdit fg" id="langForm_new" >
<input type="hidden" name="act" value="procModuleAdminInsertLang" />
<h2 class="h2">새로운 단어 또는 문장 추가</h2>
<h2 class="h2">{$lang->add_word}</h2>
<ul>
<li class="{$key2}" loop="$lang_supported=>$key2,$value2"><label for="{$langName}_{$key2}">{$value2}</label> <textarea rows="1" cols="42" name="{$key2}" id="{$langName}_{$key2}"></textarea></li>
</ul>
<div class="btnArea">
<span class="btn small"><button type="submit">Save</button></span>
<span class="btn small"><button type="submit">{$lang->cmd_save}</button></span>
</div>
</form>
</div>

View file

@ -83,7 +83,7 @@
<input type="radio" name="open_total_feed" value="T_N" id="open_total_feed_T_N" <!--@if($value['open_total_feed'] == 'T_N')-->checked="checked"<!--@end--> />
<label for="open_total_feed_T_N">{$lang->notuse}</label>
</td>
<td><input type="submit" value="Save" class="text" /></td>
<td><input type="submit" value="{$lang->cmd_save}" class="text" /></td>
</tr>
</form>
<!--@end-->

View file

@ -6,25 +6,25 @@
<permission action="procTrashAdminRestore" target="manager" />
</permissions>
<actions>
<action name="dispTrashAdminList" type="view" standalone="true" admin_index="true" menu_name="document" menu_index="true" />
<action name="dispTrashAdminList" type="view" standalone="true" admin_index="true" menu_name="trash" menu_index="true" />
<action name="procTrashAdminEmptyTrash" type="controller" standalone="true" ruleset="emptyTrash" />
<action name="procTrashAdminRestore" type="controller" standalone="true" />
<action name="procTrashAdminGetList" type="controller" standalone="true" />
</actions>
<menus>
<menu name="document">
<title xml:lang="en">Document</title>
<title xml:lang="ko">문서</title>
<title xml:lang="zh-CN">Document</title>
<title xml:lang="jp">Document</title>
<title xml:lang="es">Document</title>
<title xml:lang="ru">Document</title>
<title xml:lang="fr">Document</title>
<title xml:lang="zh-TW">Document</title>
<title xml:lang="vi">Document</title>
<title xml:lang="mn">Document</title>
<title xml:lang="tr">Document</title>
<menu name="trash">
<title xml:lang="en">Trash</title>
<title xml:lang="ko">휴지통</title>
<title xml:lang="zh-CN">Trash</title>
<title xml:lang="jp">Trash</title>
<title xml:lang="es">Trash</title>
<title xml:lang="ru">Trash</title>
<title xml:lang="fr">Trash</title>
<title xml:lang="zh-TW">Trash</title>
<title xml:lang="vi">Trash</title>
<title xml:lang="mn">Trash</title>
<title xml:lang="tr">Trash</title>
</menu>
</menus>
</module>

View file

@ -42,4 +42,8 @@
<item name="fail_restore">
<value xml:lang="ko"><![CDATA[복원하지 못했습니다.]]></value>
</item>
</lang>
<item name="origin_module_type">
<value xml:lang="ko"><![CDATA[원본 타입]]></value>
<value xml:lang="en"><![CDATA[Source Type]]></value>
</item>
</lang>

View file

@ -65,8 +65,12 @@ function completeGetTrashList(ret_obj, response_tags)
for(var x in trash_list)
{
var objTrash = trash_list[x];
var title = '';
if(objTrash.title == '') title = no_text_comment;
else title = objTrash.title;
htmlListBuffer += '<tr>' +
'<td class="title">'+ objTrash.title +'</td>' +
'<td class="title">'+ title +'</td>' +
'<td>'+ objTrash.nickName +'</td>' +
'<td>'+ objTrash.ipaddress +'</td>' +
'</tr>' +

View file

@ -1,5 +1,6 @@
<script>
var confirm_restore_msg = '{$lang->confirm_restore}';
var no_text_comment = '{$lang->no_text_comment}';
</script>
<!--%import("js/trash_admin.js")-->
<div class="content" id="content">
@ -10,37 +11,18 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
<input type="hidden" name="act" value="procTrashAdminEmptyTrash" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="is_all" value="true" />
<h1 class="h1">
<!--@if($origin_module == 'document')-->
{$lang->document}
<!--@elseif($origin_module == 'comment')-->
{$lang->comment}
<!--@end-->
</h1>
<h1 class="h1">{$lang->trash}</h1>
<div class="table even">
<div class="cnb">
<!--@if($origin_module == 'document')-->
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">All</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}</a>
<!--@elseif($origin_module == 'comment')-->
<a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList')}">All</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target','is_secret','search_keyword', 'N')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'N')-->class="active"<!--@end-->>{$secret_name_list['N']}</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target','is_secret','search_keyword', 'Y')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$secret_name_list['Y']}</a>
<!--@end-->
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $origin_module)}" class="active">{$lang->trash}</a>
</div>
<table width="100%" border="1" cellspacing="0" id="trashListTable">
<caption>
{$lang->trash}({number_format($total_count)})
<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrashList();">선택한 글 관리...</a></span>
<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a></span>
<span class="btn"><button type="submit" name="is_all" value="true">{$lang->empty_trash_all}</button></span></span>
</caption>
<thead>
<tr>
<th scope="col" class="title">{$lang->document}</th>
<th scope="col" class="title">{$lang->document}({$lang->origin_module_type})</th>
<th scope="col">{$lang->trash_nick_name}</th>
<th scope="col">{$lang->trash_date}</th>
<th scope="col">{$lang->ipaddress}</th>
@ -50,7 +32,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
</thead>
<tfoot>
<tr>
<th scope="col" class="title">{$lang->document}</th>
<th scope="col" class="title">{$lang->document}({$lang->origin_module_type})</th>
<th scope="col">{$lang->trash_nick_name}</th>
<th scope="col">{$lang->trash_date}</th>
<th scope="col">{$lang->ipaddress}</th>
@ -61,7 +43,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
<tbody>
<!--@foreach($trash_list as $no => $oTrashVO)-->
<tr>
<td class="title">{$oTrashVO->getTitle()}</td>
<td class="title"><!--@if(!trim($oTrashVO->getTitle()) && $oTrashVO->getOriginModule() == 'comment')--><strong>{$lang->no_text_comment}</strong><!--@else-->{$oTrashVO->getTitle()}<!--@end--> (<!--@if($oTrashVO->getOriginModule() == 'document')-->{$lang->document}<!--@else-->{$lang->comment}<!--@end-->)</td>
<td><span class="member_{$oTrashVO->getMemberSrl()">{htmlspecialchars($oTrashVO->getNickName())}</span></td>
<td>{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}</td>
<td>{$oTrashVO->getIpaddress()}</td>
@ -73,7 +55,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
</table>
</div>
<div class="btnArea">
<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrashList();">선택한 글 관리...</a></span>
<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a></span>
<span class="btn"><button type="submit" name="is_all" value="true">{$lang->empty_trash_all}</button></span>
</div>
</form>
@ -83,10 +65,10 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="is_all" value="false" />
<input type="hidden" name="origin_module" value="{$origin_module}" />
<h2 class="h2">선택한 글 관리</h2>
<h2 class="h2">{$lang->document_manager}</h2>
<div class="table even">
<table width="100%" border="1" cellspacing="0" id="trashManageListTable">
<caption>선택한 글 <strong id="selectedTrashCount">0</strong></caption>
<caption>{$lang->selected_document} <strong id="selectedTrashCount">0</strong></caption>
<thead>
<tr>
<th scope="col" class="title">{$lang->document}</th>
@ -132,20 +114,5 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
<button type="submit">Go</button>
</span>
</form>
<form action="">
<select>
<option>제목</option>
<option>내용</option>
<option>닉네임</option>
<option>아이디</option>
<option>사용자 이름</option>
<option>공지사항</option>
<option>IP 주소</option>
<option>모듈 아이디</option>
</select>
<input title="Search" />
<input type="submit" value="Search" />
<a href="#">Cancel</a>
</form>
</div>
</div>

View file

@ -20,32 +20,19 @@ class trashAdminView extends trash {
* @brief trash list
**/
function dispTrashAdminList() {
$origin_module = Context::get('origin_module');
$args->page = Context::get('page'); // /< Page
$args->list_count = 30; // /< the number of posts to display on a single page
$args->page_count = 5; // /< the number of pages that appear in the page navigation
$args->search_target = Context::get('search_target'); // /< search (title, contents ...)
$args->search_keyword = Context::get('search_keyword'); // /< keyword to search
$args->originModule = Context::get('origin_module');
$oTrashModel = getModel('trash');
$output = $oTrashModel->getTrashList($args);
if($origin_module == 'document')
{
// get Status name list
$oDocumentModel = &getModel('document');
$statusNameList = $oDocumentModel->getStatusNameList();
Context::set('status_name_list', $statusNameList);
}
else if($origin_module == 'comment')
{
// get a list by using comment->getCommentList.
$oCommentModel = &getModel('comment');
$secretNameList = $oCommentModel->getSecretNameList();
Context::set('secret_name_list', $secretNameList);
}
// for no text comment language and for document manange language
$oCommentModel = &getModel('comment');
$oDocumentModel = &getModel('document');
Context::set('trash_list', $output->data);
Context::set('total_count', $output->total_count);