template: fix accessibility problems

diff --git a/src/newslash_web/css/newslash/base.less b/src/newslash_web/css/newslash/base.less
index b49ecab..9dd9b6d 100644 (file)
--- a/src/newslash_web/css/newslash/base.less
+++ b/src/newslash_web/css/newslash/base.less
@@ -16,8 +16,8 @@
 
 @color-stronger: #8b4513;
 @color-strong: #b88d6f;
-@color-weak: #997a49;
-@color-weaker: #ceb19d;
+@color-weak: #695130;
+@color-weaker: #8A6D42;
 
 
 
@@ -26,7 +26,7 @@
 @background-color-weak: #f0eae0;
 @background-color-weaker: #f0eae0;
 
-@anchor-color: #775e38;
+@anchor-color: #634B2C;;
 @anchor-color-hover: #3b78e7;
 
 @component-background-color: #fdfcfb;

diff --git a/src/newslash_web/templates/common/account_bar.html.tt2 b/src/newslash_web/templates/common/account_bar.html.tt2
index e9eab13..6cf5a80 100644 (file)
--- a/src/newslash_web/templates/common/account_bar.html.tt2
+++ b/src/newslash_web/templates/common/account_bar.html.tt2
@@ -7,8 +7,7 @@
     <li><a href="/submission/new" title="情報をタレコむ">タレコむ</a></li>
     [%- IF user.is_login -%]
     <li>
-      <a href="/my/messages" class="glyphicon glyphicon-comment" area-hidden="true"
-         area-label="メッセージ"
+      <a href="/my/messages" class="glyphicon glyphicon-comment" aria-hidden="true"
          title="[% IF user.messages == 0 %]メッセージ[% ELSE %][% user.messages %]通の未読メッセージ[% END %]">[% user.messages %]</a>
     </li>
     <li class="dropdown" id="user-menu">
@@ -30,7 +29,8 @@
 
   <div class="site-search-box">
     <form class="compact" action="/search">
-      <label for="search-text" class="glyphicon glyphicon-search"></label>
+      <label for="search-text" class="glyphicon glyphicon-search"
+             aria-label="検索" aria-hidden="true"></label>
       <input name="q"id="search-text" type="text" placeholder="検索キーワードを入力...">
       <input name="sort_reverse" type="hidden" value="1">
       <input name="target" type="hidden" value="story">

diff --git a/src/newslash_web/templates/common/article/article.html.tt2 b/src/newslash_web/templates/common/article/article.html.tt2
index 28bf863..41f103b 100644 (file)
--- a/src/newslash_web/templates/common/article/article.html.tt2
+++ b/src/newslash_web/templates/common/article/article.html.tt2
@@ -47,7 +47,7 @@ END;
     <h1>
       [%- IF item.primary_topic.image.length || x_template -%]
       <img [% IF item.primary_topic.image %]src="[% Site.topic_icon_base_url %]/[% item.primary_topic.image %]"[% END %]
-           :src="primaryTopicIconURL" v-if="primaryTopicIconURL" />
+           alt="[% item.primary_topic.textname %]" :src="primaryTopicIconURL" v-if="primaryTopicIconURL" />
       [%- END -%]
       [%- IF url -%]
       <a href="[% url %]" v-html="item.title">[% item.title %]</a>
@@ -82,14 +82,14 @@ END;
       [%- IF x_template || page.type == 'single' && item.content_type == 'journal' && item.uid == user.uid -%]
       <button type="button" class="btn btn-default btn-sm" id="activate-journal-editor"
               title="編集" area-label="編集" v-show="editable" v-on:click="startEdit(item)">
-        <span class="glyphicon glyphicon-pencil"></span>
+        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
       </button>
       [%- END -%]
       [%- IF x_template || item.content_type == 'story' && user.is_admin || user.editor  -%]
       <button type="button" class="btn btn-default btn-sm" id="activate-story-editor"
               area-label="編集" title="編集" v-on:click="startEdit(item)"
               v-if="0">
-        <span class="glyphicon glyphicon-cog"></span>
+        <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
       </button>
       [%- END -%]
       [%- IF item.content_type == 'submission' && (user.author || x_template) -%]

diff --git a/src/newslash_web/templates/common/comment/comment.html.tt2 b/src/newslash_web/templates/common/comment/comment.html.tt2
index d7bb1ae..ba95167 100644 (file)
--- a/src/newslash_web/templates/common/comment/comment.html.tt2
+++ b/src/newslash_web/templates/common/comment/comment.html.tt2
@@ -81,12 +81,12 @@
       [%- IF !nojs %]
       <div class="footer-menu form">
         <button v-if="isReplyEnabled" v-on:click="showReplyForm()">
-          <span class="glyphicon glyphicon-share-alt rotate180deg"></span> <span>ここに返信</span>
+          <span class="glyphicon glyphicon-share-alt rotate180deg" aria-hidden="true"></span> <span>ここに返信</span>
         </button>
 
         <span :class="['dropdown', { open: showShareButtons }]">
           <button title="share" @click="toggleShareButtons">
-            <span class="glyphicon glyphicon-share-alt"></span> <span>共有</span>
+            <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span> <span>共有</span>
           </button>
 
           <ul class="dropdown-menu">

diff --git a/src/newslash_web/templates/common/components/comment_tree.html.tt2 b/src/newslash_web/templates/common/components/comment_tree.html.tt2
index 077a64e..af57b1d 100644 (file)
--- a/src/newslash_web/templates/common/components/comment_tree.html.tt2
+++ b/src/newslash_web/templates/common/components/comment_tree.html.tt2
@@ -11,7 +11,7 @@
       <button type="button" class="btn btn-default form-control">コメント元ページを表示</button>
       %]
       <button type="button" class="btn btn-default form-control" v-if="commentAllowed && !archived">
-        <span class="glyphicon glyphicon-comment"></span>
+        <span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
         <span class="btn-text"> コメントを書く</span>
       </button>
       <select id="comment-filter" name="comment-filter" class="form-control" v-model="config.comment.show_threshold">
@@ -36,7 +36,7 @@
 
       <button type="button" class="btn btn-default form-control" aria-label="表示設定"
               v-on:click="showPrefs=!showPrefs" :class="{active: showPrefs}">
-        <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
+        <span class="glyphicon glyphicon-cog" aria-hidden="true" aria-hidden="true"></span>
         <span class="btn-text">表示設定</span>
       </button>
     </form>

diff --git a/src/newslash_web/templates/common/footer.html.tt2 b/src/newslash_web/templates/common/footer.html.tt2
index 4eae03b..f725b51 100644 (file)
--- a/src/newslash_web/templates/common/footer.html.tt2
+++ b/src/newslash_web/templates/common/footer.html.tt2
@@ -5,7 +5,7 @@
   </blockquote>
 </section>
 <footer id="site-footer">
-  <nav id="organization-navigation" role="footer">
+  <nav id="organization-navigation">
     <ul class="">
       <li><a href="/about/">About</a></li>
       <li><a href="/faq/">FAQ</a></li>

diff --git a/src/newslash_web/templates/common/layout.html.tt2 b/src/newslash_web/templates/common/layout.html.tt2
index 05b57fc..adec68a 100644 (file)
--- a/src/newslash_web/templates/common/layout.html.tt2
+++ b/src/newslash_web/templates/common/layout.html.tt2
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="ja">
   [%- INCLUDE common/header -%]
   [%- INCLUDE common/js_vars -%]
   <body page-type="[% page.type %]" content-type="[% page.content_type %]">

diff --git a/src/newslash_web/templates/common/status_bar.html.tt2 b/src/newslash_web/templates/common/status_bar.html.tt2
index c037622..45cc6ad 100644 (file)
--- a/src/newslash_web/templates/common/status_bar.html.tt2
+++ b/src/newslash_web/templates/common/status_bar.html.tt2
@@ -1,9 +1,13 @@
 [% helpers.load_js("status-bar.js") %]
 [%# <script src="/js/status-bar.js"></script> %]
 <div id="status-bar">
-  <span id="status-bar-remove-icon" class="glyphicon glyphicon-remove"></span>
-  <span id="status-bar-loading-icon" class="glyphicon glyphicon-refresh spinner-icon"></span>
-  <span id="status-bar-ok-icon" class="glyphicon glyphicon-ok-circle"></span>
-  <span id="status-bar-error-icon" class="glyphicon glyphicon-exclamation-sign"></span>
+  <span id="status-bar-remove-icon" class="glyphicon glyphicon-remove"
+        aria-hidden="true" aria-label="通知を閉じる"></span>
+  <span id="status-bar-loading-icon" class="glyphicon glyphicon-refresh spinner-icon"
+        aria-hidden="true" aria-label="通知を閉じる"></span>
+  <span id="status-bar-ok-icon" class="glyphicon glyphicon-ok-circle"
+        aria-hidden="true" aria-label="OK"></span>
+  <span id="status-bar-error-icon" class="glyphicon glyphicon-exclamation-sign"
+        aria-hidden="true" aria-label="エラー"></span>
   <span id="status-bar-message"></span>
 </div>

diff --git a/src/newslash_web/templates/common/timeline/item.html.tt2 b/src/newslash_web/templates/common/timeline/item.html.tt2
index 723415a..a56f04f 100644 (file)
--- a/src/newslash_web/templates/common/timeline/item.html.tt2
+++ b/src/newslash_web/templates/common/timeline/item.html.tt2
@@ -31,7 +31,7 @@ IF item.content_type == 'submission'; content_id = item.subid; END;
       [%- IF item.content_type == 'journal' && item.uid == user.uid || x_template -%]
       <button type="button" class="btn btn-default btn-sm"
               area-label="編集" v-show="editable" v-on:click="editItem(item)">
-        <span class="glyphicon glyphicon-pencil"></span>
+        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
       </button>
       [%- END -%]
     </div>

diff --git a/src/newslash_web/templates/common/user.html.tt2 b/src/newslash_web/templates/common/user.html.tt2
index d83d2ed..2b40b48 100644 (file)
--- a/src/newslash_web/templates/common/user.html.tt2
+++ b/src/newslash_web/templates/common/user.html.tt2
@@ -3,8 +3,14 @@
   <div>
     [%- IF user.uid != the_user.uid && user.is_login && no_form != 1 -%]
     <form class="form">
-      [%- IF user.relations.fans.${the_user.uid} -%]<span class="glyphicon glyphicon-heart" title="あなたのファン"></span>[%- END -%]
-      [%- IF user.relations.freaks.${the_user.uid} -%]<span class="glyphicon glyphicon-fire" title="あなたのアンチ"></span>[%- END -%]
+      [%- IF user.relations.fans.${the_user.uid} -%]
+      <span class="glyphicon glyphicon-heart" title="あなたのファン"
+             aria-hidden="true"></span>
+      [%- END -%]
+      [%- IF user.relations.freaks.${the_user.uid} -%]
+      <span class="glyphicon glyphicon-fire" title="あなたのアンチ">
+        aria-hidden="true"></span>
+      [%- END -%]
       <label class="sr-only" for="relation">フレンド設定：
         [%-
         IF user.relations.friends.${the_user.uid}; SET relation = 1;