diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index fcc67b6b3..a87ee957d 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -209,6 +209,9 @@ body>.x,
.x .x_btn-group {
zoom: 1;
}
+.x .x_btn-group.margin_after {
+ margin-right: 10px;
+}
.x .x_btn-group:after {
content: "";
display: block;
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index d50ddcdc1..c0a69b1dc 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -1432,15 +1432,17 @@ jQuery(function($){
$t.addClass('tg').find('>*:not(:first-child)').hide();
}
});
- $('.x .dsTg .rx_detail_marks').hide();
- var details = $('.x .dsTg td.tg>*:not(:first-child),.x .dsTg .rx_detail_marks');
+ var details = $('.x .dsTg td.tg>*:not(:first-child),.x .dsTg .rx_detail_marks').hide();
+ var simples = $('.x .dsTg td.tg>*:not(:first-child),.x .dsTg .rx_simple_marks').show();
var simpleBtnFn = function(){
details.hide();
+ simples.show();
detailBtn.removeClass('x_active');
simpleBtn.addClass('x_active');
};
var detailBtnFn = function(){
details.show();
+ simples.hide();
detailBtn.addClass('x_active');
simpleBtn.removeClass('x_active');
};
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 6d3d886e8..b93b21850 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -23,10 +23,6 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
|
{$lang->ipaddress}:{$search_keyword}({number_format($total_count)})
-
-
-
-
+
+
+
+
@@ -63,7 +63,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
{$val->getNickName()}
| {number_format($val->get('voted_count'))}/{number_format($val->get('blamed_count'))} |
- {(zdate($val->regdate,"Y-"))}{(zdate($val->regdate,"m-d"))}{(zdate($val->regdate,"\nH:i:s"))} |
+
+ {$val->getRegdate('Y-m-d H:i:s')}
+ {$val->getRegdate($val->getRegdateTime() > time() - 86400 ? 'H:i' : 'm-d')}
+ |
{$val->ipaddress} |
{$secret_name_list['Y']}{$secret_name_list['N']} |
{$lang->published_name_list['Y']}{$lang->published_name_list['N']} |
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 792318619..3fe6ebf00 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -25,16 +25,16 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
|
{$lang->ipaddress}:{$search_keyword}({number_format($total_count)})
-
-
-
-
+
+
+
+
@@ -64,7 +64,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
| {$oDocument->get('readed_count')} |
{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')} |
- {$oDocument->getRegdate("Y-")}{$oDocument->getRegdate("m-d")}{$oDocument->getRegdate(" H:i")} |
+
+ {$oDocument->getRegdate('Y-m-d H:i:s')}
+ {$oDocument->getRegdate($oDocument->getRegdateTime() > time() - 86400 ? 'H:i' : 'm-d')}
+ |
{$oDocument->get('ipaddress')} |
{$status_name_list[$oDocument->get('status')]} |
|
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index b1d8c946a..9b7ee1d93 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -26,7 +26,7 @@
{$lang->modify}
{$lang->delete}
-
+