merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -22,7 +22,7 @@
<tr>
<th scope="row">{$lang->category_color}</th>
<td>
<input type="text" name="category_color" value="{htmlspecialchars($category_info->color)}" class="color-indicator inputTypeText" />
<input type="text" name="category_color" value="{htmlspecialchars($category_info->color)}" class="color-indicator" />
<p>{$lang->about_category_color}</p>
</td>
</tr>
@ -30,7 +30,7 @@
<tr>
<th scope="row">{$lang->category_description}</th>
<td >
<textarea name="category_description" id="category_description" >{htmlspecialchars($category_info->description)}</textarea>
<textarea name="category_description" id="category_description" rows="8" cols="42">{htmlspecialchars($category_info->description)}</textarea>
<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','category_description')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
<p>{$lang->about_category_description}</p>
</td>

View file

@ -5,7 +5,6 @@
<!--%load_js_plugin("ui.tree")-->
<load target="js/document_category.js" usecdn="true" />
<load target="css/document.css" usecdn="true" />
<!--%load_js_plugin("ui.colorpicker")-->
<script type="text/javascript">
var category_title = "{$lang->category}";

View file

@ -1,6 +1,5 @@
<!--%import("filter/manage_checked_document.xml")-->
<load target="js/document_admin.js" usecdn="true" />
<load target="css/document.css" usecdn="true" />
<h1 class="h1">{$lang->cmd_manage_document}</h1>
<form action="./" method="get" id="fo_management">
<input type="hidden" name="module" value="document" />
@ -39,7 +38,7 @@
<tr>
<th scope="row">{$lang->cmd_send_message}</th>
<td>
<textarea name="message_content" cols="45" rows="5"></textarea>
<textarea name="message_content" rows="8" cols="42"></textarea>
</td>
</tr>
</table>

View file

@ -28,22 +28,22 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
<th scope="col">{$lang->writer}</th>
<th scope="col">{$lang->cmd_declare}</th>
<th scope="col">{$lang->readed_count}</th>
<th scope="col">{$lang->cmd_vote}(+/-)</th>
<th scope="col">{$lang->date}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr">{$lang->cmd_declare}</th>
<th scope="col" class="nowr">{$lang->readed_count}</th>
<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</thead>
<tfoot>
<tr>
<th scope="col" class="title">{$lang->title}</th>
<th scope="col">{$lang->writer}</th>
<th scope="col">{$lang->cmd_declare}</th>
<th scope="col">{$lang->readed_count}</th>
<th scope="col">{$lang->cmd_vote}(+/-)</th>
<th scope="col">{$lang->date}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr">{$lang->cmd_declare}</th>
<th scope="col" class="nowr">{$lang->readed_count}</th>
<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</tfoot>
@ -51,11 +51,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<!--@foreach($document_list as $no => $oDocument)-->
<tr>
<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank">{$oDocument->getTitle()}</a></td>
<td><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
<td>{$oDocument->get('declared_count')}</td>
<td>{$oDocument->get('readed_count')}</td>
<td>{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
<td>{$oDocument->getRegdate("Y-m-d H:i")}</td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
<td class="nowr">{$oDocument->get('declared_count')}</td>
<td class="nowr">{$oDocument->get('readed_count')}</td>
<td class="nowr">{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
<td class="nowr">{$oDocument->getRegdate("Y-m-d H:i")}</td>
<td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
</tr>
<!--@end-->
@ -79,8 +79,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
<th scope="col">{$lang->writer}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr">{$lang->status}</th>
</tr>
</thead>
<tbody>
@ -109,7 +109,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</div>
<p class="q"><label for="message">{$lang->message_notice}</label></p>
<p>
<textarea cols="42" rows="3" name="message_content" id="message" style="width:98%"></textarea>
<textarea rows="8" cols="42" name="message_content" id="message" style="width:98%"></textarea>
</p>
<div class="btnArea">
<span class="btn"><button type="submit" name="type" value="trash">{$lang->cmd_trash}</button></span>

View file

@ -1,5 +1,4 @@
<!--#include("header.html")-->
<load target="css/document.css" usecdn="true" />
<!--%import("filter/delete_alias.xml")-->
<form ruleset="deleteAlias" id="deleteForm" action="./" method="post">

View file

@ -37,24 +37,24 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
<th scope="col">{$lang->writer}</th>
<th scope="col">{$lang->readed_count}</th>
<th scope="col">{$lang->cmd_vote}(+/-)</th>
<th scope="col">{$lang->date}</th>
<th scope="col">{$lang->ipaddress}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr">{$lang->readed_count}</th>
<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col" class="nowr">{$lang->ipaddress}</th>
<th scope="col" class="nowr">{$lang->status}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</thead>
<tfoot>
<tr>
<th scope="col" class="title">{$lang->title}</th>
<th scope="col">{$lang->writer}</th>
<th scope="col">{$lang->readed_count}</th>
<th scope="col">{$lang->cmd_vote}(+/-)</th>
<th scope="col">{$lang->date}</th>
<th scope="col">{$lang->ipaddress}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr">{$lang->readed_count}</th>
<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col" class="nowr">{$lang->ipaddress}</th>
<th scope="col" class="nowr">{$lang->status}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</tfoot>
@ -62,12 +62,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<!--@foreach($document_list as $no => $oDocument)-->
<tr>
<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank"><!--@if(trim($oDocument->getTitle()))-->{$oDocument->getTitle()}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a></td>
<td><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
<td>{$oDocument->get('readed_count')}</td>
<td>{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
<td>{$oDocument->getRegdate("Y-m-d H:i")}</td>
<td><a href="{getUrl('search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'))}">{$oDocument->get('ipaddress')}</a></td>
<td>{$status_name_list[$oDocument->get('status')]}</td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
<td class="nowr">{$oDocument->get('readed_count')}</td>
<td class="nowr">{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
<td class="nowr">{$oDocument->getRegdate("Y-m-d H:i")}</td>
<td class="nowr"><a href="{getUrl('search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'))}">{$oDocument->get('ipaddress')}</a></td>
<td class="nowr">{$status_name_list[$oDocument->get('status')]}</td>
<td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
</tr>
<!--@end-->
@ -91,8 +91,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
<th scope="col">{$lang->writer}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr">{$lang->status}</th>
</tr>
</thead>
<tbody>
@ -121,7 +121,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</div>
<p class="q"><label for="message">{$lang->message_notice}</label></p>
<p>
<textarea cols="42" rows="3" name="message_content" id="message" style="width:98%"></textarea>
<textarea rows="8" cols="42" name="message_content" id="message" style="width:98%"></textarea>
</p>
<div class="btnArea">
<span class="btn"><button type="submit" name="type" value="trash">{$lang->cmd_trash}</button></span>

View file

@ -29,7 +29,7 @@
<tr>
<th>{$lang->column_name}</th>
<td >
<input type="text" name="name" value="{$selected_var->name}" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
<input type="text" name="name" value="{htmlspecialchars($selected_var->name)}" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
</td>
</tr>
<tr>
@ -99,7 +99,7 @@
<td rowspan="3">
<!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><!--@end-->
<a cond="count($extra_keys) > $val->idx" href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown">{$lang->cmd_move_down}</a>
<a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a>
<a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}...</span></a>
<a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
</td>
</tr>

View file

@ -22,7 +22,7 @@ function doManageDocument(type) {
/* 선택된 글의 삭제 또는 이동 후 */
function completeManageDocument(ret_obj) {
if(opener) {
opener.window.location.href = opener.window.current_url.setQuery('document_srl','');
opener.window.location.href = opener.window.current_url.setQuery('document_srl', '');
}
alert(ret_obj['message']);
window.close();
@ -141,8 +141,8 @@ function completeGetDocumentList(ret_obj, response_tags)
var objDocument = document_list[x];
htmlListBuffer += '<tr>' +
'<td class="title">'+ objDocument.variables.title +'</td>' +
'<td>'+ objDocument.variables.nick_name +'</td>' +
'<td>'+ statusNameList[objDocument.variables.status] +'</td>' +
'<td class="nowr">'+ objDocument.variables.nick_name +'</td>' +
'<td class="nowr">'+ statusNameList[objDocument.variables.status] +'</td>' +
'</tr>'+
'<input type="hidden" name="cart[]" value="'+objDocument.document_srl+'" />';
}

View file

@ -1,5 +1,4 @@
<load target="./js/document_admin.js" usecdn="true" />
<load target="./css/document.css" usecdn="true" />
{$content}
<div class="btnArea">
<span class="btn"><button type="button" onclick="window.close();return false;">{$lang->cmd_close}</button></span>

View file

@ -1,5 +1,4 @@
<load target="./js/document_admin.js" usecdn="true" />
<load target="./css/document.css" usecdn="true" />
<h1 class="h1">{$oDocument->getTitleText()}</h1>
<a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->get('nick_name')}</a>
{$oDocument->getRegdate()}

View file

@ -1,4 +1,3 @@
<load target="css/default.css" usecdn="true" />
<h1 class="h1">{$lang->cmd_view_saved_document}</h1>
<!-- 목록 -->
<div class="table">