From f8c05eef2373a7deb14ad212c2ffc43becb9c8f3 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Tue, 8 Oct 2013 17:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/common-js.php         |  3 ++-
 admin/css/style.css         |  6 ++++--
 admin/javascript/typecho.js | 13 ++++++++++++-
 admin/manage-pages.php      | 21 ++++++++++++---------
 admin/manage-posts.php      | 11 +++++------
 admin/manage-users.php      |  2 +-
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/admin/common-js.php b/admin/common-js.php
index 1014daea..8aafb0b5 100644
--- a/admin/common-js.php
+++ b/admin/common-js.php
@@ -15,7 +15,8 @@
             $('.typecho-list-table').tableSelectable({
                 checkEl     :   'input[type=checkbox]',
                 rowEl       :   'tr',
-                selectAllEl :   '.typecho-table-select-all'
+                selectAllEl :   '.typecho-table-select-all',
+                actionEl    :   '.dropdown-menu a'
             });
 
             $('.btn-drop').dropdownMenu({
diff --git a/admin/css/style.css b/admin/css/style.css
index 2525745a..950224e0 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -241,7 +241,9 @@ select {
 }
 
 button {
-    line-height: 22px; height: 26px; vertical-align: middle;
+    height: 28px;
+    vertical-align: middle;
+    zoom: 1;
     display: inline-block;
     color: #666;
     font-size: 13px;
@@ -1317,7 +1319,7 @@ margin-top: 25px;
 
 .typecho-list-operate button {
     height: 24px;
-    line-height: 24px;
+    zoom: 1;
 }
 
 .typecho-list-operate .operate {
diff --git a/admin/javascript/typecho.js b/admin/javascript/typecho.js
index d160c17c..233dc2ef 100644
--- a/admin/javascript/typecho.js
+++ b/admin/javascript/typecho.js
@@ -22,7 +22,8 @@
         var table = this, s = $.extend({
             checkEl     :   null,
             rowEl       :   null,
-            selectAllEl :   null
+            selectAllEl :   null,
+            actionEl    :   null
         }, options);
 
         function clickRow (t) {
@@ -57,6 +58,16 @@
                 }).removeClass('checked');
             }
         });
+
+        $(s.actionEl).click(function () {
+            var t = $(this), lang = t.attr('lang');
+
+            if (!lang || confirm(lang)) {
+                table.parents('form').attr('action', t.attr('href')).submit();
+            }
+
+            return false;
+        });
     };
 })($);
 
diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index a17853f5..17341ee3 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -12,19 +12,22 @@ $stat = Typecho_Widget::widget('Widget_Stat');
             <div class="column-24 start-01 typecho-list">
                 <div class="typecho-list-operate">
                 <form method="get">
-                    <p class="operate"><?php _e('操作'); ?>: 
-                        <span class="operate-button typecho-table-select-all"><?php _e('全选'); ?></span>, 
-                        <span class="operate-button typecho-table-select-none"><?php _e('不选'); ?></span>&nbsp;&nbsp;&nbsp;
-                        <?php _e('选中项'); ?>: 
-                        <span rel="delete" lang="<?php _e('你确认要删除这些页面吗?'); ?>" class="operate-button operate-delete typecho-table-select-submit"><?php _e('删除'); ?></span>
-                    </p>
-                    <p class="search">
+                    <div class="operate">
+                        <input type="checkbox" class="typecho-table-select-all" />
+                    <div class="btn-group btn-drop">
+                    <button class="dropdown-toggle" type="button" href="">选中项 &nbsp;<i class="icon-caret-down"></i></button>
+                    <ul class="dropdown-menu">
+                        <li><a lang="<?php _e('你确认要删除这些页面吗?'); ?>" href="<?php $options->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                    </ul>
+                    </div>
+                    </div>
+                    <div class="search">
                     <?php if ('' != $request->keywords): ?>
                     <a href="<?php $options->adminUrl('manage-pages.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                     <?php endif; ?>
-                    <input type="text" value="<?php '' != $request->keywords ? print(htmlspecialchars($request->keywords)) : _e('请输入关键字'); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                    <input type="text" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
                     <button type="submit"><?php _e('筛选'); ?></button>
-                    </p>
+                    </div>
                 </form>
                 </div>
             
diff --git a/admin/manage-posts.php b/admin/manage-posts.php
index 2d6a1a55..21fe9ccf 100644
--- a/admin/manage-posts.php
+++ b/admin/manage-posts.php
@@ -17,15 +17,15 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                     <div class="btn-group btn-drop">
                     <button class="dropdown-toggle" type="button" href="">选中项 &nbsp;<i class="icon-caret-down"></i></button>
                     <ul class="dropdown-menu">
-                        <li><a href=""><?php _e('删除'); ?></a></li>
+                        <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>" href="<?php $options->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
                     </ul>
                 </div>  
                     </div>
-                    <p class="search">
+                    <div class="search">
                     <?php if ('' != $request->keywords || '' != $request->category): ?>
                     <a href="<?php $options->adminUrl('manage-posts.php' . (isset($request->uid) ? '?uid=' . htmlspecialchars($request->get('uid')) : '')); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                     <?php endif; ?>
-                    <input type="text" value="<?php '' != $request->keywords ? print(htmlspecialchars($request->keywords)) : _e('请输入关键字'); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                    <input type="text" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
                     <select name="category">
                     	<option value=""><?php _e('所有分类'); ?></option>
                     	<?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($category); ?>
@@ -37,11 +37,11 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                     <?php if(isset($request->uid)): ?>
                         <input type="hidden" value="<?php echo htmlspecialchars($request->get('uid')); ?>" name="uid" />
                     <?php endif; ?>
-                    </p>
+                    </div>
                 </form>
                 </div>
             
-                <form method="post" name="manage_posts" class="operate-form" action="<?php $options->index('/action/contents-post-edit'); ?>">
+                <form method="post" name="manage_posts" class="operate-form">
                 <table class="typecho-list-table">
                     <colgroup>
                         <col width="25"/>
@@ -113,7 +113,6 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                         <?php endif; ?>
                     </tbody>
                 </table>
-                <input type="hidden" name="do" value="delete" />
                 </form>
             
             <?php if($posts->have()): ?>
diff --git a/admin/manage-users.php b/admin/manage-users.php
index a5151630..752610ea 100644
--- a/admin/manage-users.php
+++ b/admin/manage-users.php
@@ -21,7 +21,7 @@ include 'menu.php';
                     <?php if ('' != $request->keywords): ?>
                     <a href="<?php $options->adminUrl('manage-users.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                     <?php endif; ?>
-                    <input type="text" value="<?php '' != $request->keywords ? print(htmlspecialchars($request->keywords)) : _e('请输入关键字'); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                    <input type="text" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
                     <button type="submit"><?php _e('筛选'); ?></button>
                     </p>
                 </form>