mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-21 12:19:56 +09:00
Trash list modal UX enhancement.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12476 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong
parent
7c8abb0e1e
commit
6544804465
7 changed files with 87 additions and 33 deletions
|
|
@ -1093,6 +1093,12 @@
|
|||
<value xml:lang="vi"><![CDATA[Thay đổi]]></value>
|
||||
<value xml:lang="mn"><![CDATA[Засах]]></value>
|
||||
</item>
|
||||
<item name="restore">
|
||||
<value xml:lang="ko"><![CDATA[복원]]></value>
|
||||
<value xml:lang="en"><![CDATA[Restore]]></value>
|
||||
<value xml:lang="jp"><![CDATA[復元]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[復原]]></value>
|
||||
</item>
|
||||
<item name="delete">
|
||||
<value xml:lang="ko"><![CDATA[삭제]]></value>
|
||||
<value xml:lang="en"><![CDATA[Delete]]></value>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ body>.x,
|
|||
.x h3,
|
||||
.x h4,
|
||||
.x h5,
|
||||
.x h6{line-height:1.5;font-weight:600;color:#666}
|
||||
.x h6{line-height:1.5;font-weight:600;color:#666;text-rendering:auto}
|
||||
.x h1{font-size:22px}
|
||||
.x h2{font-size:18px}
|
||||
.x h3{font-size:14px}
|
||||
|
|
|
|||
2
modules/admin/tpl/css/admin.min.css
vendored
2
modules/admin/tpl/css/admin.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -26,7 +26,7 @@
|
|||
<th scope="col">{$lang->trash_date}</th>
|
||||
<th scope="col">{$lang->ipaddress}</th>
|
||||
<th scope="col">{$lang->trash_description}</th>
|
||||
<th scope="col">{$lang->cmd_restore}</th>
|
||||
<th scope="col">{$lang->restore}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<td>{zdate($oDocument->get('trash_date'), "Y-m-d H:i:s")}</td>
|
||||
<td>{$oDocument->get('ipaddress')}</td>
|
||||
<td >{$oDocument->get('trash_description')}</td>
|
||||
<td><button type="button" onclick="executeFilterByTargetSrl('restore_form', {$oDocument->get('trash_srl')}, restore_trash);">{$lang->cmd_restore}</button></td>
|
||||
<td><button type="button" onclick="executeFilterByTargetSrl('restore_form', {$oDocument->get('trash_srl')}, restore_trash);">{$lang->restore}</button></td>
|
||||
</tr>
|
||||
<!--@end-->
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
|
|||
<caption>
|
||||
<strong>{$lang->all}({number_format($total_count)})</strong>
|
||||
<span class="x_pull-right">
|
||||
<input type="submit" class="x_btn _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
|
||||
<input type="submit" class="x_btn _allowFreqSubmit" value="{$lang->delete}" />
|
||||
</span>
|
||||
</caption>
|
||||
<thead>
|
||||
|
|
@ -51,7 +51,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
|
|||
</tbody>
|
||||
</table>
|
||||
<span class="x_pull-right">
|
||||
<input type="submit" class="x_btn _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
|
||||
<input type="submit" class="x_btn _allowFreqSubmit" value="{$lang->delete}" />
|
||||
</span>
|
||||
</form>
|
||||
|
||||
|
|
@ -104,3 +104,24 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
|
|||
<button class="x_btn x_btn-inverse" type="submit">{$lang->cmd_search}</button>
|
||||
<a class="x_btn" href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
|
||||
</form>
|
||||
<script>
|
||||
jQuery(function($){
|
||||
// Modal anchor activation
|
||||
var $docTable = $('#pollListTable');
|
||||
var $submit = $('#pollList [type="submit"]');
|
||||
$docTable.find(':checkbox').change(function(){
|
||||
if($docTable.find(':checked').length == 0){
|
||||
$submit.addClass('x_disabled');
|
||||
} else {
|
||||
$submit.removeClass('x_disabled');
|
||||
}
|
||||
}).change();
|
||||
// Button action
|
||||
$submit.click(function(){
|
||||
if($docTable.find(':checked').length == 0){
|
||||
alert(xe.lang.msg_select_poll);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
@ -6,12 +6,6 @@
|
|||
<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[回收桶]]></value>
|
||||
</item>
|
||||
<item name="cmd_restore">
|
||||
<value xml:lang="ko"><![CDATA[복원]]></value>
|
||||
<value xml:lang="en"><![CDATA[Restore]]></value>
|
||||
<value xml:lang="jp"><![CDATA[復元]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[復原]]></value>
|
||||
</item>
|
||||
<item name="cmd_restore_all">
|
||||
<value xml:lang="ko"><![CDATA[모두 복원]]></value>
|
||||
<value xml:lang="en"><![CDATA[Restore All]]></value>
|
||||
|
|
@ -79,9 +73,9 @@
|
|||
<value xml:lang="zh-TW"><![CDATA[復原失敗]]></value>
|
||||
</item>
|
||||
<item name="origin_module_type">
|
||||
<value xml:lang="ko"><![CDATA[원본 타입]]></value>
|
||||
<value xml:lang="en"><![CDATA[Source Type]]></value>
|
||||
<value xml:lang="jp"><![CDATA[原本タイプ]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[原始類型]]></value>
|
||||
<value xml:lang="ko"><![CDATA[타입]]></value>
|
||||
<value xml:lang="en"><![CDATA[Type]]></value>
|
||||
<value xml:lang="jp"><![CDATA[タイプ]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[類型]]></value>
|
||||
</item>
|
||||
</lang>
|
||||
|
|
|
|||
|
|
@ -18,13 +18,15 @@ var no_text_comment = '{$lang->no_text_comment}';
|
|||
<caption>
|
||||
<strong>{$lang->all}({number_format($total_count)})</strong>
|
||||
<div class="x_pull-right x_btn-group">
|
||||
<a href="#fo_list" class="x_btn modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a>
|
||||
<button type="submit" class="x_btn" name="is_all" value="true">{$lang->empty_trash_all}</button>
|
||||
<a href="#fo_list" class="x_btn modalAnchor" data-name="is_all" data-value="false">{$lang->delete}</a>
|
||||
<a href="#fo_list" class="x_btn modalAnchor" data-name="act" data-value="procTrashAdminRestore">{$lang->restore}</a>
|
||||
</div>
|
||||
</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="title">{$lang->document}({$lang->origin_module_type})</th>
|
||||
<th scope="col" class="title">{$lang->document}</th>
|
||||
<th scope="col" class="nowr">{$lang->origin_module_type}</th>
|
||||
<th scope="col" class="nowr">{$lang->trash_nick_name}</th>
|
||||
<th scope="col" class="nowr">{$lang->trash_date}</th>
|
||||
<th scope="col" class="nowr">{$lang->ipaddress}</th>
|
||||
|
|
@ -33,21 +35,27 @@ var no_text_comment = '{$lang->no_text_comment}';
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!--@foreach($trash_list as $no => $oTrashVO)-->
|
||||
<tr>
|
||||
<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 class="nowr"><span class="member_{$oTrashVO->getRemoverSrl()}">{htmlspecialchars($oTrashVO->getNickName())}</span></td>
|
||||
<tr loop="$trash_list => $no, $oTrashVO">
|
||||
<td class="title">
|
||||
<strong cond="!trim($oTrashVO->getTitle()) && $oTrashVO->getOriginModule() == 'comment'">{$lang->no_text_comment}</strong>
|
||||
<block cond="trim($oTrashVO->getTitle())">{$oTrashVO->getTitle()}</block>
|
||||
</td>
|
||||
<td class="nowr"><!--@if($oTrashVO->getOriginModule() == 'document')-->{$lang->document}<!--@else-->{$lang->comment}<!--@end--></td>
|
||||
<td class="nowr"><a href="#popup_menu_area" class="member_{$oTrashVO->getRemoverSrl()}">{htmlspecialchars($oTrashVO->getNickName())}</a></td>
|
||||
<td class="nowr">{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}</td>
|
||||
<td class="nowr">{$oTrashVO->getIpaddress()}</td>
|
||||
<td class="title">{$oTrashVO->getDescription()}</td>
|
||||
<td><input type="checkbox" name="cart" value="{$oTrashVO->getTrashSrl()}" /></td>
|
||||
</tr>
|
||||
<!--@end-->
|
||||
<tr cond="!$trash_list">
|
||||
<td>{$lang->no_documents}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="x_pull-right x_btn-group">
|
||||
<a href="#fo_list" class="x_btn modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a>
|
||||
<button type="submit" class="x_btn" name="is_all" value="true">{$lang->empty_trash_all}</button>
|
||||
<a href="#fo_list" class="x_btn modalAnchor" data-name="is_all" data-value="false">{$lang->delete}</a>
|
||||
<a href="#fo_list" class="x_btn modalAnchor" data-name="act" data-value="procTrashAdminRestore">{$lang->restore}</a>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
|
@ -96,11 +104,13 @@ var no_text_comment = '{$lang->no_text_comment}';
|
|||
<input type="hidden" name="is_all" value="false" />
|
||||
<input type="hidden" name="origin_module" value="{$origin_module}" />
|
||||
<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 id="trashManageListTable" class="x_table x_table-striped x_table-hover">
|
||||
<caption>{$lang->selected_document} <strong id="selectedTrashCount">0</strong></caption>
|
||||
<caption>
|
||||
<strong>{$lang->selected_document} <span id="selectedTrashCount"></span></strong>
|
||||
</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="title">{$lang->document}</th>
|
||||
|
|
@ -113,12 +123,35 @@ var no_text_comment = '{$lang->no_text_comment}';
|
|||
</table>
|
||||
</div>
|
||||
<div class="x_modal-footer">
|
||||
<div class="x_pull-left">
|
||||
<button type="submit" class="x_btn" name="act" value="procTrashAdminRestore">{$lang->cmd_restore}</button>
|
||||
</div>
|
||||
<div class="x_pull-right">
|
||||
<button type="submit" class="x_btn x_btn-inverse" name="is_all" value="false">{$lang->cmd_delete}</button>
|
||||
</div>
|
||||
<button type="submit" class="x_btn x_btn-inverse x_pull-right" name="is_all|act" value="false|procTrashAdminRestore">{$lang->confirm}</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<script>
|
||||
jQuery(function($){
|
||||
// Modal anchor activation
|
||||
var $docTable = $('#trashListTable');
|
||||
$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','#fo_list').removeClass('x_disabled');
|
||||
}
|
||||
}).change();
|
||||
// Modal anchor 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 thisName = $this.attr('data-name');
|
||||
var thisValue = $this.attr('data-value');
|
||||
var thisText = $this.text();
|
||||
getTrashList();
|
||||
$('#fo_list').find('.x_modal-header ._sub').text(thisText).end().find('[type="submit"]').val(thisValue).attr('name',thisName).text(thisText);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue