修复 PHP 8.5 中 curl_close() 弃用警告 (#1924)

* Initial plan

* 移除 curl_close() 调用以修复 PHP 8.5 弃用警告

Co-authored-by: joyqi <59437+joyqi@users.noreply.github.com>

* 使用 PHP 版本检查兼容 PHP 7.4 的 curl_close 处理

Co-authored-by: joyqi <59437+joyqi@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: joyqi <59437+joyqi@users.noreply.github.com>

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_size = 2
+
+[*.scss]
+indent_size = 2
+
+[*.php]
+insert_final_newline = true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,42 @@
+---
+name: 上报 BUG
+about: 报告问题，帮助改进项目
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## 描述这个 Bug
+
+简明扼要地描述错误是什么。
+
+
+### 复现方式
+
+复现的步骤：
+
+1. 前往 '...'
+2. 点击 '....'
+3. 滚动到 '....'
+4. 看到错误
+
+
+### 期望的结果
+
+简明扼要地描述你期望看到的结果。
+
+
+### 截图
+
+如果可以的话，请添加截图或视频以帮助解释你的问题。
+
+
+### 平台
+
+- 操作系统版本：
+- Apache/Nginx 版本：
+- 数据库版本：
+- PHP 版本：
+- Typecho 版本：
+- 浏览器版本：

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: 论坛支持
+    url: https://forum.typecho.org/
+    about: 交流使用心得，使用模板插件，寻求帮助等等

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -0,0 +1,23 @@
+---
+name: 提改进建议
+about: 提出改进建议，改进项目现有功能
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+## 你的改进是否与某个问题有关？请描述
+
+简明扼要地描述问题产生的原因。例如：当 [...] 时，我总是很困惑。
+
+
+## 描述你想要的解决方案
+
+简明扼要地描述你希望的解决方案。
+
+
+## 描述你考虑过的替代方案
+
+简明扼要地描述你考虑过的任何替代解决方案或功能。
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: 新功能提议
+about: 为项目提出一个想法或可能的新功能
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+## 你的想法是否与某个问题有关？请描述
+
+简明扼要地描述问题产生的原因。例如：当 [...] 时，我总是很困惑。
+
+
+## 描述你想要的解决方案
+
+简明扼要地描述你希望的解决方案。
+
+
+## 描述你考虑过的替代方案
+
+简明扼要地描述你考虑过的任何替代解决方案或功能。
+

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,7 @@
+Fixes #
+
+## Proposed Changes
+
+  -
+  -
+  -

.github/workflows/Typecho-dev-Ci.yml

@@ -0,0 +1,58 @@
+name: Typecho Dev Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  php:
+    name: PHP ${{ matrix.php }} Tests
+    runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.head_commit.message, 'skip ci') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.4', '8.0', '8.1', '8.2']
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+    - name: Setup PHP only
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+    - name: Test
+      run: |
+        find . -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
+  build:
+    name: Typecho Build
+    runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.head_commit.message, 'skip ci') && github.event_name != 'pull_request' && github.repository == 'typecho/typecho' }}
+    needs:
+        - php
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+    - name: Build
+      run: |
+        mkdir build
+        cp -r LICENSE.txt index.php install.php admin install usr var build/
+        mkdir build/usr/uploads/
+        chmod 755 build/usr/uploads/
+        rm -rf build/admin/src
+        rm -rf build/usr/themes/classic-22/static/scss
+        cd build && zip -q -r typecho.zip * && mv typecho.zip ../ && cd -
+    - name: Upload a Build Artifact
+      uses: WebFreak001/deploy-nightly@v1.1.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/typecho/typecho/releases/49532662/assets{?name,label}
+        release_id: 49532662
+        asset_path: ./typecho.zip
+        asset_name: typecho.zip
+        asset_content_type: application/zip
+        max_releases: 1

.github/workflows/Typecho-hotfix-Merge.yml

@@ -0,0 +1,36 @@
+name: Typecho Hotfix Merge
+
+on:
+  pull_request:
+    types:
+      - closed
+      - labeled
+    branches:
+      - master
+
+jobs:
+  auto-merge:
+    if: github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'fix/')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Merge to dev branch
+        uses: devmasx/merge-branch@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          from_branch: ${{ github.event.pull_request.head.ref }}
+          target_branch: dev
+    
+  label-merge:
+    if: github.event.action == 'labeled' && !startsWith(github.event.pull_request.head.ref, 'fix/')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Merge to dev branch
+        uses: devmasx/merge-branch@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          label_name: 'merge-to-dev'
+          target_branch: dev

.github/workflows/Typecho-release-Ci.yml

@@ -0,0 +1,33 @@
+name: Typecho Build Release Ci
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+    - name: Build
+      run: |
+        mkdir build
+        cp -r LICENSE.txt index.php install.php admin install usr var build/
+        mkdir build/usr/uploads/
+        chmod 755 build/usr/uploads/
+        rm -rf build/admin/src
+        rm -rf build/usr/themes/classic-22/static/scss
+        cd build && zip -q -r typecho.zip * && mv typecho.zip ../ && cd -
+    - name: Upload Release Asset
+      uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./typecho.zip
+          asset_name: typecho.zip
+          asset_content_type: application/zip
+    - name: Trigger language build
+      run: |
+        curl -XPOST -H "Authorization: token ${{ secrets.WORKFLOW_TOKEN }}" \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Content-Type: application/json" \
+          https://api.github.com/repos/typecho/languages/actions/workflows/update.yml/dispatches --data '{"ref": "master"}'

.gitignore

@@ -24,5 +24,14 @@
 *.sublime*
 .sass-cache
 config.rb
-/config.inc.php
-/usr/uploads/
+prepros.config
+config.inc.*
+usr/uploads/
+usr/*.db
+usr/plugins/
+!usr/plugins/HelloWorld
+usr/themes/*
+!usr/themes/default
+!usr/themes/classic-22
+node_modules/
+tools/tmp/

.phpstorm.meta.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(\Typecho\Widget::widget(0), map([
+        '' => '@'
+    ]));
+
+    exitPoint(\Typecho\Widget\Response::redirect());
+    exitPoint(\Typecho\Widget\Response::throwContent());
+    exitPoint(\Typecho\Widget\Response::throwFile());
+    exitPoint(\Typecho\Widget\Response::throwJson());
+    exitPoint(\Typecho\Widget\Response::throwXml());
+    exitPoint(\Typecho\Widget\Response::goBack());
+
+    override(\Widget\Options::__get(0), map([
+        'feedUrl'               =>  string,
+        'feedRssUrl'            =>  string,
+        'feedAtomUrl'           =>  string,
+        'commentsFeedUrl'       =>  string,
+        'commentsFeedRssUrl'    =>  string,
+        'commentsFeedAtomUrl'   =>  string,
+        'xmlRpcUrl'             =>  string,
+        'index'                 =>  string,
+        'siteUrl'               =>  string,
+        'routingTable'          =>  \ArrayObject::class,
+        'rootUrl'               =>  string,
+        'themeUrl'              =>  string,
+        'pluginUrl'             =>  string,
+        'adminUrl'              =>  string,
+        'loginUrl'              =>  string,
+        'loginAction'           =>  string,
+        'registerUrl'           =>  string,
+        'registerAction'        =>  string,
+        'profileUrl'            =>  string,
+        'logoutUrl'             =>  string,
+        'serverTimezone'        =>  int,
+        'contentType'           =>  string,
+        'software'              =>  string,
+        'version'               =>  string,
+        'markdown'              =>  int,
+        'allowedAttachmentTypes'=>  \ArrayObject::class
+    ]));
+
+    override(\Typecho\Widget::__get(0), map([
+        'sequence' => int,
+        'length'   => int
+    ]));
+}

.travis.yml

@@ -1,12 +0,0 @@
-language: php
-
-php:
-  - 5.6
-  - 5.5
-  - 5.4
-  - 5.3
-  - 5.2
-  - hhvm
-
-script: cd ./tools/ && set -e && make test
-

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+admin@typecho.org.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -0,0 +1,37 @@
+Contributing to Typecho
+=======================
+
+Thanks for considering contributing to Typecho! There are many ways to contribute to Typecho, and we appreciate all of them.
+
+## Reporting Bugs
+
+If you find a bug in the source code, you can help us by [submitting an issue](https://github.com/typecho/typecho/issues) 
+to our [GitHub Repository](https://github.com/typecho/typecho). Even better, you can submit a Pull Request with a fix.
+
+## Contributing Code
+
+If you would like to contribute code to Typecho, please read the following guidelines:
+
+* [Code of Conduct](CODE_OF_CONDUCT.md)
+* [Contributing Guide](CONTRIBUTING.md)
+* [Coding Style Guide](CODING_STYLE.md)
+
+## Translations
+
+Please see [TRANSLATION](https://github.com/typecho/languages) for details.
+
+## Plugin Development
+
+Please see [Plugin Development](http://docs.typecho.org/plugins) for details.
+
+## Theme Development
+
+Please see [Theme Development](http://docs.typecho.org/themes) for details.
+
+## Community
+
+* [Telegram Channel](https://t.me/typechodev)
+* [Homepage](http://typecho.org/)
+* [Documents](http://docs.typecho.org/)
+* [Community](http://forum.typecho.org/)
+* [Download](http://typecho.org/download)

README.md

@@ -1,15 +1,30 @@
 Typecho Blogging Platform
 =========================
 
-####Homepage
-http://typecho.org/
+Typecho is a PHP-based blog software and is designed to be the most powerful blog engine in the world.
+Typecho is released under the GNU General Public License 2.0.
 
-####Document
-http://docs.typecho.org/
+## Main Features
 
-####Forum
-http://forum.typecho.org/
+* Multiple databases support (MariaDB, MySQL, SQLite, PostgreSQL)
+* Markdown Support
+* Plugin Support
+* Theme Support
+* Custom Fields
+* Custom Pages
 
-####Download
-http://typecho.org/download
+## Requirements
 
+* PHP 7.4.0 or higher
+* Database (MariaDB, MySQL, SQLite, PostgreSQL)
+  * MariaDB or MySQL 5.5.3 or higher
+  * SQLite 3.7.11 or higher
+  * PostgreSQL 9.1 or higher
+
+## Screenshots
+
+![Typecho](https://typecho.org/usr/themes/bluecode/img/screenshot/st1.png)
+
+## Contributing
+
+Please see [CONTRIBUTING](CONTRIBUTING.md) for details.

SECURITY.md

@@ -0,0 +1,3 @@
+# Security Policy
+
+Vulnerabilities can be reported by emailing security@typecho.org

admin/backup.php

@@ -0,0 +1,107 @@
+<?php
+include 'common.php';
+include 'header.php';
+include 'menu.php';
+
+$actionUrl = $security->getTokenUrl(
+    \Typecho\Router::url('do', array('action' => 'backup', 'widget' => 'Backup'),
+        \Typecho\Common::url('index.php', $options->rootUrl)));
+
+$backupFiles = \Widget\Backup::alloc()->listFiles();
+?>
+
+<main class="main">
+    <div class="body container">
+        <?php include 'page-title.php'; ?>
+        <div class="row typecho-page-main" role="main">
+            <div class="col-mb-12 col-tb-8">
+                <div id="typecho-welcome">
+                    <form action="<?php echo $actionUrl; ?>" method="post">
+                    <h3><?php _e('备份您的数据'); ?></h3>
+                    <ul>
+                        <li><?php _e('此备份操作仅包含<strong>内容数据</strong>, 并不会涉及任何<strong>设置信息</strong>'); ?></li>
+                        <li><?php _e('如果您的数据量过大, 为了避免操作超时, 建议您直接使用数据库提供的备份工具备份数据'); ?></li>
+                        <li><strong class="warning"><?php _e('为了缩小备份文件体积, 建议您在备份前删除不必要的数据'); ?></strong></li>
+                    </ul>
+                    <p><button class="btn primary" type="submit"><?php _e('开始备份 &raquo;'); ?></button></p>
+                        <input tabindex="1" type="hidden" name="do" value="export">
+                    </form>
+                </div>
+            </div>
+
+            <div id="backup-secondary" class="col-mb-12 col-tb-4" role="form">
+                <h3><?php _e('恢复数据'); ?></h3>
+                <ul class="typecho-option-tabs">
+                    <li class="active w-50"><a href="#from-upload"><?php _e('上传'); ?></a></li>
+                    <li class="w-50"><a href="#from-server"><?php _e('从服务器'); ?></a></li>
+                </ul>
+
+                <form action="<?php echo $actionUrl; ?>" id="from-upload" class="tab-content" method="post" enctype="multipart/form-data">
+                    <ul class="typecho-option">
+                        <li>
+                            <input tabindex="2" id="backup-upload-file" name="file" type="file" class="file">
+                        </li>
+                    </ul>
+                    <ul class="typecho-option typecho-option-submit">
+                        <li>
+                            <button tabindex="4" type="submit" class="btn primary"><?php _e('上传并恢复 &raquo;'); ?></button>
+                            <input type="hidden" name="do" value="import">
+                        </li>
+                    </ul>
+                </form>
+
+                <form action="<?php echo $actionUrl; ?>" id="from-server" class="tab-content hidden" method="post">
+                    <?php if (empty($backupFiles)): ?>
+                    <ul class="typecho-option">
+                        <li>
+                            <p class="description"><?php _e('将备份文件手动上传至服务器的 %s 目录下后, 这里会出现文件选项', __TYPECHO_BACKUP_DIR__); ?></p>
+                        </li>
+                    </ul>
+                    <?php else: ?>
+                    <ul class="typecho-option">
+                        <li>
+                            <label class="typecho-label" for="backup-select-file"><?php _e('选择一个备份文件恢复数据'); ?></label>
+                            <select tabindex="5" name="file" id="backup-select-file">
+                                <?php foreach ($backupFiles as $file): ?>
+                                    <option value="<?php echo $file; ?>"><?php echo $file; ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </li>
+                    </ul>
+                    <?php endif; ?>
+                    <ul class="typecho-option typecho-option-submit">
+                        <li>
+                            <button tabindex="7" type="submit" class="btn primary"><?php _e('选择并恢复 &raquo;'); ?></button>
+                            <input type="hidden" name="do" value="import">
+                        </li>
+                    </ul>
+                </form>
+            </div>
+        </div>
+    </div>
+</main>
+
+<?php
+include 'copyright.php';
+include 'common-js.php';
+include 'form-js.php';
+?>
+<script>
+    $('#backup-secondary .typecho-option-tabs li').click(function() {
+        $('#backup-secondary .typecho-option-tabs li').removeClass('active');
+        $(this).addClass('active');
+        $(this).parents('#backup-secondary').find('.tab-content').addClass('hidden');
+
+        var selected_tab = $(this).find('a').attr('href');
+        $(selected_tab).removeClass('hidden');
+
+        return false;
+    });
+
+    $('#backup-secondary form').submit(function (e) {
+        if (!confirm('<?php _e('恢复操作将清除所有现有数据, 是否继续?'); ?>')) {
+            return false;
+        }
+    });
+</script>
+<?php include 'footer.php'; ?>

admin/category.php

@@ -4,16 +4,16 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-6 col-tb-offset-3">
-                <?php Typecho_Widget::widget('Widget_Metas_Category_Edit')->form()->render(); ?>
+                <?php \Widget\Metas\Category\Edit::alloc()->form()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/common-js.php

@@ -1,19 +1,21 @@
 <?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
-<script src="<?php $options->adminStaticUrl('js', 'jquery.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminStaticUrl('js', 'jquery-ui.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminStaticUrl('js', 'typecho.js?v=' . $suffixVersion); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'jquery.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'jquery-ui.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'typecho.js'); ?>"></script>
 <script>
     (function () {
         $(document).ready(function() {
             // 处理消息机制
             (function () {
-                var prefix = '<?php echo Typecho_Cookie::getPrefix(); ?>',
+                var prefix = '<?php echo \Typecho\Cookie::getPrefix(); ?>',
                     cookies = {
                         notice      :   $.cookie(prefix + '__typecho_notice'),
                         noticeType  :   $.cookie(prefix + '__typecho_notice_type'),
                         highlight   :   $.cookie(prefix + '__typecho_notice_highlight')
                     },
-                    path = '<?php echo Typecho_Cookie::getPath(); ?>';
+                    path = '<?php echo \Typecho\Cookie::getPath(); ?>',
+                    domain = '<?php echo \Typecho\Cookie::getDomain(); ?>',
+                    secure = <?php echo json_encode(\Typecho\Cookie::getSecure()); ?>;
 
                 if (!!cookies.notice && 'success|notice|error'.indexOf(cookies.noticeType) >= 0) {
                     var head = $('.typecho-head-nav'),
@@ -23,31 +25,10 @@
 
                     if (head.length > 0) {
                         p.insertAfter(head);
-                        offset = head.outerHeight();
                     } else {
                         p.prependTo(document.body);
                     }
 
-                    function checkScroll () {
-                        if ($(window).scrollTop() >= offset) {
-                            p.css({
-                                'position'  :   'fixed',
-                                'top'       :   0
-                            });
-                        } else {
-                            p.css({
-                                'position'  :   'absolute',
-                                'top'       :   offset
-                            });
-                        }
-                    }
-
-                    $(window).scroll(function () {
-                        checkScroll();
-                    });
-
-                    checkScroll();
-
                     p.slideDown(function () {
                         var t = $(this), color = '#C6D880';
                         
@@ -58,46 +39,33 @@
                         }
 
                         t.effect('highlight', {color : color})
-                            .delay(5000).slideUp(function () {
+                            .delay(5000).fadeOut(function () {
                             $(this).remove();
                         });
                     });
 
-                    
-                    $.cookie(prefix + '__typecho_notice', null, {path : path});
-                    $.cookie(prefix + '__typecho_notice_type', null, {path : path});
+                    $.cookie(prefix + '__typecho_notice', null, {path : path, domain: domain, secure: secure});
+                    $.cookie(prefix + '__typecho_notice_type', null, {path : path, domain: domain, secure: secure});
                 }
 
                 if (cookies.highlight) {
                     $('#' + cookies.highlight).effect('highlight', 1000);
-                    $.cookie(prefix + '__typecho_notice_highlight', null, {path : path});
+                    $.cookie(prefix + '__typecho_notice_highlight', null, {path : path, domain: domain, secure: secure});
                 }
             })();
 
-
-            // 导航菜单 tab 聚焦时展开下拉菜单
-            (function () {
-                $('#typecho-nav-list').find('.parent a').focus(function() {
-                    $('#typecho-nav-list').find('.child').hide();
-                    $(this).parents('.root').find('.child').show();
-                });
-                $('.operate').find('a').focus(function() {
-                    $('#typecho-nav-list').find('.child').hide();
-                });
-            })();
-
-
             if ($('.typecho-login').length == 0) {
                 $('a').each(function () {
                     var t = $(this), href = t.attr('href');
 
                     if ((href && href[0] == '#')
                         || /^<?php echo preg_quote($options->adminUrl, '/'); ?>.*$/.exec(href) 
-                            || /^<?php echo substr(preg_quote(Typecho_Common::url('s', $options->index), '/'), 0, -1); ?>action\/[_a-zA-Z0-9\/]+.*$/.exec(href)) {
+                            || /^<?php echo substr(preg_quote(\Typecho\Common::url('s', $options->index), '/'), 0, -1); ?>action\/[_a-zA-Z0-9\/]+.*$/.exec(href)) {
                         return;
                     }
 
-                    t.attr('target', '_blank');
+                    t.attr('target', '_blank')
+                        .attr('rel', 'noopener noreferrer');
                 });
             }
         });

admin/common.php

@@ -12,15 +12,15 @@ if (!defined('__TYPECHO_ROOT_DIR__') && !@include_once __DIR__ . '/../config.inc
 }
 
 /** 初始化组件 */
-Typecho_Widget::widget('Widget_Init');
+\Widget\Init::alloc();
 
 /** 注册一个初始化插件 */
-Typecho_Plugin::factory('admin/common.php')->begin();
+\Typecho\Plugin::factory('admin/common.php')->call('begin');
 
-Typecho_Widget::widget('Widget_Options')->to($options);
-Typecho_Widget::widget('Widget_User')->to($user);
-Typecho_Widget::widget('Widget_Security')->to($security);
-Typecho_Widget::widget('Widget_Menu')->to($menu);
+\Widget\Options::alloc()->to($options);
+\Widget\User::alloc()->to($user);
+\Widget\Security::alloc()->to($security);
+\Widget\Menu::alloc()->to($menu);
 
 /** 初始化上下文 */
 $request = $options->request;
@@ -28,32 +28,27 @@ $response = $options->response;
 
 /** 检测是否是第一次登录 */
 $currentMenu = $menu->getCurrentMenu();
-list($prefixVersion, $suffixVersion) = explode('/', $options->version);
-$params = parse_url($currentMenu[2]);
-$adminFile = basename($params['path']);
 
-if (!$user->logged && !Typecho_Cookie::get('__typecho_first_run') && !empty($currentMenu)) {
-    
-    if ('welcome.php' != $adminFile) {
-        $response->redirect(Typecho_Common::url('welcome.php', $options->adminUrl));
-    } else {
-        Typecho_Cookie::set('__typecho_first_run', 1);
-    }
-    
-} else {
+if (!empty($currentMenu)) {
+    $params = parse_url($currentMenu[2]);
+    $adminFile = basename($params['path']);
 
-    /** 检测版本是否升级 */
-    if ($user->pass('administrator', true) && !empty($currentMenu)) {
-        $mustUpgrade = (!defined('Typecho_Common::VERSION') || version_compare(str_replace('/', '.', Typecho_Common::VERSION),
-        str_replace('/', '.', $options->version), '>'));
+    if (!$user->logged && !\Typecho\Cookie::get('__typecho_first_run')) {
+        if ('welcome.php' != $adminFile) {
+            $response->redirect(\Typecho\Common::url('welcome.php', $options->adminUrl));
+        } else {
+            \Typecho\Cookie::set('__typecho_first_run', 1);
+        }
+    } elseif ($user->pass('administrator', true)) {
+        /** 检测版本是否升级 */
+        $mustUpgrade = version_compare(\Typecho\Common::VERSION, $options->version, '>');
 
-        if ($mustUpgrade && 'upgrade.php' != $adminFile) {
-            $response->redirect(Typecho_Common::url('upgrade.php', $options->adminUrl));
-        } else if (!$mustUpgrade && 'upgrade.php' == $adminFile) {
+        if ($mustUpgrade && 'upgrade.php' != $adminFile && 'backup.php' != $adminFile) {
+            $response->redirect(\Typecho\Common::url('upgrade.php', $options->adminUrl));
+        } elseif (!$mustUpgrade && 'upgrade.php' == $adminFile) {
             $response->redirect($options->adminUrl);
-        } else if (!$mustUpgrade && 'welcome.php' == $adminFile && $user->logged) {
+        } elseif (!$mustUpgrade && 'welcome.php' == $adminFile && $user->logged) {
             $response->redirect($options->adminUrl);
         }
     }
-
 }

admin/copyright.php

@@ -1,13 +1,13 @@
 <?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
-<div class="typecho-foot" role="contentinfo">
+<footer class="typecho-foot" role="contentinfo">
     <div class="copyright">
-        <a href="http://typecho.org" class="i-logo-s">Typecho</a>
-        <p><?php _e('由 <a href="http://typecho.org">%s</a> 强力驱动, 版本 %s (%s)', $options->software, $prefixVersion, $suffixVersion); ?></p>
+        <a href="https://typecho.org" class="i-logo-s">Typecho</a>
+        <p><?php _e('由 <a href="https://typecho.org">%s</a> 强力驱动, 版本 %s', $options->software, $options->version); ?></p>
     </div>
     <nav class="resource">
-        <a href="http://docs.typecho.org"><?php _e('帮助文档'); ?></a> &bull;
-        <a href="http://forum.typecho.org"><?php _e('支持论坛'); ?></a> &bull;
+        <a href="https://docs.typecho.org"><?php _e('帮助文档'); ?></a> &bull;
+        <a href="https://forum.typecho.org"><?php _e('支持论坛'); ?></a> &bull;
         <a href="https://github.com/typecho/typecho/issues"><?php _e('报告错误'); ?></a> &bull;
-        <a href="http://extends.typecho.org"><?php _e('资源下载'); ?></a>
+        <a href="https://typecho.org/download"><?php _e('资源下载'); ?></a>
     </nav>
-</div>
+</footer>

admin/css/install.css

@@ -0,0 +1 @@
+h1{text-align:center}details summary{cursor:pointer}@keyframes fadein{from{opacity:0}to{opacity:1}}.fresh .keep-word{display:none}.keep .fresh-word{display:none}form>.message{display:none;padding:20px;border-radius:5px}.message textarea{width:100%;height:200px;resize:none;margin:10px 0}.message.fade{display:block;animation:fadein .5s linear}.message *:last-child{margin-bottom:0}.message p{margin-top:10px}.message p button{margin-left:5px}.message p button:first-child{margin-left:0}

admin/css/normalize.css

@@ -1,406 +1,342 @@
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */
 
-/* ==========================================================================
-   HTML5 display definitions
+/* Document
    ========================================================================== */
 
 /**
- * Correct `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-    display: block;
-}
-
-/**
- * Correct `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
-    display: inline-block;
-}
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-    display: none;
-    height: 0;
-}
-
-/**
- * Address `[hidden]` styling not present in IE 8/9.
- * Hide the `template` element in IE, Safari, and Firefox < 22.
- */
-
-[hidden],
-template {
-    display: none;
-}
-
-/* ==========================================================================
-   Base
-   ========================================================================== */
-
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
 html {
-    font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 2 */
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+  -moz-text-size-adjust: 100%; /* 2 */
 }
 
+/* Sections
+   ========================================================================== */
+
 /**
- * Remove default margin.
+ * Remove the margin in all browsers.
  */
 
 body {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/**
- * Remove the gray background color from active links in IE 10.
- */
-
-a {
-    background: transparent;
+  margin: 0;
 }
 
 /**
- * Address `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
-}
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-    outline: 0;
-}
-
-/* ==========================================================================
-   Typography
-   ========================================================================== */
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari 5, and Chrome.
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
  */
 
 h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
 }
 
 /**
- * Address styling not present in IE 8/9, Safari 5, and Chrome.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
  */
 
 abbr[title] {
-    border-bottom: 1px dotted;
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
 }
 
 /**
- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ * Add the correct font weight in Chrome, Edge, and Safari.
  */
 
 b,
 strong {
-    font-weight: bold;
+  font-weight: bolder;
 }
 
 /**
- * Address styling not present in Safari 5 and Chrome.
- */
-
-dfn {
-    font-style: italic;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-/**
- * Correct font family set oddly in Safari 5 and Chrome.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
  */
 
 code,
 kbd,
-pre,
 samp {
-    font-family: monospace, serif;
-    font-size: 1em;
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
 }
 
 /**
- * Improve readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre-wrap;
-}
-
-/**
- * Set consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
+ * Add the correct font size in all browsers.
  */
 
 small {
-    font-size: 80%;
+  font-size: 80%;
 }
 
 /**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
  */
 
 sub,
 sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sup {
-    top: -0.5em;
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
 }
 
 sub {
-    bottom: -0.25em;
+  bottom: -0.25em;
 }
 
-/* ==========================================================================
-   Embedded content
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
    ========================================================================== */
 
 /**
- * Remove border when inside `a` element in IE 8/9.
+ * Remove the border on images inside links in IE 10.
  */
 
 img {
-    border: 0;
+  border-style: none;
 }
 
-/**
- * Correct overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-/* ==========================================================================
-   Figures
+/* Forms
    ========================================================================== */
 
 /**
- * Address margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Forms
-   ========================================================================== */
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Correct font family not being inherited in all browsers.
- * 2. Correct font size not being inherited in all browsers.
- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
  */
 
 button,
 input,
+optgroup,
 select,
 textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
 }
 
 /**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
  */
 
 button,
-input {
-    line-height: normal;
+input { /* 1 */
+  overflow: visible;
 }
 
 /**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
- * Correct `select` style inheritance in Firefox 4+ and Opera.
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
  */
 
 button,
-select {
-    text-transform: none;
+select { /* 1 */
+  text-transform: none;
 }
 
 /**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
+ * Correct the inability to style clickable types in iOS and Safari.
  */
 
 button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
 }
 
 /**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-    cursor: default;
-}
-
-/**
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-
-/**
- * Remove inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
+ * Remove the inner border and padding in Firefox.
  */
 
 button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
 }
 
 /**
- * 1. Remove default vertical scrollbar in IE 8/9.
- * 2. Improve readability and alignment in all browsers.
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
  */
 
 textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
+  overflow: auto;
 }
 
-/* ==========================================================================
-   Tables
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
    ========================================================================== */
 
 /**
- * Remove most spacing between table cells.
+ * Add the correct display in IE 10+.
  */
 
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
+template {
+  display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+  display: none;
 }

admin/custom-fields-js.php

@@ -2,41 +2,33 @@
 <script>
 $(document).ready(function () {
     // 自定义字段
-    $('#custom-field-expand').click(function() {
-        var btn = $('i', this);
-        if (btn.hasClass('i-caret-right')) {
-            btn.removeClass('i-caret-right').addClass('i-caret-down');
-        } else {
-            btn.removeClass('i-caret-down').addClass('i-caret-right');
-        }
-        $(this).parent().toggleClass('fold');
-        return false;
-    });
-
     function attachDeleteEvent (el) {
         $('button.btn-xs', el).click(function () {
             if (confirm('<?php _e('确认要删除此字段吗?'); ?>')) {
-                $(this).parents('tr').fadeOut(function () {
+                $(this).parents('li').fadeOut(function () {
                     $(this).remove();
                 });
+
+                $(this).parents('form').trigger('change');
             }
         });
     }
 
-    $('#custom-field table tbody tr').each(function () {
+    $('#custom-field .fields .field').each(function () {
         attachDeleteEvent(this);
     });
 
     $('#custom-field button.operate-add').click(function () {
-        var html = '<tr><td><input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" class="text-s w-100"></td>'
-                + '<td><select name="fieldTypes[]" id="">'
+        var html = '<li class="field"><div class="field-name"><input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" pattern="^[_a-zA-Z][_a-zA-Z0-9]*$" oninput="this.reportValidity()" class="text-s w-100">'
+                + '<select name="fieldTypes[]" id="">'
                 + '<option value="str"><?php _e('字符'); ?></option>'
                 + '<option value="int"><?php _e('整数'); ?></option>'
                 + '<option value="float"><?php _e('小数'); ?></option>'
-                + '</select></td>'
-                + '<td><textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" class="text-s w-100" rows="2"></textarea></td>'
-                + '<td><button type="button" class="btn btn-xs"><?php _e('删除'); ?></button></td></tr>',
-            el = $(html).hide().appendTo('#custom-field table tbody').fadeIn();
+                + '<option value="json"><?php _e('JSON 结构'); ?></option>'
+                + '</select></div>'
+                + '<div class="field-value"><textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" class="text-s w-100" rows="2"></textarea>'
+                + '<button type="button" class="btn btn-xs"><?php _e('删除'); ?></button></div></li>',
+            el = $(html).hide().appendTo('#custom-field .fields').fadeIn();
 
         attachDeleteEvent(el);
     });

admin/custom-fields.php

@@ -1,73 +1,72 @@
-<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
+<?php if (!defined('__TYPECHO_ADMIN__')) exit; ?>
 <?php
 $fields = isset($post) ? $post->getFieldItems() : $page->getFieldItems();
 $defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaultFieldItems();
 ?>
-                    <section id="custom-field" class="typecho-post-option<?php if (empty($defaultFields) && empty($fields)): ?> fold<?php endif; ?>">
-                        <label id="custom-field-expand" class="typecho-label"><a href="##"><i class="i-caret-right"></i> <?php _e('自定义字段'); ?></a></label>
-                        <table class="typecho-list-table mono">
-                            <colgroup>
-                                <col width="25%"/>
-                                <col width="10%"/>
-                                <col width="55%"/>
-                                <col width="10%"/>
-                            </colgroup>
-                            <?php foreach ($defaultFields as $field): ?>
-                            <?php list ($label, $input) = $field; ?>
-                            <tr>
-                                <td><?php $label->render(); ?></td>
-                                <td colspan="3"><?php $input->render(); ?></td>
-                            </tr>
-                            <?php endforeach; ?>
-                            <?php foreach ($fields as $field): ?>
-                            <tr>
-                                <td>
-                                    <label for="fieldname" class="sr-only"><?php _e('字段名称'); ?></label>
-                                    <input type="text" name="fieldNames[]" value="<?php echo htmlspecialchars($field['name']); ?>" id="fieldname" class="text-s w-100">
-                                </td>
-                                <td>
-                                    <label for="fieldtype" class="sr-only"><?php _e('字段类型'); ?></label>
-                                    <select name="fieldTypes[]" id="fieldtype">
-                                        <option value="str"<?php if ('str' == $field['type']): ?> selected<?php endif; ?>><?php _e('字符'); ?></option>
-                                        <option value="int"<?php if ('int' == $field['type']): ?> selected<?php endif; ?>><?php _e('整数'); ?></option>
-                                        <option value="float"<?php if ('float' == $field['type']): ?> selected<?php endif; ?>><?php _e('小数'); ?></option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <label for="fieldvalue" class="sr-only"><?php _e('字段值'); ?></label>
-                                    <textarea name="fieldValues[]" id="fieldvalue" class="text-s w-100" rows="2"><?php echo htmlspecialchars($field[$field['type'] . '_value']); ?></textarea>
-                                </td>
-                                <td>
-                                    <button type="button" class="btn btn-xs"><?php _e('删除'); ?></button>
-                                </td>
-                            </tr>
-                            <?php endforeach; ?>
-                            <?php if (empty($defaultFields) && empty($fields)): ?>
-                            <tr>
-                                <td>
-                                    <label for="fieldname" class="sr-only"><?php _e('字段名称'); ?></label>
-                                    <input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" id="fieldname" class="text-s w-100">
-                                </td>
-                                <td>
-                                    <label for="fieldtype" class="sr-only"><?php _e('字段类型'); ?></label>
-                                    <select name="fieldTypes[]" id="fieldtype">
-                                        <option value="str"><?php _e('字符'); ?></option>
-                                        <option value="int"><?php _e('整数'); ?></option>
-                                        <option value="float"><?php _e('小数'); ?></option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <label for="fieldvalue" class="sr-only"><?php _e('字段值'); ?></label>
-                                    <textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" id="fieldvalue" class="text-s w-100" rows="2"></textarea>
-                                </td>
-                                <td>
-                                    <button type="button" class="btn btn-xs"><?php _e('删除'); ?></button>
-                                </td>
-                            </tr>
-                            <?php endif; ?>
-                        </table>
-                        <div class="description clearfix">
-                            <button type="button" class="btn btn-xs operate-add"><?php _e('+添加字段'); ?></button>
-                            <?php _e('自定义字段可以扩展你的模板功能, 使用方法参见 <a href="http://docs.typecho.org/help/custom-fields">帮助文档</a>'); ?>
-                        </div>
-                    </section>
+<details id="custom-field"
+         class="typecho-post-option" <?php if (!empty($defaultFields) || !empty($fields)): ?>open<?php endif; ?>>
+    <summary><?php _e('自定义字段'); ?></summary>
+    <ul class="fields mono">
+        <?php foreach ($defaultFields as $field): ?>
+            <?php [$label, $input] = $field; ?>
+            <li class="field">
+                <div class="field-name"><?php $label->render(); ?></div>
+                <div class="field-value"><?php $input->render(); ?></div>
+            </li>
+        <?php endforeach; ?>
+        <?php foreach ($fields as $field): ?>
+            <li class="field">
+                <div class="field-name">
+                    <label for="fieldname" class="sr-only"><?php _e('字段名称'); ?></label>
+                    <input type="text" name="fieldNames[]" value="<?php echo htmlspecialchars($field['name']); ?>"
+                           id="fieldname" pattern="^[_a-zA-Z][_a-zA-Z0-9]*$" oninput="this.reportValidity()" class="text-s w-100">
+                    <label for="fieldtype" class="sr-only"><?php _e('字段类型'); ?></label>
+                    <select name="fieldTypes[]" id="fieldtype">
+                        <option
+                            value="str"<?php if ('str' == $field['type']): ?> selected<?php endif; ?>><?php _e('字符'); ?></option>
+                        <option
+                            value="int"<?php if ('int' == $field['type']): ?> selected<?php endif; ?>><?php _e('整数'); ?></option>
+                        <option
+                            value="float"<?php if ('float' == $field['type']): ?> selected<?php endif; ?>><?php _e('小数'); ?></option>
+                        <option
+                            value="json"<?php if ('json' == $field['type']): ?> selected<?php endif; ?>><?php _e('JSON 结构'); ?></option>
+                    </select>
+                </div>
+                <div class="field-value">
+                    <label for="fieldvalue" class="sr-only"><?php _e('字段值'); ?></label>
+                    <textarea name="fieldValues[]" id="fieldvalue" class="text-s w-100"
+                              rows="2"><?php echo htmlspecialchars($field[($field['type'] == 'json' ? 'str' : $field['type']) . '_value']); ?></textarea>
+                    <button type="button" class="btn btn-xs"><?php _e('删除'); ?></button>
+                </div>
+            </li>
+        <?php endforeach; ?>
+        <?php if (empty($defaultFields) && empty($fields)): ?>
+            <li class="field">
+                <div class="field-name">
+                    <label for="fieldname" class="sr-only"><?php _e('字段名称'); ?></label>
+                    <input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" id="fieldname"
+                           class="text-s w-100" pattern="^[_a-zA-Z][_a-zA-Z0-9]*$" oninput="this.reportValidity()">
+                    <label for="fieldtype" class="sr-only"><?php _e('字段类型'); ?></label>
+                    <select name="fieldTypes[]" id="fieldtype">
+                        <option value="str"><?php _e('字符'); ?></option>
+                        <option value="int"><?php _e('整数'); ?></option>
+                        <option value="float"><?php _e('小数'); ?></option>
+                        <option value="json"><?php _e('JSON 结构'); ?></option>
+                    </select>
+                </div>
+                <div class="field-value">
+                    <label for="fieldvalue" class="sr-only"><?php _e('字段值'); ?></label>
+                    <textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" id="fieldvalue"
+                              class="text-s w-100" rows="2"></textarea>
+                    <button type="button" class="btn btn-xs"><?php _e('删除'); ?></button>
+                </div>
+            </li>
+        <?php endif; ?>
+    </ul>
+    <div class="add">
+        <button type="button" class="btn btn-xs operate-add"><?php _e('+添加字段'); ?></button>
+        <div class="description kit-hidden-mb">
+            <?php _e('自定义字段可以扩展你的模板功能, 使用方法参见 <a href="https://docs.typecho.org/help/custom-fields">帮助文档</a>'); ?>
+        </div>
+    </div>
+</details>

admin/editor-js.php

@@ -1,15 +1,44 @@
 <?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
-<?php $content = !empty($post) ? $post : $page; if ($options->markdown): ?>
-<script src="<?php $options->adminStaticUrl('js', 'pagedown.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminStaticUrl('js', 'pagedown-extra.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminStaticUrl('js', 'diff.js?v=' . $suffixVersion); ?>"></script>
+<?php $content = !empty($post) ? $post : $page; ?>
+<script>
+(function () {
+    $('#text').on('change', function (e) {
+        e.preventDefault();
+        e.stopPropagation();
+    }).on('input', function () {
+        $(this).parents('form').trigger('write');
+    });
+})();
+</script>
+<?php if (!$options->markdown): ?>
+<script>
+(function () {
+    const textarea = $('#text');
+
+    // 原始的插入图片和文件
+    Typecho.insertFileToEditor = function (file, url, isImage) {
+        const sel = textarea.getSelection(),
+            html = isImage ? '<img src="' + url + '" alt="' + file + '" />'
+                : '<a href="' + url + '">' + file + '</a>',
+            offset = (sel ? sel.start : 0) + html.length;
+
+        textarea.replaceSelection(html);
+        textarea.setSelection(offset, offset);
+    };
+})();
+</script>
+<?php else: ?>
+<script src="<?php $options->adminStaticUrl('js', 'hyperdown.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'pagedown.js'); ?>"></script>
+<script src="<?php $options->adminStaticUrl('js', 'purify.js'); ?>"></script>
 <script>
 $(document).ready(function () {
-    var textarea = $('#text'),
+    const textarea = $('#text'),
         toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore(textarea.parent()),
         preview = $('<div id="wmd-preview" class="wmd-hidetab" />').insertAfter('.editor');
+    let isFullScreen = false;
 
-    var options = {}, isMarkdown = <?php echo intval($content->isMarkdown || !$content->have()); ?>;
+    const options = {}, isMarkdown = <?php echo json_encode(!$content->have() || $content->isMarkdown); ?>;
 
     options.strings = {
         bold: '<?php _e('加粗'); ?> <strong> Ctrl+B',
@@ -57,31 +86,18 @@ $(document).ready(function () {
         help: '<?php _e('Markdown语法帮助'); ?>'
     };
 
-    var converter = new Markdown.Converter(),
-        editor = new Markdown.Editor(converter, '', options),
-        diffMatch = new diff_match_patch(), last = '', preview = $('#wmd-preview'),
-        mark = '@mark' + Math.ceil(Math.random() * 100000000) + '@',
-        span = '<span class="diff" />',
-        cache = {};
-
-    Markdown.Extra.init(converter, {
-        'extensions' : ["tables", "fenced_code_gfm", "def_list", "attr_list", "footnotes", "strikethrough", "newlines"]
-    });
+    const converter = new HyperDown(),
+        editor = new Markdown.Editor(converter, '', options);
 
     // 自动跟随
-    converter.hooks.chain('postConversion', function (html) {
-        // clear special html tags
-        html = html.replace(/<\/?(\!doctype|html|head|body|link|title|input|select|button|textarea|style|noscript)[^>]*>/ig, function (all) {
-            return all.replace(/&/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;')
-                .replace(/'/g, '&#039;')
-                .replace(/"/g, '&quot;');
-        });
-
-        // clear hard breaks
-        html = html.replace(/\s*((?:<br>\n)+)\s*(<\/?(?:p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|li|dd|dt)[^\w])/gm, '$2');
+    converter.enableHtml(true);
+    converter.enableLine(true);
+    const reloadScroll = scrollableEditor(textarea, preview);
 
+    // 修正白名单
+    converter.hook('makeHtml', function (html) {
+        html = html.replace('<p><!--more--></p>', '<!--more-->');
+        
         if (html.indexOf('<!--more-->') > 0) {
             var parts = html.split(/\s*<\!\-\-more\-\->\s*/),
                 summary = parts.shift(),
@@ -91,137 +107,40 @@ $(document).ready(function () {
                 + '<div class="details">' + details + '</div>';
         }
 
-
-        var diffs = diffMatch.diff_main(last, html);
-        last = html;
-
-        if (diffs.length > 0) {
-            var stack = [], markStr = mark;
-            
-            for (var i = 0; i < diffs.length; i ++) {
-                var diff = diffs[i], op = diff[0], str = diff[1]
-                    sp = str.lastIndexOf('<'), ep = str.lastIndexOf('>');
-
-                if (op != 0) {
-                    if (sp >=0 && sp > ep) {
-                        if (op > 0) {
-                            stack.push(str.substring(0, sp) + markStr + str.substring(sp));
-                        } else {
-                            var lastStr = stack[stack.length - 1], lastSp = lastStr.lastIndexOf('<');
-                            stack[stack.length - 1] = lastStr.substring(0, lastSp) + markStr + lastStr.substring(lastSp);
-                        }
-                    } else {
-                        if (op > 0) {
-                            stack.push(str + markStr);
-                        } else {
-                            stack.push(markStr);
-                        }
-                    }
-                    
-                    markStr = '';
-                } else {
-                    stack.push(str);
-                }
-            }
-
-            html = stack.join('');
-
-            if (!markStr) {
-                var pos = html.indexOf(mark), prev = html.substring(0, pos),
-                    next = html.substr(pos + mark.length),
-                    sp = prev.lastIndexOf('<'), ep = prev.lastIndexOf('>');
-
-                if (sp >= 0 && sp > ep) {
-                    html = prev.substring(0, sp) + span + prev.substring(sp) + next;
-                } else {
-                    html = prev + span + next;
-                }
-            }
-        }
-
-        // 替换img
-        html = html.replace(/<(img)\s+([^>]*)\s*src="([^"]+)"([^>]*)>/ig, function (all, tag, prefix, src, suffix) {
-            if (!cache[src]) {
-                cache[src] = false;
-            } else {
-                return '<span class="cache" data-width="' + cache[src][0] + '" data-height="' + cache[src][1] + '" '
-                    + 'style="background:url(' + src + ') no-repeat left top; width:'
-                    + cache[src][0] + 'px; height:' + cache[src][1] + 'px; display: inline-block; max-width: 100%;'
-                    + '-webkit-background-size: contain;-moz-background-size: contain;-o-background-size: contain;background-size: contain;" />';
-            }
-
-            return all;
-        });
-
         // 替换block
         html = html.replace(/<(iframe|embed)\s+([^>]*)>/ig, function (all, tag, src) {
-            if (src[src.length - 1] == '/') {
+            if (src[src.length - 1] === '/') {
                 src = src.substring(0, src.length - 1);
             }
 
-            return '<div style="background: #ddd; height: 40px; overflow: hidden; line-height: 40px; text-align: center; font-size: 12px; color: #777">'
-                + tag + ' : ' + $.trim(src) + '</div>';
+            return '<div class="embed"><strong>'
+                + tag + '</strong> : ' + $.trim(src) + '</div>';
         });
 
-        return html;
+        return DOMPurify.sanitize(html, {USE_PROFILES: {html: true}});
     });
 
-    function cacheResize() {
-        var t = $(this), w = parseInt(t.data('width')), h = parseInt(t.data('height')),
-            ow = t.width();
-
-        t.height(h * ow / w);
-    }
-
-    var to;
     editor.hooks.chain('onPreviewRefresh', function () {
-        var diff = $('.diff', preview), scrolled = false;
+        const images = $('img', preview);
+        let count = images.length;
 
-        if (to) {
-            clearTimeout(to);
-        }
+        if (count === 0) {
+            reloadScroll(true);
+        } else {
+            images.bind('load error', function () {
+                count --;
 
-        $('img', preview).load(function () {
-            var t = $(this), src = t.attr('src');
-
-            if (scrolled) {
-                preview.scrollTo(diff, {
-                    offset  :   - 50
-                });
-            }
-
-            if (!!src && !cache[src]) {
-                cache[src] = [this.width, this.height];
-            }
-        });
-
-        $('.cache', preview).resize(cacheResize).each(cacheResize);
-        
-        var changed = $('.diff', preview).parent();
-        if (!changed.is(preview)) {
-            changed.css('background-color', 'rgba(255,230,0,0.5)');
-            to = setTimeout(function () {
-                changed.css('background-color', 'transparent');
-            }, 4500);
-        }
-
-        if (diff.length > 0) {
-            var p = diff.position(), lh = diff.parent().css('line-height');
-            lh = !!lh ? parseInt(lh) : 0;
-
-            if (p.top < 0 || p.top > preview.height() - lh) {
-                preview.scrollTo(diff, {
-                    offset  :   - 50
-                });
-                scrolled = true;
-            }
+                if (count === 0) {
+                    reloadScroll(true);
+                }
+            });
         }
     });
 
-    <?php Typecho_Plugin::factory('admin/editor-js.php')->markdownEditor($content); ?>
+    <?php \Typecho\Plugin::factory('admin/editor-js.php')->call('markdownEditor', $content); ?>
 
-    var input = $('#text'), th = textarea.height(), ph = preview.height(),
-        uploadBtn = $('<button type="button" id="btn-fullscreen-upload" class="btn btn-link">'
+    let th = textarea.height(), ph = preview.height();
+    const uploadBtn = $('<button type="button" id="btn-fullscreen-upload" class="btn btn-link">'
             + '<i class="i-upload"><?php _e('附件'); ?></i></button>')
             .prependTo('.submit .right')
             .click(function() {
@@ -238,39 +157,50 @@ $(document).ready(function () {
         th = textarea.height();
         ph = preview.height();
         $(document.body).addClass('fullscreen');
-        var h = $(window).height() - toolbar.outerHeight();
+        const h = $(window).height() - toolbar.outerHeight();
         
         textarea.css('height', h);
         preview.css('height', h);
+        isFullScreen = true;
     });
 
     editor.hooks.chain('enterFullScreen', function () {
         $(document.body).addClass('fullscreen');
         
-        var h = window.screen.height - toolbar.outerHeight();
+        const h = window.screen.height - toolbar.outerHeight();
         textarea.css('height', h);
         preview.css('height', h);
+        isFullScreen = true;
     });
 
     editor.hooks.chain('exitFullScreen', function () {
         $(document.body).removeClass('fullscreen');
         textarea.height(th);
         preview.height(ph);
+        isFullScreen = false;
+    });
+
+    editor.hooks.chain('commandExecuted', function () {
+        textarea.trigger('input');
+    });
+
+    editor.hooks.chain('save', function () {
+        Typecho.savePost();
     });
 
     function initMarkdown() {
         editor.run();
 
-        var imageButton = $('#wmd-image-button'),
+        const imageButton = $('#wmd-image-button'),
             linkButton = $('#wmd-link-button');
 
         Typecho.insertFileToEditor = function (file, url, isImage) {
-            var button = isImage ? imageButton : linkButton;
+            const button = isImage ? imageButton : linkButton;
 
             options.strings[isImage ? 'imagename' : 'linkname'] = file;
             button.trigger('click');
 
-            var checkDialog = setInterval(function () {
+            let checkDialog = setInterval(function () {
                 if ($('.wmd-prompt-dialog').length > 0) {
                     $('.wmd-prompt-dialog input').val(url).select();
                     clearInterval(checkDialog);
@@ -279,12 +209,12 @@ $(document).ready(function () {
             }, 10);
         };
 
-        Typecho.uploadComplete = function (file) {
-            Typecho.insertFileToEditor(file.title, file.url, file.isImage);
+        Typecho.uploadComplete = function (attachment) {
+            Typecho.insertFileToEditor(attachment.title, attachment.url, attachment.isImage);
         };
 
         // 编辑预览切换
-        var edittab = $('.editor').prepend('<div class="wmd-edittab"><a href="#wmd-editarea" class="active"><?php _e('撰写'); ?></a><a href="#wmd-preview"><?php _e('预览'); ?></a></div>'),
+        const edittab = $('.editor').append('<div class="wmd-edittab"><a href="#wmd-editarea" class="active"><?php _e('撰写'); ?></a><a href="#wmd-preview"><?php _e('预览'); ?></a></div>'),
             editarea = $(textarea.parent()).attr("id", "wmd-editarea");
 
         $(".wmd-edittab a").click(function() {
@@ -292,11 +222,11 @@ $(document).ready(function () {
             $(this).addClass("active");
             $("#wmd-editarea, #wmd-preview").addClass("wmd-hidetab");
         
-            var selected_tab = $(this).attr("href"),
+            const selected_tab = $(this).attr("href"),
                 selected_el = $(selected_tab).removeClass("wmd-hidetab");
 
             // 预览时隐藏编辑器按钮
-            if (selected_tab == "#wmd-preview") {
+            if (selected_tab === "#wmd-preview") {
                 $("#wmd-button-row").addClass("wmd-visualhide");
             } else {
                 $("#wmd-button-row").removeClass("wmd-visualhide");
@@ -307,12 +237,32 @@ $(document).ready(function () {
 
             return false;
         });
+
+        // 剪贴板复制图片
+        textarea.bind('paste', function (e) {
+            const items = (e.clipboardData || e.originalEvent.clipboardData).items;
+
+            for (const item of items) {
+                if (item.kind === 'file') {
+                    const file = item.getAsFile();
+
+                    if (file.size > 0) {
+                        if (!file.name) {
+                            file.name = (new Date()).toISOString().replace(/\..+$/, '')
+                                + '.' + file.type.split('/').pop();
+                        }
+
+                        Typecho.uploadFile(file);
+                    }
+                }
+            }
+        });
     }
 
     if (isMarkdown) {
         initMarkdown();
     } else {
-        var notice = $('<div class="message notice"><?php _e('这篇文章不是由Markdown语法创建的, 继续使用Markdown编辑它吗?'); ?> '
+        const notice = $('<div class="message notice"><?php _e('这篇文章不是由Markdown语法创建的, 继续使用Markdown编辑它吗?'); ?> '
             + '<button class="btn btn-xs primary yes"><?php _e('是'); ?></button> ' 
             + '<button class="btn btn-xs no"><?php _e('否'); ?></button></div>')
             .hide().insertBefore(textarea).slideDown();

admin/extending.php

@@ -1,13 +1,14 @@
 <?php
+
 include 'common.php';
 
 $panel = $request->get('panel');
-$panelTable = unserialize($options->panelTable);
+$panelTable = $options->panelTable;
 
 if (!isset($panelTable['file']) || !in_array(urlencode($panel), $panelTable['file'])) {
-    throw new Typecho_Plugin_Exception(_t('页面不存在'), 404);
+    throw new \Typecho\Plugin\Exception(_t('页面不存在'), 404);
 }
 
-list ($pluginName, $file) = explode('/', trim($panel, '/'), 2);
+[$pluginName, $file] = explode('/', trim($panel, '/'), 2);
 
-require_once $options->pluginDir($pluginName) . '/' . $panel;
+require_once $options->pluginDir($pluginName) . '/' . $file;

admin/file-upload-js.php

@@ -1,23 +1,18 @@
 <?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
 <?php
-if (isset($post) && $post instanceof Typecho_Widget && $post->have()) {
-    $fileParentContent = $post;
-} else if (isset($page) && $page instanceof Typecho_Widget && $page->have()) {
-    $fileParentContent = $page;
-}
+$phpMaxFilesize = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : '0';
 
-$phpMaxFilesize = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
+if (preg_match("/^([0-9]+)([a-z]{1,2})?$/i", $phpMaxFilesize, $matches)) {
+    $size = intval($matches[1]);
+    $unit = $matches[2] ?? 'b';
 
-if (preg_match("/^([0-9]+)([a-z]{1,2})$/i", $phpMaxFilesize, $matches)) {
-    $phpMaxFilesize = strtolower($matches[1] . $matches[2] . (1 == strlen($matches[2]) ? 'b' : ''));
+    $phpMaxFilesize = round($size * pow(1024, stripos('bkmgtpezy', $unit[0])));
 }
 ?>
 
-<script src="<?php $options->adminStaticUrl('js', 'moxie.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminStaticUrl('js', 'plupload.js?v=' . $suffixVersion); ?>"></script>
 <script>
 $(document).ready(function() {
-    function updateAttacmentNumber () {
+    function updateAttachmentNumber () {
         var btn = $('#tab-files-btn'),
             balloon = $('.balloon', btn),
             count = $('#file-list li .insert').length;
@@ -29,24 +24,40 @@ $(document).ready(function() {
             }
 
             balloon.html(count);
-        } else if (0 == count && balloon.length > 0) {
+        } else if (0 === count && balloon.length > 0) {
             balloon.remove();
         }
     }
 
-    $('.upload-area').bind({
-        dragenter   :   function () {
+    updateAttachmentNumber();
+
+    const uploadUrl = $('.upload-area').bind({
+        dragenter   :   function (e) {
             $(this).parent().addClass('drag');
         },
 
         dragover    :   function (e) {
+            e.stopPropagation();
+            e.preventDefault();
             $(this).parent().addClass('drag');
         },
 
-        drop        :   function () {
+        drop        :   function (e) {
+            e.stopPropagation();
+            e.preventDefault();
             $(this).parent().removeClass('drag');
+
+            const files = e.originalEvent.dataTransfer.files;
+
+            if (files.length === 0) {
+                return;
+            }
+
+            for (const file of files) {
+                Typecho.uploadFile(file);
+            }
         },
-        
+
         dragend     :   function () {
             $(this).parent().removeClass('drag');
         },
@@ -54,31 +65,44 @@ $(document).ready(function() {
         dragleave   :   function () {
             $(this).parent().removeClass('drag');
         }
+    }).data('url');
+
+    const btn = $('.upload-file');
+    const fileInput = $('<input type="file" name="file" />').hide().insertAfter(btn);
+
+    btn.click(function () {
+        fileInput.click();
+        return false;
     });
 
-    updateAttacmentNumber();
+    fileInput.change(function () {
+        if (this.files.length === 0) {
+            return;
+        }
+
+        Typecho.uploadFile(this.files[0]);
+    });
 
     function fileUploadStart (file) {
         $('<li id="' + file.id + '" class="loading">'
             + file.name + '</li>').appendTo('#file-list');
     }
 
-    function fileUploadError (error) {
-        var file = error.file, code = error.code, word; 
+    function fileUploadError (type, file) {
+        let word = '<?php _e('上传出现错误'); ?>';
         
-        switch (code) {
-            case plupload.FILE_SIZE_ERROR:
+        switch (type) {
+            case 'size':
                 word = '<?php _e('文件大小超过限制'); ?>';
                 break;
-            case plupload.FILE_EXTENSION_ERROR:
+            case 'type':
                 word = '<?php _e('文件扩展名不被支持'); ?>';
                 break;
-            case plupload.FILE_DUPLICATE_ERROR:
+            case 'duplicate':
                 word = '<?php _e('文件已经上传过'); ?>';
                 break;
-            case plupload.HTTP_ERROR:
+            case 'network':
             default:
-                word = '<?php _e('上传出现错误'); ?>';
                 break;
         }
 
@@ -94,87 +118,91 @@ $(document).ready(function() {
         li.effect('highlight', {color : '#FBC2C4'}, 2000, function () {
             $(this).remove();
         });
-
-        // fix issue #341
-        plupload.removeFile(file);
     }
 
-    var completeFile = null;
-    function fileUploadComplete (id, url, data) {
-        var li = $('#' + id).removeClass('loading').data('cid', data.cid)
-            .data('url', data.url)
-            .data('image', data.isImage)
-            .html('<input type="hidden" name="attachment[]" value="' + data.cid + '" />'
-                + '<a class="insert" target="_blank" href="###" title="<?php _e('点击插入文件'); ?>">' + data.title + '</a><div class="info">' + data.bytes
+    function fileUploadComplete (file, attachment) {
+        const li = $('#' + file.id).removeClass('loading').data('cid', attachment.cid)
+            .data('url', attachment.url)
+            .data('image', attachment.isImage)
+            .html('<input type="hidden" name="attachment[]" value="' + attachment.cid + '" />'
+                + '<a class="insert" target="_blank" href="###" title="<?php _e('点击插入文件'); ?>">'
+                + attachment.title + '</a><div class="info">' + attachment.bytes
                 + ' <a class="file" target="_blank" href="<?php $options->adminUrl('media.php'); ?>?cid=' 
-                + data.cid + '" title="<?php _e('编辑'); ?>"><i class="i-edit"></i></a>'
+                + attachment.cid + '" title="<?php _e('编辑'); ?>"><i class="i-edit"></i></a>'
                 + ' <a class="delete" href="###" title="<?php _e('删除'); ?>"><i class="i-delete"></i></a></div>')
             .effect('highlight', 1000);
-            
+
         attachInsertEvent(li);
         attachDeleteEvent(li);
-        updateAttacmentNumber();
+        updateAttachmentNumber();
 
-        if (!completeFile) {
-            completeFile = data;
-        }
+        Typecho.uploadComplete(attachment);
     }
 
-    $('#tab-files').bind('init', function () {
-        var uploader = new plupload.Uploader({
-            browse_button   :   $('.upload-file').get(0),
-            url             :   '<?php $security->index('/action/upload'
-                . (isset($fileParentContent) ? '?cid=' . $fileParentContent->cid : '')); ?>',
-            runtimes        :   'html5,flash,html4',
-            flash_swf_url   :   '<?php $options->adminStaticUrl('js', 'Moxie.swf'); ?>',
-            drop_element    :   $('.upload-area').get(0),
-            filters         :   {
-                max_file_size       :   '<?php echo $phpMaxFilesize ?>',
-                mime_types          :   [{'title' : '<?php _e('允许上传的文件'); ?>', 'extensions' : '<?php echo implode(',', $options->allowedAttachmentTypes); ?>'}],
-                prevent_duplicates  :   true
-            },
+    Typecho.uploadFile = (function () {
+        const types = '<?php echo json_encode($options->allowedAttachmentTypes); ?>';
+        const maxSize = <?php echo $phpMaxFilesize ?>;
+        const queue = [];
+        let index = 0;
 
-            init            :   {
-                FilesAdded      :   function (up, files) {
-                    plupload.each(files, function(file) {
-                        fileUploadStart(file);
-                    });
+        const getUrl = function () {
+            const url = new URL(uploadUrl);
+            const cid = $('input[name=cid]').val();
 
-                    completeFile = null;
-                    uploader.start();
-                },
+            url.searchParams.append('cid', cid);
+            return url.toString();
+        };
 
-                UploadComplete  :   function () {
-                    if (completeFile) {
-                        Typecho.uploadComplete(completeFile);
-                    }
-                },
+        const upload = function () {
+            const file = queue.shift();
 
-                FileUploaded    :   function (up, file, result) {
-                    if (200 == result.status) {
-                        var data = $.parseJSON(result.response);
-
-                        if (data) {
-                            fileUploadComplete(file.id, data[0], data[1]);
-                            plupload.removeFile(file);
-                            return;
-                        }
-                    }
-
-                    fileUploadError({
-                        code : plupload.HTTP_ERROR,
-                        file : file
-                    });
-                },
-
-                Error           :   function (up, error) {
-                    fileUploadError(error);
-                }
+            if (!file) {
+                return;
             }
-        });
 
-        uploader.init();
-    });
+            const data = new FormData();
+            data.append('file', file);
+
+            fetch(getUrl(), {
+                method: 'POST',
+                body: data
+            }).then(function (response) {
+                if (response.ok) {
+                    return response.json();
+                } else {
+                    throw new Error(response.statusText);
+                }
+            }).then(function (data) {
+                if (data) {
+                    const [_, attachment] = data;
+                    fileUploadComplete(file, attachment);
+                    upload();
+                } else {
+                    throw new Error('no data');
+                }
+            }).catch(function (error) {
+                fileUploadError('network', file);
+                upload();
+            });
+        };
+
+        return function (file) {
+            file.id = 'upload-' + (index++);
+
+            if (file.size > maxSize) {
+                return fileUploadError('size', file);
+            }
+
+            const match = file.name.match(/\.([a-z0-9]+)$/i);
+            if (!match || types.indexOf(match[1].toLowerCase()) < 0) {
+                return fileUploadError('type', file);
+            }
+
+            queue.push(file);
+            fileUploadStart(file);
+            upload();
+        };
+    })();
 
     function attachInsertEvent (el) {
         $('.insert', el).click(function () {
@@ -194,7 +222,7 @@ $(document).ready(function() {
                     function () {
                         $(el).fadeOut(function () {
                             $(this).remove();
-                            updateAttacmentNumber();
+                            updateAttachmentNumber();
                         });
                     });
             }

admin/file-upload.php

@@ -3,17 +3,19 @@
 <?php
 if (isset($post) || isset($page)) {
     $cid = isset($post) ? $post->cid : $page->cid;
-    
+
     if ($cid) {
-        Typecho_Widget::widget('Widget_Contents_Attachment_Related', 'parentId=' . $cid)->to($attachment);
+        \Widget\Contents\Attachment\Related::alloc(['parentId' => $cid])->to($attachment);
     } else {
-        Typecho_Widget::widget('Widget_Contents_Attachment_Unattached')->to($attachment);
+        \Widget\Contents\Attachment\Unattached::alloc()->to($attachment);
     }
 }
 ?>
 
 <div id="upload-panel" class="p">
-    <div class="upload-area" draggable="true"><?php _e('拖放文件到这里<br>或者 %s选择文件上传%s', '<a href="###" class="upload-file">', '</a>'); ?></div>
+    <div class="upload-area" data-url="<?php $security->index('/action/upload'); ?>">
+        <?php _e('拖放文件到这里<br>或者 %s选择文件上传%s', '<a href="###" class="upload-file">', '</a>'); ?>
+    </div>
     <ul id="file-list">
     <?php while ($attachment->next()): ?>
         <li data-cid="<?php $attachment->cid(); ?>" data-url="<?php echo $attachment->attachment->url; ?>" data-image="<?php echo $attachment->attachment->isImage ? 1 : 0; ?>"><input type="hidden" name="attachment[]" value="<?php $attachment->cid(); ?>" />

admin/footer.php

@@ -1,6 +1,7 @@
 <?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
+<?php \Typecho\Plugin::factory('admin/footer.php')->call('begin'); ?>
     </body>
 </html>
 <?php
 /** 注册一个结束插件 */
-Typecho_Plugin::factory('admin/footer.php')->end();
+\Typecho\Plugin::factory('admin/footer.php')->call('end');

admin/form-js.php

@@ -2,25 +2,50 @@
 <script>
 (function () {
     $(document).ready(function () {
-        var error = $('.typecho-option .error:first');
+        const error = $('.typecho-option .error:first');
 
         if (error.length > 0) {
             $('html,body').scrollTop(error.parents('.typecho-option').offset().top);
         }
 
-        $('form').submit(function () {
-            if (this.submitted) {
+        $('.main form').submit(function () {
+            const self = $(this);
+
+            if (self.hasClass('submitting')) {
                 return false;
             } else {
-                this.submitted = true;
+                $('button[type=submit]', this).attr('disabled', 'disabled');
+                self.addClass('submitting');
             }
+        }).on('submitted', function () {
+            $('button[type=submit]', this).removeAttr('disabled');
+            $(this).removeClass('submitting');
         });
 
         $('label input[type=text]').click(function (e) {
-            var check = $('#' + $(this).parents('label').attr('for'));
+            const check = $('#' + $(this).parents('label').attr('for'));
             check.prop('checked', true);
             return false;
         });
+
+        $('.main form input[type="url"]').each(function () {
+            const self = $(this);
+            const input = $('<input type="hidden" />').attr('name', self.attr('name'));
+
+            function setInput() {
+                const url = self.val();
+
+                try {
+                    const urlObj = new URL(url);
+                    input.val(urlObj.toString());
+                } catch {
+                    // ignore
+                }
+            }
+
+            self.removeAttr('name').after(input).on('input', setInput);
+            setInput();
+        });
     });
 })();
 </script>

admin/header.php

@@ -3,29 +3,21 @@ if (!defined('__TYPECHO_ADMIN__')) {
     exit;
 }
 
-$header = '<link rel="stylesheet" href="' . Typecho_Common::url('normalize.css?v=' . $suffixVersion, $options->adminStaticUrl('css')) . '">
-<link rel="stylesheet" href="' . Typecho_Common::url('grid.css?v=' . $suffixVersion, $options->adminStaticUrl('css')) . '">
-<link rel="stylesheet" href="' . Typecho_Common::url('style.css?v=' . $suffixVersion, $options->adminStaticUrl('css')) . '">
-<!--[if lt IE 9]>
-<script src="' . Typecho_Common::url('html5shiv.js?v=' . $suffixVersion, $options->adminStaticUrl('js')) . '"></script>
-<script src="' . Typecho_Common::url('respond.js?v=' . $suffixVersion, $options->adminStaticUrl('js')) . '"></script>
-<![endif]-->';
+$header = '<link rel="stylesheet" href="' . $options->adminStaticUrl('css', 'normalize.css', true) . '">
+<link rel="stylesheet" href="' . $options->adminStaticUrl('css', 'grid.css', true) . '">
+<link rel="stylesheet" href="' . $options->adminStaticUrl('css', 'style.css', true) . '">';
 
 /** 注册一个初始化插件 */
-$header = Typecho_Plugin::factory('admin/header.php')->header($header);
+$header = \Typecho\Plugin::factory('admin/header.php')->filter('header', $header);
 
 ?><!DOCTYPE HTML>
-<html class="no-js">
+<html>
     <head>
         <meta charset="<?php $options->charset(); ?>">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
         <meta name="renderer" content="webkit">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
         <title><?php _e('%s - %s - Powered by Typecho', $menu->title, $options->title); ?></title>
         <meta name="robots" content="noindex, nofollow">
         <?php echo $header; ?>
     </head>
     <body<?php if (isset($bodyClass)) {echo ' class="' . $bodyClass . '"';} ?>>
-    <!--[if lt IE 9]>
-        <div class="message error browsehappy" role="dialog"><?php _e('当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>'); ?>.</div>
-    <![endif]-->

admin/index.php

@@ -3,72 +3,68 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
+$stat = \Widget\Stat::alloc();
 ?>
-<div class="main">
+<main class="main">
     <div class="container typecho-dashboard">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main">
             <div class="col-mb-12 welcome-board" role="main">
                 <p><?php _e('目前有 <em>%s</em> 篇文章, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.',
-                $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>
-                <br><?php _e('点击下面的链接快速开始:'); ?></p>
+                        $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>
+                    <br><?php _e('点击下面的链接快速开始:'); ?></p>
 
-                <ul id="start-link" class="clearfix">
-                    <?php if($user->pass('contributor', true)): ?>
-                    <li><a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写新文章'); ?></a></li>
-                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->waitingCommentsNum > 0): ?>
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核的评论'); ?></a>
-                        <span class="balloon"><?php $stat->waitingCommentsNum(); ?></span>
-                        </li>
-                    <?php elseif($stat->myWaitingCommentsNum > 0): ?>
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核评论'); ?></a>
-                        <span class="balloon"><?php $stat->myWaitingCommentsNum(); ?></span>
-                        </li>
-                    <?php endif; ?>
-                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->spamCommentsNum > 0): ?>
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
-                        <span class="balloon"><?php $stat->spamCommentsNum(); ?></span>
-                        </li>
-                    <?php elseif($stat->mySpamCommentsNum > 0): ?>
-                        <li><a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
-                        <span class="balloon"><?php $stat->mySpamCommentsNum(); ?></span>
-                        </li>
-                    <?php endif; ?>
-                    <?php if($user->pass('administrator', true)): ?>
-                    <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('更换外观'); ?></a></li>
-                    <li><a href="<?php $options->adminUrl('plugins.php'); ?>"><?php _e('插件管理'); ?></a></li>
-                    <li><a href="<?php $options->adminUrl('options-general.php'); ?>"><?php _e('系统设置'); ?></a></li>
-                    <?php endif; ?>
+                <ul id="start-link">
+                    <?php if ($user->pass('contributor', true)): ?>
+                        <li><a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写新文章'); ?></a></li>
+                        <?php if ($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->waitingCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核的评论'); ?></a>
+                                <span class="balloon"><?php $stat->waitingCommentsNum(); ?></span>
+                            </li>
+                        <?php elseif ($stat->myWaitingCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核评论'); ?></a>
+                                <span class="balloon"><?php $stat->myWaitingCommentsNum(); ?></span>
+                            </li>
+                        <?php endif; ?>
+                        <?php if ($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->spamCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
+                                <span class="balloon"><?php $stat->spamCommentsNum(); ?></span>
+                            </li>
+                        <?php elseif ($stat->mySpamCommentsNum > 0): ?>
+                            <li>
+                                <a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
+                                <span class="balloon"><?php $stat->mySpamCommentsNum(); ?></span>
+                            </li>
+                        <?php endif; ?>
+                        <?php if ($user->pass('administrator', true)): ?>
+                            <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('更换外观'); ?></a></li>
+                            <li><a href="<?php $options->adminUrl('plugins.php'); ?>"><?php _e('插件管理'); ?></a></li>
+                            <li><a href="<?php $options->adminUrl('options-general.php'); ?>"><?php _e('系统设置'); ?></a>
+                            </li>
+                        <?php endif; ?>
                     <?php endif; ?>
                     <!--<li><a href="<?php $options->adminUrl('profile.php'); ?>"><?php _e('更新我的资料'); ?></a></li>-->
                 </ul>
-                <?php $version = Typecho_Cookie::get('__typecho_check_version'); ?>
-                <?php if ($version && $version['available']): ?>
-                <div class="update-check">
-                    <p class="message notice">
-                        <?php _e('您当前使用的版本是'); ?> <?php echo $version['current']; ?> &rarr;
-                        <strong><a href="<?php echo $version['link']; ?>"><?php _e('官方最新版本是'); ?> <?php echo $version['latest']; ?></a></strong>
-                    </p>
-                </div>
-                <?php endif; ?>
             </div>
 
             <div class="col-mb-12 col-tb-4" role="complementary">
                 <section class="latest-link">
                     <h3><?php _e('最近发布的文章'); ?></h3>
-                    <?php Typecho_Widget::widget('Widget_Contents_Post_Recent', 'pageSize=10')->to($posts); ?>
+                    <?php \Widget\Contents\Post\Recent::alloc('pageSize=10')->to($posts); ?>
                     <ul>
-                    <?php if($posts->have()): ?>
-                    <?php while($posts->next()): ?>
-                        <li>
-                            <span><?php $posts->date('n.j'); ?></span>
-                            <a href="<?php $posts->permalink(); ?>" class="title"><?php $posts->title(); ?></a>
-                        </li>
-                    <?php endwhile; ?>
-                    <?php else: ?>
-                        <li><em><?php _e('暂时没有文章'); ?></em></li>
-                    <?php endif; ?>
+                        <?php if ($posts->have()): ?>
+                            <?php while ($posts->next()): ?>
+                                <li>
+                                    <span><?php $posts->date('n.j'); ?></span>
+                                    <a href="<?php $posts->permalink(); ?>" class="title"><?php $posts->title(); ?></a>
+                                </li>
+                            <?php endwhile; ?>
+                        <?php else: ?>
+                            <li><em><?php _e('暂时没有文章'); ?></em></li>
+                        <?php endif; ?>
                     </ul>
                 </section>
             </div>
@@ -77,17 +73,18 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                 <section class="latest-link">
                     <h3><?php _e('最近得到的回复'); ?></h3>
                     <ul>
-                        <?php Typecho_Widget::widget('Widget_Comments_Recent', 'pageSize=10')->to($comments); ?>
-                        <?php if($comments->have()): ?>
-                        <?php while($comments->next()): ?>
-                        <li>
-                            <span><?php $comments->date('n.j'); ?></span>
-                            <a href="<?php $comments->permalink(); ?>" class="title"><?php $comments->author(true); ?></a>:
-                            <?php $comments->excerpt(35, '...'); ?>
-                        </li>
-                        <?php endwhile; ?>
+                        <?php \Widget\Comments\Recent::alloc('pageSize=10')->to($comments); ?>
+                        <?php if ($comments->have()): ?>
+                            <?php while ($comments->next()): ?>
+                                <li>
+                                    <span><?php $comments->date('n.j'); ?></span>
+                                    <a href="<?php $comments->permalink(); ?>"
+                                       class="title"><?php $comments->author(false); ?></a>:
+                                    <?php $comments->excerpt(35, '...'); ?>
+                                </li>
+                            <?php endwhile; ?>
                         <?php else: ?>
-                        <li><?php _e('暂时没有回复'); ?></li>
+                            <li><?php _e('暂时没有回复'); ?></li>
                         <?php endif; ?>
                     </ul>
                 </section>
@@ -105,7 +102,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';
@@ -113,47 +110,46 @@ include 'common-js.php';
 ?>
 
 <script>
-$(document).ready(function () {
-    var ul = $('#typecho-message ul'), cache = window.sessionStorage,
-        html = cache ? cache.getItem('feed') : '',
-        update = cache ? cache.getItem('update') : '';
-
-    if (!!html) {
-        ul.html(html);
-    } else {
-        html = '';
-        $.get('<?php $options->index('/action/ajax?do=feed'); ?>', function (o) {
-            for (var i = 0; i < o.length; i ++) {
-                var item = o[i];
-                html += '<li><span>' + item.date + '</span> <a href="' + item.link + '" target="_blank">' + item.title
-                    + '</a></li>';
-            }
+    $(document).ready(function () {
+        var ul = $('#typecho-message ul'), cache = window.sessionStorage,
+            html = cache ? cache.getItem('feed') : '',
+            update = cache ? cache.getItem('update') : '';
 
+        if (!!html) {
             ul.html(html);
-            cache.setItem('feed', html);
-        }, 'json');
-    }
+        } else {
+            html = '';
+            $.get('<?php $options->index('/action/ajax?do=feed'); ?>', function (o) {
+                for (var i = 0; i < o.length; i++) {
+                    var item = o[i];
+                    html += '<li><span>' + item.date + '</span> <a href="' + item.link + '" target="_blank">' + item.title
+                        + '</a></li>';
+                }
 
-    function applyUpdate(update) {
-        if (update.available) {
-            $('<div class="update-check"><p>'
-                + '<?php _e('您当前使用的版本是 %s'); ?>'.replace('%s', update.current) + '<br />'
-                + '<strong><a href="' + update.link + '" target="_blank">'
-                + '<?php _e('官方最新版本是 %s'); ?>'.replace('%s', update.latest) + '</a></strong></p></div>')
-            .appendTo('.welcome-board').effect('highlight');
+                ul.html(html);
+                cache.setItem('feed', html);
+            }, 'json');
         }
-    }
 
-    if (!!update) {
-        applyUpdate($.parseJSON(update));
-    } else {
-        update = '';
-        $.get('<?php $options->index('/action/ajax?do=checkVersion'); ?>', function (o, status, resp) {
-            applyUpdate(o);
-            cache.setItem('update', resp.responseText);
-        }, 'json');
-    }
-});
+        function applyUpdate(update) {
+            if (update.available) {
+                $('<div class="update-check message error"><p>'
+                    + '<?php _e('您当前使用的版本是 %s'); ?>'.replace('%s', update.current) + '<br />'
+                    + '<strong><a href="' + update.link + '" target="_blank">'
+                    + '<?php _e('官方最新版本是 %s'); ?>'.replace('%s', update.latest) + '</a></strong></p></div>')
+                    .insertAfter('.typecho-page-title').effect('highlight');
+            }
+        }
+
+        if (!!update) {
+            applyUpdate($.parseJSON(update));
+        } else {
+            $.get('<?php $options->index('/action/ajax?do=checkVersion'); ?>', function (o, status, resp) {
+                applyUpdate(o);
+                cache.setItem('update', resp.responseText);
+            }, 'json');
+        }
+    });
 
 </script>
 <?php include 'footer.php'; ?>

admin/js/html5shiv.js

@@ -1,301 +0,0 @@
-/**
-* @preserve HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-;(function(window, document) {
-/*jshint evil:true */
-  /** version */
-  var version = '3.7.0';
-
-  /** Preset options */
-  var options = window.html5 || {};
-
-  /** Used to skip problem elements */
-  var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
-  /** Not all elements can be cloned in IE **/
-  var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
-
-  /** Detect whether the browser supports default html5 styles */
-  var supportsHtml5Styles;
-
-  /** Name of the expando, to work with multiple documents or to re-shiv one document */
-  var expando = '_html5shiv';
-
-  /** The id for the the documents expando */
-  var expanID = 0;
-
-  /** Cached data for each document */
-  var expandoData = {};
-
-  /** Detect whether the browser supports unknown elements */
-  var supportsUnknownElements;
-
-  (function() {
-    try {
-        var a = document.createElement('a');
-        a.innerHTML = '<xyz></xyz>';
-        //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
-        supportsHtml5Styles = ('hidden' in a);
-
-        supportsUnknownElements = a.childNodes.length == 1 || (function() {
-          // assign a false positive if unable to shiv
-          (document.createElement)('a');
-          var frag = document.createDocumentFragment();
-          return (
-            typeof frag.cloneNode == 'undefined' ||
-            typeof frag.createDocumentFragment == 'undefined' ||
-            typeof frag.createElement == 'undefined'
-          );
-        }());
-    } catch(e) {
-      // assign a false positive if detection fails => unable to shiv
-      supportsHtml5Styles = true;
-      supportsUnknownElements = true;
-    }
-
-  }());
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * Creates a style sheet with the given CSS text and adds it to the document.
-   * @private
-   * @param {Document} ownerDocument The document.
-   * @param {String} cssText The CSS text.
-   * @returns {StyleSheet} The style element.
-   */
-  function addStyleSheet(ownerDocument, cssText) {
-    var p = ownerDocument.createElement('p'),
-        parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
-
-    p.innerHTML = 'x<style>' + cssText + '</style>';
-    return parent.insertBefore(p.lastChild, parent.firstChild);
-  }
-
-  /**
-   * Returns the value of `html5.elements` as an array.
-   * @private
-   * @returns {Array} An array of shived element node names.
-   */
-  function getElements() {
-    var elements = html5.elements;
-    return typeof elements == 'string' ? elements.split(' ') : elements;
-  }
-
-    /**
-   * Returns the data associated to the given document
-   * @private
-   * @param {Document} ownerDocument The document.
-   * @returns {Object} An object of data.
-   */
-  function getExpandoData(ownerDocument) {
-    var data = expandoData[ownerDocument[expando]];
-    if (!data) {
-        data = {};
-        expanID++;
-        ownerDocument[expando] = expanID;
-        expandoData[expanID] = data;
-    }
-    return data;
-  }
-
-  /**
-   * returns a shived element for the given nodeName and document
-   * @memberOf html5
-   * @param {String} nodeName name of the element
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived element.
-   */
-  function createElement(nodeName, ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createElement(nodeName);
-    }
-    if (!data) {
-        data = getExpandoData(ownerDocument);
-    }
-    var node;
-
-    if (data.cache[nodeName]) {
-        node = data.cache[nodeName].cloneNode();
-    } else if (saveClones.test(nodeName)) {
-        node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
-    } else {
-        node = data.createElem(nodeName);
-    }
-
-    // Avoid adding some elements to fragments in IE < 9 because
-    // * Attributes like `name` or `type` cannot be set/changed once an element
-    //   is inserted into a document/fragment
-    // * Link elements with `src` attributes that are inaccessible, as with
-    //   a 403 response, will cause the tab/window to crash
-    // * Script elements appended to fragments will execute when their `src`
-    //   or `text` property is set
-    return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node;
-  }
-
-  /**
-   * returns a shived DocumentFragment for the given document
-   * @memberOf html5
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived DocumentFragment.
-   */
-  function createDocumentFragment(ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createDocumentFragment();
-    }
-    data = data || getExpandoData(ownerDocument);
-    var clone = data.frag.cloneNode(),
-        i = 0,
-        elems = getElements(),
-        l = elems.length;
-    for(;i<l;i++){
-        clone.createElement(elems[i]);
-    }
-    return clone;
-  }
-
-  /**
-   * Shivs the `createElement` and `createDocumentFragment` methods of the document.
-   * @private
-   * @param {Document|DocumentFragment} ownerDocument The document.
-   * @param {Object} data of the document.
-   */
-  function shivMethods(ownerDocument, data) {
-    if (!data.cache) {
-        data.cache = {};
-        data.createElem = ownerDocument.createElement;
-        data.createFrag = ownerDocument.createDocumentFragment;
-        data.frag = data.createFrag();
-    }
-
-
-    ownerDocument.createElement = function(nodeName) {
-      //abort shiv
-      if (!html5.shivMethods) {
-          return data.createElem(nodeName);
-      }
-      return createElement(nodeName, ownerDocument, data);
-    };
-
-    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
-      'var n=f.cloneNode(),c=n.createElement;' +
-      'h.shivMethods&&(' +
-        // unroll the `createElement` calls
-        getElements().join().replace(/[\w\-]+/g, function(nodeName) {
-          data.createElem(nodeName);
-          data.frag.createElement(nodeName);
-          return 'c("' + nodeName + '")';
-        }) +
-      ');return n}'
-    )(html5, data.frag);
-  }
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * Shivs the given document.
-   * @memberOf html5
-   * @param {Document} ownerDocument The document to shiv.
-   * @returns {Document} The shived document.
-   */
-  function shivDocument(ownerDocument) {
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    var data = getExpandoData(ownerDocument);
-
-    if (html5.shivCSS && !supportsHtml5Styles && !data.hasCSS) {
-      data.hasCSS = !!addStyleSheet(ownerDocument,
-        // corrects block display not defined in IE6/7/8/9
-        'article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}' +
-        // adds styling not present in IE6/7/8/9
-        'mark{background:#FF0;color:#000}' +
-        // hides non-rendered elements
-        'template{display:none}'
-      );
-    }
-    if (!supportsUnknownElements) {
-      shivMethods(ownerDocument, data);
-    }
-    return ownerDocument;
-  }
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * The `html5` object is exposed so that more elements can be shived and
-   * existing shiving can be detected on iframes.
-   * @type Object
-   * @example
-   *
-   * // options can be changed before the script is included
-   * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
-   */
-  var html5 = {
-
-    /**
-     * An array or space separated string of node names of the elements to shiv.
-     * @memberOf html5
-     * @type Array|String
-     */
-    'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video',
-
-    /**
-     * current version of html5shiv
-     */
-    'version': version,
-
-    /**
-     * A flag to indicate that the HTML5 style sheet should be inserted.
-     * @memberOf html5
-     * @type Boolean
-     */
-    'shivCSS': (options.shivCSS !== false),
-
-    /**
-     * Is equal to true if a browser supports creating unknown/HTML5 elements
-     * @memberOf html5
-     * @type boolean
-     */
-    'supportsUnknownElements': supportsUnknownElements,
-
-    /**
-     * A flag to indicate that the document's `createElement` and `createDocumentFragment`
-     * methods should be overwritten.
-     * @memberOf html5
-     * @type Boolean
-     */
-    'shivMethods': (options.shivMethods !== false),
-
-    /**
-     * A string to describe the type of `html5` object ("default" or "default print").
-     * @memberOf html5
-     * @type String
-     */
-    'type': 'default',
-
-    // shivs the document according to the specified `html5` object options
-    'shivDocument': shivDocument,
-
-    //creates a shived element
-    createElement: createElement,
-
-    //creates a shived documentFragment
-    createDocumentFragment: createDocumentFragment
-  };
-
-  /*--------------------------------------------------------------------------*/
-
-  // expose html5
-  window.html5 = html5;
-
-  // shiv the document
-  shivDocument(document);
-
-}(this, document));

admin/js/pagedown-extra.js

@@ -1,875 +0,0 @@
-(function () {
-  // A quick way to make sure we're only keeping span-level tags when we need to.
-  // This isn't supposed to be foolproof. It's just a quick way to make sure we
-  // keep all span-level tags returned by a pagedown converter. It should allow
-  // all span-level tags through, with or without attributes.
-  var inlineTags = new RegExp(['^(<\\/?(a|abbr|acronym|applet|area|b|basefont|',
-                               'bdo|big|button|cite|code|del|dfn|em|figcaption|',
-                               'font|i|iframe|img|input|ins|kbd|label|map|',
-                               'mark|meter|object|param|progress|q|ruby|rp|rt|s|',
-                               'samp|script|select|small|span|strike|strong|',
-                               'sub|sup|textarea|time|tt|u|var|wbr)[^>]*>|',
-                               '<(br)\\s?\\/?>)$'].join(''), 'i');
-
-  /******************************************************************
-   * Utility Functions                                              *
-   *****************************************************************/
-
-  // patch for ie7
-  if (!Array.indexOf) {
-    Array.prototype.indexOf = function(obj) {
-      for (var i = 0; i < this.length; i++) {
-        if (this[i] == obj) {
-          return i;
-        }
-      }
-      return -1;
-    };
-  }
-
-  function trim(str) {
-    return str.replace(/^\s+|\s+$/g, '');
-  }
-
-  function rtrim(str) {
-    return str.replace(/\s+$/g, '');
-  }
-
-  // Remove one level of indentation from text. Indent is 4 spaces.
-  function outdent(text) {
-    return text.replace(new RegExp('^(\\t|[ ]{1,4})', 'gm'), '');
-  }
-
-  function contains(str, substr) {
-    return str.indexOf(substr) != -1;
-  }
-
-  // Sanitize html, removing tags that aren't in the whitelist
-  function sanitizeHtml(html, whitelist) {
-    return html.replace(/<[^>]*>?/gi, function(tag) {
-      return tag.match(whitelist) ? tag : '';
-    });
-  }
-
-  // Merge two arrays, keeping only unique elements.
-  function union(x, y) {
-    var obj = {};
-    for (var i = 0; i < x.length; i++)
-       obj[x[i]] = x[i];
-    for (i = 0; i < y.length; i++)
-       obj[y[i]] = y[i];
-    var res = [];
-    for (var k in obj) {
-      if (obj.hasOwnProperty(k))
-        res.push(obj[k]);
-    }
-    return res;
-  }
-
-  // JS regexes don't support \A or \Z, so we add sentinels, as Pagedown
-  // does. In this case, we add the ascii codes for start of text (STX) and
-  // end of text (ETX), an idea borrowed from:
-  // https://github.com/tanakahisateru/js-markdown-extra
-  function addAnchors(text) {
-    if(text.charAt(0) != '\x02')
-      text = '\x02' + text;
-    if(text.charAt(text.length - 1) != '\x03')
-      text = text + '\x03';
-    return text;
-  }
-
-  // Remove STX and ETX sentinels.
-  function removeAnchors(text) {
-    if(text.charAt(0) == '\x02')
-      text = text.substr(1);
-    if(text.charAt(text.length - 1) == '\x03')
-      text = text.substr(0, text.length - 1);
-    return text;
-  }
-
-  // Convert markdown within an element, retaining only span-level tags
-  function convertSpans(text, extra) {
-    return sanitizeHtml(convertAll(text, extra), inlineTags);
-  }
-
-  // Convert internal markdown using the stock pagedown converter
-  function convertAll(text, extra) {
-    var result = extra.blockGamutHookCallback(text);
-    // We need to perform these operations since we skip the steps in the converter
-    result = unescapeSpecialChars(result);
-    result = result.replace(/~D/g, "$$").replace(/~T/g, "~");
-    result = extra.previousPostConversion(result);
-    return result;
-  }
-
-  // Convert escaped special characters
-  function processEscapesStep1(text) {
-    // Markdown extra adds two escapable characters, `:` and `|`
-    return text.replace(/\\\|/g, '~I').replace(/\\:/g, '~i');
-  }
-  function processEscapesStep2(text) {
-    return text.replace(/~I/g, '|').replace(/~i/g, ':');
-  }
-
-  // Duplicated from PageDown converter
-  function unescapeSpecialChars(text) {
-    // Swap back in all the special characters we've hidden.
-    text = text.replace(/~E(\d+)E/g, function(wholeMatch, m1) {
-      var charCodeToReplace = parseInt(m1);
-      return String.fromCharCode(charCodeToReplace);
-    });
-    return text;
-  }
-  
-  function slugify(text) {
-    return text.toLowerCase()
-    .replace(/\s+/g, '-') // Replace spaces with -
-    .replace(/[^\w\-]+/g, '') // Remove all non-word chars
-    .replace(/\-\-+/g, '-') // Replace multiple - with single -
-    .replace(/^-+/, '') // Trim - from start of text
-    .replace(/-+$/, ''); // Trim - from end of text
-  }
-
-  /*****************************************************************************
-   * Markdown.Extra *
-   ****************************************************************************/
-
-  Markdown.Extra = function() {
-    // For converting internal markdown (in tables for instance).
-    // This is necessary since these methods are meant to be called as
-    // preConversion hooks, and the Markdown converter passed to init()
-    // won't convert any markdown contained in the html tags we return.
-    this.converter = null;
-
-    // Stores html blocks we generate in hooks so that
-    // they're not destroyed if the user is using a sanitizing converter
-    this.hashBlocks = [];
-    
-    // Stores footnotes
-    this.footnotes = {};
-    this.usedFootnotes = [];
-
-    // Special attribute blocks for fenced code blocks and headers enabled.
-    this.attributeBlocks = false;
-
-    // Fenced code block options
-    this.googleCodePrettify = false;
-    this.highlightJs = false;
-
-    // Table options
-    this.tableClass = '';
-
-    this.tabWidth = 4;
-  };
-
-  Markdown.Extra.init = function(converter, options) {
-    // Each call to init creates a new instance of Markdown.Extra so it's
-    // safe to have multiple converters, with different options, on a single page
-    var extra = new Markdown.Extra();
-    var postNormalizationTransformations = [];
-    var preBlockGamutTransformations = [];
-    var postSpanGamutTransformations = [];
-    var postConversionTransformations = ["unHashExtraBlocks"];
-
-    options = options || {};
-    options.extensions = options.extensions || ["all"];
-    if (contains(options.extensions, "all")) {
-      options.extensions = ["tables", "fenced_code_gfm", "def_list", "attr_list", "footnotes", "smartypants", "strikethrough", "newlines"];
-    }
-    preBlockGamutTransformations.push("wrapHeaders");
-    if (contains(options.extensions, "attr_list")) {
-      postNormalizationTransformations.push("hashFcbAttributeBlocks");
-      preBlockGamutTransformations.push("hashHeaderAttributeBlocks");
-      postConversionTransformations.push("applyAttributeBlocks");
-      extra.attributeBlocks = true;
-    }
-    if (contains(options.extensions, "fenced_code_gfm")) {
-      // This step will convert fcb inside list items and blockquotes
-      preBlockGamutTransformations.push("fencedCodeBlocks");
-      // This extra step is to prevent html blocks hashing and link definition/footnotes stripping inside fcb
-      postNormalizationTransformations.push("fencedCodeBlocks");
-    }
-    if (contains(options.extensions, "tables")) {
-      preBlockGamutTransformations.push("tables");
-    }
-    if (contains(options.extensions, "def_list")) {
-      preBlockGamutTransformations.push("definitionLists");
-    }
-    if (contains(options.extensions, "footnotes")) {
-      postNormalizationTransformations.push("stripFootnoteDefinitions");
-      preBlockGamutTransformations.push("doFootnotes");
-      postConversionTransformations.push("printFootnotes");
-    }
-    if (contains(options.extensions, "smartypants")) {
-      postConversionTransformations.push("runSmartyPants");
-    }
-    if (contains(options.extensions, "strikethrough")) {
-      postSpanGamutTransformations.push("strikethrough");
-    }
-    if (contains(options.extensions, "newlines")) {
-      postSpanGamutTransformations.push("newlines");
-    }
-    
-    converter.hooks.chain("postNormalization", function(text) {
-      return extra.doTransform(postNormalizationTransformations, text) + '\n';
-    });
-
-    converter.hooks.chain("preBlockGamut", function(text, blockGamutHookCallback) {
-      // Keep a reference to the block gamut callback to run recursively
-      extra.blockGamutHookCallback = blockGamutHookCallback;
-      text = processEscapesStep1(text);
-      text = extra.doTransform(preBlockGamutTransformations, text) + '\n';
-      text = processEscapesStep2(text);
-      return text;
-    });
-
-    converter.hooks.chain("postSpanGamut", function(text) {
-      return extra.doTransform(postSpanGamutTransformations, text);
-    });
-
-    // Keep a reference to the hook chain running before doPostConversion to apply on hashed extra blocks
-    extra.previousPostConversion = converter.hooks.postConversion;
-    converter.hooks.chain("postConversion", function(text) {
-      text = extra.doTransform(postConversionTransformations, text);
-      // Clear state vars that may use unnecessary memory
-      extra.hashBlocks = [];
-      extra.footnotes = {};
-      extra.usedFootnotes = [];
-      return text;
-    });
-
-    if ("highlighter" in options) {
-      extra.googleCodePrettify = options.highlighter === 'prettify';
-      extra.highlightJs = options.highlighter === 'highlight';
-    }
-
-    if ("table_class" in options) {
-      extra.tableClass = options.table_class;
-    }
-
-    extra.converter = converter;
-
-    // Caller usually won't need this, but it's handy for testing.
-    return extra;
-  };
-
-  // Do transformations
-  Markdown.Extra.prototype.doTransform = function(transformations, text) {
-    for(var i = 0; i < transformations.length; i++)
-      text = this[transformations[i]](text);
-    return text;
-  };
-
-  // Return a placeholder containing a key, which is the block's index in the
-  // hashBlocks array. We wrap our output in a <p> tag here so Pagedown won't.
-  Markdown.Extra.prototype.hashExtraBlock = function(block) {
-    return '\n<p>~X' + (this.hashBlocks.push(block) - 1) + 'X</p>\n';
-  };
-  Markdown.Extra.prototype.hashExtraInline = function(block) {
-    return '~X' + (this.hashBlocks.push(block) - 1) + 'X';
-  };
-  
-  // Replace placeholder blocks in `text` with their corresponding
-  // html blocks in the hashBlocks array.
-  Markdown.Extra.prototype.unHashExtraBlocks = function(text) {
-    var self = this;
-    function recursiveUnHash() {
-      var hasHash = false;
-      text = text.replace(/(?:<p>)?~X(\d+)X(?:<\/p>)?/g, function(wholeMatch, m1) {
-        hasHash = true;
-        var key = parseInt(m1, 10);
-        return self.hashBlocks[key];
-      });
-      if(hasHash === true) {
-        recursiveUnHash();
-      }
-    }
-    recursiveUnHash();
-    return text;
-  };
-  
-  // Wrap headers to make sure they won't be in def lists
-  Markdown.Extra.prototype.wrapHeaders = function(text) {
-    function wrap(text) {
-      return '\n' + text + '\n';
-    }
-    text = text.replace(/^.+[ \t]*\n=+[ \t]*\n+/gm, wrap);
-    text = text.replace(/^.+[ \t]*\n-+[ \t]*\n+/gm, wrap);
-    text = text.replace(/^\#{1,6}[ \t]*.+?[ \t]*\#*\n+/gm, wrap);
-    return text;
-  };
-
-
-  /******************************************************************
-   * Attribute Blocks                                               *
-   *****************************************************************/
-
-  // TODO: use sentinels. Should we just add/remove them in doConversion?
-  // TODO: better matches for id / class attributes
-  var attrBlock = "\\{[ \\t]*((?:[#.][-_:a-zA-Z0-9]+[ \\t]*)+)\\}";
-  var hdrAttributesA = new RegExp("^(#{1,6}.*#{0,6})[ \\t]+" + attrBlock + "[ \\t]*(?:\\n|0x03)", "gm");
-  var hdrAttributesB = new RegExp("^(.*)[ \\t]+" + attrBlock + "[ \\t]*\\n" +
-    "(?=[\\-|=]+\\s*(?:\\n|0x03))", "gm"); // underline lookahead
-  var fcbAttributes =  new RegExp("^(```[ \\t]*[^{\\s]*)[ \\t]+" + attrBlock + "[ \\t]*\\n" +
-    "(?=([\\s\\S]*?)\\n```[ \\t]*(\\n|0x03))", "gm");
-      
-  // Extract headers attribute blocks, move them above the element they will be
-  // applied to, and hash them for later.
-  Markdown.Extra.prototype.hashHeaderAttributeBlocks = function(text) {
-    
-    var self = this;
-    function attributeCallback(wholeMatch, pre, attr) {
-      return '<p>~XX' + (self.hashBlocks.push(attr) - 1) + 'XX</p>\n' + pre + "\n";
-    }
-
-    text = text.replace(hdrAttributesA, attributeCallback);  // ## headers
-    text = text.replace(hdrAttributesB, attributeCallback);  // underline headers
-    return text;
-  };
-  
-  // Extract FCB attribute blocks, move them above the element they will be
-  // applied to, and hash them for later.
-  Markdown.Extra.prototype.hashFcbAttributeBlocks = function(text) {
-    // TODO: use sentinels. Should we just add/remove them in doConversion?
-    // TODO: better matches for id / class attributes
-
-    var self = this;
-    function attributeCallback(wholeMatch, pre, attr) {
-      return '<p>~XX' + (self.hashBlocks.push(attr) - 1) + 'XX</p>\n' + pre + "\n";
-    }
-
-    return text.replace(fcbAttributes, attributeCallback);
-  };
-
-  Markdown.Extra.prototype.applyAttributeBlocks = function(text) {
-    var self = this;
-    var blockRe = new RegExp('<p>~XX(\\d+)XX</p>[\\s]*' +
-                             '(?:<(h[1-6]|pre)(?: +class="(\\S+)")?(>[\\s\\S]*?</\\2>))', "gm");
-    text = text.replace(blockRe, function(wholeMatch, k, tag, cls, rest) {
-      if (!tag) // no following header or fenced code block.
-        return '';
-
-      // get attributes list from hash
-      var key = parseInt(k, 10);
-      var attributes = self.hashBlocks[key];
-
-      // get id
-      var id = attributes.match(/#[^\s#.]+/g) || [];
-      var idStr = id[0] ? ' id="' + id[0].substr(1, id[0].length - 1) + '"' : '';
-
-      // get classes and merge with existing classes
-      var classes = attributes.match(/\.[^\s#.]+/g) || [];
-      for (var i = 0; i < classes.length; i++) // Remove leading dot
-        classes[i] = classes[i].substr(1, classes[i].length - 1);
-
-      var classStr = '';
-      if (cls)
-        classes = union(classes, [cls]);
-
-      if (classes.length > 0)
-        classStr = ' class="' + classes.join(' ') + '"';
-
-      return "<" + tag + idStr + classStr + rest;
-    });
-
-    return text;
-  };
-
-  /******************************************************************
-   * Tables                                                         *
-   *****************************************************************/
-
-  // Find and convert Markdown Extra tables into html.
-  Markdown.Extra.prototype.tables = function(text) {
-    var self = this;
-
-    var leadingPipe = new RegExp(
-      ['^'                         ,
-       '[ ]{0,3}'                  , // Allowed whitespace
-       '[|]'                       , // Initial pipe
-       '(.+)\\n'                   , // $1: Header Row
-
-       '[ ]{0,3}'                  , // Allowed whitespace
-       '[|]([ ]*[-:]+[-| :]*)\\n'  , // $2: Separator
-
-       '('                         , // $3: Table Body
-         '(?:[ ]*[|].*\\n?)*'      , // Table rows
-       ')',
-       '(?:\\n|$)'                   // Stop at final newline
-      ].join(''),
-      'gm'
-    );
-
-    var noLeadingPipe = new RegExp(
-      ['^'                         ,
-       '[ ]{0,3}'                  , // Allowed whitespace
-       '(\\S.*[|].*)\\n'           , // $1: Header Row
-
-       '[ ]{0,3}'                  , // Allowed whitespace
-       '([-:]+[ ]*[|][-| :]*)\\n'  , // $2: Separator
-
-       '('                         , // $3: Table Body
-         '(?:.*[|].*\\n?)*'        , // Table rows
-       ')'                         ,
-       '(?:\\n|$)'                   // Stop at final newline
-      ].join(''),
-      'gm'
-    );
-
-    text = text.replace(leadingPipe, doTable);
-    text = text.replace(noLeadingPipe, doTable);
-
-    // $1 = header, $2 = separator, $3 = body
-    function doTable(match, header, separator, body, offset, string) {
-      // remove any leading pipes and whitespace
-      header = header.replace(/^ *[|]/m, '');
-      separator = separator.replace(/^ *[|]/m, '');
-      body = body.replace(/^ *[|]/gm, '');
-
-      // remove trailing pipes and whitespace
-      header = header.replace(/[|] *$/m, '');
-      separator = separator.replace(/[|] *$/m, '');
-      body = body.replace(/[|] *$/gm, '');
-
-      // determine column alignments
-      alignspecs = separator.split(/ *[|] */);
-      align = [];
-      for (var i = 0; i < alignspecs.length; i++) {
-        var spec = alignspecs[i];
-        if (spec.match(/^ *-+: *$/m))
-          align[i] = ' align="right"';
-        else if (spec.match(/^ *:-+: *$/m))
-          align[i] = ' align="center"';
-        else if (spec.match(/^ *:-+ *$/m))
-          align[i] = ' align="left"';
-        else align[i] = '';
-      }
-
-      // TODO: parse spans in header and rows before splitting, so that pipes
-      // inside of tags are not interpreted as separators
-      var headers = header.split(/ *[|] */);
-      var colCount = headers.length;
-
-      // build html
-      var cls = self.tableClass ? ' class="' + self.tableClass + '"' : '';
-      var html = ['<table', cls, '>\n', '<thead>\n', '<tr>\n'].join('');
-
-      // build column headers.
-      for (i = 0; i < colCount; i++) {
-        var headerHtml = convertSpans(trim(headers[i]), self);
-        html += ["  <th", align[i], ">", headerHtml, "</th>\n"].join('');
-      }
-      html += "</tr>\n</thead>\n";
-
-      // build rows
-      var rows = body.split('\n');
-      for (i = 0; i < rows.length; i++) {
-        if (rows[i].match(/^\s*$/)) // can apply to final row
-          continue;
-
-        // ensure number of rowCells matches colCount
-        var rowCells = rows[i].split(/ *[|] */);
-        var lenDiff = colCount - rowCells.length;
-        for (var j = 0; j < lenDiff; j++)
-          rowCells.push('');
-
-        html += "<tr>\n";
-        for (j = 0; j < colCount; j++) {
-          var colHtml = convertSpans(trim(rowCells[j]), self);
-          html += ["  <td", align[j], ">", colHtml, "</td>\n"].join('');
-        }
-        html += "</tr>\n";
-      }
-
-      html += "</table>\n";
-
-      // replace html with placeholder until postConversion step
-      return self.hashExtraBlock(html);
-    }
-
-    return text;
-  };
-
-
-  /******************************************************************
-   * Footnotes                                                      *
-   *****************************************************************/
-  
-  // Strip footnote, store in hashes.
-  Markdown.Extra.prototype.stripFootnoteDefinitions = function(text) {
-    var self = this;
-
-    text = text.replace(
-      /\n[ ]{0,3}\[\^(.+?)\]\:[ \t]*\n?([\s\S]*?)\n{1,2}((?=\n[ ]{0,3}\S)|$)/g,
-      function(wholeMatch, m1, m2) {
-        m1 = slugify(m1);
-        m2 += "\n";
-        m2 = m2.replace(/^[ ]{0,3}/g, "");
-        self.footnotes[m1] = m2;
-        return "\n";
-      });
-
-    return text;
-  };
-  
-
-  // Find and convert footnotes references.
-  Markdown.Extra.prototype.doFootnotes = function(text) {
-    var self = this;
-    if(self.isConvertingFootnote === true) {
-      return text;
-    }
-
-    var footnoteCounter = 0;
-    text = text.replace(/\[\^(.+?)\]/g, function(wholeMatch, m1) {
-      var id = slugify(m1);
-      var footnote = self.footnotes[id];
-      if (footnote === undefined) {
-        return wholeMatch;
-      }
-      footnoteCounter++;
-      self.usedFootnotes.push(id);
-      var html = '<a href="#fn:' + id + '" id="fnref:' + id
-      + '" title="See footnote" class="footnote">' + footnoteCounter
-      + '</a>';
-      return self.hashExtraInline(html);
-    });
-
-    return text;
-  };
-
-  // Print footnotes at the end of the document
-  Markdown.Extra.prototype.printFootnotes = function(text) {
-    var self = this;
-
-    if (self.usedFootnotes.length === 0) {
-      return text;
-    }
-
-    text += '\n\n<div class="footnotes">\n<hr>\n<ol>\n\n';
-    for(var i=0; i<self.usedFootnotes.length; i++) {
-      var id = self.usedFootnotes[i];
-      var footnote = self.footnotes[id];
-      self.isConvertingFootnote = true;
-      var formattedfootnote = convertSpans(footnote, self);
-      delete self.isConvertingFootnote;
-      text += '<li id="fn:'
-        + id
-        + '">'
-        + formattedfootnote
-        + ' <a href="#fnref:'
-        + id
-        + '" title="Return to article" class="reversefootnote">&#8617;</a></li>\n\n';
-    }
-    text += '</ol>\n</div>';
-    return text;
-  };
-  
-  
-  /******************************************************************
-  * Fenced Code Blocks  (gfm)                                       *
-  ******************************************************************/
-
-  // Find and convert gfm-inspired fenced code blocks into html.
-  Markdown.Extra.prototype.fencedCodeBlocks = function(text) {
-    function encodeCode(code) {
-      code = code.replace(/&/g, "&amp;");
-      code = code.replace(/</g, "&lt;");
-      code = code.replace(/>/g, "&gt;");
-      // These were escaped by PageDown before postNormalization 
-      code = code.replace(/~D/g, "$$");
-      code = code.replace(/~T/g, "~");
-      return code;
-    }
-
-    var self = this;
-    text = text.replace(/(?:^|\n)```[ \t]*(\S*)[ \t]*\n([\s\S]*?)\n```[ \t]*(?=\n)/g, function(match, m1, m2) {
-      var language = m1, codeblock = m2;
-
-      // adhere to specified options
-      var preclass = self.googleCodePrettify ? ' class="prettyprint"' : '';
-      var codeclass = '';
-      if (language) {
-        if (self.googleCodePrettify || self.highlightJs) {
-          // use html5 language- class names. supported by both prettify and highlight.js
-          codeclass = ' class="language-' + language + '"';
-        } else {
-          codeclass = ' class="' + language + '"';
-        }
-      }
-
-      var html = ['<pre', preclass, '><code', codeclass, '>',
-                  encodeCode(codeblock), '</code></pre>'].join('');
-
-      // replace codeblock with placeholder until postConversion step
-      return self.hashExtraBlock(html);
-    });
-
-    return text;
-  };
-
-
-  /******************************************************************
-  * SmartyPants                                                     *
-  ******************************************************************/
-  
-  Markdown.Extra.prototype.educatePants = function(text) {
-    var self = this;
-    var result = '';
-    var blockOffset = 0;
-    // Here we parse HTML in a very bad manner
-    text.replace(/(?:<!--[\s\S]*?-->)|(<)([a-zA-Z1-6]+)([^\n]*?>)([\s\S]*?)(<\/\2>)/g, function(wholeMatch, m1, m2, m3, m4, m5, offset) {
-      var token = text.substring(blockOffset, offset);
-      result += self.applyPants(token);
-      self.smartyPantsLastChar = result.substring(result.length - 1);
-      blockOffset = offset + wholeMatch.length;
-      if(!m1) {
-        // Skip commentary
-        result += wholeMatch;
-        return;
-      }
-      // Skip special tags
-      if(!/code|kbd|pre|script|noscript|iframe|math|ins|del|pre/i.test(m2)) {
-        m4 = self.educatePants(m4);
-      }
-      else {
-        self.smartyPantsLastChar = m4.substring(m4.length - 1);
-      }
-      result += m1 + m2 + m3 + m4 + m5;
-    });
-    var lastToken = text.substring(blockOffset);
-    result += self.applyPants(lastToken);
-    self.smartyPantsLastChar = result.substring(result.length - 1);
-    return result;
-  };
-    
-  function revertPants(wholeMatch, m1) {
-    var blockText = m1;
-    blockText = blockText.replace(/&\#8220;/g, "\"");
-    blockText = blockText.replace(/&\#8221;/g, "\"");
-    blockText = blockText.replace(/&\#8216;/g, "'");
-    blockText = blockText.replace(/&\#8217;/g, "'");
-    blockText = blockText.replace(/&\#8212;/g, "---");
-    blockText = blockText.replace(/&\#8211;/g, "--");
-    blockText = blockText.replace(/&\#8230;/g, "...");
-    return blockText;
-  }
-  
-  Markdown.Extra.prototype.applyPants = function(text) {
-    // Dashes
-    text = text.replace(/---/g, "&#8212;").replace(/--/g, "&#8211;");
-    // Ellipses
-    text = text.replace(/\.\.\./g, "&#8230;").replace(/\.\s\.\s\./g, "&#8230;");
-    // Backticks
-    text = text.replace(/``/g, "&#8220;").replace (/''/g, "&#8221;");
-    
-    if(/^'$/.test(text)) {
-      // Special case: single-character ' token
-      if(/\S/.test(this.smartyPantsLastChar)) {
-        return "&#8217;";
-      }
-      return "&#8216;";
-    }
-    if(/^"$/.test(text)) {
-      // Special case: single-character " token
-      if(/\S/.test(this.smartyPantsLastChar)) {
-        return "&#8221;";
-      }
-      return "&#8220;";
-    }
-
-    // Special case if the very first character is a quote
-    // followed by punctuation at a non-word-break. Close the quotes by brute force:
-    text = text.replace (/^'(?=[!"#\$\%'()*+,\-.\/:;<=>?\@\[\\]\^_`{|}~]\B)/, "&#8217;");
-    text = text.replace (/^"(?=[!"#\$\%'()*+,\-.\/:;<=>?\@\[\\]\^_`{|}~]\B)/, "&#8221;");
-
-    // Special case for double sets of quotes, e.g.:
-    //   <p>He said, "'Quoted' words in a larger quote."</p>
-    text = text.replace(/"'(?=\w)/g, "&#8220;&#8216;");
-    text = text.replace(/'"(?=\w)/g, "&#8216;&#8220;");
-
-    // Special case for decade abbreviations (the '80s):
-    text = text.replace(/'(?=\d{2}s)/g, "&#8217;");
-    
-    // Get most opening single quotes:
-    text = text.replace(/(\s|&nbsp;|--|&[mn]dash;|&\#8211;|&\#8212;|&\#x201[34];)'(?=\w)/g, "$1&#8216;");
-    
-    // Single closing quotes:
-    text = text.replace(/([^\s\[\{\(\-])'/g, "$1&#8217;");
-    text = text.replace(/'(?=\s|s\b)/g, "&#8217;");
-
-    // Any remaining single quotes should be opening ones:
-    text = text.replace(/'/g, "&#8216;");
-    
-    // Get most opening double quotes:
-    text = text.replace(/(\s|&nbsp;|--|&[mn]dash;|&\#8211;|&\#8212;|&\#x201[34];)"(?=\w)/g, "$1&#8220;");
-    
-    // Double closing quotes:
-    text = text.replace(/([^\s\[\{\(\-])"/g, "$1&#8221;");
-    text = text.replace(/"(?=\s)/g, "&#8221;");
-    
-    // Any remaining quotes should be opening ones.
-    text = text.replace(/"/ig, "&#8220;");
-    return text;
-  };
-
-  // Find and convert markdown extra definition lists into html.
-  Markdown.Extra.prototype.runSmartyPants = function(text) {
-    this.smartyPantsLastChar = '';
-    text = this.educatePants(text);
-    // Clean everything inside html tags (some of them may have been converted due to our rough html parsing)
-    text = text.replace(/(<([a-zA-Z1-6]+)\b([^\n>]*?)(\/)?>)/g, revertPants);
-    return text;
-  };
-  
-  /******************************************************************
-  * Definition Lists                                                *
-  ******************************************************************/
-
-  // Find and convert markdown extra definition lists into html.
-  Markdown.Extra.prototype.definitionLists = function(text) {
-    var wholeList = new RegExp(
-      ['(\\x02\\n?|\\n\\n)'          ,
-       '(?:'                         ,
-         '('                         , // $1 = whole list
-           '('                       , // $2
-             '[ ]{0,3}'              ,
-             '((?:[ \\t]*\\S.*\\n)+)', // $3 = defined term
-             '\\n?'                  ,
-             '[ ]{0,3}:[ ]+'         , // colon starting definition
-           ')'                       ,
-           '([\\s\\S]+?)'            ,
-           '('                       , // $4
-               '(?=\\0x03)'          , // \z
-             '|'                     ,
-               '(?='                 ,
-                 '\\n{2,}'           ,
-                 '(?=\\S)'           ,
-                 '(?!'               , // Negative lookahead for another term
-                   '[ ]{0,3}'        ,
-                   '(?:\\S.*\\n)+?'  , // defined term
-                   '\\n?'            ,
-                   '[ ]{0,3}:[ ]+'   , // colon starting definition
-                 ')'                 ,
-                 '(?!'               , // Negative lookahead for another definition
-                   '[ ]{0,3}:[ ]+'   , // colon starting definition
-                 ')'                 ,
-               ')'                   ,
-           ')'                       ,
-         ')'                         ,
-       ')'
-      ].join(''),
-      'gm'
-    );
-
-    var self = this;
-    text = addAnchors(text);
-
-    text = text.replace(wholeList, function(match, pre, list) {
-      var result = trim(self.processDefListItems(list));
-      result = "<dl>\n" + result + "\n</dl>";
-      return pre + self.hashExtraBlock(result) + "\n\n";
-    });
-
-    return removeAnchors(text);
-  };
-
-  // Process the contents of a single definition list, splitting it
-  // into individual term and definition list items.
-  Markdown.Extra.prototype.processDefListItems = function(listStr) {
-    var self = this;
-
-    var dt = new RegExp(
-      ['(\\x02\\n?|\\n\\n+)'    , // leading line
-       '('                      , // definition terms = $1
-         '[ ]{0,3}'             , // leading whitespace
-         '(?![:][ ]|[ ])'       , // negative lookahead for a definition
-                                  //   mark (colon) or more whitespace
-         '(?:\\S.*\\n)+?'       , // actual term (not whitespace)
-       ')'                      ,
-       '(?=\\n?[ ]{0,3}:[ ])'     // lookahead for following line feed
-      ].join(''),                 //   with a definition mark
-      'gm'
-    );
-
-    var dd = new RegExp(
-      ['\\n(\\n+)?'              , // leading line = $1
-       '('                       , // marker space = $2
-         '[ ]{0,3}'              , // whitespace before colon
-         '[:][ ]+'               , // definition mark (colon)
-       ')'                       ,
-       '([\\s\\S]+?)'            , // definition text = $3
-       '(?=\\n*'                 , // stop at next definition mark,
-         '(?:'                   , // next term or end of text
-           '\\n[ ]{0,3}[:][ ]|'  ,
-           '<dt>|\\x03'          , // \z
-         ')'                     ,
-       ')'
-      ].join(''),
-      'gm'
-    );
-
-    listStr = addAnchors(listStr);
-    // trim trailing blank lines:
-    listStr = listStr.replace(/\n{2,}(?=\\x03)/, "\n");
-
-    // Process definition terms.
-    listStr = listStr.replace(dt, function(match, pre, termsStr) {
-      var terms = trim(termsStr).split("\n");
-      var text = '';
-      for (var i = 0; i < terms.length; i++) {
-        var term = terms[i];
-        // process spans inside dt
-        term = convertSpans(trim(term), self);
-        text += "\n<dt>" + term + "</dt>";
-      }
-      return text + "\n";
-    });
-
-    // Process actual definitions.
-    listStr = listStr.replace(dd, function(match, leadingLine, markerSpace, def) {
-      if (leadingLine || def.match(/\n{2,}/)) {
-        // replace marker with the appropriate whitespace indentation
-        def = Array(markerSpace.length + 1).join(' ') + def;
-        // process markdown inside definition
-        // TODO?: currently doesn't apply extensions
-        def = outdent(def) + "\n\n";
-        def = "\n" + convertAll(def, self) + "\n";
-      } else {
-        // convert span-level markdown inside definition
-        def = rtrim(def);
-        def = convertSpans(outdent(def), self);
-      }
-
-      return "\n<dd>" + def + "</dd>\n";
-    });
-
-    return removeAnchors(listStr);
-  };
-
-
-  /***********************************************************
-  * Strikethrough                                            *
-  ************************************************************/
-
-  Markdown.Extra.prototype.strikethrough = function(text) {
-    // Pretty much duplicated from _DoItalicsAndBold
-    return text.replace(/([\W_]|^)~T~T(?=\S)([^\r]*?\S[\*_]*)~T~T([\W_]|$)/g,
-      "$1<del>$2</del>$3");
-  };
-
-
-  /***********************************************************
-  * New lines                                                *
-  ************************************************************/
-
-  Markdown.Extra.prototype.newlines = function(text) {
-    // We have to ignore already converted newlines and line breaks in sub-list items
-    return text.replace(/(<(?:br|\/li)>)?\n/g, function(wholeMatch, previousTag) {
-      return previousTag ? wholeMatch : " <br>\n";
-    });
-  };
-  
-})();
-
-

admin/js/respond.js

@@ -1,237 +0,0 @@
-/*! Respond.js v1.4.2: min/max-width media query polyfill
- * Copyright 2013 Scott Jehl
- * Licensed under MIT
- * http://j.mp/respondjs */
-
-/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
-/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
-(function(w) {
-  "use strict";
-  w.matchMedia = w.matchMedia || function(doc, undefined) {
-    var bool, docElem = doc.documentElement, refNode = docElem.firstElementChild || docElem.firstChild, fakeBody = doc.createElement("body"), div = doc.createElement("div");
-    div.id = "mq-test-1";
-    div.style.cssText = "position:absolute;top:-100em";
-    fakeBody.style.background = "none";
-    fakeBody.appendChild(div);
-    return function(q) {
-      div.innerHTML = '&shy;<style media="' + q + '"> #mq-test-1 { width: 42px; }</style>';
-      docElem.insertBefore(fakeBody, refNode);
-      bool = div.offsetWidth === 42;
-      docElem.removeChild(fakeBody);
-      return {
-        matches: bool,
-        media: q
-      };
-    };
-  }(w.document);
-})(this);
-
-(function(w) {
-  "use strict";
-  var respond = {};
-  w.respond = respond;
-  respond.update = function() {};
-  var requestQueue = [], xmlHttp = function() {
-    var xmlhttpmethod = false;
-    try {
-      xmlhttpmethod = new w.XMLHttpRequest();
-    } catch (e) {
-      xmlhttpmethod = new w.ActiveXObject("Microsoft.XMLHTTP");
-    }
-    return function() {
-      return xmlhttpmethod;
-    };
-  }(), ajax = function(url, callback) {
-    var req = xmlHttp();
-    if (!req) {
-      return;
-    }
-    req.open("GET", url, true);
-    req.onreadystatechange = function() {
-      if (req.readyState !== 4 || req.status !== 200 && req.status !== 304) {
-        return;
-      }
-      callback(req.responseText);
-    };
-    if (req.readyState === 4) {
-      return;
-    }
-    req.send(null);
-  }, isUnsupportedMediaQuery = function(query) {
-    return query.replace(respond.regex.minmaxwh, "").match(respond.regex.other);
-  };
-  respond.ajax = ajax;
-  respond.queue = requestQueue;
-  respond.unsupportedmq = isUnsupportedMediaQuery;
-  respond.regex = {
-    media: /@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,
-    keyframes: /@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,
-    comments: /\/\*[^*]*\*+([^/][^*]*\*+)*\//gi,
-    urls: /(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,
-    findStyles: /@media *([^\{]+)\{([\S\s]+?)$/,
-    only: /(only\s+)?([a-zA-Z]+)\s?/,
-    minw: /\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,
-    maxw: /\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,
-    minmaxwh: /\(\s*m(in|ax)\-(height|width)\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/gi,
-    other: /\([^\)]*\)/g
-  };
-  respond.mediaQueriesSupported = w.matchMedia && w.matchMedia("only all") !== null && w.matchMedia("only all").matches;
-  if (respond.mediaQueriesSupported) {
-    return;
-  }
-  var doc = w.document, docElem = doc.documentElement, mediastyles = [], rules = [], appendedEls = [], parsedSheets = {}, resizeThrottle = 30, head = doc.getElementsByTagName("head")[0] || docElem, base = doc.getElementsByTagName("base")[0], links = head.getElementsByTagName("link"), lastCall, resizeDefer, eminpx, getEmValue = function() {
-    var ret, div = doc.createElement("div"), body = doc.body, originalHTMLFontSize = docElem.style.fontSize, originalBodyFontSize = body && body.style.fontSize, fakeUsed = false;
-    div.style.cssText = "position:absolute;font-size:1em;width:1em";
-    if (!body) {
-      body = fakeUsed = doc.createElement("body");
-      body.style.background = "none";
-    }
-    docElem.style.fontSize = "100%";
-    body.style.fontSize = "100%";
-    body.appendChild(div);
-    if (fakeUsed) {
-      docElem.insertBefore(body, docElem.firstChild);
-    }
-    ret = div.offsetWidth;
-    if (fakeUsed) {
-      docElem.removeChild(body);
-    } else {
-      body.removeChild(div);
-    }
-    docElem.style.fontSize = originalHTMLFontSize;
-    if (originalBodyFontSize) {
-      body.style.fontSize = originalBodyFontSize;
-    }
-    ret = eminpx = parseFloat(ret);
-    return ret;
-  }, applyMedia = function(fromResize) {
-    var name = "clientWidth", docElemProp = docElem[name], currWidth = doc.compatMode === "CSS1Compat" && docElemProp || doc.body[name] || docElemProp, styleBlocks = {}, lastLink = links[links.length - 1], now = new Date().getTime();
-    if (fromResize && lastCall && now - lastCall < resizeThrottle) {
-      w.clearTimeout(resizeDefer);
-      resizeDefer = w.setTimeout(applyMedia, resizeThrottle);
-      return;
-    } else {
-      lastCall = now;
-    }
-    for (var i in mediastyles) {
-      if (mediastyles.hasOwnProperty(i)) {
-        var thisstyle = mediastyles[i], min = thisstyle.minw, max = thisstyle.maxw, minnull = min === null, maxnull = max === null, em = "em";
-        if (!!min) {
-          min = parseFloat(min) * (min.indexOf(em) > -1 ? eminpx || getEmValue() : 1);
-        }
-        if (!!max) {
-          max = parseFloat(max) * (max.indexOf(em) > -1 ? eminpx || getEmValue() : 1);
-        }
-        if (!thisstyle.hasquery || (!minnull || !maxnull) && (minnull || currWidth >= min) && (maxnull || currWidth <= max)) {
-          if (!styleBlocks[thisstyle.media]) {
-            styleBlocks[thisstyle.media] = [];
-          }
-          styleBlocks[thisstyle.media].push(rules[thisstyle.rules]);
-        }
-      }
-    }
-    for (var j in appendedEls) {
-      if (appendedEls.hasOwnProperty(j)) {
-        if (appendedEls[j] && appendedEls[j].parentNode === head) {
-          head.removeChild(appendedEls[j]);
-        }
-      }
-    }
-    appendedEls.length = 0;
-    for (var k in styleBlocks) {
-      if (styleBlocks.hasOwnProperty(k)) {
-        var ss = doc.createElement("style"), css = styleBlocks[k].join("\n");
-        ss.type = "text/css";
-        ss.media = k;
-        head.insertBefore(ss, lastLink.nextSibling);
-        if (ss.styleSheet) {
-          ss.styleSheet.cssText = css;
-        } else {
-          ss.appendChild(doc.createTextNode(css));
-        }
-        appendedEls.push(ss);
-      }
-    }
-  }, translate = function(styles, href, media) {
-    var qs = styles.replace(respond.regex.comments, "").replace(respond.regex.keyframes, "").match(respond.regex.media), ql = qs && qs.length || 0;
-    href = href.substring(0, href.lastIndexOf("/"));
-    var repUrls = function(css) {
-      return css.replace(respond.regex.urls, "$1" + href + "$2$3");
-    }, useMedia = !ql && media;
-    if (href.length) {
-      href += "/";
-    }
-    if (useMedia) {
-      ql = 1;
-    }
-    for (var i = 0; i < ql; i++) {
-      var fullq, thisq, eachq, eql;
-      if (useMedia) {
-        fullq = media;
-        rules.push(repUrls(styles));
-      } else {
-        fullq = qs[i].match(respond.regex.findStyles) && RegExp.$1;
-        rules.push(RegExp.$2 && repUrls(RegExp.$2));
-      }
-      eachq = fullq.split(",");
-      eql = eachq.length;
-      for (var j = 0; j < eql; j++) {
-        thisq = eachq[j];
-        if (isUnsupportedMediaQuery(thisq)) {
-          continue;
-        }
-        mediastyles.push({
-          media: thisq.split("(")[0].match(respond.regex.only) && RegExp.$2 || "all",
-          rules: rules.length - 1,
-          hasquery: thisq.indexOf("(") > -1,
-          minw: thisq.match(respond.regex.minw) && parseFloat(RegExp.$1) + (RegExp.$2 || ""),
-          maxw: thisq.match(respond.regex.maxw) && parseFloat(RegExp.$1) + (RegExp.$2 || "")
-        });
-      }
-    }
-    applyMedia();
-  }, makeRequests = function() {
-    if (requestQueue.length) {
-      var thisRequest = requestQueue.shift();
-      ajax(thisRequest.href, function(styles) {
-        translate(styles, thisRequest.href, thisRequest.media);
-        parsedSheets[thisRequest.href] = true;
-        w.setTimeout(function() {
-          makeRequests();
-        }, 0);
-      });
-    }
-  }, ripCSS = function() {
-    for (var i = 0; i < links.length; i++) {
-      var sheet = links[i], href = sheet.href, media = sheet.media, isCSS = sheet.rel && sheet.rel.toLowerCase() === "stylesheet";
-      if (!!href && isCSS && !parsedSheets[href]) {
-        if (sheet.styleSheet && sheet.styleSheet.rawCssText) {
-          translate(sheet.styleSheet.rawCssText, href, media);
-          parsedSheets[href] = true;
-        } else {
-          if (!/^([a-zA-Z:]*\/\/)/.test(href) && !base || href.replace(RegExp.$1, "").split("/")[0] === w.location.host) {
-            if (href.substring(0, 2) === "//") {
-              href = w.location.protocol + href;
-            }
-            requestQueue.push({
-              href: href,
-              media: media
-            });
-          }
-        }
-      }
-    }
-    makeRequests();
-  };
-  ripCSS();
-  respond.update = ripCSS;
-  respond.getEmValue = getEmValue;
-  function callMedia() {
-    applyMedia(true);
-  }
-  if (w.addEventListener) {
-    w.addEventListener("resize", callMedia, false);
-  } else if (w.attachEvent) {
-    w.attachEvent("onresize", callMedia);
-  }
-})(this);

admin/login.php

@@ -4,8 +4,8 @@ include 'common.php';
 if ($user->hasLogin()) {
     $response->redirect($options->adminUrl);
 }
-$rememberName = htmlspecialchars(Typecho_Cookie::get('__typecho_remember_name'));
-Typecho_Cookie::delete('__typecho_remember_name');
+$rememberName = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_name', ''));
+\Typecho\Cookie::delete('__typecho_remember_name');
 
 $bodyClass = 'body-100';
 
@@ -13,22 +13,24 @@ include 'header.php';
 ?>
 <div class="typecho-login-wrap">
     <div class="typecho-login">
-        <h1><a href="http://typecho.org" class="i-logo">Typecho</a></h1>
+        <h1><a href="https://typecho.org" class="i-logo">Typecho</a></h1>
         <form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form">
             <p>
-                <label for="name" class="sr-only"><?php _e('用户名'); ?></label>
-                <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" autofocus />
+                <label for="name" class="sr-only"><?php _e('用户名或邮箱'); ?></label>
+                <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名或邮箱'); ?>" class="text-l w-100" autofocus />
             </p>
             <p>
                 <label for="password" class="sr-only"><?php _e('密码'); ?></label>
-                <input type="password" id="password" name="password" class="text-l w-100" placeholder="<?php _e('密码'); ?>" />
+                <input type="password" id="password" name="password" class="text-l w-100" placeholder="<?php _e('密码'); ?>" required />
             </p>
             <p class="submit">
                 <button type="submit" class="btn btn-l w-100 primary"><?php _e('登录'); ?></button>
-                <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
+                <input type="hidden" name="referer" value="<?php echo $request->filter('html')->get('referer'); ?>" />
             </p>
             <p>
-                <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('下次自动登录'); ?></label>
+                <label for="remember">
+                    <input<?php if(\Typecho\Cookie::get('__typecho_remember_remember')): ?> checked<?php endif; ?> type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('下次自动登录'); ?>
+                </label>
             </p>
         </form>
         

admin/manage-categories.php

@@ -3,27 +3,35 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-Typecho_Widget::widget('Widget_Metas_Category_Admin')->to($categories);
+\Widget\Metas\Category\Admin::alloc()->to($categories);
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main manage-metas">
-            
-                <div class="col-mb-12" role="main">
-                    
-                    <form method="post" name="manage_categories" class="operate-form">
-                    <div class="typecho-list-operate clearfix">
+
+            <div class="col-mb-12" role="main">
+
+                <form method="post" name="manage_categories" class="operate-form">
+                    <div class="typecho-list-operate">
                         <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
+                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                                   class="typecho-table-select-all"/></label>
                             <div class="btn-group btn-drop">
-                                <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+                                <button class="btn dropdown-toggle btn-s" type="button"><i
+                                        class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                        class="i-caret-down"></i></button>
                                 <ul class="dropdown-menu">
-                                    <li><a lang="<?php _e('此分类下的所有内容将被删除, 你确认要删除这些分类吗?'); ?>" href="<?php $security->index('/action/metas-category-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                                    <li><a lang="<?php _e('刷新分类可能需要等待较长时间, 你确认要刷新这些分类吗?'); ?>" href="<?php $security->index('/action/metas-category-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a></li>
+                                    <li><a lang="<?php _e('此分类下的所有内容将被删除, 你确认要删除这些分类吗?'); ?>"
+                                           href="<?php $security->index('/action/metas-category-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                    </li>
+                                    <li><a lang="<?php _e('刷新分类可能需要等待较长时间, 你确认要刷新这些分类吗?'); ?>"
+                                           href="<?php $security->index('/action/metas-category-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a>
+                                    </li>
                                     <li class="multiline">
-                                        <button type="button" class="btn merge btn-s" rel="<?php $security->index('/action/metas-category-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>
+                                        <button type="button" class="btn merge btn-s"
+                                                rel="<?php $security->index('/action/metas-category-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>
                                         <select name="merge">
                                             <?php $categories->parse('<option value="{mid}">{name}</option>'); ?>
                                         </select>
@@ -36,67 +44,74 @@ Typecho_Widget::widget('Widget_Metas_Category_Admin')->to($categories);
                         </div>
                     </div>
 
-                    <div class="typecho-table-wrap">
-                        <table class="typecho-list-table">
-                            <colgroup>
-                                <col width="20"/>
-                                <col width="30%"/>
-                                <col width="15%"/>
-                                <col width="25%"/>
-                                <col width=""/>
-                                <col width="10%"/>
-                            </colgroup>
-                            <thead>
-                                <tr class="nodrag">
-                                    <th> </th>
-                                    <th><?php _e('名称'); ?></th>
-                                    <th><?php _e('子分类'); ?></th>
-                                    <th><?php _e('缩略名'); ?></th>
-                                    <th> </th>
-                                    <th><?php _e('文章数'); ?></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <?php if($categories->have()): ?>
-                                <?php while ($categories->next()): ?>
+                    <table class="typecho-list-table">
+                        <colgroup>
+                            <col width="3%" class="kit-hidden-mb"/>
+                            <col width=""/>
+                            <col width="15%" class="kit-hidden-mb"/>
+                            <col width="20%"/>
+                            <col width="15%"/>
+                            <col width="15%" class="kit-hidden-mb"/>
+                        </colgroup>
+                        <thead>
+                        <tr class="nodrag">
+                            <th class="kit-hidden-mb"></th>
+                            <th><?php _e('名称'); ?></th>
+                            <th><?php _e('子分类'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('缩略名'); ?></th>
+                            <th></th>
+                            <th class="kit-hidden-mb"><?php _e('文章数'); ?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php if ($categories->have()): ?>
+                            <?php while ($categories->next()): ?>
                                 <tr id="mid-<?php $categories->theId(); ?>">
-                                    <td><input type="checkbox" value="<?php $categories->mid(); ?>" name="mid[]"/></td>
-                                    <td><a href="<?php $options->adminUrl('category.php?mid=' . $categories->mid); ?>"><?php $categories->name(); ?></a> 
-                                    <a href="<?php $categories->permalink(); ?>" title="<?php _e('浏览 %s', $categories->name); ?>"><i class="i-exlink"></i></a>
+                                    <td class="kit-hidden-mb"><input type="checkbox"
+                                                                     value="<?php $categories->mid(); ?>"
+                                                                     name="mid[]"/></td>
+                                    <td>
+                                        <a href="<?php $options->adminUrl('category.php?mid=' . $categories->mid); ?>"><?php $categories->name(); ?></a>
+                                        <a href="<?php $categories->permalink(); ?>"
+                                           title="<?php _e('浏览 %s', $categories->name); ?>"><i class="i-exlink"></i></a>
                                     </td>
                                     <td>
-                                    
-                                    <?php if (count($categories->children) > 0): ?>
-                                    <a href="<?php $options->adminUrl('manage-categories.php?parent=' . $categories->mid); ?>"><?php echo _n('一个分类', '%d个分类', count($categories->children)); ?></a>
-                                    <?php else: ?>
-                                    <a href="<?php $options->adminUrl('category.php?parent=' . $categories->mid); ?>"><?php echo _e('新增'); ?></a>
-                                    <?php endif; ?>
+
+                                        <?php if (count($categories->children) > 0): ?>
+                                            <a href="<?php $options->adminUrl('manage-categories.php?parent=' . $categories->mid); ?>"><?php echo _n('一个分类', '%d个分类', count($categories->children)); ?></a>
+                                        <?php else: ?>
+                                            <a href="<?php $options->adminUrl('category.php?parent=' . $categories->mid); ?>"><?php echo _e('新增'); ?></a>
+                                        <?php endif; ?>
                                     </td>
-                                    <td><?php $categories->slug(); ?></td>
+                                    <td class="kit-hidden-mb"><?php $categories->slug(); ?></td>
                                     <td>
-                                    <?php if ($options->defaultCategory == $categories->mid): ?>
-                                    <?php _e('默认'); ?>
-                                    <?php else: ?>
-                                    <a class="hidden-by-mouse" href="<?php $security->index('/action/metas-category-edit?do=default&mid=' . $categories->mid); ?>" title="<?php _e('设为默认'); ?>"><?php _e('默认'); ?></a>
-                                    <?php endif; ?>
+                                        <?php if ($options->defaultCategory == $categories->mid): ?>
+                                            <?php _e('默认'); ?>
+                                        <?php else: ?>
+                                            <a class="hidden-by-mouse"
+                                               href="<?php $security->index('/action/metas-category-edit?do=default&mid=' . $categories->mid); ?>"
+                                               title="<?php _e('设为默认'); ?>"><?php _e('默认'); ?></a>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td class="kit-hidden-mb"><a
+                                            class="balloon-button left size-<?php echo \Typecho\Common::splitByCount($categories->count, 1, 10, 20, 50, 100); ?>"
+                                            href="<?php $options->adminUrl('manage-posts.php?category=' . $categories->mid); ?>"><?php $categories->count(); ?></a>
                                     </td>
-                                    <td><a class="balloon-button left size-<?php echo Typecho_Common::splitByCount($categories->count, 1, 10, 20, 50, 100); ?>" href="<?php $options->adminUrl('manage-posts.php?category=' . $categories->mid); ?>"><?php $categories->count(); ?></a></td>
                                 </tr>
-                                <?php endwhile; ?>
-                                <?php else: ?>
-                                <tr>
-                                    <td colspan="6"><h6 class="typecho-list-table-title"><?php _e('没有任何分类'); ?></h6></td>
-                                </tr>
-                                <?php endif; ?>
-                            </tbody>
-                        </table>
-                    </div>
-                    </form>
-                    
-                </div>
+                            <?php endwhile; ?>
+                        <?php else: ?>
+                            <tr>
+                                <td colspan="6" class="none"><?php _e('没有任何分类'); ?></td>
+                            </tr>
+                        <?php endif; ?>
+                        </tbody>
+                    </table>
+                </form>
+
+            </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';
@@ -104,51 +119,51 @@ include 'common-js.php';
 ?>
 
 <script type="text/javascript">
-(function () {
-    $(document).ready(function () {
-        var table = $('.typecho-list-table').tableDnD({
-            onDrop : function () {
-                var ids = [];
+    (function () {
+        $(document).ready(function () {
+            var table = $('.typecho-list-table').tableDnD({
+                onDrop: function () {
+                    var ids = [];
 
-                $('input[type=checkbox]', table).each(function () {
-                    ids.push($(this).val());
-                });
+                    $('input[type=checkbox]', table).each(function () {
+                        ids.push($(this).val());
+                    });
 
-                $.post('<?php $security->index('/action/metas-category-edit?do=sort'); ?>',
-                    $.param({mid : ids}));
+                    $.post('<?php $security->index('/action/metas-category-edit?do=sort'); ?>',
+                        $.param({mid: ids}));
 
-                $('tr', table).each(function (i) {
-                    if (i % 2) {
-                        $(this).addClass('even');
-                    } else {
-                        $(this).removeClass('even');
-                    }
-                });
-            }
+                    $('tr', table).each(function (i) {
+                        if (i % 2) {
+                            $(this).addClass('even');
+                        } else {
+                            $(this).removeClass('even');
+                        }
+                    });
+                }
+            });
+
+            table.tableSelectable({
+                checkEl: 'input[type=checkbox]',
+                rowEl: 'tr',
+                selectAllEl: '.typecho-table-select-all',
+                actionEl: '.dropdown-menu a'
+            });
+
+            $('.btn-drop').dropdownMenu({
+                btnEl: '.dropdown-toggle',
+                menuEl: '.dropdown-menu'
+            });
+
+            $('.dropdown-menu button.merge').click(function () {
+                var btn = $(this);
+                btn.parents('form').attr('action', btn.attr('rel')).submit();
+            });
+
+            <?php if (isset($request->mid)): ?>
+            $('.typecho-mini-panel').effect('highlight', '#AACB36');
+            <?php endif; ?>
         });
-
-        table.tableSelectable({
-            checkEl     :   'input[type=checkbox]',
-            rowEl       :   'tr',
-            selectAllEl :   '.typecho-table-select-all',
-            actionEl    :   '.dropdown-menu a'
-        });
-
-        $('.btn-drop').dropdownMenu({
-            btnEl       :   '.dropdown-toggle',
-            menuEl      :   '.dropdown-menu'
-        });
-
-        $('.dropdown-menu button.merge').click(function () {
-            var btn = $(this);
-            btn.parents('form').attr('action', btn.attr('rel')).submit();
-        });
-
-        <?php if (isset($request->mid)): ?>
-        $('.typecho-mini-panel').effect('highlight', '#AACB36');
-        <?php endif; ?>
-    });
-})();
+    })();
 </script>
 <?php include 'footer.php'; ?>
 

admin/manage-comments.php

@@ -3,27 +3,21 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
-$comments = Typecho_Widget::widget('Widget_Comments_Admin');
-$isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typecho_Cookie::get('__typecho_all_comments'));
+$stat = \Widget\Stat::alloc();
+$comments = \Widget\Comments\Admin::alloc();
+$isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == \Typecho\Cookie::get('__typecho_all_comments'));
 ?>
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
-                <div class="clearfix">
-                    <ul class="typecho-option-tabs right">
-                    <?php if($user->pass('editor', true) && !isset($request->cid)): ?>
-                        <li class="<?php if($isAllComments): ?> current<?php endif; ?>"><a href="<?php echo $request->makeUriByRequest('__typecho_all_comments=on'); ?>"><?php _e('所有'); ?></a></li>
-                        <li class="<?php if(!$isAllComments): ?> current<?php endif; ?>"><a href="<?php echo $request->makeUriByRequest('__typecho_all_comments=off'); ?>"><?php _e('我的'); ?></a></li>
-                    <?php endif; ?>
-                    </ul>
+                <div class="typecho-list-operate">
                     <ul class="typecho-option-tabs">
                         <li<?php if(!isset($request->status) || 'approved' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php'
-                        . (isset($request->cid) ? '?cid=' . $request->cid : '')); ?>"><?php _e('已通过'); ?></a></li>
+                        . (isset($request->cid) ? '?cid=' . $request->filter('encode')->cid : '')); ?>"><?php _e('已通过'); ?></a></li>
                         <li<?php if('waiting' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'
-                        . (isset($request->cid) ? '&cid=' . $request->cid : '')); ?>"><?php _e('待审核'); ?>
+                        . (isset($request->cid) ? '&cid=' . $request->filter('encode')->cid : '')); ?>"><?php _e('待审核'); ?>
                         <?php if(!$isAllComments && $stat->myWaitingCommentsNum > 0 && !isset($request->cid)): ?> 
                             <span class="balloon"><?php $stat->myWaitingCommentsNum(); ?></span>
                         <?php elseif($isAllComments && $stat->waitingCommentsNum > 0 && !isset($request->cid)): ?>
@@ -33,7 +27,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
                         <?php endif; ?>
                         </a></li>
                         <li<?php if('spam' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php?status=spam'
-                        . (isset($request->cid) ? '&cid=' . $request->cid : '')); ?>"><?php _e('垃圾'); ?>
+                        . (isset($request->cid) ? '&cid=' . $request->filter('encode')->cid : '')); ?>"><?php _e('垃圾'); ?>
                         <?php if(!$isAllComments && $stat->mySpamCommentsNum > 0 && !isset($request->cid)): ?> 
                             <span class="balloon"><?php $stat->mySpamCommentsNum(); ?></span>
                         <?php elseif($isAllComments && $stat->spamCommentsNum > 0 && !isset($request->cid)): ?>
@@ -43,58 +37,62 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
                         <?php endif; ?>
                         </a></li>
                     </ul>
+
+                    <?php if($user->pass('editor', true) && !isset($request->cid)): ?>
+                    <ul class="typecho-option-tabs">
+                        <li class="<?php if($isAllComments): ?> current<?php endif; ?>"><a href="<?php echo $request->makeUriByRequest('__typecho_all_comments=on'); ?>"><?php _e('所有'); ?></a></li>
+                        <li class="<?php if(!$isAllComments): ?> current<?php endif; ?>"><a href="<?php echo $request->makeUriByRequest('__typecho_all_comments=off'); ?>"><?php _e('我的'); ?></a></li>
+                    </ul>
+                    <?php endif; ?>
                 </div>
             
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                            <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
-                            <ul class="dropdown-menu">
-                                <li><a href="<?php $security->index('/action/comments-edit?do=approved'); ?>"><?php _e('通过'); ?></a></li>
-                                <li><a href="<?php $security->index('/action/comments-edit?do=waiting'); ?>"><?php _e('待审核'); ?></a></li>
-                                <li><a href="<?php $security->index('/action/comments-edit?do=spam'); ?>"><?php _e('标记垃圾'); ?></a></li>
-                                <li><a lang="<?php _e('你确认要删除这些评论吗?'); ?>" href="<?php $security->index('/action/comments-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                            </ul>
-                            <?php if('spam' == $request->get('status')): ?>
-                                <button lang="<?php _e('你确认要删除所有垃圾评论吗?'); ?>" class="btn btn-s btn-warn btn-operate" href="<?php $security->index('/action/comments-edit?do=delete-spam'); ?>"><?php _e('删除所有垃圾评论'); ?></button>
-                            <?php endif; ?>
-                            </div>
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
+                        <div class="btn-group btn-drop">
+                        <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+                        <ul class="dropdown-menu">
+                            <li><a href="<?php $security->index('/action/comments-edit?do=approved'); ?>"><?php _e('通过'); ?></a></li>
+                            <li><a href="<?php $security->index('/action/comments-edit?do=waiting'); ?>"><?php _e('待审核'); ?></a></li>
+                            <li><a href="<?php $security->index('/action/comments-edit?do=spam'); ?>"><?php _e('标记垃圾'); ?></a></li>
+                            <li><a lang="<?php _e('你确认要删除这些评论吗?'); ?>" href="<?php $security->index('/action/comments-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                        </ul>
+                        <?php if('spam' == $request->get('status')): ?>
+                            <button lang="<?php _e('你确认要删除所有垃圾评论吗?'); ?>" class="btn btn-s btn-warn btn-operate" href="<?php $security->index('/action/comments-edit?do=delete-spam'); ?>"><?php _e('删除所有垃圾评论'); ?></button>
+                        <?php endif; ?>
                         </div>
-                        <div class="search" role="search">
-                            <?php if ('' != $request->keywords || '' != $request->category): ?>
-                            <a href="<?php $options->adminUrl('manage-comments.php' 
-                            . (isset($request->status) || isset($request->cid) ? '?' .
-                            (isset($request->status) ? 'status=' . htmlspecialchars($request->get('status')) : '') .
-                            (isset($request->cid) ? (isset($request->status) ? '&' : '') . 'cid=' . htmlspecialchars($request->get('cid')) : '') : '')); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
-                            <?php endif; ?>
-                            <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
-                            <?php if(isset($request->status)): ?>
-                                <input type="hidden" value="<?php echo htmlspecialchars($request->get('status')); ?>" name="status" />
-                            <?php endif; ?>
-                            <?php if(isset($request->cid)): ?>
-                                <input type="hidden" value="<?php echo htmlspecialchars($request->get('cid')); ?>" name="cid" />
-                            <?php endif; ?>
-                            <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
-                        </div>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
-                
+                    </div>
+                    <div class="search" role="search">
+                        <?php if ('' != $request->keywords || '' != $request->category): ?>
+                        <a href="<?php $options->adminUrl('manage-comments.php'
+                        . (isset($request->status) || isset($request->cid) ? '?' .
+                        (isset($request->status) ? 'status=' . $request->filter('encode')->status : '') .
+                        (isset($request->cid) ? (isset($request->status) ? '&' : '') . 'cid=' . $request->filter('encode')->cid : '') : '')); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
+                        <?php endif; ?>
+                        <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo $request->filter('html')->keywords; ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                        <?php if(isset($request->status)): ?>
+                            <input type="hidden" value="<?php echo $request->filter('html')->status; ?>" name="status" />
+                        <?php endif; ?>
+                        <?php if(isset($request->cid)): ?>
+                            <input type="hidden" value="<?php echo $request->filter('html')->cid; ?>" name="cid" />
+                        <?php endif; ?>
+                        <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
+                    </div>
+                </form>
+
                 <form method="post" name="manage_comments" class="operate-form">
-                <div class="typecho-table-wrap">
                     <table class="typecho-list-table">
                         <colgroup>
-                            <col width="3%"/>
-                            <col width="6%" />
+                            <col width="3%" class="kit-hidden-mb"/>
+                            <col width="6%" class="kit-hidden" />
                             <col width="20%"/>
                             <col width="71%"/>
                         </colgroup>
                         <thead>
                             <tr>
-                                <th> </th>
+                                <th class="kit-hidden-mb"> </th>
                                 <th><?php _e('作者'); ?></th>
-                                <th> </th>
+                                <th class="kit-hidden-mb"> </th>
                                 <th><?php _e('内容'); ?></th>
                             </tr>
                         </thead>
@@ -112,15 +110,15 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
                             'text'      =>  $comments->text
                         );
 
-                        echo htmlspecialchars(Json::encode($comment));
+                        echo htmlspecialchars(json_encode($comment));
                         ?>">
-                            <td valign="top">
+                            <td valign="top" class="kit-hidden-mb">
                                 <input type="checkbox" value="<?php $comments->coid(); ?>" name="coid[]"/>
                             </td>
-                            <td valign="top">
+                            <td valign="top" class="kit-hidden">
                                 <div class="comment-avatar">
                                     <?php if ('comment' == $comments->type): ?>
-                                    <?php $comments->gravatar(40); ?>
+                                    <?php $comments->gravatar(40, null, true); ?>
                                     <?php endif; ?>
                                     <?php if ('comment' != $comments->type): ?>
                                     <?php _e('引用'); ?>
@@ -131,7 +129,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
                                 <div class="comment-meta">
                                     <strong class="comment-author"><?php $comments->author(true); ?></strong>
                                     <?php if($comments->mail): ?>
-                                    <br /><span><a href="mailto:<?php $comments->mail(); ?>"><?php $comments->mail(); ?></a></span>
+                                    <br /><span><a href="<?php $comments->mail(true); ?>"><?php $comments->mail(); ?></a></span>
                                     <?php endif; ?>
                                     <?php if($comments->ip): ?>
                                     <br /><span><?php $comments->ip(); ?></span>
@@ -175,46 +173,43 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
                         <?php endwhile; ?>
                         <?php else: ?>
                         <tr>
-                            <td colspan="4"><h6 class="typecho-list-table-title"><?php _e('没有评论') ?></h6></td>
+                            <td colspan="4" class="none"><?php _e('没有评论') ?></td>
                         </tr>
                         <?php endif; ?>
                         </tbody>
                     </table><!-- end .typecho-list-table -->
-                </div><!-- end .typecho-table-wrap -->
 
                 <?php if(isset($request->cid)): ?>
-                <input type="hidden" value="<?php echo htmlspecialchars($request->get('cid')); ?>" name="cid" />
+                <input type="hidden" value="<?php echo $request->filter('html')->cid; ?>" name="cid" />
                 <?php endif; ?>
                 </form><!-- end .operate-form -->
 
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                            <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
-                            <ul class="dropdown-menu">
-                                <li><a href="<?php $security->index('/action/comments-edit?do=approved'); ?>"><?php _e('通过'); ?></a></li>
-                                <li><a href="<?php $security->index('/action/comments-edit?do=waiting'); ?>"><?php _e('待审核'); ?></a></li>
-                                <li><a href="<?php $security->index('/action/comments-edit?do=spam'); ?>"><?php _e('标记垃圾'); ?></a></li>
-                                <li><a lang="<?php _e('你确认要删除这些评论吗?'); ?>" href="<?php $security->index('/action/comments-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                            </ul>
-                            <?php if('spam' == $request->get('status')): ?>
-                                <button lang="<?php _e('你确认要删除所有垃圾评论吗?'); ?>" class="btn btn-s btn-warn btn-operate" href="<?php $security->index('/action/comments-edit?do=delete-spam'); ?>"><?php _e('删除所有垃圾评论'); ?></button>
-                            <?php endif; ?>
-                            </div>
-                        </div>
-                        <?php if($comments->have()): ?>
-                        <ul class="typecho-pager">
-                            <?php $comments->pageNav(); ?>
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
+                        <div class="btn-group btn-drop">
+                        <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+                        <ul class="dropdown-menu">
+                            <li><a href="<?php $security->index('/action/comments-edit?do=approved'); ?>"><?php _e('通过'); ?></a></li>
+                            <li><a href="<?php $security->index('/action/comments-edit?do=waiting'); ?>"><?php _e('待审核'); ?></a></li>
+                            <li><a href="<?php $security->index('/action/comments-edit?do=spam'); ?>"><?php _e('标记垃圾'); ?></a></li>
+                            <li><a lang="<?php _e('你确认要删除这些评论吗?'); ?>" href="<?php $security->index('/action/comments-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
                         </ul>
+                        <?php if('spam' == $request->get('status')): ?>
+                            <button lang="<?php _e('你确认要删除所有垃圾评论吗?'); ?>" class="btn btn-s btn-warn btn-operate" href="<?php $security->index('/action/comments-edit?do=delete-spam'); ?>"><?php _e('删除所有垃圾评论'); ?></button>
                         <?php endif; ?>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
+                        </div>
+                    </div>
+                    <?php if($comments->have()): ?>
+                    <ul class="typecho-pager">
+                        <?php $comments->pageNav(); ?>
+                    </ul>
+                    <?php endif; ?>
+                </form>
             </div><!-- end .typecho-list -->
         </div><!-- end .typecho-page-main -->
     </div>
-</div>
+</main>
 <?php
 include 'copyright.php';
 include 'common-js.php';
@@ -279,10 +274,12 @@ $(document).ready(function () {
             form.submit(function () {
                 var t = $(this), tr = t.parents('tr'), 
                     reply = $('<div class="comment-reply-content"></div>').insertAfter($('.comment-content', tr));
-                
-                reply.html('<p>' + textarea.val() + '</p>');
+
+                var html = DOMPurify.sanitize(textarea.val(), {USE_PROFILES: {html: true}});
+                reply.html('<p>' + html + '</p>');
                 $.post(t.attr('action'), t.serialize(), function (o) {
-                    reply.html(o.comment.content)
+                    var html = DOMPurify.sanitize(o.comment.content, {USE_PROFILES: {html: true}});
+                    reply.html(html)
                         .effect('highlight');
                 }, 'json');
 
@@ -340,7 +337,7 @@ $(document).ready(function () {
                 }
             });
 
-            var html = '<strong class="comment-author">'
+            var unsafeHTML = '<strong class="comment-author">'
                 + (comment.url ? '<a target="_blank" href="' + comment.url + '">'
                 + comment.author + '</a>' : comment.author) + '</strong>'
                 + ('comment' != comment.type ? '<small><?php _e('引用'); ?></small>' : '')
@@ -348,13 +345,16 @@ $(document).ready(function () {
                 + comment.mail + '</a></span>' : '')
                 + (comment.ip ? '<br /><span>' + comment.ip + '</span>' : '');
 
+            var html = DOMPurify.sanitize(unsafeHTML, {USE_PROFILES: {html: true}});
+            var content = DOMPurify.sanitize(comment.text, {USE_PROFILES: {html: true}});
             $('.comment-meta', oldTr).html(html)
                 .effect('highlight');
-            $('.comment-content', oldTr).html('<p>' + comment.text + '</p>');
+            $('.comment-content', oldTr).html('<p>' + content + '</p>');
             oldTr.data('comment', comment);
 
             $.post(t.attr('action'), comment, function (o) {
-                $('.comment-content', oldTr).html(o.comment.content)
+                var content = DOMPurify.sanitize(o.comment.content, {USE_PROFILES: {html: true}});
+                $('.comment-content', oldTr).html('<p>' + content + '</p>')
                     .effect('highlight');
             }, 'json');
             

admin/manage-medias.php

@@ -3,116 +3,131 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
+$stat = \Widget\Stat::alloc();
+$attachments = \Widget\Contents\Attachment\Admin::alloc();
 ?>
-
-<?php Typecho_Widget::widget('Widget_Contents_Attachment_Admin')->to($attachments); ?>
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
-                
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                            <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
                             <ul class="dropdown-menu">
-                                <li><a lang="<?php _e('你确认要删除这些文件吗?'); ?>" href="<?php $security->index('/action/contents-attachment-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                                <li><a lang="<?php _e('你确认要删除这些文件吗?'); ?>"
+                                       href="<?php $security->index('/action/contents-attachment-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
                             </ul>
-                            <button class="btn btn-s btn-warn btn-operate" href="<?php $security->index('/action/contents-attachment-edit?do=clear'); ?>" lang="<?php _e('您确认要清理未归档的文件吗?'); ?>"><?php _e('清理未归档文件'); ?></button>
-                            </div>
+                            <button class="btn btn-s btn-warn btn-operate"
+                                    href="<?php $security->index('/action/contents-attachment-edit?do=clear'); ?>"
+                                    lang="<?php _e('您确认要清理未归档的文件吗?'); ?>"><?php _e('清理未归档文件'); ?></button>
                         </div>
-                        <div class="search" role="search">
-                            <?php if ('' != $request->keywords): ?>
+                    </div>
+                    <div class="search" role="search">
+                        <?php if ('' != $request->keywords): ?>
                             <a href="<?php $options->adminUrl('manage-medias.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
-                            <?php endif; ?>
-                            <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
-                            <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
-                        </div>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
-            
+                        <?php endif; ?>
+                        <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
+                               value="<?php echo $request->filter('html')->keywords; ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                        <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
+                    </div>
+                </form>
+
                 <form method="post" name="manage_medias" class="operate-form">
-                <div class="typecho-table-wrap">
                     <table class="typecho-list-table draggable">
                         <colgroup>
-                            <col width="20"/>
-                            <col width="6%"/>
-                            <col width="30%"/>
-                            <col width=""/>
+                            <col width="3%" class="kit-hidden-mb"/>
+                            <col width="6%" class="kit-hidden-mb"/>
                             <col width="30%"/>
+                            <col width="" class="kit-hidden-mb"/>
+                            <col width="30%" class="kit-hidden-mb"/>
                             <col width="16%"/>
                         </colgroup>
                         <thead>
-                            <tr>
-                                <th> </th>
-                                <th> </th>
-                                <th><?php _e('文件名'); ?></th>
-                                <th><?php _e('上传者'); ?></th>
-                                <th><?php _e('所属文章'); ?></th>
-                                <th><?php _e('发布日期'); ?></th>
-                            </tr>
+                        <tr>
+                            <th class="kit-hidden-mb"></th>
+                            <th class="kit-hidden-mb"></th>
+                            <th><?php _e('文件名'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('上传者'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('所属文章'); ?></th>
+                            <th><?php _e('发布日期'); ?></th>
+                        </tr>
                         </thead>
                         <tbody>
-                        	<?php if($attachments->have()): ?>
-                            <?php while($attachments->next()): ?>
-                            <?php $mime = Typecho_Common::mimeIconType($attachments->attachment->mime); ?>
-                            <tr id="<?php $attachments->theId(); ?>">
-                                <td><input type="checkbox" value="<?php $attachments->cid(); ?>" name="cid[]"/></td>
-                                <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $attachments->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($attachments->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $attachments->commentsNum(); ?></a></td>
-                                <td>
-                                <i class="mime-<?php echo $mime; ?>"></i>
-                                <a href="<?php $options->adminUrl('media.php?cid=' . $attachments->cid); ?>"><?php $attachments->title(); ?></a>
-                                <a href="<?php $attachments->permalink(); ?>" title="<?php _e('浏览 %s', $attachments->title); ?>"><i class="i-exlink"></i></a>
-                                </td>
-                                <td><?php $attachments->author(); ?></td>
-                                <td>
-                                <?php if ($attachments->parentPost->cid): ?>
-                                <a href="<?php $options->adminUrl('write-' . (0 === strpos($attachments->parentPost->type, 'post') ? 'post' : 'page') . '.php?cid=' . $attachments->parentPost->cid); ?>"><?php $attachments->parentPost->title(); ?></a>
-                                <?php else: ?>
-                                <span class="description"><?php _e('未归档'); ?></span>
-                                <?php endif; ?>
-                                </td>
-                                <td><?php $attachments->dateWord(); ?></td>
-                            </tr>
+                        <?php if ($attachments->have()): ?>
+                            <?php while ($attachments->next()): ?>
+                                <?php $mime = \Typecho\Common::mimeIconType($attachments->attachment->mime); ?>
+                                <tr id="<?php $attachments->theId(); ?>">
+                                    <td class="kit-hidden-mb"><input type="checkbox"
+                                                                     value="<?php $attachments->cid(); ?>"
+                                                                     name="cid[]"/></td>
+                                    <td class="kit-hidden-mb"><a
+                                            href="<?php $options->adminUrl('manage-comments.php?cid=' . $attachments->cid); ?>"
+                                            class="balloon-button size-<?php echo \Typecho\Common::splitByCount($attachments->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $attachments->commentsNum(); ?></a>
+                                    </td>
+                                    <td>
+                                        <i class="mime-<?php echo $mime; ?>"></i>
+                                        <a href="<?php $options->adminUrl('media.php?cid=' . $attachments->cid); ?>"><?php $attachments->title(); ?></a>
+                                        <a href="<?php $attachments->permalink(); ?>"
+                                           title="<?php _e('浏览 %s', $attachments->title); ?>"><i
+                                                class="i-exlink"></i></a>
+                                    </td>
+                                    <td class="kit-hidden-mb"><?php $attachments->author(); ?></td>
+                                    <td class="kit-hidden-mb">
+                                        <?php if ($attachments->parentPost->cid): ?>
+                                            <a href="<?php $options->adminUrl('write-' . (0 === strpos($attachments->parentPost->type, 'post') ? 'post' : 'page') . '.php?cid=' . $attachments->parentPost->cid); ?>"><?php $attachments->parentPost->title(); ?></a>
+                                        <?php else: ?>
+                                            <span class="description"><?php _e('未归档'); ?></span>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td><?php $attachments->dateWord(); ?></td>
+                                </tr>
                             <?php endwhile; ?>
-                            <?php else: ?>
+                        <?php else: ?>
                             <tr>
-                            	<td colspan="6"><h6 class="typecho-list-table-title"><?php _e('没有任何文件'); ?></h6></td>
+                                <td colspan="6" class="none"><?php _e('没有任何文件'); ?></td>
                             </tr>
-                            <?php endif; ?>
+                        <?php endif; ?>
                         </tbody>
                     </table><!-- end .typecho-list-table -->
-                </div><!-- end .typecho-table-wrap -->
                 </form><!-- end .operate-form -->
 
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                                <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
-                                <ul class="dropdown-menu">
-                                    <li><a lang="<?php _e('你确认要删除这些文件吗?'); ?>" href="<?php $security->index('/action/contents-attachment-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                                </ul>
-                            </div>
-                            <button class="btn btn-s btn-warn btn-operate" href="<?php $security->index('/action/contents-attachment-edit?do=clear'); ?>" lang="<?php _e('您确认要清理未归档的文件吗?'); ?>"><?php _e('清理未归档文件'); ?></button>
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
+                            <ul class="dropdown-menu">
+                                <li><a lang="<?php _e('你确认要删除这些文件吗?'); ?>"
+                                       href="<?php $security->index('/action/contents-attachment-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
+                            </ul>
                         </div>
-                        <?php if($attachments->have()): ?>
+                        <button class="btn btn-s btn-warn btn-operate"
+                                href="<?php $security->index('/action/contents-attachment-edit?do=clear'); ?>"
+                                lang="<?php _e('您确认要清理未归档的文件吗?'); ?>"><?php _e('清理未归档文件'); ?></button>
+                    </div>
+                    <?php if ($attachments->have()): ?>
                         <ul class="typecho-pager">
                             <?php $attachments->pageNav(); ?>
                         </ul>
-                        <?php endif; ?>  
-                    </form>
-                </div><!-- end .typecho-list-operate -->
-                
+                    <?php endif; ?>
+                </form>
+
             </div>
         </div><!-- end .typecho-page-main -->
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/manage-pages.php

@@ -3,103 +3,132 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
+$stat = \Widget\Stat::alloc();
+$pages = \Widget\Contents\Page\Admin::alloc();
 ?>
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                            <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
                             <ul class="dropdown-menu">
-                                <li><a lang="<?php _e('你确认要删除这些页面吗?'); ?>" href="<?php $security->index('/action/contents-page-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                                <li><a lang="<?php _e('你确认要删除这些页面吗?'); ?>"
+                                       href="<?php $security->index('/action/contents-page-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
+                                <li>
+                                    <a href="<?php $security->index('/action/contents-page-edit?do=mark&status=publish'); ?>"><?php _e('标记为<strong>%s</strong>', _t('公开')); ?></a>
+                                </li>
+                                <li>
+                                    <a href="<?php $security->index('/action/contents-page-edit?do=mark&status=hidden'); ?>"><?php _e('标记为<strong>%s</strong>', _t('隐藏')); ?></a>
+                                </li>
                             </ul>
-                            </div>
                         </div>
+                    </div>
 
-                        <div class="search" role="search">
-                            <?php if ('' != $request->keywords): ?>
+                    <div class="search" role="search">
+                        <?php $pages->backLink(); ?>
+                        <?php if ('' != $request->keywords): ?>
                             <a href="<?php $options->adminUrl('manage-pages.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
-                            <?php endif; ?>
-                            <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
-                            <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
-                        </div>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
-            
+                        <?php endif; ?>
+                        <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
+                               value="<?php echo $request->filter('html')->keywords; ?>" name="keywords"/>
+                        <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
+                    </div>
+                </form>
+
                 <form method="post" name="manage_pages" class="operate-form">
-                <div class="typecho-table-wrap">
                     <table class="typecho-list-table">
                         <colgroup>
-                            <col width="20"/>
-                            <col width="6%"/>
-                            <col width="30%"/>
-                            <col width="30%"/>
-                            <col width=""/>
+                            <col width="3%" class="kit-hidden-mb"/>
+                            <col width="6%" class="kit-hidden-mb"/>
+                            <col width="42%"/>
+                            <col width="18%"/>
+                            <col width="" class="kit-hidden-mb"/>
                             <col width="16%"/>
                         </colgroup>
                         <thead>
-                            <tr class="nodrag">
-                                <th> </th>
-                                <th> </th>
-                                <th><?php _e('标题'); ?></th>
-                                <th><?php _e('缩略名'); ?></th>
-                                <th><?php _e('作者'); ?></th>
-                                <th><?php _e('日期'); ?></th>
-                            </tr>
+                        <tr class="nodrag">
+                            <th class="kit-hidden-mb"></th>
+                            <th class="kit-hidden-mb"></th>
+                            <th><?php _e('标题'); ?></th>
+                            <th><?php _e('子页面'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('作者'); ?></th>
+                            <th><?php _e('日期'); ?></th>
+                        </tr>
                         </thead>
                         <tbody>
-                        	<?php Typecho_Widget::widget('Widget_Contents_Page_Admin')->to($pages); ?>
-                        	<?php if($pages->have()): ?>
-                            <?php while($pages->next()): ?>
-                            <tr id="<?php $pages->theId(); ?>">
-                                <td><input type="checkbox" value="<?php $pages->cid(); ?>" name="cid[]"/></td>
-                                <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $pages->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($pages->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $pages->commentsNum(); ?></a></td>
-                                <td>
-                                <a href="<?php $options->adminUrl('write-page.php?cid=' . $pages->cid); ?>"><?php $pages->title(); ?></a>
-                                <?php 
-                                if ($pages->hasSaved || 'page_draft' == $pages->type) {
-                                    echo '<em class="status">' . _t('草稿') . '</em>';
-                                } else if ('hidden' == $pages->status) {
-                                    echo '<em class="status">' . _t('隐藏') . '</em>';
-                                }
-                                ?>
-                                <?php if ('page_draft' != $pages->type): ?>
-                                <a href="<?php $pages->permalink(); ?>" title="<?php _e('浏览 %s', htmlspecialchars($pages->title)); ?>"><i class="i-exlink"></i></a>
-                                <?php endif; ?>
-                                </td>
-                                <td><?php $pages->slug(); ?></td>
-                                <td><?php $pages->author(); ?></td>
-                                <td>
-                                <?php if ($pages->hasSaved): ?>
-                                <span class="description">
-                                <?php $modifyDate = new Typecho_Date($pages->modified); ?>
-                                <?php _e('保存于 %s', $modifyDate->word()); ?>
-                                </span>
-                                <?php else: ?>
-                                <?php $pages->dateWord(); ?>
-                                <?php endif; ?>
-                                </td>
-                            </tr>
+                        <?php if ($pages->have()): ?>
+                            <?php while ($pages->next()): ?>
+                                <tr id="<?php $pages->theId(); ?>">
+                                    <td class="kit-hidden-mb"><input type="checkbox" value="<?php $pages->cid(); ?>"
+                                                                     name="cid[]"/></td>
+                                    <td class="kit-hidden-mb"><a
+                                            href="<?php $options->adminUrl('manage-comments.php?cid=' . $pages->cid); ?>"
+                                            class="balloon-button size-<?php echo \Typecho\Common::splitByCount($pages->commentsNum, 1, 10, 20, 50, 100); ?>"
+                                            title="<?php $pages->commentsNum(); ?> <?php _e('评论'); ?>"><?php $pages->commentsNum(); ?></a>
+                                    </td>
+                                    <td>
+                                        <a href="<?php $options->adminUrl('write-page.php?cid=' . $pages->cid); ?>"><?php $pages->title(); ?></a>
+                                        <?php
+                                        if ('page_draft' == $pages->type) {
+                                            echo '<em class="status">' . _t('草稿') . '</em>';
+                                        } elseif ($pages->revision) {
+                                            echo '<em class="status">' . _t('有修订版') . '</em>';
+                                        }
+
+                                        if ('hidden' == $pages->status) {
+                                            echo '<em class="status">' . _t('隐藏') . '</em>';
+                                        }
+                                        ?>
+                                        <a href="<?php $options->adminUrl('write-page.php?cid=' . $pages->cid); ?>"
+                                           title="<?php _e('编辑 %s', htmlspecialchars($pages->title)); ?>"><i
+                                                class="i-edit"></i></a>
+                                        <?php if ('page_draft' != $pages->type): ?>
+                                            <a href="<?php $pages->permalink(); ?>"
+                                               title="<?php _e('浏览 %s', htmlspecialchars($pages->title)); ?>"><i
+                                                    class="i-exlink"></i></a>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td>
+                                        <?php if (count($pages->children) > 0): ?>
+                                            <a href="<?php $options->adminUrl('manage-pages.php?parent=' . $pages->cid); ?>"><?php echo _n('一个页面', '%d个页面', count($pages->children)); ?></a>
+                                        <?php else: ?>
+                                            <a href="<?php $options->adminUrl('write-page.php?parent=' . $pages->cid); ?>"><?php echo _e('新增'); ?></a>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td class="kit-hidden-mb"><?php $pages->author(); ?></td>
+                                    <td>
+                                        <?php if ('page_draft' == $pages->type || $pages->revision): ?>
+                                            <span class="description">
+                            <?php $modifyDate = new \Typecho\Date($pages->revision ? $pages->revision['modified'] : $pages->modified); ?>
+                            <?php _e('保存于 %s', $modifyDate->word()); ?>
+                            </span>
+                                        <?php else: ?>
+                                            <?php $pages->dateWord(); ?>
+                                        <?php endif; ?>
+                                    </td>
+                                </tr>
                             <?php endwhile; ?>
-                            <?php else: ?>
+                        <?php else: ?>
                             <tr>
-                            	<td colspan="6"><h6 class="typecho-list-table-title"><?php _e('没有任何页面'); ?></h6></td>
+                                <td colspan="6" class="none"><?php _e('没有任何页面'); ?></td>
                             </tr>
-                            <?php endif; ?>
+                        <?php endif; ?>
                         </tbody>
                     </table>
-                </div><!-- end .typecho-table-wrap -->
                 </form><!-- end .operate-form -->
             </div><!-- end .typecho-list -->
         </div><!-- end .typecho-page-main -->
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';
@@ -107,25 +136,25 @@ include 'common-js.php';
 include 'table-js.php';
 ?>
 
-<?php if(!isset($request->status) || 'publish' == $request->get('status')): ?>
-<script type="text/javascript">
-(function () {
-    $(document).ready(function () {
-        var table = $('.typecho-list-table').tableDnD({
-            onDrop : function () {
-                var ids = [];
+<?php if (!$request->is('keywords')): ?>
+    <script type="text/javascript">
+        (function () {
+            $(document).ready(function () {
+                var table = $('.typecho-list-table').tableDnD({
+                    onDrop: function () {
+                        var ids = [];
 
-                $('input[type=checkbox]', table).each(function () {
-                    ids.push($(this).val());
+                        $('input[type=checkbox]', table).each(function () {
+                            ids.push($(this).val());
+                        });
+
+                        $.post('<?php $security->index('/action/contents-page-edit?do=sort'); ?>',
+                            $.param({cid: ids}));
+                    }
                 });
-
-                $.post('<?php $security->index('/action/contents-page-edit?do=sort'); ?>',
-                    $.param({cid : ids}));
-            }
-        });
-    });
-})();
-</script>
+            });
+        })();
+    </script>
 <?php endif; ?>
 
 <?php include 'footer.php'; ?>

admin/manage-posts.php

@@ -3,146 +3,246 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
+$stat = \Widget\Stat::alloc();
+$posts = \Widget\Contents\Post\Admin::alloc();
+$isAllPosts = ('on' == $request->get('__typecho_all_posts') || 'on' == \Typecho\Cookie::get('__typecho_all_posts'));
 ?>
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                                <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
-                                <ul class="dropdown-menu">
-                                    <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>" href="<?php $security->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                                </ul>
-                            </div>  
+                <div class="typecho-list-operate">
+                    <ul class="typecho-option-tabs">
+                        <li<?php if (!isset($request->status) || 'all' == $request->get('status')): ?> class="current"<?php endif; ?>>
+                            <a href="<?php $options->adminUrl('manage-posts.php'
+                                . (isset($request->uid) ? '?uid=' . $request->filter('encode')->uid : '')); ?>"><?php _e('可用'); ?></a>
+                        </li>
+                        <li<?php if ('waiting' == $request->get('status')): ?> class="current"<?php endif; ?>><a
+                                href="<?php $options->adminUrl('manage-posts.php?status=waiting'
+                                    . (isset($request->uid) ? '&uid=' . $request->filter('encode')->uid : '')); ?>"><?php _e('待审核'); ?>
+                                <?php if (!$isAllPosts && $stat->myWaitingPostsNum > 0 && !isset($request->uid)): ?>
+                                    <span class="balloon"><?php $stat->myWaitingPostsNum(); ?></span>
+                                <?php elseif ($isAllPosts && $stat->waitingPostsNum > 0 && !isset($request->uid)): ?>
+                                    <span class="balloon"><?php $stat->waitingPostsNum(); ?></span>
+                                <?php elseif (isset($request->uid) && $stat->currentWaitingPostsNum > 0): ?>
+                                    <span class="balloon"><?php $stat->currentWaitingPostsNum(); ?></span>
+                                <?php endif; ?>
+                            </a></li>
+                        <li<?php if ('draft' == $request->get('status')): ?> class="current"<?php endif; ?>><a
+                                href="<?php $options->adminUrl('manage-posts.php?status=draft'
+                                    . (isset($request->uid) ? '&uid=' . $request->filter('encode')->uid : '')); ?>"><?php _e('草稿'); ?>
+                                <?php if (!$isAllPosts && $stat->myDraftPostsNum > 0 && !isset($request->uid)): ?>
+                                    <span class="balloon"><?php $stat->myDraftPostsNum(); ?></span>
+                                <?php elseif ($isAllPosts && $stat->draftPostsNum > 0 && !isset($request->uid)): ?>
+                                    <span class="balloon"><?php $stat->draftPostsNum(); ?></span>
+                                <?php elseif (isset($request->uid) && $stat->currentDraftPostsNum > 0): ?>
+                                    <span class="balloon"><?php $stat->currentDraftPostsNum(); ?></span>
+                                <?php endif; ?>
+                            </a></li>
+                    </ul>
+
+                    <?php if ($user->pass('editor', true) && !isset($request->uid)): ?>
+                    <ul class="typecho-option-tabs">
+                        <li class="<?php if ($isAllPosts): ?> current<?php endif; ?>"><a
+                                href="<?php echo $request->makeUriByRequest('__typecho_all_posts=on&page=1'); ?>"><?php _e('所有'); ?></a>
+                        </li>
+                        <li class="<?php if (!$isAllPosts): ?> current<?php endif; ?>"><a
+                                href="<?php echo $request->makeUriByRequest('__typecho_all_posts=off&page=1'); ?>"><?php _e('我的'); ?></a>
+                        </li>
+                    </ul>
+                    <?php endif; ?>
+                </div>
+
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
+                            <ul class="dropdown-menu">
+                                <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>"
+                                       href="<?php $security->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
+                                <?php if ($user->pass('editor', true)): ?>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=publish'); ?>"><?php _e('标记为<strong>%s</strong>', _t('公开')); ?></a>
+                                    </li>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=waiting'); ?>"><?php _e('标记为<strong>%s</strong>', _t('待审核')); ?></a>
+                                    </li>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=hidden'); ?>"><?php _e('标记为<strong>%s</strong>', _t('隐藏')); ?></a>
+                                    </li>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=private'); ?>"><?php _e('标记为<strong>%s</strong>', _t('私密')); ?></a>
+                                    </li>
+                                <?php endif; ?>
+                            </ul>
                         </div>
-                        <div class="search" role="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" class="text-s" 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); ?>
-                            	<?php while($category->next()): ?>
-                            	<option value="<?php $category->mid(); ?>"<?php if($request->get('category') == $category->mid): ?> selected="true"<?php endif; ?>><?php $category->name(); ?></option>
-                            	<?php endwhile; ?>
-                            </select>
-                            <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
-                            <?php if(isset($request->uid)): ?>
-                            <input type="hidden" value="<?php echo htmlspecialchars($request->get('uid')); ?>" name="uid" />
-                            <?php endif; ?>
-                        </div>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
-            
+                    </div>
+                    <div class="search" role="search">
+                        <?php if ('' != $request->keywords || '' != $request->category): ?>
+                            <a href="<?php $options->adminUrl('manage-posts.php'
+                                . (isset($request->status) || isset($request->uid) ? '?' .
+                                    (isset($request->status) ? 'status=' . $request->filter('encode')->status : '') .
+                                    (isset($request->uid) ? (isset($request->status) ? '&' : '') . 'uid=' . $request->filter('encode')->uid : '') : '')); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
+                        <?php endif; ?>
+                        <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
+                               value="<?php echo $request->filter('html')->keywords; ?>" name="keywords"/>
+                        <select name="category">
+                            <option value=""><?php _e('所有分类'); ?></option>
+                            <?php \Widget\Metas\Category\Rows::alloc()->to($category); ?>
+                            <?php while ($category->next()): ?>
+                                <option
+                                    value="<?php $category->mid(); ?>"<?php if ($request->get('category') == $category->mid): ?> selected="true"<?php endif; ?>><?php $category->name(); ?></option>
+                            <?php endwhile; ?>
+                        </select>
+                        <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
+                        <?php if (isset($request->uid)): ?>
+                            <input type="hidden" value="<?php echo $request->filter('html')->uid; ?>"
+                                   name="uid"/>
+                        <?php endif; ?>
+                        <?php if (isset($request->status)): ?>
+                            <input type="hidden" value="<?php echo $request->filter('html')->status; ?>"
+                                   name="status"/>
+                        <?php endif; ?>
+                    </div>
+                </form>
+
                 <form method="post" name="manage_posts" class="operate-form">
-                <div class="typecho-table-wrap">
                     <table class="typecho-list-table">
                         <colgroup>
-                            <col width="20"/>
-                            <col width="6%"/>
+                            <col width="3%" class="kit-hidden-mb"/>
+                            <col width="6%" class="kit-hidden-mb"/>
                             <col width="45%"/>
-                            <col width=""/>
-                            <col width="18%"/>
+                            <col width="" class="kit-hidden-mb"/>
+                            <col width="18%" class="kit-hidden-mb"/>
                             <col width="16%"/>
                         </colgroup>
                         <thead>
-                            <tr>
-                                <th> </th>
-                                <th> </th>
-                                <th><?php _e('标题'); ?></th>
-                                <th><?php _e('作者'); ?></th>
-                                <th><?php _e('分类'); ?></th>
-                                <th><?php _e('日期'); ?></th>
-                            </tr>
+                        <tr>
+                            <th class="kit-hidden-mb"></th>
+                            <th class="kit-hidden-mb"></th>
+                            <th><?php _e('标题'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('作者'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('分类'); ?></th>
+                            <th><?php _e('日期'); ?></th>
+                        </tr>
                         </thead>
                         <tbody>
-                        	<?php Typecho_Widget::widget('Widget_Contents_Post_Admin')->to($posts); ?>
-                        	<?php if($posts->have()): ?>
-                            <?php while($posts->next()): ?>
-                            <tr id="<?php $posts->theId(); ?>">
-                                <td><input type="checkbox" value="<?php $posts->cid(); ?>" name="cid[]"/></td>
-                                <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $posts->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($posts->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $posts->commentsNum(); ?></a></td>
-                                <td>
-                                <a href="<?php $options->adminUrl('write-post.php?cid=' . $posts->cid); ?>"><?php $posts->title(); ?></a>
-                                <?php 
-                                if ($posts->hasSaved || 'post_draft' == $posts->type) {
-                                    echo '<em class="status">' . _t('草稿') . '</em>';
-                                } else if ('hidden' == $posts->status) {
-                                    echo '<em class="status">' . _t('隐藏') . '</em>';
-                                } else if ('waiting' == $posts->status) {
-                                    echo '<em class="status">' . _t('待审核') . '</em>';
-                                } else if ('private' == $posts->status) {
-                                    echo '<em class="status">' . _t('私密') . '</em>';
-                                } else if ($posts->password) {
-                                    echo '<em class="status">' . _t('密码保护') . '</em>';
-                                }
-                                ?>
-                                <?php if ('post_draft' != $posts->type): ?>
-                                <a href="<?php $posts->permalink(); ?>" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>"><i class="i-exlink"></i></a>
-                                <?php endif; ?>
-                                </td>
-                                <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $posts->author->uid); ?>"><?php $posts->author(); ?></a></td>
-                                <td><?php $categories = $posts->categories; $length = count($categories); ?>
-                                <?php foreach ($categories as $key => $val): ?>
-                                    <?php echo '<a href="';
-                                    $options->adminUrl('manage-posts.php?category=' . $val['mid']
-                                    . (isset($request->uid) ? '&uid=' . $request->uid : '')
-                                    . (isset($request->status) ? '&status=' . $request->status : ''));
-                                    echo '">' . $val['name'] . '</a>' . ($key < $length - 1 ? ', ' : ''); ?>
-                                <?php endforeach; ?>
-                                </td>
-                                <td>
-                                <?php if ($posts->hasSaved): ?>
-                                <span class="description">
-                                <?php $modifyDate = new Typecho_Date($posts->modified); ?>
-                                <?php _e('保存于 %s', $modifyDate->word()); ?>
-                                </span>
-                                <?php else: ?>
-                                <?php $posts->dateWord(); ?>
-                                <?php endif; ?>
-                                </td>
-                            </tr>
+                        <?php if ($posts->have()): ?>
+                            <?php while ($posts->next()): ?>
+                                <tr id="<?php $posts->theId(); ?>">
+                                    <td class="kit-hidden-mb"><input type="checkbox" value="<?php $posts->cid(); ?>"
+                                                                     name="cid[]"/></td>
+                                    <td class="kit-hidden-mb"><a
+                                            href="<?php $options->adminUrl('manage-comments.php?cid=' . ($posts->parentId ? $posts->parentId : $posts->cid)); ?>"
+                                            class="balloon-button size-<?php echo \Typecho\Common::splitByCount($posts->commentsNum, 1, 10, 20, 50, 100); ?>"
+                                            title="<?php $posts->commentsNum(); ?> <?php _e('评论'); ?>"><?php $posts->commentsNum(); ?></a>
+                                    </td>
+                                    <td>
+                                        <a href="<?php $options->adminUrl('write-post.php?cid=' . $posts->cid); ?>"><?php $posts->title(); ?></a>
+                                        <?php
+                                        if ('post_draft' == $posts->type) {
+                                            echo '<em class="status">' . _t('草稿') . '</em>';
+                                        } elseif ($posts->revision) {
+                                            echo '<em class="status">' . _t('有修订版') . '</em>';
+                                        }
+
+                                        if ('hidden' == $posts->status) {
+                                            echo '<em class="status">' . _t('隐藏') . '</em>';
+                                        } elseif ('waiting' == $posts->status) {
+                                            echo '<em class="status">' . _t('待审核') . '</em>';
+                                        } elseif ('private' == $posts->status) {
+                                            echo '<em class="status">' . _t('私密') . '</em>';
+                                        } elseif ($posts->password) {
+                                            echo '<em class="status">' . _t('密码保护') . '</em>';
+                                        }
+                                        ?>
+                                        <a href="<?php $options->adminUrl('write-post.php?cid=' . $posts->cid); ?>"
+                                           title="<?php _e('编辑 %s', htmlspecialchars($posts->title)); ?>"><i
+                                                class="i-edit"></i></a>
+                                        <?php if ('post_draft' != $posts->type): ?>
+                                            <a href="<?php $posts->permalink(); ?>"
+                                               title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>"><i
+                                                    class="i-exlink"></i></a>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td class="kit-hidden-mb"><a
+                                            href="<?php $options->adminUrl('manage-posts.php?__typecho_all_posts=off&uid=' . $posts->author->uid); ?>"><?php $posts->author(); ?></a>
+                                    </td>
+                                    <td class="kit-hidden-mb"><?php foreach($posts->categories as $index => $category): ?><!--
+                                            --><?php echo ($index > 0 ? ', ' : '') . '<a href="';
+                                            $options->adminUrl('manage-posts.php?category=' . $category['mid']
+                                                . (isset($request->uid) ? '&uid=' . $request->filter('encode')->uid : '')
+                                                . (isset($request->status) ? '&status=' . $request->filter('encode')->status : ''));
+                                            echo '">' . $category['name'] . '</a>'; ?><!--
+                                        --><?php endforeach; ?>
+                                    </td>
+                                    <td>
+                                        <?php if ('post_draft' == $posts->type || $posts->revision): ?>
+                                            <span class="description">
+                            <?php $modifyDate = new \Typecho\Date($posts->revision ? $posts->revision['modified'] : $posts->modified); ?>
+                            <?php _e('保存于 %s', $modifyDate->word()); ?>
+                            </span>
+                                        <?php else: ?>
+                                            <?php $posts->dateWord(); ?>
+                                        <?php endif; ?>
+                                    </td>
+                                </tr>
                             <?php endwhile; ?>
-                            <?php else: ?>
+                        <?php else: ?>
                             <tr>
-                            	<td colspan="6"><h6 class="typecho-list-table-title"><?php _e('没有任何文章'); ?></h6></td>
+                                <td colspan="6" class="none"><?php _e('没有任何文章'); ?></td>
                             </tr>
-                            <?php endif; ?>
+                        <?php endif; ?>
                         </tbody>
                     </table>
-                </div>
                 </form><!-- end .operate-form -->
 
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                                <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
-                                <ul class="dropdown-menu">
-                                    <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>" href="<?php $security->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                                </ul>
-                            </div>  
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
+                            <ul class="dropdown-menu">
+                                <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>"
+                                       href="<?php $security->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
+                                <?php if ($user->pass('editor', true)): ?>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=publish'); ?>"><?php _e('标记为<strong>%s</strong>', _t('公开')); ?></a>
+                                    </li>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=waiting'); ?>"><?php _e('标记为<strong>%s</strong>', _t('待审核')); ?></a>
+                                    </li>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=hidden'); ?>"><?php _e('标记为<strong>%s</strong>', _t('隐藏')); ?></a>
+                                    </li>
+                                    <li>
+                                        <a href="<?php $security->index('/action/contents-post-edit?do=mark&status=private'); ?>"><?php _e('标记为<strong>%s</strong>', _t('私密')); ?></a>
+                                    </li>
+                                <?php endif; ?>
+                            </ul>
                         </div>
+                    </div>
 
-                        <?php if($posts->have()): ?>
+                    <?php if ($posts->have()): ?>
                         <ul class="typecho-pager">
                             <?php $posts->pageNav(); ?>
                         </ul>
-                        <?php endif; ?>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
+                    <?php endif; ?>
+                </form>
             </div><!-- end .typecho-list -->
         </div><!-- end .typecho-page-main -->
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/manage-tags.php

@@ -3,57 +3,70 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-Typecho_Widget::widget('Widget_Metas_Tag_Admin')->to($tags);
+\Widget\Metas\Tag\Admin::alloc()->to($tags);
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main manage-metas">
-            
-                <div class="col-mb-12 col-tb-8" role="main">
-                    
-                    <form method="post" name="manage_tags" class="operate-form">
-                    <div class="typecho-list-operate clearfix">
+
+            <div class="col-mb-12 col-tb-8" role="main">
+
+                <form method="post" name="manage_tags" class="operate-form">
+                    <div class="typecho-list-operate">
                         <div class="operate">
-                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                        <div class="btn-group btn-drop">
-                        <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
-                        <ul class="dropdown-menu">
-                            <li><a lang="<?php _e('你确认要删除这些标签吗?'); ?>" href="<?php $security->index('/action/metas-tag-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
-                            <li><a lang="<?php _e('刷新标签可能需要等待较长时间, 你确认要刷新这些标签吗?'); ?>" href="<?php $security->index('/action/metas-tag-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a></li>
-                            <li class="multiline">
-                                <button type="button" class="btn btn-s merge" rel="<?php $security->index('/action/metas-tag-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>
-                                <input type="text" name="merge" class="text-s" />
-                            </li>
-                        </ul>
-                        </div>
+                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                                   class="typecho-table-select-all"/></label>
+                            <div class="btn-group btn-drop">
+                                <button class="btn dropdown-toggle btn-s" type="button"><i
+                                        class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                        class="i-caret-down"></i></button>
+                                <ul class="dropdown-menu">
+                                    <li><a lang="<?php _e('你确认要删除这些标签吗?'); ?>"
+                                           href="<?php $security->index('/action/metas-tag-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                    </li>
+                                    <li><a lang="<?php _e('刷新标签可能需要等待较长时间, 你确认要刷新这些标签吗?'); ?>"
+                                           href="<?php $security->index('/action/metas-tag-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a>
+                                    </li>
+                                    <li class="multiline">
+                                        <button type="button" class="btn btn-s merge"
+                                                rel="<?php $security->index('/action/metas-tag-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>
+                                        <input type="text" name="merge" class="text-s"/>
+                                    </li>
+                                </ul>
+                            </div>
                         </div>
                     </div>
-                    
-                    <ul class="typecho-list-notable tag-list clearfix">
-                        <?php if($tags->have()): ?>
-                        <?php while ($tags->next()): ?>
-                        <li class="size-<?php $tags->split(5, 10, 20, 30); ?>" id="<?php $tags->theId(); ?>">
-                        <input type="checkbox" value="<?php $tags->mid(); ?>" name="mid[]"/>
-                        <span rel="<?php echo $request->makeUriByRequest('mid=' . $tags->mid); ?>"><?php $tags->name(); ?></span>
-                        <a class="tag-edit-link" href="<?php echo $request->makeUriByRequest('mid=' . $tags->mid); ?>"><i class="i-edit"></i></a>
-                        </li>
-                        <?php endwhile; ?>
-                        <?php else: ?>
-                        <h6 class="typecho-list-table-title"><?php _e('没有任何标签'); ?></h6>
-                        <?php endif; ?>
-                    </ul>
-                    <input type="hidden" name="do" value="delete" />
-                    </form>
-                    
-                </div>
-                <div class="col-mb-12 col-tb-4" role="form">
-                    <?php Typecho_Widget::widget('Widget_Metas_Tag_Edit')->form()->render(); ?>
-                </div>
+
+                    <?php if ($tags->have()): ?>
+                        <ul class="typecho-list-notable tag-list">
+                            <?php while ($tags->next()): ?>
+                                <li class="size-<?php $tags->split(5, 10, 20, 30); ?>" id="<?php $tags->theId(); ?>">
+                                    <input type="checkbox" value="<?php $tags->mid(); ?>" name="mid[]"/>
+                                    <span
+                                        rel="<?php echo $request->makeUriByRequest('mid=' . $tags->mid); ?>"><?php $tags->name(); ?></span>
+                                    <a class="tag-edit-link"
+                                       href="<?php echo $request->makeUriByRequest('mid=' . $tags->mid); ?>"><i
+                                            class="i-edit"></i></a>
+                                </li>
+                            <?php endwhile; ?>
+                        </ul>
+                    <?php else: ?>
+                        <ul class="tag-list">
+                            <li class="none"><?php _e('没有任何标签'); ?></li>
+                        </ul>
+                    <?php endif; ?>
+                    <input type="hidden" name="do" value="delete"/>
+                </form>
+
+            </div>
+            <div class="col-mb-12 col-tb-4" role="form">
+                <?php \Widget\Metas\Tag\Edit::alloc()->form()->render(); ?>
+            </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';
@@ -61,31 +74,31 @@ include 'common-js.php';
 ?>
 
 <script type="text/javascript">
-(function () {
-    $(document).ready(function () {
+    (function () {
+        $(document).ready(function () {
 
-        $('.typecho-list-notable').tableSelectable({
-            checkEl     :   'input[type=checkbox]',
-            rowEl       :   'li',
-            selectAllEl :   '.typecho-table-select-all',
-            actionEl    :   '.dropdown-menu a'
+            $('.typecho-list-notable').tableSelectable({
+                checkEl: 'input[type=checkbox]',
+                rowEl: 'li',
+                selectAllEl: '.typecho-table-select-all',
+                actionEl: '.dropdown-menu a'
+            });
+
+            $('.btn-drop').dropdownMenu({
+                btnEl: '.dropdown-toggle',
+                menuEl: '.dropdown-menu'
+            });
+
+            $('.dropdown-menu button.merge').click(function () {
+                var btn = $(this);
+                btn.parents('form').attr('action', btn.attr('rel')).submit();
+            });
+
+            <?php if (isset($request->mid)): ?>
+            $('.typecho-mini-panel').effect('highlight', '#AACB36');
+            <?php endif; ?>
         });
-
-        $('.btn-drop').dropdownMenu({
-            btnEl       :   '.dropdown-toggle',
-            menuEl      :   '.dropdown-menu'
-        });
-
-        $('.dropdown-menu button.merge').click(function () {
-            var btn = $(this);
-            btn.parents('form').attr('action', btn.attr('rel')).submit();
-        });
-
-        <?php if (isset($request->mid)): ?>
-        $('.typecho-mini-panel').effect('highlight', '#AACB36');
-        <?php endif; ?>
-    });
-})();
+    })();
 </script>
 <?php include 'footer.php'; ?>
 

admin/manage-users.php

@@ -2,113 +2,128 @@
 include 'common.php';
 include 'header.php';
 include 'menu.php';
+
+$users = \Widget\Users\Admin::alloc();
 ?>
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                            <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
                             <ul class="dropdown-menu">
-                                <li><a lang="<?php _e('你确认要删除这些用户吗?'); ?>" href="<?php $security->index('/action/users-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                                <li><a lang="<?php _e('你确认要删除这些用户吗?'); ?>"
+                                       href="<?php $security->index('/action/users-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
                             </ul>
-                            </div>  
                         </div>
-                        <div class="search" role="search">
-                            <?php if ('' != $request->keywords): ?>
+                    </div>
+                    <div class="search" role="search">
+                        <?php if ('' != $request->keywords): ?>
                             <a href="<?php $options->adminUrl('manage-users.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
-                            <?php endif; ?>
-                            <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
-                            <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
-                        </div>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
+                        <?php endif; ?>
+                        <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
+                               value="<?php echo $request->filter('html')->keywords; ?>" name="keywords"/>
+                        <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
+                    </div>
+                </form>
 
                 <form method="post" name="manage_users" class="operate-form">
-                <div class="typecho-table-wrap">
                     <table class="typecho-list-table">
                         <colgroup>
-                            <col width="20"/>
-                            <col width="6%"/>
+                            <col width="3%" class="kit-hidden-mb"/>
+                            <col width="6%" class="kit-hidden-mb"/>
                             <col width="30%"/>
-                            <col width=""/>
-                            <col width="25%"/>
+                            <col width="" class="kit-hidden-mb"/>
+                            <col width="25%" class="kit-hidden-mb"/>
                             <col width="15%"/>
                         </colgroup>
                         <thead>
-                            <tr>
-                                <th> </th>
-                                <th> </th>
-                                <th><?php _e('用户名'); ?></th>
-                                <th><?php _e('昵称'); ?></th>
-                                <th><?php _e('电子邮件'); ?></th>
-                                <th><?php _e('用户组'); ?></th>
-                            </tr>
+                        <tr>
+                            <th class="kit-hidden-mb"></th>
+                            <th class="kit-hidden-mb"></th>
+                            <th><?php _e('用户名'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('昵称'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('电子邮件'); ?></th>
+                            <th><?php _e('用户组'); ?></th>
+                        </tr>
                         </thead>
                         <tbody>
-                        	<?php Typecho_Widget::widget('Widget_Users_Admin')->to($users); ?>
-                            <?php while($users->next()): ?>
+                        <?php while ($users->next()): ?>
                             <tr id="user-<?php $users->uid(); ?>">
-                                <td><input type="checkbox" value="<?php $users->uid(); ?>" name="uid[]"/></td>
-                                <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $users->uid); ?>" class="balloon-button left size-<?php echo Typecho_Common::splitByCount($users->postsNum, 1, 10, 20, 50, 100); ?>"><?php $users->postsNum(); ?></a></td>
-                                <td><a href="<?php $options->adminUrl('user.php?uid=' . $users->uid); ?>"><?php $users->name(); ?></a>
-                                <a href="<?php $users->permalink(); ?>" title="<?php _e('浏览 %s', $users->screenName); ?>"><i class="i-exlink"></i></a>
+                                <td class="kit-hidden-mb"><input type="checkbox" value="<?php $users->uid(); ?>"
+                                                                 name="uid[]"/></td>
+                                <td class="kit-hidden-mb"><a
+                                        href="<?php $options->adminUrl('manage-posts.php?__typecho_all_posts=off&uid=' . $users->uid); ?>"
+                                        class="balloon-button left size-<?php echo \Typecho\Common::splitByCount($users->postsNum, 1, 10, 20, 50, 100); ?>"><?php $users->postsNum(); ?></a>
+                                </td>
+                                <td>
+                                    <a href="<?php $options->adminUrl('user.php?uid=' . $users->uid); ?>"><?php $users->name(); ?></a>
+                                    <a href="<?php $users->permalink(); ?>"
+                                       title="<?php _e('浏览 %s', $users->screenName); ?>"><i
+                                            class="i-exlink"></i></a>
+                                </td>
+                                <td class="kit-hidden-mb"><?php $users->screenName(); ?></td>
+                                <td class="kit-hidden-mb"><?php if ($users->mail): ?><a
+                                        href="mailto:<?php $users->mail(); ?>"><?php $users->mail(); ?></a><?php else: _e('暂无'); endif; ?>
                                 </td>
-                                <td><?php $users->screenName(); ?></td>
-                                <td><?php if($users->mail): ?><a href="mailto:<?php $users->mail(); ?>"><?php $users->mail(); ?></a><?php else: _e('暂无'); endif; ?></td>
                                 <td><?php switch ($users->group) {
-                                    case 'administrator':
-                                        _e('管理员');
-                                        break;
-                                    case 'editor':
-                                        _e('编辑');
-                                        break;
-                                    case 'contributor':
-                                        _e('贡献者');
-                                        break;
-                                    case 'subscriber':
-                                        _e('关注者');
-                                        break;
-                                    case 'visitor':
-                                        _e('访问者');
-                                        break;
-                                    default:
-                                        break;
-                                } ?></td>
+                                        case 'administrator':
+                                            _e('管理员');
+                                            break;
+                                        case 'editor':
+                                            _e('编辑');
+                                            break;
+                                        case 'contributor':
+                                            _e('贡献者');
+                                            break;
+                                        case 'subscriber':
+                                            _e('关注者');
+                                            break;
+                                        case 'visitor':
+                                            _e('访问者');
+                                            break;
+                                        default:
+                                            break;
+                                    } ?></td>
                             </tr>
-                            <?php endwhile; ?>
+                        <?php endwhile; ?>
                         </tbody>
                     </table><!-- end .typecho-list-table -->
-                </div><!-- end .typecho-table-wrap -->
                 </form><!-- end .operate-form -->
 
-                <div class="typecho-list-operate clearfix">
-                    <form method="get">
-                        <div class="operate">
-                            <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox" class="typecho-table-select-all" /></label>
-                            <div class="btn-group btn-drop">
-                            <button class="btn dropdown-toggle btn-s" type="button"><i class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i class="i-caret-down"></i></button>
+                <form method="get" class="typecho-list-operate">
+                    <div class="operate">
+                        <label><i class="sr-only"><?php _e('全选'); ?></i><input type="checkbox"
+                                                                               class="typecho-table-select-all"/></label>
+                        <div class="btn-group btn-drop">
+                            <button class="btn dropdown-toggle btn-s" type="button"><i
+                                    class="sr-only"><?php _e('操作'); ?></i><?php _e('选中项'); ?> <i
+                                    class="i-caret-down"></i></button>
                             <ul class="dropdown-menu">
-                                <li><a lang="<?php _e('你确认要删除这些用户吗?'); ?>" href="<?php $security->index('/action/users-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+                                <li><a lang="<?php _e('你确认要删除这些用户吗?'); ?>"
+                                       href="<?php $security->index('/action/users-edit?do=delete'); ?>"><?php _e('删除'); ?></a>
+                                </li>
                             </ul>
-                            </div>  
                         </div>
-                        <?php if($users->have()): ?>
+                    </div>
+                    <?php if ($users->have()): ?>
                         <ul class="typecho-pager">
                             <?php $users->pageNav(); ?>
                         </ul>
-                        <?php endif; ?>
-                    </form>
-                </div><!-- end .typecho-list-operate -->
+                    <?php endif; ?>
+                </form>
             </div><!-- end .typecho-list -->
         </div><!-- end .typecho-page-main -->
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/media.php

@@ -3,37 +3,35 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$phpMaxFilesize = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
-
-if (preg_match("/^([0-9]+)([a-z]{1,2})$/i", $phpMaxFilesize, $matches)) {
-    $phpMaxFilesize = strtolower($matches[1] . $matches[2] . (1 == strlen($matches[2]) ? 'b' : ''));
-}
-
-Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
+\Widget\Contents\Attachment\Edit::alloc()->prepare()->to($attachment);
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main">
             <div class="col-mb-12 col-tb-8" role="main">
                 <?php if ($attachment->attachment->isImage): ?>
-                <p><img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" class="typecho-attachment-photo" /></p>
+                    <p><img src="<?php $attachment->attachment->url(); ?>"
+                            alt="<?php $attachment->attachment->name(); ?>" class="typecho-attachment-photo"/></p>
                 <?php endif; ?>
-                
+
                 <p>
-                    <?php $mime = Typecho_Common::mimeIconType($attachment->attachment->mime); ?>
+                    <?php $mime = \Typecho\Common::mimeIconType($attachment->attachment->mime); ?>
                     <i class="mime-<?php echo $mime; ?>"></i>
                     <a href=""><strong><?php $attachment->attachment->name(); ?></strong></a>
                     <span><?php echo number_format(ceil($attachment->attachment->size / 1024)); ?> Kb</span>
                 </p>
 
                 <p>
-                    <input id="attachment-url" type="text" class="mono w-100" value="<?php $attachment->attachment->url(); ?>" readonly />
+                    <input id="attachment-url" type="text" class="mono w-100"
+                           value="<?php $attachment->attachment->url(); ?>" readonly/>
                 </p>
 
                 <div id="upload-panel" class="p">
-                    <div class="upload-area" draggable="true"><?php _e('拖放文件到这里<br>或者 %s选择文件上传%s', '<a href="###" class="upload-file">', '</a>'); ?></div>
+                    <div class="upload-area" data-url="<?php $security->index('/action/upload?do=modify'); ?>">
+                        <?php _e('拖放文件到这里<br>或者 %s选择文件上传%s', '<a href="###" class="upload-file">', '</a>'); ?>
+                    </div>
                     <ul id="file-list"></ul>
                 </div>
             </div>
@@ -42,152 +40,40 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';
 include 'common-js.php';
+include 'file-upload-js.php';
 ?>
-<script src="<?php $options->adminStaticUrl('js', 'moxie.js?v=' . $suffixVersion); ?>"></script>
-<script src="<?php $options->adminStaticUrl('js', 'plupload.js?v=' . $suffixVersion); ?>"></script>
 <script type="text/javascript">
-$(document).ready(function() {
-    $('#attachment-url').click(function () {
-        $(this).select();
-    });
-    
-    $('.operate-delete').click(function () {
-        var t = $(this), href = t.attr('href');
-
-        if (confirm(t.attr('lang'))) {
-            window.location.href = href;
-        }
-
-        return false;
-    });
-
-    $('.upload-area').bind({
-        dragenter   :   function () {
-            $(this).parent().addClass('drag');
-        },
-
-        dragover    :   function (e) {
-            $(this).parent().addClass('drag');
-        },
-
-        drop        :   function () {
-            $(this).parent().removeClass('drag');
-        },
-        
-        dragend     :   function () {
-            $(this).parent().removeClass('drag');
-        },
-
-        dragleave   :   function () {
-            $(this).parent().removeClass('drag');
-        }
-    });
-
-    function fileUploadStart (file) {
-        $('<ul id="file-list"></ul>').appendTo('#upload-panel');
-        $('<li id="' + file.id + '" class="loading">'
-            + file.name + '</li>').prependTo('#file-list');
-    }
-
-    function fileUploadError (error) {
-        var file = error.file, code = error.code, word; 
-        
-        switch (code) {
-            case plupload.FILE_SIZE_ERROR:
-                word = '<?php _e('文件大小超过限制'); ?>';
-                break;
-            case plupload.FILE_EXTENSION_ERROR:
-                word = '<?php _e('文件扩展名不被支持'); ?>';
-                break;
-            case plupload.FILE_DUPLICATE_ERROR:
-                word = '<?php _e('文件已经上传过'); ?>';
-                break;
-            case plupload.HTTP_ERROR:
-            default:
-                word = '<?php _e('上传出现错误'); ?>';
-                break;
-        }
-
-        var fileError = '<?php _e('%s 上传失败'); ?>'.replace('%s', file.name),
-            li, exist = $('#' + file.id);
-
-        if (exist.length > 0) {
-            li = exist.removeClass('loading').html(fileError);
-        } else {
-            $('<ul id="file-list"></ul>').appendTo('#upload-panel');
-            li = $('<li>' + fileError + '<br />' + word + '</li>').prependTo('#file-list');
-        }
-
-        li.effect('highlight', {color : '#FBC2C4'}, 2000, function () {
-            $(this).remove();
+    $(document).ready(function () {
+        $('#attachment-url').click(function () {
+            $(this).select();
         });
-    }
 
-    function fileUploadComplete (id, url, data) {
-        var img = $('.typecho-attachment-photo');
+        $('.operate-delete').click(function () {
+            var t = $(this), href = t.attr('href');
 
-        if (img.length > 0) {
-            img.get(0).src = '<?php $attachment->attachment->url(); ?>?' + Math.random();
-        }
-        
-        $('#' + id).html('<?php _e('文件 %s 已经替换'); ?>'.replace('%s', data.title))
-        .effect('highlight', 1000, function () {
-            $(this).remove();
-            $('#file-list').remove();
-        });
-    }
-
-    var uploader = new plupload.Uploader({
-        browse_button   :   $('.upload-file').get(0),
-        url             :   '<?php $security->index('/action/upload?do=modify&cid=' . $attachment->cid); ?>',
-        runtimes        :   'html5,flash,html4',
-        flash_swf_url   :   '<?php $options->adminStaticUrl('js', 'Moxie.swf'); ?>',
-        drop_element    :   $('.upload-area').get(0),
-        filters         :   {
-            max_file_size       :   '<?php echo $phpMaxFilesize ?>',
-            mime_types          :   [{'title' : '<?php _e('允许上传的文件'); ?>', 'extensions' : '<?php $attachment->attachment->type(); ?>'}],
-            prevent_duplicates  :   true
-        },
-        multi_selection :   false,
-
-        init            :   {
-            FilesAdded      :   function (up, files) {
-                plupload.each(files, function(file) {
-                    fileUploadStart(file);
-                });
-
-                uploader.start();
-            },
-
-            FileUploaded    :   function (up, file, result) {
-                if (200 == result.status) {
-                    var data = $.parseJSON(result.response);
-
-                    if (data) {
-                        fileUploadComplete(file.id, data[0], data[1]);
-                        return;
-                    }
-                }
-
-                fileUploadError({
-                    code : plupload.HTTP_ERROR,
-                    file : file
-                });
-            },
-
-            Error           :   function (up, error) {
-                fileUploadError(error);
+            if (confirm(t.attr('lang'))) {
+                window.location.href = href;
             }
-        }
-    });
 
-    uploader.init();
-});
+            return false;
+        });
+
+        Typecho.uploadComplete = function (attachment) {
+            if (attachment.isImage) {
+                $('.typecho-attachment-photo').attr('src', attachment.url + '?' + Math.random());
+            }
+
+            $('#file-list li').text('<?php _e('文件 %s 已经替换'); ?>'.replace('%s', attachment.title))
+                .effect('highlight', 1000, function () {
+                    $(this).remove();
+                });
+        };
+    });
 </script>
 <?php
 include 'footer.php';

admin/menu.php

@@ -1,15 +1,22 @@
-<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
-<div class="typecho-head-nav clearfix" role="navigation">
-    <nav id="typecho-nav-list">
-        <?php $menu->output(); ?>
+<?php if (!defined('__TYPECHO_ADMIN__')) exit; ?>
+<header class="typecho-head-nav" role="navigation">
+    <nav>
+        <details class="menu-bar">
+            <summary><?php _e('菜单'); ?></summary>
+        </details>
+        <menu>
+            <?php $menu->output(); ?>
+            <li class="operate">
+                <?php \Typecho\Plugin::factory('admin/menu.php')->call('navBar'); ?><a title="<?php
+                if ($user->logged > 0) {
+                    $logged = new \Typecho\Date($user->logged);
+                    _e('最后登录: %s', $logged->word());
+                }
+                ?>" href="<?php $options->adminUrl('profile.php'); ?>" class="author"><?php $user->screenName(); ?></a><a
+                    class="exit" href="<?php $options->logoutUrl(); ?>"><?php _e('登出'); ?></a><a
+                    href="<?php $options->siteUrl(); ?>"><?php _e('网站'); ?></a>
+            </li>
+        </menu>
     </nav>
-    <div class="operate">
-        <?php Typecho_Plugin::factory('admin/menu.php')->navBar(); ?>
-        <a title="<?php 
-                    if ($user->logged > 0) {
-                        _e('最后登录: %s', Typecho_I18n::dateWord($user->logged  + $options->timezone, $options->gmtTime + $options->timezone));
-                    }
-                    ?>" href="<?php $options->adminUrl('profile.php'); ?>" class="author"><?php $user->screenName(); ?></a><a class="exit" href="<?php $options->logoutUrl(); ?>"><?php _e('登出'); ?></a><a href="<?php $options->siteUrl(); ?>"><?php _e('网站'); ?></a>
-    </div>
-</div>
+</header>
 

admin/options-discussion.php

@@ -4,16 +4,16 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
-                <?php Typecho_Widget::widget('Widget_Options_Discussion')->form()->render(); ?>
+                <?php \Widget\Options\Discussion::alloc()->form()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/options-general.php

@@ -4,16 +4,16 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
-                <?php Typecho_Widget::widget('Widget_Options_General')->form()->render(); ?>
+                <?php \Widget\Options\General::alloc()->form()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/options-permalink.php

@@ -4,16 +4,16 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
-                <?php Typecho_Widget::widget('Widget_Options_Permalink')->form()->render(); ?>
+                <?php \Widget\Options\Permalink::alloc()->form()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/options-plugin.php

@@ -4,16 +4,16 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
-                <?php Typecho_Widget::widget('Widget_Plugins_Config')->config()->render(); ?>
+                <?php \Widget\Plugins\Config::alloc()->config()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/options-reading.php

@@ -4,16 +4,16 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
-                <?php Typecho_Widget::widget('Widget_Options_Reading')->form()->render(); ?>
+                <?php \Widget\Options\Reading::alloc()->form()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/options-theme.php

@@ -4,25 +4,17 @@ include 'header.php';
 include 'menu.php';
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
+        <?php include 'theme-tabs.php'; ?>
         <div class="row typecho-page-main" role="main">
-            <div class="col-mb-12">
-                <ul class="typecho-option-tabs fix-tabs clearfix">
-                    <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
-                    <?php if (!defined('__TYPECHO_THEME_WRITEABLE__') || __TYPECHO_THEME_WRITEABLE__): ?>
-                        <li><a href="<?php $options->adminUrl('theme-editor.php'); ?>"><?php _e('编辑当前外观'); ?></a></li>
-                    <?php endif; ?>
-                    <li class="current"><a href="<?php $options->adminUrl('options-theme.php'); ?>"><?php _e('设置外观'); ?></a></li>
-                </ul>
-            </div>
             <div class="col-mb-12 col-tb-8 col-tb-offset-2" role="form">
-                <?php Typecho_Widget::widget('Widget_Themes_Config')->config()->render(); ?>
+                <?php \Widget\Themes\Config::alloc()->config()->render(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/page-title.php

@@ -1,8 +1,9 @@
-<?php if(!defined('__TYPECHO_ADMIN__')) exit; ?>
+<?php if (!defined('__TYPECHO_ADMIN__')) exit; ?>
 <div class="typecho-page-title">
-    <h2><?php echo $menu->title; ?><?php 
+    <h2><?php echo $menu->title; ?></h2>
+    <?php
     if (!empty($menu->addLink)) {
         echo "<a href=\"{$menu->addLink}\">" . _t("新增") . "</a>";
     }
-    ?></h2>
+    ?>
 </div>

admin/plugins.php

@@ -3,122 +3,124 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 ?>
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
-                <?php Typecho_Widget::widget('Widget_Plugins_List@activated', 'activated=1')->to($activatedPlugins); ?>
+                <?php \Widget\Plugins\Rows::allocWithAlias('activated', 'activated=1')->to($activatedPlugins); ?>
                 <?php if ($activatedPlugins->have() || !empty($activatedPlugins->activatedPlugins)): ?>
-                <h4 class="typecho-list-table-title"><?php _e('启用的插件'); ?></h4>
-                <div class="typecho-table-wrap">
+                    <h4 class="typecho-list-table-title"><?php _e('启用的插件'); ?></h4>
                     <table class="typecho-list-table">
                         <colgroup>
                             <col width="25%"/>
                             <col width="45%"/>
-                            <col width="8%"/>
-                            <col width="10%"/>
+                            <col width="8%" class="kit-hidden-mb"/>
+                            <col width="10%" class="kit-hidden-mb"/>
                             <col width=""/>
                         </colgroup>
                         <thead>
-                            <tr>
-                                <th><?php _e('名称'); ?></th>
-                                <th><?php _e('描述'); ?></th>
-                                <th><?php _e('版本'); ?></th>
-                                <th><?php _e('作者'); ?></th>
-                                <th><?php _e('操作'); ?></th>
-                            </tr>
+                        <tr>
+                            <th><?php _e('名称'); ?></th>
+                            <th><?php _e('描述'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('版本'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('作者'); ?></th>
+                            <th><?php _e('操作'); ?></th>
+                        </tr>
                         </thead>
                         <tbody>
-                            <?php while ($activatedPlugins->next()): ?>
+                        <?php while ($activatedPlugins->next()): ?>
                             <tr id="plugin-<?php $activatedPlugins->name(); ?>">
                                 <td><?php $activatedPlugins->title(); ?>
-                                <?php if (!$activatedPlugins->dependence): ?>
-                                <img src="<?php $options->adminUrl('images/notice.gif'); ?>" title="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>" alt="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>" class="tiny" />
-                                <?php endif; ?>
+                                    <?php if (!$activatedPlugins->dependence): ?>
+                                        <i class="i-delete"
+                                           title="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>"></i>
+                                    <?php endif; ?>
                                 </td>
                                 <td><?php $activatedPlugins->description(); ?></td>
-                                <td><?php $activatedPlugins->version(); ?></td>
-                                <td><?php echo empty($activatedPlugins->homepage) ? $activatedPlugins->author : '<a href="' . $activatedPlugins->homepage
-                                . '">' . $activatedPlugins->author . '</a>'; ?></td>
+                                <td class="kit-hidden-mb"><?php $activatedPlugins->version(); ?></td>
+                                <td class="kit-hidden-mb"><?php echo empty($activatedPlugins->homepage) ? $activatedPlugins->author : '<a href="' . $activatedPlugins->homepage
+                                        . '">' . $activatedPlugins->author . '</a>'; ?></td>
                                 <td>
                                     <?php if ($activatedPlugins->activate || $activatedPlugins->deactivate || $activatedPlugins->config || $activatedPlugins->personalConfig): ?>
                                         <?php if ($activatedPlugins->config): ?>
                                             <a href="<?php $options->adminUrl('options-plugin.php?config=' . $activatedPlugins->name); ?>"><?php _e('设置'); ?></a>
                                             &bull;
                                         <?php endif; ?>
-                                        <a lang="<?php _e('你确认要禁用插件 %s 吗?', $activatedPlugins->name); ?>" href="<?php $security->index('/action/plugins-edit?deactivate=' . $activatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
+                                        <a lang="<?php _e('你确认要禁用插件 %s 吗?', $activatedPlugins->name); ?>"
+                                           href="<?php $security->index('/action/plugins-edit?deactivate=' . $activatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
                                     <?php else: ?>
                                         <span class="important"><?php _e('即插即用'); ?></span>
                                     <?php endif; ?>
                                 </td>
                             </tr>
-                            <?php endwhile; ?>
-                            
-                            <?php if (!empty($activatedPlugins->activatedPlugins)): ?>
+                        <?php endwhile; ?>
+
+                        <?php if (!empty($activatedPlugins->activatedPlugins)): ?>
                             <?php foreach ($activatedPlugins->activatedPlugins as $key => $val): ?>
-                            <tr>
-                            <td><?php echo $key; ?></td>
-                            <td colspan="3"><span class="warning"><?php _e('此插件文件已经损坏或者被不安全移除, 强烈建议你禁用它'); ?></span></td>
-                            <td><a lang="<?php _e('你确认要禁用插件 %s 吗?', $key); ?>" href="<?php $security->index('/action/plugins-edit?deactivate=' . $key); ?>"><?php _e('禁用'); ?></a></td>
-                            </tr>
+                                <tr>
+                                    <td><?php echo $key; ?></td>
+                                    <td colspan="3"><span
+                                            class="warning"><?php _e('此插件文件已经损坏或者被不安全移除, 强烈建议你禁用它'); ?></span></td>
+                                    <td><a lang="<?php _e('你确认要禁用插件 %s 吗?', $key); ?>"
+                                           href="<?php $security->index('/action/plugins-edit?deactivate=' . $key); ?>"><?php _e('禁用'); ?></a>
+                                    </td>
+                                </tr>
                             <?php endforeach; ?>
-                            <?php endif; ?>
-                            
+                        <?php endif; ?>
+
                         </tbody>
                     </table>
-                </div>
                 <?php endif; ?>
-                
-                <?php Typecho_Widget::widget('Widget_Plugins_List@unactivated', 'activated=0')->to($deactivatedPlugins); ?>
+
+                <?php \Widget\Plugins\Rows::allocWithAlias('unactivated', 'activated=0')->to($deactivatedPlugins); ?>
                 <?php if ($deactivatedPlugins->have() || !$activatedPlugins->have()): ?>
-                <h4 class="typecho-list-table-title"><?php _e('禁用的插件'); ?></h4>
-                <div class="typecho-table-wrap">
+                    <h4 class="typecho-list-table-title"><?php _e('禁用的插件'); ?></h4>
                     <table class="typecho-list-table deactivate">
                         <colgroup>
                             <col width="25%"/>
                             <col width="45%"/>
-                            <col width="8%"/>
-                            <col width="10%"/>
+                            <col width="8%" class="kit-hidden-mb"/>
+                            <col width="10%" class="kit-hidden-mb"/>
                             <col width=""/>
                         </colgroup>
                         <thead>
-                            <tr>
-                                <th><?php _e('名称'); ?></th>
-                                <th><?php _e('描述'); ?></th>
-                                <th><?php _e('版本'); ?></th>
-                                <th><?php _e('作者'); ?></th>
-                                <th class="typecho-radius-topright"><?php _e('操作'); ?></th>
-                            </tr>
+                        <tr>
+                            <th><?php _e('名称'); ?></th>
+                            <th><?php _e('描述'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('版本'); ?></th>
+                            <th class="kit-hidden-mb"><?php _e('作者'); ?></th>
+                            <th class="typecho-radius-topright"><?php _e('操作'); ?></th>
+                        </tr>
                         </thead>
                         <tbody>
-                            <?php if ($deactivatedPlugins->have()): ?>
+                        <?php if ($deactivatedPlugins->have()): ?>
                             <?php while ($deactivatedPlugins->next()): ?>
-                            <tr id="plugin-<?php $deactivatedPlugins->name(); ?>">
-                                <td><?php $deactivatedPlugins->title(); ?></td>
-                                <td><?php $deactivatedPlugins->description(); ?></td>
-                                <td><?php $deactivatedPlugins->version(); ?></td>
-                                <td><?php echo empty($deactivatedPlugins->homepage) ? $deactivatedPlugins->author : '<a href="' . $deactivatedPlugins->homepage
-                                . '">' . $deactivatedPlugins->author . '</a>'; ?></td>
-                                <td>
-                                    <a href="<?php $security->index('/action/plugins-edit?activate=' . $deactivatedPlugins->name); ?>"><?php _e('启用'); ?></a>
+                                <tr id="plugin-<?php $deactivatedPlugins->name(); ?>">
+                                    <td><?php $deactivatedPlugins->title(); ?></td>
+                                    <td><?php $deactivatedPlugins->description(); ?></td>
+                                    <td class="kit-hidden-mb"><?php $deactivatedPlugins->version(); ?></td>
+                                    <td class="kit-hidden-mb"><?php echo empty($deactivatedPlugins->homepage) ? $deactivatedPlugins->author : '<a href="' . $deactivatedPlugins->homepage
+                                            . '">' . $deactivatedPlugins->author . '</a>'; ?></td>
+                                    <td>
+                                        <a href="<?php $security->index('/action/plugins-edit?activate=' . $deactivatedPlugins->name); ?>"><?php _e('启用'); ?></a>
+                                    </td>
+                                </tr>
+                            <?php endwhile; ?>
+                        <?php else: ?>
+                            <tr>
+                                <td colspan="5"><h6 class="typecho-list-table-title"><?php _e('没有安装插件'); ?></h6>
                                 </td>
                             </tr>
-                            <?php endwhile; ?>
-                            <?php else: ?>
-                            <tr>
-                            	<td colspan="5"><h6 class="typecho-list-table-title"><?php _e('没有安装插件'); ?></h6></td>
-                            </tr>
-                            <?php endif; ?>
+                        <?php endif; ?>
                         </tbody>
                     </table>
-                </div>
                 <?php endif; ?>
-                
+
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';

admin/preview.php

@@ -0,0 +1,27 @@
+<?php
+
+include 'common.php';
+
+/** 获取内容 Widget */
+\Widget\Archive::alloc('type=single&checkPermalink=0&preview=1')->to($content);
+
+/** 检测是否存在 */
+if (!$content->have()) {
+    $response->redirect($options->adminUrl);
+}
+
+/** 检测权限 */
+if (!$user->pass('editor', true) && $content->authorId != $user->uid) {
+    $response->redirect($options->adminUrl);
+}
+
+/** 输出内容 */
+$content->render();
+?>
+<script>
+    window.onbeforeunload = function () {
+        if (!!window.parent) {
+            window.parent.postMessage('cancelPreview', '<?php $options->rootUrl(); ?>');
+        }
+    }
+</script>

admin/profile.php

@@ -3,56 +3,60 @@ include 'common.php';
 include 'header.php';
 include 'menu.php';
 
-$stat = Typecho_Widget::widget('Widget_Stat');
+$stat = \Widget\Stat::alloc();
 ?>
 
-<div class="main">
+<main class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="row typecho-page-main">
             <div class="col-mb-12 col-tb-3">
-                <p><a href="http://gravatar.com/emails/" title="<?php _e('在 Gravatar 上修改头像'); ?>"><?php echo '<img class="profile-avatar" src="' . Typecho_Common::gravatarUrl($user->mail, 220, 'X', 'mm', $request->isSecure()) . '" alt="' . $user->screenName . '" />'; ?></a></p>
+                <p><a href="https://gravatar.com/"
+                      title="<?php _e('在 Gravatar 上修改头像'); ?>"><?php echo '<img class="profile-avatar" src="' . \Typecho\Common::gravatarUrl($user->mail, 220, 'X', 'mm', $request->isSecure()) . '" alt="' . $user->screenName . '" />'; ?></a>
+                </p>
                 <h2><?php $user->screenName(); ?></h2>
                 <p><?php $user->name(); ?></p>
-                <p><?php _e('目前有 <em>%s</em> 篇日志, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.', 
-                $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?></p>
+                <p><?php _e('目前有 <em>%s</em> 篇日志, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.',
+                        $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?></p>
                 <p><?php
-                if ($user->logged > 0) {
-                    _e('最后登录: %s', Typecho_I18n::dateWord($user->logged  + $options->timezone, $options->gmtTime + $options->timezone));
-                }
-                ?></p>
+                    if ($user->logged > 0) {
+                        $logged = new \Typecho\Date($user->logged);
+                        _e('最后登录: %s', $logged->word());
+                    }
+                    ?></p>
             </div>
 
             <div class="col-mb-12 col-tb-6 col-tb-offset-1 typecho-content-panel" role="form">
                 <section>
                     <h3><?php _e('个人资料'); ?></h3>
-                    <?php Typecho_Widget::widget('Widget_Users_Profile')->profileForm()->render(); ?>
+                    <?php \Widget\Users\Profile::alloc()->profileForm()->render(); ?>
                 </section>
 
-                <?php if($user->pass('contributor', true)): ?>
-                <br>
-                <section id="writing-option">
-                    <h3><?php _e('撰写设置'); ?></h3>
-                    <?php Typecho_Widget::widget('Widget_Users_Profile')->optionsForm()->render(); ?>
-                </section>
+                <?php if ($user->pass('contributor', true)): ?>
+                    <br>
+                    <section id="writing-option">
+                        <h3><?php _e('撰写设置'); ?></h3>
+                        <?php \Widget\Users\Profile::alloc()->optionsForm()->render(); ?>
+                    </section>
                 <?php endif; ?>
 
                 <br>
 
                 <section id="change-password">
                     <h3><?php _e('密码修改'); ?></h3>
-                    <?php Typecho_Widget::widget('Widget_Users_Profile')->personalFormList(); ?>
-                    <?php Typecho_Widget::widget('Widget_Users_Profile')->passwordForm()->render(); ?>
+                    <?php \Widget\Users\Profile::alloc()->passwordForm()->render(); ?>
                 </section>
+
+                <?php \Widget\Users\Profile::alloc()->personalFormList(); ?>
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <?php
 include 'copyright.php';
 include 'common-js.php';
 include 'form-js.php';
-Typecho_Plugin::factory('admin/profile.php')->bottom();
+\Typecho\Plugin::factory('admin/profile.php')->call('bottom');
 include 'footer.php';
 ?>

admin/register.php

@@ -4,10 +4,10 @@ include 'common.php';
 if ($user->hasLogin() || !$options->allowRegister) {
     $response->redirect($options->siteUrl);
 }
-$rememberName = htmlspecialchars(Typecho_Cookie::get('__typecho_remember_name'));
-$rememberMail = htmlspecialchars(Typecho_Cookie::get('__typecho_remember_mail'));
-Typecho_Cookie::delete('__typecho_remember_name');
-Typecho_Cookie::delete('__typecho_remember_mail');
+$rememberName = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_name', ''));
+$rememberMail = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_mail', ''));
+\Typecho\Cookie::delete('__typecho_remember_name');
+\Typecho\Cookie::delete('__typecho_remember_mail');
 
 $bodyClass = 'body-100';
 
@@ -15,7 +15,7 @@ include 'header.php';
 ?>
 <div class="typecho-login-wrap">
     <div class="typecho-login">
-        <h1><a href="http://typecho.org" class="i-logo">Typecho</a></h1>
+        <h1><a href="https://typecho.org" class="i-logo">Typecho</a></h1>
         <form action="<?php $options->registerAction(); ?>" method="post" name="register" role="form">
             <p>
                 <label for="name" class="sr-only"><?php _e('用户名'); ?></label>

admin/scss/_header.scss

@@ -1,109 +0,0 @@
-/**
-* 后台头部导航
-*/
-.typecho-head-nav {
-  padding: 0 10px;
-  background: #292D33;
-}
-
-.typecho-head-nav a {
-  color: #BBB;
-}
-.typecho-head-nav a:hover,
-.typecho-head-nav a:focus {
-  color: #FFF;
-  text-decoration: none;
-}
-
-#typecho-nav-list {
-  float: left;
-  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;
-}
-
-#typecho-nav-list .parent a {
-  display: block;
-  float: left;
-  padding: 0 20px;
-  border-right: 1px solid #383D45;
-  height: 36px;
-  line-height: 36px;
-  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 {
-  position: absolute;
-  top: 36px;
-  display: none;
-  margin: 0;
-  min-width: 160px; 
-  max-width: 240px;
-  background: #202328;
-  z-index: 250;
-}
-
-#typecho-nav-list .root:hover .child {
-  display: block;
-}
-
-#typecho-nav-list .child li a {
-  color: #BBB;
-  display: block;
-  padding: 0 20px;
-  overflow: hidden;
-  text-overflow : ellipsis;
-  white-space: nowrap;
-  height: 36px;
-  line-height: 36px;
-}
-
-#typecho-nav-list .child li a:hover,
-#typecho-nav-list .child li a:focus {
-  background: #292D33;
-  color: #FFF;
-}
-#typecho-nav-list .child li.focus a {
-  color: #6DA1BB;
-  font-weight: bold;
-}
-
-.typecho-head-nav .operate {
-  float: right;
-}
-.typecho-head-nav .operate a {
-  display: inline-block;
-  margin-left: -1px;
-  padding: 0 20px;
-  border: 1px solid #383D45;
-  border-width: 0 1px;
-  line-height: 36px;
-  color: #BBB;
-}
-.typecho-head-nav .operate a:hover {
-  background-color: #202328;
-  color: #FFF;
-}

admin/scss/_pagenavi.scss

@@ -1,36 +0,0 @@
-/**
-* 后台分页
-*/
-
-.typecho-pager {
-  list-style: none;
-  float: right;
-  margin: 0;
-  padding: 0;
-  line-height: 1;
-  text-align: center;
-  zoom: 1;
-}
-
-.typecho-pager li {
-  display: inline-block;
-  margin: 0 3px;
-  height: 28px;
-  line-height: 28px;
-}
-
-.typecho-pager a {
-  display: block;
-  padding: 0 10px;
-  @include border-radius(2px);
-}
-
-.typecho-pager a:hover {
-  text-decoration: none;
-  background: #E9E9E6;
-}
-
-.typecho-pager li.current a {
-  background: #E9E9E6;
-  color: #444;
-}

admin/scss/components/_editor.scss

@@ -1,248 +0,0 @@
-/*
-* Editor
-*/
-.editor {
-  margin-bottom: -0.5em;
-}
-
-.wmd-button-row {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  height: 26px;
-  line-height: 1;
-
-  li {
-    display: inline-block;
-    margin-right: 4px;
-    padding: 3px;
-    cursor: pointer;
-    vertical-align: middle;
-    @include border-radius(2px);
-    &:hover {
-      background-color: #E9E9E6;
-    }
-    &.wmd-spacer {
-      height: 20px;
-      margin: 0 10px 0 6px;
-      padding: 0;
-      width: 1px;
-      background: #E9E9E6;
-      cursor: default;
-    }
-  }
-}
-
-#wmd-button-row span {
-  display: block;
-  width: 20px;
-  height: 20px;
-  background: transparent url(../img/editor.png) no-repeat;
-}
-
-@media 
-(-webkit-min-device-pixel-ratio: 2), 
-(min-resolution: 192dpi) {
-  #wmd-button-row span {
-    background-image: url(../img/editor@2x.png);
-    @include background-size(320px auto);
-  }
-}
-
-// 撰写预览切换 tab
-.wmd-edittab {
-  float: right;
-  margin-top: 3px;
-  font-size: .92857em;
-  a {
-    display: inline-block;
-    padding: 0 8px;
-    margin-left: 5px;
-    height: 20px;
-    line-height: 20px;
-    &:hover {
-      text-decoration: none;
-    }
-    &.active {
-      background: #E9E9E6;
-      color: #999;
-    }
-  }
-}
-
-// 控制被隐藏的 tab，全屏时显示
-.wmd-hidetab {
-  display: none;
-}
-// 隐藏编辑器，但占位
-.wmd-visualhide {
-  visibility: hidden;
-}
-
-/* 对话框 */
-.wmd-prompt-background {
-  background-color: #000;
-}
-.wmd-prompt-dialog {
-  position: fixed;
-  z-index: 1001;
-  top: 50%;
-  left: 50%;
-  margin-top: -95px;
-  margin-left: -200px;
-  padding: 20px;
-  width: 360px;
-  background: #F6F6F3;
-
-  p { margin: 0 0 5px; }
-  form { margin-top: 10px; }
-  input[type="text"] {
-    margin-bottom: 10px;
-    width: 100%;
-  }
-  button { margin-right: 10px; }
-}
-
-/* 预览 */
-#wmd-preview {
-  background: #FFF;
-  margin: 1em 0;
-  padding: 0 15px;
-  word-wrap: break-word;
-  overflow: auto;
-  @include border-radius(2px);
-  img { max-width: 100%; }
-  code, pre {
-    padding: 2px 4px;
-    background: #F3F3F0;
-    font-size: .92857em;
-  }
-  code { color: #C13; }
-  pre {
-    padding: 1em;
-    code {
-      padding: 0;
-      color: #444;
-    }
-  }
-  blockquote {
-    margin: 1em 1.5em;
-    padding-left: 1.5em;
-    border-left: 4px solid #E9E9E6;
-    color: #777;
-  }
-  hr {
-    margin: 2em auto;
-    width: 100px;
-    border: 1px solid #E9E9E6;
-    border-width: 2px 0 0 0;
-  }
-  .summary:after {
-    display: block;
-    margin: 2em 0;
-    background: #FFF9E8;
-    color: darken(#FFF9E8, 55%);
-    font-size: .85714em;
-    text-align: center;
-    content: "- more -";
-  }
-}
-
-/* 上传面板动画效果 */
-@keyframes fullscreen-upload {
-  0%   { right: -280px; }
-  100% { right: -1px; }
-}
-
-@-moz-keyframes fullscreen-upload {
-  0%   { right: -280px; }
-  100% { right: -1px; }
-}
-
-@-webkit-keyframes fullscreen-upload {
-  0%   { right: -280px; }
-  100% { right: -1px; }
-}
-
-@-o-keyframes fullscreen-upload {
-  0%   { right: -280px; }
-  100% { right: -1px; }
-}
-
-/* 编辑器全屏 */
-.fullscreen {
-  #wmd-button-bar, #text, #wmd-preview, .submit {
-    // position: fixed;
-    position: absolute;
-    top: 0;
-    width: 50%;
-    background: #FFF;
-    z-index: 999;
-    @include box-sizing(border-box);
-    @include border-radius(0);
-  }
-  #wmd-button-bar {
-    left: 0;
-    padding: 13px 20px;
-    border-bottom: 1px solid #F3F3F0;
-    z-index: 1000;
-  }
-  #text {
-    top: 53px;
-    left: 0;
-    padding: 20px;
-    border: none;
-    outline: none;
-  }
-  #wmd-preview {
-    top: 53px;
-    right: 0;
-    margin: 0;
-    padding: 5px 20px;
-    border: none;
-    border-left: 1px solid #F3F3F0;
-    background: #F6F6F3;
-    overflow: auto;
-    code, pre {
-      background: #F0F0EC;
-    }
-  }
-  .submit {
-    right: 0;
-    margin: 0;
-    padding: 10px 20px;
-    border-bottom: 1px solid #F3F3F0;
-  }
-  #upload-panel {
-    -webkit-box-shadow: 0 4px 16px rgba(0,0,0,0.225);
-    box-shadow: 0 4px 16px rgba(0,0,0,0.225);
-    border-style: solid;
-  }
-
-  // 全屏附件上传
-  #tab-files {
-    position: absolute;
-    top: 52px;
-    right: -1px;
-    width: 280px;
-    z-index: 1001;
-
-    animation: fullscreen-upload 0.5s;
-    -moz-animation: fullscreen-upload 0.5s;
-    -webkit-animation: fullscreen-upload 0.5s;
-    -o-animation: fullscreen-upload 0.5s;
-  }
-
-  .wmd-edittab,
-  .typecho-post-option,
-  .title,
-  .url-slug,
-  .typecho-page-title,
-  .typecho-head-nav,
-  .message { display: none; }
-  .wmd-hidetab { display: block; }
-  .wmd-visualhide,
-  #btn-fullscreen-upload {
-    visibility: visible;
-  }
-}

admin/scss/components/_retina.scss

@@ -1,12 +0,0 @@
-@import "compass/css3/background-size";
-
-@mixin image-2x($image, $width, $height) {
-  @media (-webkit-min-device-pixel-ratio: 1.3),
-         (min-resolution: 124.8dpi),
-         (min-resolution: 1.3dppx) {
-      & {
-        background-image: url($image);
-        @include background-size($width $height);
-      }
-  }
-}

admin/scss/style.scss

@@ -1,947 +0,0 @@
-/* vim: set et sw=2 ts=2 sts=2 fdm=marker ff=unix fenc=utf8 */
-/**
-* Typecho 后台样式
-*
-* @author  Typecho Team
-* @since   2008-09-26
-* @update  2013-11-02
-* @link    http://www.typecho.org/
-* @version 0.9
-*/
-
-@import "compass";
-
-/**
-* Typecho 全局样式
-*/
-
-html {
-  height: 100%;
-}
-
-body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  background: #F6F6F3;
-  color: #444;
-  font-size: 87.5%;
-  line-height: 1.5;
-}
-
-a {
-  color: #467B96;
-  text-decoration: none;
-  &:hover {
-    color: #499BC3;
-    text-decoration: underline;
-  }
-}
-
-code, pre, .mono { 
-  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-}
-
-.p { margin: 1em 0; }
-
-.body-100 {
-  height: 100%;
-}
-
-a.balloon-button {
-  display: inline-block;
-  padding: 0 6px;
-  min-width: 12px;
-  height: 18px;
-  line-height: 18px;
-  background: #D8E7EE;
-  font-size: .85714em;
-  text-align: center;
-  text-decoration: none;
-  
-  /** 修正ie中文不对齐 */
-  zoom:1;
-  
-  -moz-border-radius: 30px;
-  -webkit-border-radius: 30px;
-  border-radius: 30px;
-}
-
-a.button:hover, a.balloon-button:hover {
-  background-color: #A5CADC;
-  color: #FFF;
-  text-decoration: none;
-}
-
-
-@import "forms";
-@import "buttons";
-@import "messages";
-@import "pagenavi";
-
-@import "header";
-@import "footer";
-
-/* 低版本浏览器升级提示 */
-.browsehappy {
-  border: none;
-  text-align: center;
-}
-
-/** 顶部消息样式 by 70 */
-.popup {
-  display: none;
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 8px 0;
-  border: none;
-  width: 100%;
-  z-index: 10;
-  text-align: center;
-
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  border-radius: 0;
-}
-
-.popup ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  text-align: center;
-}
-
-.popup ul li {
-  display: inline-block;
-  margin-right: 10px;
-}
-
-/**
-* logo 的样式
-*/
-.logo {
-}
-
-/**
-* 载入状态
-*/
-.loading {
-  padding-left: 20px !important;
-  background: transparent url(../img/ajax-loader.gif) no-repeat left center;
-}
-
-
-/**
-* 典型配置选项
-*/
-.typecho-option {
-  list-style: none;
-  margin: 1em 0;
-  padding: 0;
-}
-
-.typecho-option li {
-}
-
-.typecho-option-submit li {
-  border-bottom: none;
-}
-
-.typecho-option label.typecho-label {
-  display: block;
-  margin-bottom: .5em;
-  font-weight: bold;
-}
-.typecho-option label.required:after {
-  content: " *";
-  color: #B94A48;
-}
-.typecho-option label.typecho-label+input {
-}
-.typecho-option span { margin-right: 15px; }
-.typecho-option .description {
-  margin: .5em 0 0;
-  color: #999;
-  font-size: .92857em;
-}
-
-.front-archive {
-  padding-left: 1.5em;
-}
-
-.profile-avatar {
-  border: 1px dashed #D9D9D6;
-  max-width: 100%;
-}
-
-/** 增加配置面板内部的错误样式 by 70 */
-
-
-/** 
-* 安装样式
-* 
-* @author mingcheng
-* @date   2008-09-06
-*/
-
-/**
-* 安装向导
-*/
-.typecho-install {
-  padding-bottom: 2em;
-}
-.typecho-install-patch {
-  margin-bottom: 2em;
-  padding: 2em 0;
-  background-color: #292D33;
-  color: #FFF;
-  text-align: center;
-}
-
-.typecho-install-patch ol {
-  list-style: none;
-  margin: 3em 0 1em;
-  padding: 0;
-  color: #999;
-}
-.typecho-install-patch li {
-  display: inline-block;
-  margin: 0 .8em;
-}
-.typecho-install-patch span {
-  display: inline-block;
-  margin-right: 5px;
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  border: 2px solid #999;
-  text-align: center;
-  border-radius: 2em;
-}
-.typecho-install-patch li.current {
-  color: #FFF;
-  font-weight: bold;
-}
-.typecho-install-patch li.current span {
-  border-color: #FFF;
-}
-
-
-/**
-* 安装主体内容
-*/
-
-.typecho-install .typecho-install-body input {
-  width: 100%;
-}
-.typecho-install-body .typecho-option li {
-  margin: 1em 0;
-}
-
-
-/**
-* 欢迎界面
-*/
-
-#typecho-welcome {
-  margin: 1em 0;
-  padding: 1em 2em;
-  background-color: #E9E9E6;
-}
-
-.welcome-board {
-  color: #999;
-  font-size: 1.15em;
-  em {
-    color: #444;
-    font-size: 2em;
-    font-style: normal;
-    font-family: Georgia, serif;
-  }
-}
-
-#start-link {
-  margin-bottom: 25px;
-  padding: 0 0 35px;
-  border-bottom: 1px solid #ECECEC;
-  li {
-    float: left;
-    margin-right: 1.5em;
-  }
-  .balloon {
-    margin-top: 2px;
-  }
-}
-
-.latest-link {
-  li {
-    white-space: nowrap;
-    overflow: hidden; 
-    text-overflow: ellipsis;
-  }
-  span {
-    display: inline-block;
-    margin-right: 4px;
-    padding-right: 8px;
-    border-right: 1px solid #ECECEC;
-    width: 37px;
-    text-align: right;
-    color: #999;
-  }
-}
-
-.update-check {
-  font-size: 14px;
-}
-
-/**
-* 登录框
-*/
-.typecho-login-wrap {
-  display: table;
-  margin: 0 auto;
-  height: 100%;
-}
-.typecho-login {
-  display: table-cell;
-  padding: 30px 0 100px;
-  width: 280px;
-  text-align: center;
-  vertical-align: middle;
-  h1 {
-    margin: 0 0 1em; 
-  }
-}
-
-.typecho-login .more-link {
-  margin-top: 2em;
-  color: #CCC;
-}
-.typecho-login .more-link a { margin: 0 3px; }
-
-/**
-* 标题
-*/
-.typecho-page-title {
-}
-.typecho-page-title h2 {
-  margin: 25px 0 10px;
-  font-size: 1.28571em;
-}
-.typecho-page-title h2 a {
-  margin-left: 10px;
-  padding: 3px 8px;
-  background: #E9E9E6;
-  font-size: .8em;
-
-  border-radius: 2px;
-}
-.typecho-page-title h2 a:hover {
-  text-decoration: none;
-}
-
-/**
-* 后台页面主体
-*/
-
-
-/**
-* 主页主体
-*/
-.typecho-dashboard {
-}
-.typecho-dashboard ul {
-  list-style: none;
-  padding: 0;
-}
-.typecho-dashboard li {
-  margin-bottom: 5px;
-}
-
-
-/**
-* 标签页
-*/
-.typecho-option-tabs {
-  list-style: none;
-  margin: 1em 0 0;
-  padding: 0;
-  font-size: 13px;
-  text-align: center;
-  &.fix-tabs {
-    margin-bottom: 1em;
-  }
-}
-
-.typecho-option-tabs a {
-  display: block;
-  margin-right: -1px;
-  border: 1px solid #D9D9D6;
-  padding: 0 15px;
-  height: 26px;
-  line-height: 26px;
-  color: #666;
-  @include box-sizing(border-box);
-  
-}
-.typecho-option-tabs a:hover {
-  background-color: #E9E9E6;
-  color: #666;
-  text-decoration: none;
-}
-
-.typecho-option-tabs li {
-  float: left;
-  &:first-child a {
-    @include border-radius(2px 0 0 2px);
-  }
-  &:last-child a {
-    @include border-radius(0 2px 2px 0);
-  }
-}
-
-.typecho-option-tabs.right {
-  float: right;
-}
-
-.typecho-option-tabs li.current a,
-.typecho-option-tabs li.active a {
-  background-color: #E9E9E6;
-}
-
-
-/**
-* 表格列表页
-*/
-
-/**
-* 列表页选项
-*/
-.typecho-list .typecho-pager {
-}
-
-.typecho-list-operate {
-  margin: 1em 0;
-}
-
-.typecho-list-operate input,
-.typecho-list-operate button,
-.typecho-list-operate select {
-  vertical-align: bottom;
-}
-
-.typecho-list-operate input[type="checkbox"] {
-  vertical-align: text-top;
-}
-
-.typecho-list-operate .operate {
-  float: left;
-}
-
-.typecho-list-operate .search {
-  float: right;
-}
-
-.typecho-list-operate span.operate-delete, a.operate-delete,
-.typecho-list-operate span.operate-button-delete, a.operate-button-delete {
-  color: #B94A48;
-}
-
-a.operate-edit {
-  color: #007700;
-}
-
-a.operate-reply {
-  color: #545c30;
-}
-
-.typecho-list-operate a:hover {
-  text-decoration: none;
-}
-
-/**
-* 列表表格
-*/
-/** 增加表格标题 by 70 */
-.typecho-list-table-title {
-  margin: 1em 0;
-  color: #999;
-  text-align: center;
-}
-.typecho-table-wrap {
-  padding: 30px;
-  background: #FFF;
-}
-.typecho-list-table {
-  width: 100%;
-}
-
-.typecho-list-table.deactivate {
-  color: #999;
-}
-
-.typecho-list-table .right {
-  text-align: right;
-}
-
-.typecho-list-table th {
-  padding: 0 10px 10px;
-  border-bottom: 2px solid #F0F0EC;
-  text-align: left;
-}
-
-.typecho-list-table td {
-  padding: 10px;
-  border-top: 1px solid #F0F0EC;
-  word-break: break-all;
-}
-.typecho-list-table .status {
-  margin-left: 5px;
-  color: #999;
-  font-size: .92857em;
-  font-style: normal;
-}
-.typecho-list-table tbody tr:hover td {
-  background-color: #F6F6F3;
-}
-
-.typecho-list-table tbody tr.checked td {
-  background-color: #FFF9E8;
-}
-
-.warning {
-  color: #B94A48;
-}
-
-
-.typecho-list-table tr td .hidden-by-mouse {
-  @include opacity(0); 
-}
-
-.typecho-list-table tr:hover td .hidden-by-mouse {
-  @include opacity(1);
-}
-
-
-/**
-* 评论管理
-*/
-
-.comment-reply-content {
-  position: relative;
-  margin: 1em 0;
-  padding: 0 1em;
-  border: 1px solid transparent;
-  background-color: #F0F0EC;
-}
-.comment-reply-content:after {
-  position: absolute;
-  right: 1em;
-  border: 8px solid #F0F0EC;
-  border-color: #F0F0EC #F0F0EC transparent transparent;
-  content: " ";
-}
-
-.comment-meta span,
-.comment-date {
-  font-size: .92857em;
-  color: #999;
-}
-
-.comment-action a, .comment-action span { margin-right: 4px; }
-
-.comment-edit label {
-  display: block;
-}
-
-
-/**
-* 评论回复
-*/
-#typecho-respond {
-  padding: 10px;
-  display: none;
-}
-
-
-/**
-* 模板列表
-*/
-.typecho-theme-list {
-}
-
-.typecho-theme-list .theme-item {
-}
-
-.typecho-theme-list td {
-}
-
-.typecho-theme-list img {
-  margin: 1em 0;
-  max-width: 100%;
-  max-height: 240px;
-}
-
-.typecho-theme-list cite {
-  font-style: normal;
-  color: #999;
-}
-
-.typecho-theme-list tbody tr.current td {
-  background-color: #FFF9E8;
-}
-
-
-/**
-* 后台配置项
-*/
-
-.typecho-page-main .typecho-option input.text {
-  width: 100%;
-}
-
-.typecho-page-main .typecho-option input.num {
-  width: 40px;
-}
-
-.typecho-page-main .typecho-option textarea {
-  width: 100%;
-  height: 100px;
-}
-
-.typecho-page-main .typecho-option .multiline {
-  display: block;
-  margin: .3em 0;
-  &.hidden {
-    display: none;
-  }
-}
-
-
-/**
-* 编辑模板
-*/
-.typecho-select-theme {
-  height: 25px;
-  line-height: 25px;
-  margin: 15px 0px;
-}
-
-.typecho-select-theme h5 {
-  color: #E47E00;
-  font-weight: bold;
-  float: left;
-  font-size: 14px;
-  width: 120px;
-  margin-right: 10px;
-}
-
-.typecho-select-theme select {
-  width: 150px;
-}
-
-/**
-* 编辑模板（编辑详情）
-*/
-
-.typecho-edit-theme ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.typecho-edit-theme li {
-  padding: 3px 10px;
-}
-
-.typecho-edit-theme .current {
-  background-color: #E6E6E3;
-}
-.typecho-edit-theme .current a {
-  color: #444;
-}
-
-.typecho-edit-theme textarea {
-  font-size: .92857em;
-  line-height: 1.2;
-  height: 500px;
-}
-
-/**
-* 编写页面
-*/
-
-.typecho-post-area .edit-draft-notice {
-  color: #999;
-  font-size: .92857em;
-}
-.typecho-post-area .edit-draft-notice a { color: #B94A48; }
-
-.typecho-post-area .typecho-label {
-  display: block;
-  margin: 1em 0 -0.5em;
-  font-weight: bold;
-}
-
-.typecho-post-area #auto-save-message {
-  display: block;
-  margin-top: 0.5em;
-  color: #999;
-  font-size: .92857em;
-}
-
-.typecho-post-area .submit .right button {
-  margin-left: 5px;
-}
-
-.typecho-post-area .right {
-  float: right;
-  padding-left: 24px;
-}
-
-.typecho-post-area .left {
-  float: left;
-}
-
-.typecho-post-area input.text {
-}
-
-.typecho-post-area .out-date {
-  border: 1px solid #D3DBB3;
-  padding: 3px;
-  background: #fff;
-}
-
-.typecho-post-area input.title {
-  font-size: 1.17em;
-  font-weight: bold;
-}
-.typecho-post-area .url-slug {
-  margin-top: -0.5em;
-  color: #AAA;
-  font-size: .92857em;
-  word-break: break-word;
-}
-.typecho-post-area #slug {
-  padding: 2px;
-  border: none;
-  background: #FFFBCC;
-  color: #666;
-}
-
-.typecho-post-area #text {
-  resize: none;
-}
-
-#advance-panel {
-  display: none;
-}
-
-#custom-field {
-  margin: 1em 0;
-  padding: 10px 15px;
-  background: #FFF;
-  &.fold {
-    table, .description { display: none; }
-  }
-
-  .description {
-    margin-top: 10px;
-    text-align: right;
-    button {
-      float: left;
-    }
-  }
-
-  p.description {
-    text-align: left;
-  }
-
-  .typecho-label {
-    margin: 0;
-    a {
-      display: block;
-      color: #444;
-      &:hover {
-        color: #467B96;
-        text-decoration: none;
-      }
-    }
-  }
-  table {
-    margin-top: 10px;
-  }
-  td {
-    padding: 10px 5px;
-    font-size: .92857em;
-    border-bottom: 1px solid #F0F0EC;
-    vertical-align: top;
-    label {
-      font-size: 1em;
-      font-weight: normal;
-    }
-  }
-  select { height: 27px; }
-}
-
-.typecho-post-area .is-draft {
-background: #FFF1A8;
-}
-
-.typecho-post-option .description {
-  margin-top: -0.5em;
-  color: #999;
-  font-size: .92857em;
-}
-
-.category-option ul {
-  list-style: none;
-  border: 1px solid #D9D9D6;
-  padding: 6px 12px;
-  max-height: 240px;
-  overflow: auto;
-  background-color: #FFF;
-  border-radius: 2px;
-}
-.category-option li {
-  margin: 3px 0;
-}
-
-.visibility-option ul,
-.allow-option ul {
-  list-style: none;
-  padding: 0;
-}
-
-
-/**
-* 标签列表
-*/
-
-.typecho-page-main ul.tag-list {
-  list-style: none;
-  margin: 0;
-  padding: 20px;
-  background-color: #FFF;
-}
-
-.typecho-page-main ul.tag-list li {
-  display: inline-block;
-  margin: 0 0 5px 0;
-  padding: 5px 5px 5px 10px;
-  cursor: pointer;
-}
-.typecho-page-main ul.tag-list li:hover {
-  background-color: #E9E9E6;
-}
-
-.typecho-page-main ul.tag-list li input {
-  display: none;
-}
-
-
-.typecho-page-main ul.tag-list li.checked {
-  background-color: #FFFBCC;
-}
-
-.typecho-page-main ul.tag-list li.size-5 { font-size: 1em; }
-.typecho-page-main ul.tag-list li.size-10 { font-size: 1.2em; }
-.typecho-page-main ul.tag-list li.size-20 { font-size: 1.4em; }
-.typecho-page-main ul.tag-list li.size-30 { font-size: 1.6em; }
-.typecho-page-main ul.tag-list li.size-0 { font-size: 1.8em; }
-
-.typecho-page-main .tag-edit-link { visibility: hidden; }
-.typecho-page-main li:hover .tag-edit-link { visibility: visible; }
-
-.typecho-attachment-photo {
-  border: 1px solid #E6E6E3;
-  max-width: 100%;
-}
-
-
-/*
-* Upload
-*/
-#upload-panel {
-  border: 1px dashed #D9D9D6;
-  background-color: #FFF;
-  color: #999;
-  font-size: .92857em;
-  &.drag {
-    background-color: #FFFBCC;
-  }
-}
-
-.upload-area {
-  padding: 15px;
-  text-align: center;
-}
-
-#file-list {
-  list-style: none;
-  margin: 0 10px;
-  padding: 0;
-  max-height: 450px;
-  overflow: auto;
-  word-break: break-all;
-  li,
-  .insert {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-  li {
-    padding: 8px 0;
-    border-top: 1px dashed #D9D9D6;
-  }
-  .insert {
-    display: block;
-    max-width: 100%;
-  }
-  .file {
-    margin-left: 5px;
-  }
-  .info {
-    text-transform: uppercase;
-  }
-}
-
-#btn-fullscreen-upload {
-  visibility: hidden;
-}
-
-
-/**
-* 附件管理
-*/
-.edit-media button { margin-right: 6px; }
-
-/* 拖动调整 textarea 大小 */
-.resize {
-  display: block;
-  margin: 2px auto 0;
-  padding: 2px 0;
-  border: 1px solid #D9D9D6;
-  border-width: 1px 0;
-  width: 60px;
-  cursor: row-resize;
-  i {
-    display: block;
-    height: 1px;
-    background-color: #D9D9D6;
-  }
-}
-
-/* 拖动排序 */
-.tDnD_whileDrag {
-  background-color: #FFFBCC;
-}
-
-
-/**
-* 导入扩展样式
-*/
-
-@import "icons";
-@import "components";
-@import "hidden";