From a2ff3dbda1a6230771b0ff3d7e2d7d2fbb730309 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Sat, 12 Oct 2013 13:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css       | 83 +++++++++++++++++++++++++++++----------
 admin/manage-comments.php | 75 ++++++++++++++++-------------------
 admin/menu.php            |  2 +-
 3 files changed, 96 insertions(+), 64 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index cc941d88..e374a08f 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -45,7 +45,7 @@ a.balloon-button {
     height: 18px;
     line-height: 18px;
     background: #D8E7EE;
-    font-size: 12px;
+    font-size: .85714em;
     text-align: center;
     text-decoration: none;
     
@@ -671,7 +671,7 @@ margin-top: 25px;
  * 后台头部导航
  */
 .typecho-head-nav {
-    height: 40px;
+    padding: 0 10px;
     background: #2E3639;
 }
 
@@ -695,24 +695,25 @@ margin-top: 25px;
 
 #typecho-nav-list .parent a {
     color: #FFF;
-    height: 40px;
-    line-height: 40px;
+    height: 36px;
+    line-height: 36px;
     display: block;
     padding: 0 20px;
     float: left;
 }
 
-#typecho-nav-list .parent a:hover, #typecho-nav-list .focus .parent a, #typecho-nav-list .root:hover .parent a {
-    background: #62686B;
+#typecho-nav-list .parent a:hover,
+#typecho-nav-list .focus .parent a,
+#typecho-nav-list .root:hover .parent a {
+    background: #434A4D;
     text-decoration: none;
 }
 
 #typecho-nav-list .child {
     display: none;
     position: absolute;
-    top: 40px;
+    top: 36px;
     margin: 0;
-    border-top: none;
     background: #2E3639;
     overflow: hidden;
     z-index: 250;
@@ -732,12 +733,10 @@ margin-top: 25px;
 #typecho-nav-list .child li.last {
 }
 
-#typecho-nav-list .child li a:hover {
-    background: #62686B;
-}
-
-#typecho-nav-list .child li.focus a, #typecho-nav-list .child li.focus a:hover {
-    background: #62686B;
+#typecho-nav-list .child li a:hover,
+#typecho-nav-list .child li.focus a,
+#typecho-nav-list .child li.focus a:hover {
+    background: #434A4D;
 }
 
 #typecho-nav-list .child li a {
@@ -748,21 +747,17 @@ margin-top: 25px;
     overflow: hidden;
     text-overflow : ellipsis;
     white-space: nowrap;
-    height: 40px;
-    line-height: 40px;
+    height: 36px;
+    line-height: 36px;
 }
 
 .typecho-head-nav .operate {
-    color: #ccc;
     position: absolute;
-    font-size: 13px;
     top: 0px;
     right: 0;
 }
 
 .typecho-head-nav .operate .author {
-    margin-right: 8px;
-    text-decoration: underline;
 }
 
 
@@ -1157,8 +1152,54 @@ a.operate-reply {
 }
 
 /**
- * 不使用表格的列表
+ * 评论管理
  */
+.comment-content {
+    margin: -0.5em 0;
+}
+.comment-date {
+    color: #999;
+}
+
+.comment-action a, .comment-action span { margin-right: 4px; }
+
+.comment-action { visibility: hidden; }
+.typecho-list-table tr:hover .comment-action { visibility: visible; }
+
+/* 下拉操作按钮 */
+/*.typecho-list-table tr:hover .drop-action { display: block; }
+
+.drop-action {
+    display: none;
+    position: relative;
+    list-style: none;
+    position: absolute;
+    margin: 0;
+    padding: 0;
+    border: 1px solid #F0F0EC;
+    height: 24px;
+    overflow: hidden;
+    background-color: #FFF;
+
+    border-radius: 2px;
+}
+.drop-action:hover {
+    border-color: #E0E0DC;
+    height: auto;
+    z-index: 10;
+}
+
+.drop-action a, .drop-action span {
+    display: block;
+    padding: 0 10px;
+    height: 24px;
+    line-height: 24px;
+}
+.drop-action a:hover, .drop-action span:hover {
+    background-color: #FFF9E8;
+    text-decoration: none;
+}*/
+
 /*
 ul.typecho-list-notable {
     margin: 10px 0 0 0;
diff --git a/admin/manage-comments.php b/admin/manage-comments.php
index 313cb1cc..ab135afa 100644
--- a/admin/manage-comments.php
+++ b/admin/manage-comments.php
@@ -86,9 +86,9 @@ $comments = Typecho_Widget::widget('Widget_Comments_Admin');
                         </colgroup>
                         <thead>
                             <tr>
-                                <th> </th>
                                 <th> </th>
                                 <th><?php _e('作者'); ?></th>
+                                <th> </th>
                                 <th><?php _e('内容'); ?></th>
                             </tr>
                         </thead>
@@ -107,55 +107,46 @@ $comments = Typecho_Widget::widget('Widget_Comments_Admin');
                             <td valign="top" class="comment-head">
                                 <div class="comment-meta">
                                     <span class="<?php $comments->type(); ?>"></span>
-                                    <span class="comment-author"><?php $comments->author(true); ?></span><br>
+                                    <strong class="comment-author"><?php $comments->author(true); ?></strong>
                                     <?php if($comments->mail): ?>
-                                    <a href="mailto:<?php $comments->mail(); ?>"><?php $comments->mail(); ?></a><br>
+                                    <br><span><a href="mailto:<?php $comments->mail(); ?>"><?php $comments->mail(); ?></a></span>
                                     <?php endif; ?>
                                     <?php if($comments->ip): ?>
-                                    <?php $comments->ip(); ?>
+                                    <br><span><?php $comments->ip(); ?></span>
                                     <?php endif; ?>
                                 </div>
                             </td>
                             <td valign="top" class="comment-body">
-                                <div class="content">
-                                    <div class="comment-content">
-                                        <?php $comments->content(); ?>
-                                    </div>
+                                <div class="comment-date"><?php $comments->dateWord(); ?> 于 <a href="<?php $comments->permalink(); ?>"><?php $comments->title(); ?></a></div>
+                                <div class="comment-content">
+                                    <?php $comments->content(); ?>
                                 </div>
-                                
-                                <div class="line">
-                                    <div class="left hidden-by-mouse">
-                                        <?php if('approved' == $comments->status): ?>
-                                        <span class="weak"><?php _e('通过'); ?></span>
-                                        <?php else: ?>
-                                        <a href="<?php $options->index('/action/comments-edit?do=approved&coid=' . $comments->coid); ?>" class="ajax"><?php _e('通过'); ?></a>
-                                        <?php endif; ?>
-                                         | 
-                                        <?php if('waiting' == $comments->status): ?>
-                                        <span class="weak"><?php _e('待审核'); ?></span>
-                                        <?php else: ?>
-                                        <a href="<?php $options->index('/action/comments-edit?do=waiting&coid=' . $comments->coid); ?>" class="ajax"><?php _e('待审核'); ?></a>
-                                        <?php endif; ?>
-                                         | 
-                                        <?php if('spam' == $comments->status): ?>
-                                        <span class="weak"><?php _e('垃圾'); ?></span>
-                                        <?php else: ?>
-                                        <a href="<?php $options->index('/action/comments-edit?do=spam&coid=' . $comments->coid); ?>" class="ajax"><?php _e('垃圾'); ?></a>
-                                        <?php endif; ?>
-                                         | 
-                                        <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=get&coid=' . $comments->coid); ?>" class="ajax operate-edit"><?php _e('编辑'); ?></a>
-                                        <?php if('approved' == $comments->status && 'comment' == $comments->type): ?>
-                                         | 
-                                        <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=reply&coid=' . $comments->coid); ?>" class="ajax operate-reply"><?php _e('回复'); ?></a>
-                                        <?php endif; ?>
-                                         | 
-                                        <a lang="<?php _e('你确认要删除%s的评论吗?', htmlspecialchars($comments->author)); ?>" href="<?php $options->index('/action/comments-edit?do=delete&coid=' . $comments->coid); ?>" class="ajax operate-delete"><?php _e('删除'); ?></a>
-                                    </div>
-                                    <div class="right">
-                                        <?php $comments->dateWord(); ?>
-                                        &nbsp;&nbsp;
-                                        <a href="<?php $comments->permalink(); ?>"><?php $comments->title(); ?></a>
-                                    </div>
+                                <div class="comment-action">
+                                    <?php if('approved' == $comments->status): ?>
+                                    <span class="weak"><?php _e('通过'); ?></span>
+                                    <?php else: ?>
+                                    <a href="<?php $options->index('/action/comments-edit?do=approved&coid=' . $comments->coid); ?>" class="ajax"><?php _e('通过'); ?></a>
+                                    <?php endif; ?>
+                                    
+                                    <?php if('waiting' == $comments->status): ?>
+                                    <span class="weak"><?php _e('待审核'); ?></span>
+                                    <?php else: ?>
+                                    <a href="<?php $options->index('/action/comments-edit?do=waiting&coid=' . $comments->coid); ?>" class="ajax"><?php _e('待审核'); ?></a>
+                                    <?php endif; ?>
+                                    
+                                    <?php if('spam' == $comments->status): ?>
+                                    <span class="weak"><?php _e('垃圾'); ?></span>
+                                    <?php else: ?>
+                                    <a href="<?php $options->index('/action/comments-edit?do=spam&coid=' . $comments->coid); ?>" class="ajax"><?php _e('垃圾'); ?></a>
+                                    <?php endif; ?>
+                                    
+                                    <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=get&coid=' . $comments->coid); ?>" class="ajax operate-edit"><?php _e('编辑'); ?></a>
+
+                                    <?php if('approved' == $comments->status && 'comment' == $comments->type): ?>
+                                    <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=reply&coid=' . $comments->coid); ?>" class="ajax operate-reply"><?php _e('回复'); ?></a>
+                                    <?php endif; ?>
+                                    
+                                    <a lang="<?php _e('你确认要删除%s的评论吗?', htmlspecialchars($comments->author)); ?>" href="<?php $options->index('/action/comments-edit?do=delete&coid=' . $comments->coid); ?>" class="ajax operate-delete"><?php _e('删除'); ?></a>
                                 </div>
                             </td>
                         </tr>
diff --git a/admin/menu.php b/admin/menu.php
index e1bd341f..40ca7dcc 100644
--- a/admin/menu.php
+++ b/admin/menu.php
@@ -1,5 +1,5 @@
 <?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<div class="typecho-head-nav">
+<div class="typecho-head-nav clearfix">
     <div id="typecho-nav-list">
         <?php $menu->output(); ?>
     </div>