From 31b06efc56b42b4656880459fb722dd0f0208cce Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Fri, 6 Dec 2013 17:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8F=B0=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E7=9A=84=20landmark=20main=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20label=20=E4=BF=AE=E5=A4=8D=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A8=A1=E6=9D=BF=E8=AF=84=E8=AE=BA=20label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/custom-fields.php         | 25 +++++----
 admin/options-theme.php         |  2 +-
 admin/plugins.php               |  2 +-
 admin/theme-editor.php          |  2 +-
 admin/themes.php                |  2 +-
 admin/upgrade.php               |  2 +-
 admin/welcome.php               |  2 +-
 usr/themes/default/comments.php | 96 ++++++++++++++++-----------------
 8 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/admin/custom-fields.php b/admin/custom-fields.php
index d857b074..d91f75c4 100644
--- a/admin/custom-fields.php
+++ b/admin/custom-fields.php
@@ -21,15 +21,22 @@ $defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaul
                             <?php endforeach; ?>
                             <?php foreach ($fields as $field): ?>
                             <tr>
-                                <td><input type="text" name="fieldNames[]" value="<?php echo htmlspecialchars($field['name']); ?>" class="text-s w-100"></td>
                                 <td>
-                                    <select name="fieldTypes[]" id="">
+                                    <label for="fieldname" class="visuallyhidden"><?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="visuallyhidden"><?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><textarea name="fieldValues[]" class="text-s w-100" rows="2"><?php echo htmlspecialchars($field[$field['type'] . '_value']); ?></textarea></td>
+                                <td>
+                                    <label for="fieldvalue" class="visuallyhidden"><?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-xs"><?php _e('删除'); ?></button>
                                 </td>
@@ -38,20 +45,20 @@ $defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaul
                             <?php if (empty($defaultFields) && empty($fields)): ?>
                             <tr>
                                 <td>
-                                    <label for="title" class="visuallyhidden"><?php _e('字段名称'); ?></label>
-                                    <input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" class="text-s w-100">
+                                    <label for="fieldname" class="visuallyhidden"><?php _e('字段名称'); ?></label>
+                                    <input type="text" name="fieldNames[]" placeholder="<?php _e('字段名称'); ?>" id="fieldname" class="text-s w-100">
                                 </td>
                                 <td>
-                                    <label for="title" class="visuallyhidden"><?php _e('字段类型'); ?></label>
-                                    <select name="fieldTypes[]" id="">
+                                    <label for="fieldtype" class="visuallyhidden"><?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="title" class="visuallyhidden"><?php _e('字段值'); ?></label>
-                                    <textarea name="fieldValues[]" placeholder="<?php _e('字段值'); ?>" class="text-s w-100" rows="2"></textarea>
+                                    <label for="fieldvalue" class="visuallyhidden"><?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-xs"><?php _e('删除'); ?></button>
diff --git a/admin/options-theme.php b/admin/options-theme.php
index ee8ba67d..49827830 100644
--- a/admin/options-theme.php
+++ b/admin/options-theme.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="colgroup 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>
diff --git a/admin/plugins.php b/admin/plugins.php
index d7c2d823..d7421f9b 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -6,7 +6,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="colgroup typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <?php Typecho_Widget::widget('Widget_Plugins_List_Activated')->to($activatedPlugins); ?>
                 <?php if ($activatedPlugins->have() || !empty($activatedPlugins->activatedPlugins)): ?>
diff --git a/admin/theme-editor.php b/admin/theme-editor.php
index 3f8a5bf3..5689f088 100644
--- a/admin/theme-editor.php
+++ b/admin/theme-editor.php
@@ -9,7 +9,7 @@ Typecho_Widget::widget('Widget_Themes_Files')->to($files);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="colgroup 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>
diff --git a/admin/themes.php b/admin/themes.php
index 162867b6..1d5e396f 100644
--- a/admin/themes.php
+++ b/admin/themes.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="colgroup typecho-page-main" role="main">
             <div class="col-mb-12">
                 <ul class="typecho-option-tabs fix-tabs clearfix">
                     <li class="current"><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
diff --git a/admin/upgrade.php b/admin/upgrade.php
index 36e35cf9..a05c2bde 100644
--- a/admin/upgrade.php
+++ b/admin/upgrade.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="colgroup typecho-page-main" role="main">
             <div class="col-mb-12">
                 <div id="typecho-welcome">
                     <form action="<?php echo Typecho_Router::url('do', array('action' => 'upgrade', 'widget' => 'Upgrade'), 
diff --git a/admin/welcome.php b/admin/welcome.php
index 7b183977..f0358064 100644
--- a/admin/welcome.php
+++ b/admin/welcome.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="colgroup typecho-page-main" role="main">
             <div class="col-mb-12">
                 <div id="typecho-welcome" class="message">
                     <form action="<?php $options->adminUrl(); ?>" method="get">
diff --git a/usr/themes/default/comments.php b/usr/themes/default/comments.php
index 8252e326..ddcb7cff 100644
--- a/usr/themes/default/comments.php
+++ b/usr/themes/default/comments.php
@@ -1,48 +1,48 @@
-<div id="comments">
-    <?php $this->comments()->to($comments); ?>
-    <?php if ($comments->have()): ?>
-	<h3><?php $this->commentsNum(_t('暂无评论'), _t('仅有 1 条评论'), _t('已有 %d 条评论')); ?></h3>
-    
-    <?php $comments->listComments(); ?>
-
-    <?php $comments->pageNav('&laquo; 前一页', '后一页 &raquo;'); ?>
-    
-    <?php endif; ?>
-
-    <?php if($this->allow('comment')): ?>
-    <div id="<?php $this->respondId(); ?>" class="respond">
-        <div class="cancel-comment-reply">
-        <?php $comments->cancelReply(); ?>
-        </div>
-    
-    	<h3 id="response"><?php _e('添加新评论'); ?></h3>
-    	<form method="post" action="<?php $this->commentUrl() ?>" id="comment-form">
-            <?php if($this->user->hasLogin()): ?>
-    		<p><?php _e('登录身份：'); ?><a href="<?php $this->options->profileUrl(); ?>"><?php $this->user->screenName(); ?></a>. <a href="<?php $this->options->logoutUrl(); ?>" title="Logout"><?php _e('退出'); ?> &raquo;</a></p>
-            <?php else: ?>
-    		<p>
-                <label for="author" class="required"><?php _e('称呼'); ?></label>
-    			<input type="text" name="author" id="author" class="text" value="<?php $this->remember('author'); ?>" />
-    		</p>
-    		<p>
-                <label for="mail"<?php if ($this->options->commentsRequireMail): ?> class="required"<?php endif; ?>><?php _e('Email'); ?></label>
-    			<input type="email" name="mail" id="mail" class="text" value="<?php $this->remember('mail'); ?>" />
-    		</p>
-    		<p>
-                <label for="url"<?php if ($this->options->commentsRequireURL): ?> class="required"<?php endif; ?>><?php _e('网站'); ?></label>
-    			<input type="url" name="url" id="url" class="text" placeholder="<?php _e('http://example.com'); ?>" value="<?php $this->remember('url'); ?>" />
-    		</p>
-            <?php endif; ?>
-    		<p>
-                <label for="textarea" class="required"><?php _e('内容'); ?></label>
-                <textarea rows="8" cols="50" name="text" class="textarea"><?php $this->remember('text'); ?></textarea>
-            </p>
-    		<p>
-                <button type="submit" class="submit"><?php _e('提交评论'); ?></button>
-            </p>
-    	</form>
-    </div>
-    <?php else: ?>
-    <h3><?php _e('评论已关闭'); ?></h3>
-    <?php endif; ?>
-</div>
+<div id="comments">
+    <?php $this->comments()->to($comments); ?>
+    <?php if ($comments->have()): ?>
+	<h3><?php $this->commentsNum(_t('暂无评论'), _t('仅有 1 条评论'), _t('已有 %d 条评论')); ?></h3>
+    
+    <?php $comments->listComments(); ?>
+
+    <?php $comments->pageNav('&laquo; 前一页', '后一页 &raquo;'); ?>
+    
+    <?php endif; ?>
+
+    <?php if($this->allow('comment')): ?>
+    <div id="<?php $this->respondId(); ?>" class="respond">
+        <div class="cancel-comment-reply">
+        <?php $comments->cancelReply(); ?>
+        </div>
+    
+    	<h3 id="response"><?php _e('添加新评论'); ?></h3>
+    	<form method="post" action="<?php $this->commentUrl() ?>" id="comment-form">
+            <?php if($this->user->hasLogin()): ?>
+    		<p><?php _e('登录身份：'); ?><a href="<?php $this->options->profileUrl(); ?>"><?php $this->user->screenName(); ?></a>. <a href="<?php $this->options->logoutUrl(); ?>" title="Logout"><?php _e('退出'); ?> &raquo;</a></p>
+            <?php else: ?>
+    		<p>
+                <label for="author" class="required"><?php _e('称呼'); ?></label>
+    			<input type="text" name="author" id="author" class="text" value="<?php $this->remember('author'); ?>" />
+    		</p>
+    		<p>
+                <label for="mail"<?php if ($this->options->commentsRequireMail): ?> class="required"<?php endif; ?>><?php _e('Email'); ?></label>
+    			<input type="email" name="mail" id="mail" class="text" value="<?php $this->remember('mail'); ?>" />
+    		</p>
+    		<p>
+                <label for="url"<?php if ($this->options->commentsRequireURL): ?> class="required"<?php endif; ?>><?php _e('网站'); ?></label>
+    			<input type="url" name="url" id="url" class="text" placeholder="<?php _e('http://example.com'); ?>" value="<?php $this->remember('url'); ?>" />
+    		</p>
+            <?php endif; ?>
+    		<p>
+                <label for="textarea" class="required"><?php _e('内容'); ?></label>
+                <textarea rows="8" cols="50" name="text" id="textarea" class="textarea"><?php $this->remember('text'); ?></textarea>
+            </p>
+    		<p>
+                <button type="submit" class="submit"><?php _e('提交评论'); ?></button>
+            </p>
+    	</form>
+    </div>
+    <?php else: ?>
+    <h3><?php _e('评论已关闭'); ?></h3>
+    <?php endif; ?>
+</div>