Document, Comment list manager modal UI update.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12471 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-12-26 10:14:30 +00:00
parent d19ad9c2d0
commit 28492bafa7
10 changed files with 145 additions and 102 deletions

View file

@ -1069,6 +1069,16 @@
<value xml:lang="zh-CN"><![CDATA[选择]]></value>
<value xml:lang="tr"><![CDATA[Seç]]></value>
</item>
<item name="move">
<value xml:lang="ko"><![CDATA[이동]]></value>
<value xml:lang="en"><![CDATA[Move]]></value>
<value xml:lang="jp"><![CDATA[移動]]></value>
<value xml:lang="zh-CN"><![CDATA[移动]]></value>
<value xml:lang="zh-TW"><![CDATA[搬移]]></value>
<value xml:lang="ru"><![CDATA[Перейти]]></value>
<value xml:lang="tr"><![CDATA[Taşı]]></value>
<value xml:lang="vi"><![CDATA[Di chuyển]]></value>
</item>
<item name="delete">
<value xml:lang="ko"><![CDATA[삭제]]></value>
<value xml:lang="en"><![CDATA[Delete]]></value>

View file

@ -208,7 +208,7 @@ jQuery(function($){
.change(function() {
var $this = $(this), name = $this.data('name');
$this.closest('table')
.find('input:checkbox')
.find(':checkbox')
.filter(function(){
var $this = $(this);
return !$this.prop('disabled') && (($this.attr('name') == name) || ($this.data('name') == name));

File diff suppressed because one or more lines are too long

View file

@ -251,11 +251,11 @@
<item name="published_name_list" type="array">
<item name="Y">
<value xml:lang="en"><![CDATA[Published]]></value>
<value xml:lang="ko"><![CDATA[공개 발행]]></value>
<value xml:lang="ko"><![CDATA[발행완료]]></value>
</item>
<item name="N">
<value xml:lang="en"><![CDATA[Unpublished]]></value>
<value xml:lang="ko"><![CDATA[발행 대기]]></value>
<value xml:lang="ko"><![CDATA[발행대기]]></value>
</item>
</item>
<item name="comment_manager">

View file

@ -23,8 +23,13 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<i cond="$search_target == 'ipaddress'">|</i>
<a href="{getUrl('search_target', 'ipaddress')}" class="active" cond="$search_target == 'ipaddress'">{$lang->ipaddress}:{$search_keyword}({number_format($total_count)})</a>
<div class="x_pull-right">
<a href="#listManager" class="x_btn modalAnchor" onclick="getCommentList();">{$lang->comment_manager}</a>
<div class="x_btn-group x_pull-right">
<a href="#listManager" class="x_btn modalAnchor" data-value="true" data-name="is_trash">{$lang->trash}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="false" data-name="is_trash">{$lang->delete}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="0" data-name="will_publish" cond="$search_target=='is_published' && $search_keyword=='Y'">{$lang->cmd_unpublish}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="1" data-name="will_publish" cond="$search_target=='is_published' && $search_keyword=='N'">{$lang->cmd_publish}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="0" data-name="will_publish" cond="$search_target!='is_published'">{$lang->cmd_unpublish}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="1" data-name="will_publish" cond="$search_target!='is_published'">{$lang->cmd_publish}</a>
</div>
</caption>
<thead>
@ -56,8 +61,13 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</tr>
</tbody>
</table>
<div class="x_pull-right">
<a href="#listManager" class="x_btn modalAnchor" onclick="getCommentList();">{$lang->comment_manager}</a>
<div class="x_btn-group x_pull-right">
<a href="#listManager" class="x_btn modalAnchor" data-value="true" data-name="is_trash">{$lang->trash}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="false" data-name="is_trash">{$lang->delete}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="0" data-name="will_publish" cond="$search_target=='is_published' && $search_keyword=='Y'">{$lang->cmd_unpublish}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="1" data-name="will_publish" cond="$search_target=='is_published' && $search_keyword=='N'">{$lang->cmd_publish}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="0" data-name="will_publish" cond="$search_target!='is_published'">{$lang->cmd_unpublish}</a>
<a href="#listManager" class="x_btn modalAnchor" data-value="1" data-name="will_publish" cond="$search_target!='is_published'">{$lang->cmd_publish}</a>
</div>
</form>
@ -115,7 +125,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<button class="x_btn" type="button" onclick="document.location.href='{getUrl('','module',$module,'act',$act)}'">{$lang->cmd_cancel}</button>
</form>
<form ruleset="deleteChecked" action="./" method="post" class="x_modal" id="listManager">
<form ruleset="deleteChecked" action="./" method="post" class="x_modal x" id="listManager">
<input type="hidden" name="module" value="comment" />
<input type="hidden" name="act" value="procCommentAdminDeleteChecked" />
<input type="hidden" name="page" value="{$page}" />
@ -124,12 +134,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="search_target" value="{$search_target}" />
<input type="hidden" name="search_keyword" value="{$search_keyword}" />
<div class="x_modal-header">
<h3>{$lang->comment_manager}</h3>
<h3>{$lang->comment_manager}: <span class="_sub"></span></h3>
</div>
<div class="x_modal-body">
<table id="commentManageListTable" class="x_table x_table-striped x_table-hover">
<caption>
<strong>{$lang->selected_comment}</strong> <strong id="selectedCommentCount"></strong>
<strong>{$lang->selected_comment} <span id="selectedCommentCount"></span></strong>
</caption>
<thead>
<tr>
@ -148,19 +158,38 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</div>
</div>
<div class="x_modal-footer">
<div class="x_btn-group x_pull-left">
<button type="submit" class="x_btn" name="is_trash" value="true">{$lang->cmd_trash}</button>
<button type="submit" class="x_btn" name="is_trash" value="false">{$lang->cmd_delete}</button>
</div>
<div class="x_btn-group x_pull-right">
<!--@if ($search_target=='is_published' && $search_keyword=="N")-->
<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="1" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_publish}</button>
<!--@elseif ($search_target=='is_published' && $search_keyword=="Y")-->
<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="0" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_unpublish}</button>
<!--@else-->
<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="0" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_unpublish}</button>
<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="1" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_publish}</button>
<!--@end-->
</div>
<button type="submit" class="x_btn x_btn-inverse x_pull-right" name="is_trash|will_publish" value="true|false|0|1">{$lang->cmd_confirm}</button>
</div>
</form>
<script>
jQuery(function($){
// Modal anchor activation
var $docTable = $('#commentListTable');
$docTable.find(':checkbox').change(function(){
var $modalAnchor = $('a[data-value]');
if($docTable.find(':checked').length == 0){
$modalAnchor.removeAttr('href').addClass('x_disabled');
} else {
$modalAnchor.attr('href','#listManager').removeClass('x_disabled');
}
}).change();
// Button action
$('a[data-value]').click(function(){
if($docTable.find(':checked').length == 0){
$('body').css('overflow','auto');
alert('{$lang->msg_not_selected_document}');
return false;
} else {
var $this = $(this);
var thisValue = $this.attr('data-value');
var thisName = $this.attr('data-name');
var thisText = $this.text();
getCommentList();
$('#listManager').find('.x_modal-header ._sub').text(thisText).end().find('[type="submit"]').val(thisValue).attr('name', thisName).text(thisText);
}
});
$('[type="submit"][name="will_publish"]').click(function(){
doChangePublishedStatus(this.value);
});
});
</script>

View file

@ -10,7 +10,7 @@
<input type="hidden" name="is_trash" value="false" />
<!-- 목록 -->
<table class="x_table x_table-striped x_table-hover">
<table id="commentListTable" class="x_table x_table-striped x_table-hover">
<caption>
<a href="{getUrl('search_keyword','','search_target','','act','dispCommentAdminList','Y')}">{$lang->all}</a>
<i>|</i>
@ -101,3 +101,17 @@
<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
</ul>
</form>
<script>
jQuery(function($){
// Modal anchor activation
var $docTable = $('#commentListTable');
$docTable.find(':checkbox').change(function(){
var $btn = $('#fo_list [type="submit"], #fo_list [type="button"]');
if($docTable.find(':checked').length == 0){
$btn.addClass('x_disabled');
} else {
$btn.removeClass('x_disabled');
}
}).change();
});
</script>

View file

@ -25,8 +25,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<i>|</i>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" class="active"|cond="$act == 'dispDocumentAdminDeclared'">{$lang->cmd_declared_list}({number_format($total_count)})</a>
<div class="x_pull-right">
<a href="#manageForm" class="x_btn modalAnchor" onclick="getDocumentList();">{$lang->document_manager}</a>
<div class="x_btn-group x_pull-right">
<a href="#manageForm" class="x_btn modalAnchor" data-value="trash">{$lang->trash}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="delete">{$lang->delete}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="move">{$lang->move}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="copy">{$lang->copy}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="cancelDeclare">{$lang->cmd_cancel_declare}</a>
</div>
</caption>
<thead>
@ -37,7 +41,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<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>
<th scope="col"><input type="checkbox" name="cart" title="Check All" /></th>
</tr>
</thead>
<tbody>
@ -52,8 +56,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</tr>
</tbody>
</table>
<div class="x_pull-right">
<a href="#manageForm" class="x_btn modalAnchor" onclick="getDocumentList();">{$lang->document_manager}</a></span>
<div class="x_btn-group x_pull-right">
<a href="#manageForm" class="x_btn modalAnchor" data-value="trash">{$lang->trash}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="delete">{$lang->delete}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="move">{$lang->move}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="copy">{$lang->copy}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="cancelDeclare">{$lang->cmd_cancel_declare}</a>
</div>
</form>
@ -102,11 +110,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="type" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" />
<div class="x_modal-header">
<h3>{$lang->document_manager}</h3>
<h3>{$lang->document_manager}: <span class="_sub"></span></h3>
</div>
<div class="x_modal-body">
<table width="100%" id="documentManageListTable" class="x_table x_table-striped x_table-hover">
<caption>{$lang->selected_document} <strong id="selectedDocumentCount"></strong></caption>
<caption><strong>{$lang->selected_document} <span id="selectedDocumentCount"></span></strong></caption>
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
@ -117,7 +125,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<tbody>
</tbody>
</table>
<div class="x_control-group" style="position:relative">
<div class="x_control-group _moveTarget" style="position:relative" hidden>
<label>{$lang->selected_document_move}</label>
<input type="text" name="module_srl" class="module_search" />
</div>
@ -127,15 +135,41 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</div>
</div>
<div class="x_modal-footer">
<div class="x_btn-group x_pull-left">
<button type="submit" name="type" value="trash" class="x_btn">{$lang->cmd_trash}</button>
<button type="submit" name="type" value="delete" class="x_btn">{$lang->cmd_delete}</button>
</div>
<div class="x_btn-group x_pull-right">
<button type="submit" name="type" value="move" class="x_btn x_btn-inverse">{$lang->cmd_move}</button>
<button type="submit" name="type" value="copy" class="x_btn x_btn-inverse">{$lang->cmd_copy}</button>
<button type="submit" name="type" value="cancelDeclare" class="x_btn x_btn-inverse">{$lang->cmd_cancel_declare}</button>
</div>
<button type="submit" name="type" value="" class="x_btn x_btn-inverse x_pull-right">{$lang->cmd_confirm}</button>
<!-- value="trash|delete|move|copy|cancelDeclare" -->
</div>
</form>
<script>
jQuery(function($){
// Modal anchor activation
var $docTable = $('#documentListTable');
$docTable.find(':checkbox').change(function(){
var $modalAnchor = $('a[data-value]');
if($docTable.find(':checked').length == 0){
$modalAnchor.removeAttr('href').addClass('x_disabled');
} else {
$modalAnchor.attr('href','#manageForm').removeClass('x_disabled');
}
}).change();
// Button action
$('a[data-value]').click(function(){
if($docTable.find(':checked').length == 0){
$('body').css('overflow','auto');
alert('{$lang->msg_not_selected_document}');
return false;
} else {
var $this = $(this);
var $moveTarget = $('._moveTarget');
var thisValue = $this.attr('data-value');
var thisText = $this.text();
getDocumentList();
$('#manageForm').find('.x_modal-header ._sub').text(thisText).end().find('[type="submit"]').val(thisValue).text(thisText);
if(thisValue == 'trash' || thisValue == 'delete' || thisValue == 'cancelDeclare'){
$moveTarget.hide().next().css('borderTopWidth','0');
} else {
$moveTarget.show().next().css('borderTopWidth','1px');
}
}
});
});
</script>

View file

@ -28,10 +28,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<a href="{getUrl('search_target', 'ipaddress')}" class="active" cond="$search_target == 'ipaddress'">{$lang->ipaddress}:{$search_keyword}({number_format($total_count)})</a>
<div class="x_btn-group x_pull-right">
<a href="#manageForm" class="x_btn modalAnchor" data-value="trash">{$lang->cmd_trash}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="delete">{$lang->cmd_delete}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="move">{$lang->cmd_move}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="copy">{$lang->cmd_copy}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="trash">{$lang->trash}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="delete">{$lang->delete}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="move">{$lang->move}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="copy">{$lang->copy}</a>
</div>
</caption>
<thead>
@ -43,7 +43,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<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>
<th scope="col"><input type="checkbox" name="cart" title="Check All" /></th>
</tr>
</thead>
<tbody>
@ -61,10 +61,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</table>
<div class="x_clearfix">
<div class="x_btn-group x_pull-right">
<a href="#manageForm" class="x_btn modalAnchor" data-value="trash">{$lang->cmd_trash}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="delete">{$lang->cmd_delete}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="move">{$lang->cmd_move}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="copy">{$lang->cmd_copy}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="trash">{$lang->trash}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="delete">{$lang->delete}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="move">{$lang->move}</a>
<a href="#manageForm" class="x_btn modalAnchor" data-value="copy">{$lang->copy}</a>
</div>
</div>
</form>
@ -129,7 +129,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</div>
<div class="x_modal-body">
<table width="100%" id="documentManageListTable" class="x_table x_table-striped x_table-hover">
<caption>{$lang->selected_document} <strong id="selectedDocumentCount"></strong></caption>
<caption><strong>{$lang->selected_document} <span id="selectedDocumentCount"></span></strong></caption>
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
@ -154,48 +154,13 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<!-- value="trash|delete|move|copy" -->
</div>
</form>
<style>
.menu_selector {
position:absolute;
width:100%;
border:3px solid green;
top:100px;
z-index: 100;
}
.menu_selector ul {list-style-type:none; margin:0;}
.menu_selector .contents {
border:1px solid black;
background:white;
max-width:500px;
min-width:300px;
height:500px;
box-shadow:10px 10px 5px #888;
border-radius:5px;
margin-left:auto;
margin-right:auto;
margin-top:20px;
}
@media only screen and (max-width:1024px){
.menu_selector li {display:inline;}
.menu_selector .contents {margin-top:0;}
.menu_selector .contents {background:#afa;}
}
@media only screen and (max-width:800px){
.menu_selector li {display:inline;}
.menu_selector .contents {background:#aaf;}
}
</style>
<script>
jQuery(function($){
// Modal anchor activation
var $docTable = $('#documentListTable');
$docTable.find(':checkbox').change(function(){
var $modalAnchor = $('a[data-value]');
if($docTable.find(':checked').length < 1){
if($docTable.find(':checked').length == 0){
$modalAnchor.removeAttr('href').addClass('x_disabled');
} else {
$modalAnchor.attr('href','#manageForm').removeClass('x_disabled');
@ -203,7 +168,7 @@ jQuery(function($){
}).change();
// Button action
$('a[data-value]').click(function(){
if($docTable.find(':checked').length < 1){
if($docTable.find(':checked').length == 0){
$('body').css('overflow','auto');
alert('{$lang->msg_not_selected_document}');
return false;
@ -222,4 +187,4 @@ jQuery(function($){
}
});
});
</script>
</script>

View file

@ -255,3 +255,4 @@ function checkSearch(form)
return false;
}
}

View file

@ -1859,16 +1859,6 @@
<value xml:lang="tr"><![CDATA[Simge Durumuna Küçült]]></value>
<value xml:lang="vi"><![CDATA[Thu nhỏ]]></value>
</item>
<item name="move">
<value xml:lang="ko"><![CDATA[이동]]></value>
<value xml:lang="en"><![CDATA[Move]]></value>
<value xml:lang="jp"><![CDATA[移動]]></value>
<value xml:lang="zh-CN"><![CDATA[移动]]></value>
<value xml:lang="zh-TW"><![CDATA[搬移]]></value>
<value xml:lang="ru"><![CDATA[Перейти]]></value>
<value xml:lang="tr"><![CDATA[Taşı]]></value>
<value xml:lang="vi"><![CDATA[Di chuyển]]></value>
</item>
<item name="refresh">
<value xml:lang="ko"><![CDATA[새로 고침]]></value>
<value xml:lang="en"><![CDATA[Refresh]]></value>