diff --git a/modules/trash/tpl/js/trash_admin.js b/modules/trash/tpl/js/trash_admin.js index b5b4f1e98..46ca7de79 100644 --- a/modules/trash/tpl/js/trash_admin.js +++ b/modules/trash/tpl/js/trash_admin.js @@ -70,11 +70,10 @@ function completeGetTrashList(ret_obj, response_tags) else title = objTrash.title; htmlListBuffer += '' + - ''+ title +'' + + ''+ title +'' + ''+ objTrash.nickName +'' + ''+ objTrash.ipaddress +'' + - '' + - ''; + ''; } jQuery('#selectedTrashCount').html(trash_list.length); } diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index ff6d6eb92..0f164f462 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -3,107 +3,70 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; var no_text_comment = '{$lang->no_text_comment}'; +
+

{$lang->trash}

+

{$XE_VALIDATOR_MESSAGE}

-
- - - - -
-

{$lang->trash}

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {$lang->trash}({number_format($total_count)}) -
- {$lang->document_manager} - -
-
{$lang->document}({$lang->origin_module_type}){$lang->trash_nick_name}{$lang->trash_date}{$lang->ipaddress}{$lang->trash_description}
{$lang->document}({$lang->origin_module_type}){$lang->trash_nick_name}{$lang->trash_date}{$lang->ipaddress}{$lang->trash_description}
{$lang->no_text_comment}{$oTrashVO->getTitle()} ({$lang->document}{$lang->comment}){htmlspecialchars($oTrashVO->getNickName())}{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}{$oTrashVO->getIpaddress()}{$oTrashVO->getDescription()}
-
-
-
- {$lang->document_manager} - -
-
-
- -
+ - - -
-

{$lang->document_manager}

-
-
- - - - - - - - - - - -
{$lang->selected_document} 0
{$lang->document}{$lang->trash_nick_name}{$lang->ipaddress}
-
-