From 3bc77e9a52fad33c49f8692239fd5ca211aa4701 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Thu, 17 Oct 2013 11:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B5=E9=9D=A2=E6=90=9E?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/write-js.php   |  80 +++++++++++-----------
 admin/write-page.php | 153 +++++++++++++++++++------------------------
 admin/write-post.php |   6 +-
 3 files changed, 110 insertions(+), 129 deletions(-)

diff --git a/admin/write-js.php b/admin/write-js.php
index 4648d999..93d535d9 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -36,51 +36,53 @@ $(document).ready(function() {
     // tag autocomplete 提示
     var tags = $('#tags'), tagsPre = [];
     
-    var items = tags.val().split(','), result = [];
-    for (var i = 0; i < items.length; i ++) {
-        var tag = items[i];
+    if (tags.length > 0) {
+        var items = tags.val().split(','), result = [];
+        for (var i = 0; i < items.length; i ++) {
+            var tag = items[i];
 
-        if (!tag) {
-            continue;
+            if (!tag) {
+                continue;
+            }
+
+            tagsPre.push({
+                id      :   tag,
+                tags    :   tag
+            });
         }
 
-        tagsPre.push({
-            id      :   tag,
-            tags    :   tag
+        tags.tokenInput(<?php 
+        $data = array();
+        while ($tags->next()) {
+            $data[] = array(
+                'id'    =>  $tags->name,
+                'tags'  =>  $tags->name
+            );
+        }
+        echo json_encode($data);
+        ?>, {
+            propertyToSearch:   'tags',
+            tokenValue      :   'tags',
+            searchDelay     :   0,
+            preventDuplicates   :   true,
+            animateDropdown :   false,
+            hintText        :   '<?php _e('请输入标签名'); ?>',
+            noResultsText   :   '此标签不存在, 按回车创建',
+            prePopulate     :   tagsPre,
+
+            onResult        :   function (result) {
+                return result.slice(0, 5);
+            }
+        });
+
+        // tag autocomplete 提示宽度设置
+        $('#token-input-tags').focus(function() {
+            var t = $('.token-input-dropdown'),
+                offset = t.outerWidth() - t.width();
+            t.width($('.token-input-list').outerWidth() - offset);
         });
     }
 
-    tags.tokenInput(<?php 
-    $data = array();
-    while ($tags->next()) {
-        $data[] = array(
-            'id'    =>  $tags->name,
-            'tags'  =>  $tags->name
-        );
-    }
-    echo json_encode($data);
-    ?>, {
-        propertyToSearch:   'tags',
-        tokenValue      :   'tags',
-        searchDelay     :   0,
-        preventDuplicates   :   true,
-        animateDropdown :   false,
-        hintText        :   '<?php _e('请输入标签名'); ?>',
-        noResultsText   :   '此标签不存在, 按回车创建',
-        prePopulate     :   tagsPre,
-
-        onResult        :   function (result) {
-            return result.slice(0, 5);
-        }
-    });
-
-    // tag autocomplete 提示宽度设置
-    $('#token-input-tags').focus(function() {
-        var t = $('.token-input-dropdown'),
-            offset = t.outerWidth() - t.width();
-        t.width($('.token-input-list').outerWidth() - offset);
-    });
-
     // 缩略名自适应宽度
     var slug = $('#slug'), sw = slug.width();
 
diff --git a/admin/write-page.php b/admin/write-page.php
index b1950695..35973c1c 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -7,43 +7,57 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main typecho-post-option typecho-post-area">
+        <div class="col-group typecho-page-main typecho-post-area">
             <form action="<?php $options->index('/action/contents-page-edit'); ?>" method="post" name="write_page">
-                <div class="col-9 suffix">
-                    <div>
-                        <label for="title" class="typecho-label"><?php _e('标题'); ?>
-                        <?php if ($page->draft && $page->draft['cid'] != $page->cid): ?>
-                        <?php $pageModifyDate = new Typecho_Date($page->draft['modified']); ?>
-                        <cite><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $pageModifyDate->word(), 
+                <div class="col-mb-12 col-tb-9">
+                    <?php if ($page->draft && $page->draft['cid'] != $page->cid): ?>
+                    <?php $pageModifyDate = new Typecho_Date($page->draft['modified']); ?>
+                        <cite class="edit-draft-notice"><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $pageModifyDate->word(), 
                         Typecho_Common::url('/action/contents-page-edit?do=deleteDraft&cid=' . $page->cid, $options->index)); ?></cite>
-                        <?php endif; ?>
-                        </label>
-                        <p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($page->title); ?>" class="text title" /></p>
-                        <label for="text" class="typecho-label"><?php _e('内容'); ?><cite id="auto-save-message"></cite></label>
-                        <p><textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text"><?php echo htmlspecialchars($page->text); ?></textarea></p>
-                        <?php Typecho_Plugin::factory('admin/write-page.php')->content($page); ?>
-                        <p class="submit">
-                            <span class="left">
-                            <span class="typecho-preview-label"><input type="checkbox" name="preview" id="btn-preview" /> <label for="btn-preview"><?php _e('预览内容'); ?></label></span>
-                                <span class="advance close" tabindex="0"><?php _e('展开高级选项'); ?></span>
-                                <span class="attach" tabindex="0"><?php _e('展开附件'); ?></span>
-                            </span>
-                            <span class="right">
-                                <input type="hidden" name="cid" value="<?php $page->cid(); ?>" />
-                                <button type="submit" name="do" value="save" id="btn-save"><?php _e('保存草稿'); ?></button>
-                                <button type="submit" name="do" value="publish" class="primary" id="btn-submit"><?php _e('发布页面'); ?></button>
-                            </span>
-                        </p>
-                    </div>
+                    <?php endif; ?>
+
+                    <p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($page->title); ?>" placeholder="<?php _e('标题'); ?>" class="w-100 text title" /></p>
+                        <?php $permalink = Typecho_Common::url($options->routingTable['page']['url'], $options->index);
+                        list ($scheme, $permalink) = explode(':', $permalink, 2);
+                        $permalink = ltrim($permalink, '/');
+                        ?>
+                    <?php if (preg_match("/\[slug:?[_0-9a-z-:]*\]/i", $permalink)): 
+                        $input = '<input type="text" id="slug" name="slug" value="' . htmlspecialchars($page->slug) . '" class="mono" />';
+                        ?>
+                        <p class="mono url-slug"><?php echo preg_replace("/\[slug:?[_0-9a-z-:]*\]/i", $input, $permalink); ?></p>
+                    <?php endif; ?>
+                    <p>
+                        <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text); ?></textarea>
+                        <span id="auto-save-message"></span>
+                    </p>
                         
-                    <ul id="advance-panel" class="typecho-post-option col-9">
-                        <li class="col-9">
-                            <div class="col-12">
-                                <label for="order" class="typecho-label"><?php _e('页面顺序'); ?></label>
-                                <p><input type="text" id="order" name="order" value="<?php $page->order(); ?>" class="mini" /></p>
-                                <p class="description"><?php _e('为你的自定义页面设定一个序列值以后, 能够使得它们按此值从小到大排列'); ?></p>
-                                <br />
-                                <label for="template" class="typecho-label"><?php _e('自定义模板'); ?></label>
+                    <?php include 'file-upload.php'; ?>
+                        
+                    <?php Typecho_Plugin::factory('admin/write-page.php')->content($page); ?>
+                    <p class="submit">
+                        <span class="right">
+                            <input type="hidden" name="cid" value="<?php $page->cid(); ?>" />
+                            <button type="submit" name="do" value="save" id="btn-save"><?php _e('保存草稿'); ?></button>
+                            <button type="submit" name="do" value="publish" class="primary" id="btn-submit"><?php _e('发布页面'); ?></button>
+                        </span>
+                    </p>
+                        
+                    <div id="typecho-preview-box"></div>
+                </div>
+                <div class="col-mb-12 col-tb-3">
+                        <section  class="typecho-post-option">
+                            <label for="date" class="typecho-label"><?php _e('发布日期'); ?></label>
+                            <p><input class="typecho-date w-100" type="text" name="date" id="date" value="<?php $page->have() ? $page->date('Y-m-d H:i') : ''; ?>" /></p>
+                        </section>
+
+                        <section class="typecho-post-option">
+                            <label for="order" class="typecho-label"><?php _e('页面顺序'); ?></label>
+                            <p><input type="text" id="order" name="order" value="<?php $page->order(); ?>" class="mini" /></p>
+                            <p class="description"><?php _e('为你的自定义页面设定一个序列值以后, 能够使得它们按此值从小到大排列'); ?></p>
+                        </section>
+
+                        <section  class="typecho-post-option">
+                            <label for="template" class="typecho-label"><?php _e('自定义模板'); ?></label>
                                 <p>
                                     <select name="template" id="template">
                                         <option value=""><?php _e('不选择'); ?></option>
@@ -53,9 +67,11 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                                     </select>
                                 </p>
                                 <p class="description"><?php _e('如果你为此页面选择了一个自定义模板, 系统将按照你选择的模板文件展现它'); ?></p>
-                                <?php Typecho_Plugin::factory('admin/write-page.php')->advanceOptionLeft($page); ?>
-                            </div>
-                            <div class="col-3">
+                        </section>
+
+                        <?php Typecho_Plugin::factory('admin/write-page.php')->option($page); ?>
+                        <div id="advance-panel">
+                            <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($page->allow('comment')): ?>checked="true"<?php endif; ?> />
@@ -64,59 +80,22 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                                     <label for="allowPing"><?php _e('允许被引用'); ?></label></li>
                                     <li><input id="allowFeed" name="allowFeed" type="checkbox" value="1" <?php if($page->allow('feed')): ?>checked="true"<?php endif; ?> />
                                     <label for="allowFeed"><?php _e('允许在聚合中出现'); ?></label></li>
-                                    <?php Typecho_Plugin::factory('admin/write-page.php')->advanceOptionRight($page); ?>
                                 </ul>
-                            </div>
-                        </li>
-                    </ul>
-                    <ul id="upload-panel" class="col-9">
-                        <li class="col-9">
-                            <?php include 'file-upload.php'; ?>
-                        </li>
-                    </ul>
-                    <div id="typecho-preview-box"></div>
-                </div>
-                <div class="col-3">
-                    <ul class="typecho-post-option">
-                        <li>
-                            <label for="date" class="typecho-label"><?php _e('日期'); ?></label>
-                            <p>
-                                <select disabled class="typecho-date" name="month" id="month">
-                                    <option value="1" <?php if (1 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('一月'); ?></option>
-                                    <option value="2" <?php if (2 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('二月'); ?></option>
-                                    <option value="3" <?php if (3 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('三月'); ?></option>
-                                    <option value="4" <?php if (4 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('四月'); ?></option>
-                                    <option value="5" <?php if (5 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('五月'); ?></option>
-                                    <option value="6" <?php if (6 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('六月'); ?></option>
-                                    <option value="7" <?php if (7 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('七月'); ?></option>
-                                    <option value="8" <?php if (8 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('八月'); ?></option>
-                                    <option value="9" <?php if (9 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('九月'); ?></option>
-                                    <option value="10" <?php if (10 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('十月'); ?></option>
-                                    <option value="11" <?php if (11 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('十一月'); ?></option>
-                                    <option value="12" <?php if (12 == $page->date->format('n')): ?>selected="true"<?php endif; ?>><?php _e('十二月'); ?></option>
-                                </select>
-                                <input disabled class="typecho-date" size="4" maxlength="4" type="text" name="day" id="day" value="<?php $page->date('d'); ?>" />
-                                ,
-                                <input disabled class="typecho-date" size="4" maxlength="4" type="text" name="year" id="year" value="<?php $page->date('Y'); ?>" />
-                                @
-                                <input disabled class="typecho-date" size="2" maxlength="2" type="text" name="hour" id="hour" value="<?php $page->date('H'); ?>" />
-                                :
-                                <input disabled class="typecho-date" size="2" maxlength="2" type="text" name="min" id="min" value="<?php $page->date('i'); ?>" />
-                            </p>
-                            <p class="description"><?php _e('请选择一个发布日期'); ?></p>
-                        </li>
-                        <li>
-                            <label for="slug" class="typecho-label"><?php _e('缩略名'); ?></label>
-                            <p><input type="text" id="slug" name="slug" value="<?php $page->slug(); ?>" class="mini" /></p>
-                            <p class="description"><?php _e('为这篇日志自定义链接地址, 有利于搜索引擎收录'); ?></p>
-                        </li>
-                        <?php Typecho_Plugin::factory('admin/write-page.php')->option($page); ?>
+                            </section>
+                            
+                            <?php Typecho_Plugin::factory('admin/write-page.php')->advanceOption($page); ?>
+                        </div>
+                        <a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
                         <?php if($page->have()): ?>
                         <?php $modified = new Typecho_Date($page->modified); ?>
-                        <li>
-                            <label class="typecho-label"><?php _e('本页面由 %s 创建', $page->author->screenName); ?></label>
-                            <p class="description"><?php _e('最后修改于 %s', $modified->word()); ?></p>
-                        </li>
+                        <section class="typecho-post-option">
+                        <p class="description">
+                            <br>&mdash;<br>
+                            <?php _e('本页面由 <a href="%s">%s</a> 创建',
+                            Typecho_Common::url('manage-pages.php?uid=' . $page->author->uid, $options->adminUrl), $page->author->screenName); ?><br>
+                            <?php _e('最后更新于 %s', $modified->word()); ?>
+                        </p>
+                        </section>
                         <?php endif; ?>
                     </ul>
                 </div>
diff --git a/admin/write-post.php b/admin/write-post.php
index e29ed90f..1f9ddd87 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -88,6 +88,8 @@ 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>
 
+                    <?php Typecho_Plugin::factory('admin/write-post.php')->option($post); ?>
+
                     <div id="advance-panel">
                         <?php if($user->pass('editor', true)): ?>
                         <section class="typecho-post-option visibility-option">
@@ -105,7 +107,6 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                             <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">
@@ -117,13 +118,12 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                                 <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>
+                        <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOption($post); ?>
                     </div><!-- end #advance-panel -->
                     <a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
 
-                    <?php Typecho_Plugin::factory('admin/write-post.php')->option($post); ?>
                     <?php if($post->have()): ?>
                     <?php $modified = new Typecho_Date($post->modified); ?>
                     <section class="typecho-post-option">