From 846ff1c477dd303251516d47bb1dbc839e211a8f Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Tue, 15 Oct 2013 14:16:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css  | 45 +++++++++++++++++++++++++-------------------
 admin/write-post.php |  4 ++--
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index 592351a7..96a2d15d 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -679,15 +679,16 @@ margin-top: 25px;
     background: #292D33;
 }
 
-.typecho-nav-list {
-}
-
 #typecho-nav-list ul {
     list-style: none;
     margin: 0;
     padding: 0;
 }
 
+#typecho-nav-list ul:first-child {
+    border-left: 1px solid #383D45;
+}
+
 #typecho-nav-list .root {
     position: relative;
     float: left;
@@ -698,30 +699,36 @@ margin-top: 25px;
 }
 
 #typecho-nav-list .parent a {
-    color: #FFF;
+    display: block;
+    float: left;
+    padding: 0 20px;
+    border-right: 1px solid #383D45;
     height: 36px;
     line-height: 36px;
-    display: block;
-    padding: 0 20px;
-    float: left;
+    color: #BBB;
 }
 
 #typecho-nav-list .parent a:hover,
 #typecho-nav-list .focus .parent a,
 #typecho-nav-list .root:hover .parent a {
     background: #202328;
+    color: #FFF;
     text-decoration: none;
 }
 
+#typecho-nav-list .focus .parent a {
+    font-weight: bold;
+}
+
 #typecho-nav-list .child {
     display: none;
     position: absolute;
     top: 36px;
     margin: 0;
+    width: 160px; 
     background: #202328;
     overflow: hidden;
     z-index: 250;
-    width: 160px; 
 }
 
 #typecho-nav-list .root:hover .child {
@@ -737,18 +744,9 @@ margin-top: 25px;
 #typecho-nav-list .child li.last {
 }
 
-#typecho-nav-list .child li a:hover,
-#typecho-nav-list .child li.focus a,
-#typecho-nav-list .child li.focus a:hover {
-    background: #292D33;
-}
-#typecho-nav-list .child li.focus a {
-    color: #6DA1BB;
-}
-
 #typecho-nav-list .child li a {
     text-decoration: none;
-    color: #FFF;
+    color: #BBB;
     display: block;
     padding: 0 20px;
     overflow: hidden;
@@ -758,6 +756,15 @@ margin-top: 25px;
     line-height: 36px;
 }
 
+#typecho-nav-list .child li a:hover {
+    background: #292D33;
+    color: #FFF;
+}
+#typecho-nav-list .child li.focus a {
+    color: #6DA1BB;
+    font-weight: bold;
+}
+
 .typecho-head-nav .operate {
     position: absolute;
     top: 0px;
@@ -1993,7 +2000,7 @@ ul.typecho-list-notable li .loading {
  * Upload
  */
 #upload-panel {
-    padding: 10px 15px;
+    padding: 15px;
     border: 1px dashed #D9D9D6;
     background-color: #FFF;
     color: #999;
diff --git a/admin/write-post.php b/admin/write-post.php
index ffd404b9..9051a202 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -64,7 +64,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                     </section>
 
                     <section class="typecho-post-option category-option">
-                        <label class="typecho-label"><?php _e('所属分类'); ?></label>
+                        <label class="typecho-label"><?php _e('分类'); ?></label>
                         <?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($category); ?>
                         <ul>
                             <?php
@@ -82,7 +82,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                     </section>
 
                     <section class="typecho-post-option">
-                        <label for="tags" class="typecho-label"><?php _e('标签'); ?></label>
+                        <label for="token-input-tags" class="typecho-label"><?php _e('标签'); ?></label>
                         <p><input id="tags" name="tags" type="text" value="<?php $post->tags(',', false); ?>" class="w-100 text" /></p>
                     </section>
 

From d829988bf6aa69867045eff5947d5a288463fbd8 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Tue, 15 Oct 2013 15:08:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=90=8D=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css  | 28 +++++++-------
 admin/write-post.php | 89 +++++++++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index 96a2d15d..11d4d0b0 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -1561,7 +1561,7 @@ ul.typecho-list-notable li .loading {
 
 .typecho-post-area .typecho-label {
     display: block;
-    margin-bottom: -0.5em;
+    margin: 1em 0 -0.5em;
     font-weight: bold;
 }
 
@@ -1688,6 +1688,17 @@ ul.typecho-list-notable li .loading {
     font-size: 1.17em;
     font-weight: bold;
 }
+.typecho-post-area .url-slug {
+    margin-top: -0.5em;
+    color: #AAA;
+    font-size: .92857em;
+}
+.typecho-post-area #slug {
+    padding: 2px;
+    border: none;
+    background: #FFFBCC;
+    color: #666;
+}
 
 .typecho-post-area textarea#text {
 }
@@ -1738,11 +1749,6 @@ ul.typecho-list-notable li .loading {
     padding: 0;
 }
 
-.visibility-option {
-    float: left;
-    width: 50%;
-}
-
 /*.typecho-post-area .advance, .typecho-post-area .attach, .typecho-post-area .media {
     font-weight: bold;
     color: #333;
@@ -2007,8 +2013,8 @@ ul.typecho-list-notable li .loading {
     font-size: .92857em;
 }
 
-#upload-panel.drag {
-    background-color: #FFF9E8;
+#upload-panel.drag, .tDnD_whileDrag {
+    background-color: #FFFBCC;
 }
 
 #file-list {
@@ -2095,12 +2101,6 @@ ul.typecho-list-notable li .loading {
 #ui-datepicker-div button { height: 28px; }
 #ui-datepicker-div .ui-datepicker-current {
     float: left;
-    border-color: #F3F3F0;
-    color: #467B96;
-    background: #F3F3F0;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
 }
 #ui-datepicker-div .ui-datepicker-close { float: right; }
 
diff --git a/admin/write-post.php b/admin/write-post.php
index cd07ee0a..b85e04d5 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -10,14 +10,14 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
         <div class="col-group typecho-page-main typecho-post-area">
             <form action="<?php $options->index('/action/contents-post-edit'); ?>" method="post" name="write_post">
                 <div class="col-mb-12 col-tb-9">
-                    <label for="title" class="typecho-label"><?php _e('标题'); ?>
-                        <?php if ($post->draft && $post->draft['cid'] != $post->cid): ?>
-                        <?php $postModifyDate = new Typecho_Date($post->draft['modified']); ?>
-                        <cite><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $postModifyDate->word(), 
-                        Typecho_Common::url('/action/contents-post-edit?do=deleteDraft&cid=' . $post->cid, $options->index)); ?></cite>
-                        <?php endif; ?>
-                    </label>
-                    <p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($post->title); ?>" class="w-100 text title" /></p>
+                    <?php if ($post->draft && $post->draft['cid'] != $post->cid): ?>
+                    <?php $postModifyDate = new Typecho_Date($post->draft['modified']); ?>
+                    <cite><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $postModifyDate->word(), 
+                    Typecho_Common::url('/action/contents-post-edit?do=deleteDraft&cid=' . $post->cid, $options->index)); ?></cite>
+                    <?php endif; ?>
+                    <p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($post->title); ?>" placeholder="<?php _e('标题'); ?>" class="w-100 text title" /></p>
+
+                    <p class="mono url-slug"><?php _e('缩略名'); ?> http://xxxxxxxxxxxx.com/2011/08/29/<input type="text" id="slug" name="slug" value="<?php $post->slug(); ?>" class="mono" />/</p>
 
                     <p class="editor">
                         <span class="btnBold">bold</span><!--
@@ -43,7 +43,6 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                     <?php Typecho_Plugin::factory('admin/write-post.php')->content($post); ?>
                     <p class="submit">
                         <span class="left">
-                            <a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
                             <span id="auto-save-message">保存于 1 分钟前</span>
                         </span>
                         
@@ -84,11 +83,40 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                         <p><input id="tags" name="tags" type="text" value="<?php $post->tags(',', false); ?>" class="w-100 text" /></p>
                     </section>
 
-                    <section class="typecho-post-option">
-                        <label for="slug" class="typecho-label"><?php _e('URL 缩略名'); ?></label>
-                        <p><input type="text" id="slug" name="slug" value="<?php $post->slug(); ?>" class="mini w-100" /></p>
-                        <p class="description"><?php _e('为这篇日志自定义链接地址, 有利于搜索引擎收录'); ?></p>
-                    </section>
+                    <a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
+                    <div id="advance-panel">
+                        <?php if($user->pass('editor', true)): ?>
+                        <section class="typecho-post-option visibility-option">
+                            <label class="typecho-label"><?php _e('公开度'); ?></label>
+                            <ul>
+                                <li><input id="publish" value="publish" name="visibility" type="radio"<?php if (($post->status == 'publish' && !$post->password) || !$post->status) { ?> checked="true"<?php } ?> /> <label for="publish"><?php _e('公开'); ?></label></li>
+                                <li><input id="password" value="password" name="visibility" type="radio"<?php if ($post->password) { ?> checked="true"<?php } ?> /> <label for="password">密码保护 <input type="text" id="post-password" name="post-password" class="text-s" value="<?php $post->password(); ?>" size="16" /></label></li>
+                                <li><input id="private" value="private" name="visibility" type="radio"<?php if ($post->status == 'private') { ?> checked="true"<?php } ?> /> <label for="private">私密</label></li>
+                                <li><input id="waiting" value="waiting" name="visibility" type="radio"<?php if ($post->status == 'waiting') { ?> checked="true"<?php } ?> /> <label for="waiting">待审核</label></li>
+                            </ul>
+                        </section>
+                        <?php endif; ?>
+
+                        <section class="typecho-post-option">
+                            <label for="trackback" class="typecho-label"><?php _e('引用通告'); ?></label>
+                            <p><textarea id="trackback" class="w-100 mono" name="trackback" rows="3"></textarea></p>
+                            <p class="description"><?php _e('每一行一个引用地址, 用回车隔开'); ?></p>
+                            <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOptionLeft($post); ?>
+                        </section>
+
+                        <section class="typecho-post-option allow-option">
+                            <label class="typecho-label"><?php _e('权限控制'); ?></label>
+                            <ul>
+                                <li><input id="allowComment" name="allowComment" type="checkbox" value="1" <?php if($post->allow('comment')): ?>checked="true"<?php endif; ?> />
+                                <label for="allowComment"><?php _e('允许评论'); ?></label></li>
+                                <li><input id="allowPing" name="allowPing" type="checkbox" value="1" <?php if($post->allow('ping')): ?>checked="true"<?php endif; ?> />
+                                <label for="allowPing"><?php _e('允许被引用'); ?></label></li>
+                                <li><input id="allowFeed" name="allowFeed" type="checkbox" value="1" <?php if($post->allow('feed')): ?>checked="true"<?php endif; ?> />
+                                <label for="allowFeed"><?php _e('允许在聚合中出现'); ?></label></li>
+                                <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOptionRight($post); ?>
+                            </ul>
+                        </section>
+                    </div><!-- end #advance-panel -->
 
                     <?php Typecho_Plugin::factory('admin/write-post.php')->option($post); ?>
                     <?php if($post->have()): ?>
@@ -103,39 +131,6 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                     </section>
                     <?php endif; ?>
                 </div>
-                <div id="advance-panel" class="col-mb-12 col-tb-9">
-                    <section class="typecho-post-option">
-                        <label for="trackback" class="typecho-label"><?php _e('引用通告'); ?></label>
-                        <p><textarea id="trackback" class="w-100 mono" name="trackback" rows="3"></textarea></p>
-                        <p class="description"><?php _e('每一行一个引用地址, 用回车隔开'); ?></p>
-                        <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOptionLeft($post); ?>
-                    </section>
-
-                    <?php if($user->pass('editor', true)): ?>
-                    <section class="typecho-post-option visibility-option">
-                        <label class="typecho-label"><?php _e('公开度'); ?></label>
-                        <ul>
-                            <li><input id="publish" value="publish" name="visibility" type="radio"<?php if (($post->status == 'publish' && !$post->password) || !$post->status) { ?> checked="true"<?php } ?> /> <label for="publish"><?php _e('公开'); ?></label></li>
-                            <li><input id="password" value="password" name="visibility" type="radio"<?php if ($post->password) { ?> checked="true"<?php } ?> /> <label for="password">密码保护 <input type="text" id="post-password" name="post-password" class="text-s" value="<?php $post->password(); ?>" size="16" /></label></li>
-                            <li><input id="private" value="private" name="visibility" type="radio"<?php if ($post->status == 'private') { ?> checked="true"<?php } ?> /> <label for="private">私密</label></li>
-                            <li><input id="waiting" value="waiting" name="visibility" type="radio"<?php if ($post->status == 'waiting') { ?> checked="true"<?php } ?> /> <label for="waiting">待审核</label></li>
-                        </ul>
-                    </section>
-                    <?php endif; ?>
-
-                    <section class="typecho-post-option allow-option">
-                        <label class="typecho-label"><?php _e('权限控制'); ?></label>
-                        <ul>
-                            <li><input id="allowComment" name="allowComment" type="checkbox" value="1" <?php if($post->allow('comment')): ?>checked="true"<?php endif; ?> />
-                            <label for="allowComment"><?php _e('允许评论'); ?></label></li>
-                            <li><input id="allowPing" name="allowPing" type="checkbox" value="1" <?php if($post->allow('ping')): ?>checked="true"<?php endif; ?> />
-                            <label for="allowPing"><?php _e('允许被引用'); ?></label></li>
-                            <li><input id="allowFeed" name="allowFeed" type="checkbox" value="1" <?php if($post->allow('feed')): ?>checked="true"<?php endif; ?> />
-                            <label for="allowFeed"><?php _e('允许在聚合中出现'); ?></label></li>
-                            <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOptionRight($post); ?>
-                        </ul>
-                    </section>
-                </div>
             </form>
         </div>
     </div>