From 260fda92db779f4165ed3133c9125cbde6a5389e Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Wed, 6 Nov 2013 11:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Issue=20#56=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/copyright.php          | 2 +-
 admin/css/style.css          | 4 +++-
 admin/index.php              | 6 +++---
 admin/login.php              | 2 +-
 admin/manage-comments.php    | 4 ++--
 admin/manage-medias.php      | 4 ++--
 admin/manage-metas.php       | 4 ++--
 admin/manage-pages.php       | 4 ++--
 admin/manage-posts.php       | 4 ++--
 admin/manage-users.php       | 4 ++--
 admin/media.php              | 4 ++--
 admin/menu.php               | 2 +-
 admin/options-discussion.php | 2 +-
 admin/options-general.php    | 2 +-
 admin/options-permalink.php  | 2 +-
 admin/options-plugin.php     | 2 +-
 admin/options-reading.php    | 2 +-
 admin/options-theme.php      | 2 +-
 admin/profile.php            | 2 +-
 admin/register.php           | 2 +-
 admin/scss/style.scss        | 4 +++-
 admin/user.php               | 2 +-
 admin/write-page.php         | 9 +++++----
 admin/write-post.php         | 8 ++++----
 24 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/admin/copyright.php b/admin/copyright.php
index 1785e29c..73e94850 100644
--- a/admin/copyright.php
+++ b/admin/copyright.php
@@ -1,5 +1,5 @@
 <?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<div class="typecho-foot">
+<div class="typecho-foot" role="contentinfo">
     <div class="copyright">
         <?php _e('由 <a href="http://typecho.org">%s</a> 强力驱动, 版本 %s (%s)', $options->software, $prefixVersion, $suffixVersion); ?>
     </div>
diff --git a/admin/css/style.css b/admin/css/style.css
index 19ac37a4..1dca2084 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -870,7 +870,9 @@ a.operate-reply {
   font-size: .92857em; }
 
 .typecho-post-area #advance-panel-btn {
-  color: #999; }
+  padding: 0 10px;
+  height: 26px;
+  font-size: .92857em; }
 
 .typecho-post-area #advance-panel {
   display: none; }
diff --git a/admin/index.php b/admin/index.php
index bf0839fe..c69f68c0 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -9,7 +9,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
     <div class="container typecho-dashboard">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav">
+            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav" role="main">
                 <p class="intro"><?php _e('欢迎使用 Typecho, 您可以使用下面的链接开始您的 Blog 之旅:'); ?></p>
             
                 <ul class="intro-link">
@@ -54,7 +54,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                 </div>
             </div>
 
-            <div class="col-mb-12 col-tb-6 typecho-dashboard-main">
+            <div class="col-mb-12 col-tb-6 typecho-dashboard-main" role="complementary">
                 <section>
                     <h3><?php _e('最近发表的文章'); ?></h3>
                     <?php Typecho_Widget::widget('Widget_Contents_Post_Recent', 'pageSize=7')->to($posts); ?>
@@ -90,7 +90,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                 </section>
             </div>
 
-            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav">
+            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav" role="complementary">
                 <?php $version = Typecho_Cookie::get('__typecho_check_version'); ?>
                 <?php if ($version && $version['available']): ?>
                 <div class="update-check">
diff --git a/admin/login.php b/admin/login.php
index 2b76d3f9..124a815b 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -24,7 +24,7 @@ Typecho_Cookie::delete('__typecho_remember_name');
 
 <div class="typecho-login">
     <h1>Typecho</h1>
-    <form action="<?php $options->loginAction(); ?>" method="post" name="login">
+    <form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form">
         <p>
             <label for="name" class="visuallyhidden"><?php _e('用户名'); ?></label>
             <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" />
diff --git a/admin/manage-comments.php b/admin/manage-comments.php
index b2e6fe1a..04311b38 100644
--- a/admin/manage-comments.php
+++ b/admin/manage-comments.php
@@ -10,7 +10,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <ul class="typecho-option-tabs clearfix">
                     <li<?php if(!isset($request->status) || 'approved' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php'
@@ -58,7 +58,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
                         </ul>
                         </div>
                         </div>
-                        <div class="search">
+                        <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) ? '?' .
diff --git a/admin/manage-medias.php b/admin/manage-medias.php
index 1d48a4da..d7f11fc2 100644
--- a/admin/manage-medias.php
+++ b/admin/manage-medias.php
@@ -10,7 +10,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group typecho-page-main" role="main">
             <div class="col-mb-12">
                 
                 <div class="typecho-list-operate clearfix">
@@ -24,7 +24,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                     </ul>
                     </div>  
                     </div>
-                    <div class="search">
+                    <div class="search" role="search">
                     <?php if ('' != $request->keywords): ?>
                     <a href="<?php $options->adminUrl('manage-medias.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                     <?php endif; ?>
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index f483c1a4..4ea98cf2 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -15,7 +15,7 @@ include 'menu.php';
                     </ul>
                 </div>
                 
-                <div class="col-mb-12 col-tb-8">
+                <div class="col-mb-12 col-tb-8" role="main">
                     <?php if(!isset($request->type) || 'category' == $request->get('type')): ?>
                     <?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($categories); ?>
                     
@@ -123,7 +123,7 @@ include 'menu.php';
                     <?php endif; ?>
                     
                 </div>
-                <div class="col-mb-12 col-tb-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
+                <div class="col-mb-12 col-tb-4" role="form">
                     <?php if(!isset($request->type) || 'category' == $request->get('type')): ?>
                         <?php Typecho_Widget::widget('Widget_Metas_Category_Edit')->form()->render(); ?>
                     <?php else: ?>
diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index a9a7f057..2821fe24 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                 <form method="get">
@@ -21,7 +21,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                     </ul>
                     </div>
                     </div>
-                    <div class="search">
+                    <div class="search" role="search">
                     <?php if ('' != $request->keywords): ?>
                     <a href="<?php $options->adminUrl('manage-pages.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                     <?php endif; ?>
diff --git a/admin/manage-posts.php b/admin/manage-posts.php
index f36c974d..f1f8e18f 100644
--- a/admin/manage-posts.php
+++ b/admin/manage-posts.php
@@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                     <form method="get">
@@ -21,7 +21,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                         </ul>
                         </div>  
                         </div>
-                        <div class="search">
+                        <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; ?>
diff --git a/admin/manage-users.php b/admin/manage-users.php
index 5d17b82f..a18e9b9e 100644
--- a/admin/manage-users.php
+++ b/admin/manage-users.php
@@ -6,7 +6,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                 <form method="get">
@@ -19,7 +19,7 @@ include 'menu.php';
                     </ul>
                     </div>  
                     </div>
-                    <div class="search">
+                    <div class="search" role="search">
                     <?php if ('' != $request->keywords): ?>
                     <a href="<?php $options->adminUrl('manage-users.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                     <?php endif; ?>
diff --git a/admin/media.php b/admin/media.php
index 373887df..2c42b666 100644
--- a/admin/media.php
+++ b/admin/media.php
@@ -10,7 +10,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-mb-12 col-tb-8">
+            <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>
                 <?php endif; ?>
@@ -31,7 +31,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
                     <ul id="file-list"></ul>
                 </div>
             </div>
-            <div class="col-mb-12 col-tb-4 edit-media">
+            <div class="col-mb-12 col-tb-4 edit-media" role="form">
                 <?php $attachment->form()->render(); ?>
             </div>
         </div>
diff --git a/admin/menu.php b/admin/menu.php
index 1655b6b5..0594f570 100644
--- a/admin/menu.php
+++ b/admin/menu.php
@@ -1,5 +1,5 @@
 <?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<div class="typecho-head-nav clearfix">
+<div class="typecho-head-nav clearfix" role="navigation">
     <nav id="typecho-nav-list">
         <?php $menu->output(); ?>
     </nav>
diff --git a/admin/options-discussion.php b/admin/options-discussion.php
index 9c0e7f97..cebf829f 100644
--- a/admin/options-discussion.php
+++ b/admin/options-discussion.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group 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(); ?>
             </div>
diff --git a/admin/options-general.php b/admin/options-general.php
index 44138159..5491854f 100644
--- a/admin/options-general.php
+++ b/admin/options-general.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group 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(); ?>
             </div>
diff --git a/admin/options-permalink.php b/admin/options-permalink.php
index 20c2dcd0..ea87cad8 100644
--- a/admin/options-permalink.php
+++ b/admin/options-permalink.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group 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(); ?>
             </div>
diff --git a/admin/options-plugin.php b/admin/options-plugin.php
index 89426357..98067428 100644
--- a/admin/options-plugin.php
+++ b/admin/options-plugin.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group 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(); ?>
             </div>
diff --git a/admin/options-reading.php b/admin/options-reading.php
index 4a4daf4d..67965d14 100644
--- a/admin/options-reading.php
+++ b/admin/options-reading.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group 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(); ?>
             </div>
diff --git a/admin/options-theme.php b/admin/options-theme.php
index c5d8e8c9..71fb5cc5 100644
--- a/admin/options-theme.php
+++ b/admin/options-theme.php
@@ -15,7 +15,7 @@ include 'menu.php';
                     <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">
+            <div class="col-mb-12 col-tb-8 col-tb-offset-2" role="form">
                 <?php Typecho_Widget::widget('Widget_Themes_Config')->config()->render(); ?>
             </div>
         </div>
diff --git a/admin/profile.php b/admin/profile.php
index 256e199e..f4409033 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -23,7 +23,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                 ?></p>
             </div>
 
-            <div class="col-mb-12 col-tb-6 col-tb-offset-1 typecho-content-panel">
+            <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(); ?>
diff --git a/admin/register.php b/admin/register.php
index 6ff89f4f..4d6206aa 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -40,7 +40,7 @@ Typecho_Cookie::delete('__typecho_remember_mail');
 
 <div class="typecho-login">
     <h1>Typecho</h1>
-    <form action="<?php $options->registerAction(); ?>" method="post" name="register">
+    <form action="<?php $options->registerAction(); ?>" method="post" name="register" role="form">
         <p>
             <label for="name" class="visuallyhidden"><?php _e('用户名'); ?></label>
             <input type="text" id="name" name="name" placeholder="<?php _e('用户名'); ?>" value="<?php echo $rememberName; ?>" class="text-l w-100" />
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index 135c9df8..bd0bbc11 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -650,7 +650,9 @@ a.operate-reply {
 }
 
 .typecho-post-area #advance-panel-btn {
-  color: #999;
+  padding: 0 10px;
+  height: 26px;
+  font-size: .92857em;
 }
 
 .typecho-post-area #advance-panel {
diff --git a/admin/user.php b/admin/user.php
index ac8ed1e1..3ea13fb3 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -8,7 +8,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="col-group typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-6 col-tb-offset-3">
                 <?php Typecho_Widget::widget('Widget_Users_Edit')->form()->render(); ?>
             </div>
diff --git a/admin/write-page.php b/admin/write-page.php
index db55fd36..bf53fcda 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -7,9 +7,9 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main typecho-post-area">
+        <div class="col-group typecho-page-main typecho-post-area" role="form">
             <form action="<?php $options->index('/action/contents-page-edit'); ?>" method="post" name="write_page">
-                <div class="col-mb-12 col-tb-9">
+                <div class="col-mb-12 col-tb-9" role="main">
                     <?php if ($page->draft && $page->draft['cid'] != $page->cid): ?>
                     <?php $pageModifyDate = new Typecho_Date($page->draft['modified']); ?>
                         <cite class="edit-draft-notice"><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $pageModifyDate->word(), 
@@ -53,7 +53,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                         </span>
                     </p>
                 </div>
-                <div class="col-mb-12 col-tb-3">
+                <div class="col-mb-12 col-tb-3" role="complementary">
                         <section  class="typecho-post-option">
                             <label for="date" class="typecho-label"><?php _e('发布日期'); ?></label>
                             <p><input class="typecho-date w-100" type="text" name="date" id="date" value="<?php $page->have() ? $page->date('Y-m-d H:i') : ''; ?>" /></p>
@@ -79,6 +79,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                         </section>
 
                         <?php Typecho_Plugin::factory('admin/write-page.php')->option($page); ?>
+
+                        <button id="advance-panel-btn"><?php _e('高级选项'); ?></button>
                         <div id="advance-panel">
                             <section class="typecho-post-option allow-option">
                                 <label class="typecho-label"><?php _e('权限控制'); ?></label>
@@ -94,7 +96,6 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                             
                             <?php Typecho_Plugin::factory('admin/write-page.php')->advanceOption($page); ?>
                         </div>
-                        <a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
                         <?php if($page->have()): ?>
                         <?php $modified = new Typecho_Date($page->modified); ?>
                         <section class="typecho-post-option">
diff --git a/admin/write-post.php b/admin/write-post.php
index c40c31b5..75bc9acf 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -7,9 +7,9 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main typecho-post-area">
+        <div class="col-group typecho-page-main typecho-post-area" role="form">
             <form action="<?php $options->index('/action/contents-post-edit'); ?>" method="post" name="write_post">
-                <div class="col-mb-12 col-tb-9">
+                <div class="col-mb-12 col-tb-9" role="main">
                     <?php if ($post->draft && $post->draft['cid'] != $post->cid): ?>
                     <?php $postModifyDate = new Typecho_Date($post->draft['modified']); ?>
                     <cite class="edit-draft-notice"><?php _e('你正在编辑的是保存于 %s 的草稿, 你也可以 <a href="%s">删除它</a>', $postModifyDate->word(), 
@@ -57,7 +57,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                         </span>
                     </p>
                 </div>
-                <div class="col-mb-12 col-tb-3">
+                <div class="col-mb-12 col-tb-3" role="complementary">
                     <section class="typecho-post-option">
                         <label for="date" class="typecho-label"><?php _e('发布日期'); ?></label>
                         <p><input class="typecho-date w-100" type="text" name="date" id="date" value="<?php $post->have() ? $post->date('Y-m-d H:i') : ''; ?>" /></p>
@@ -88,6 +88,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
 
                     <?php Typecho_Plugin::factory('admin/write-post.php')->option($post); ?>
 
+                    <button id="advance-panel-btn"><?php _e('高级选项'); ?></button>
                     <div id="advance-panel">
                         <?php if($user->pass('editor', true)): ?>
                         <section class="typecho-post-option visibility-option">
@@ -122,7 +123,6 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                         </section>
                         <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOption($post); ?>
                     </div><!-- end #advance-panel -->
-                    <a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
 
                     <?php if($post->have()): ?>
                     <?php $modified = new Typecho_Date($post->modified); ?>