8 files changed, 38 insertions, 38 deletions

diff --git a/tpl/default/import.html b/tpl/default/import.html
index 20f854d1..c41afcdb 100644
--- a/tpl/default/import.html
+++ b/tpl/default/import.html
@@ -69,7 +69,7 @@
         </div>
         <div class="pure-u-lg-2-3 pure-u-1">
           <div class="form-input">
-            <input type="text" name="default_tags" id="default_tags" placeholder="{'Tag'|t}">
+            <input type="text" name="default_tags" id="default_tags" aria-label="{'Tag'|t}" placeholder="{'Tag'|t}">
           </div>
         </div>
       </div>
diff --git a/tpl/default/install.html b/tpl/default/install.html
index f0e7040e..c6f501f0 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -17,7 +17,7 @@
     <h2 class="window-title">{'Install Shaarli'|t}</h2>
 
     <div class="center">
-      {'It looks like it\'s the first time you run Shaarli. Please configure it.'|t}
+      <p>{'It looks like it\'s the first time you run Shaarli. Please configure it.'|t}</p>
     </div>
 
     <div class="pure-g">
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index a025d53c..ffc236c7 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -19,19 +19,19 @@
 <div id="search-linklist" class="searchform-block search-linklist">
 
   <form method="GET" class="pure-form searchform" name="searchform">
-    <input type="text" tabindex="1" name="searchterm" class="searchterm" placeholder="{'Search text'|t}"
+    <input type="text" name="searchterm" class="searchterm" aria-label="{'Search text'|t}" placeholder="{'Search text'|t}"
            {if="!empty($search_term)"}
            value="{$search_term}"
            {/if}
     >
-    <input type="text" tabindex="2" name="searchtags" class="searchtags" placeholder="{'Filter by tag'|t}"
+    <input type="text" name="searchtags" class="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
            {if="!empty($search_tags)"}
            value="{$search_tags}"
            {/if}
     autocomplete="off" data-multiple data-autofirst data-minChars="1"
     data-list="{loop="$tags"}{$key}, {/loop}"
     >
-    <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+    <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
   </form>
 </div>
 
@@ -94,7 +94,7 @@
           {'tagged'|t}
           {loop="$exploded_tags"}
               <span class="label label-tag" title="{'Remove tag'|t}">
-                <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times" aria-hidden="true"></i></span></a>
+                <a href="?removetag={function="urlencode($value)"}" aria-label="{'Remove tag'|t}">{$value}<span class="remove"><i class="fa fa-times" aria-hidden="true"></i></span></a>
               </span>
           {/loop}
         {/if}
@@ -136,11 +136,11 @@
             {if="$thumbnails_enabled && !empty($value.thumbnail)"}
               <div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;">
                 <div class="thumbnail">
-                  <a href="{$value.real_url}">
                   {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
+                  <a href="{$value.real_url}" aria-hidden="true" tabindex="-1">
                   <img data-src="{$value.thumbnail}#" class="b-lazy"
                     src=""
-                    alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" />
+                    alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
                   </a>
                 </div>
               </div>
@@ -158,9 +158,9 @@
             <h2>
               <a href="{$value.real_url}">
                 {if="strpos($value.url, $value.shorturl) === false"}
-                  <i class="fa fa-external-link"></i>
+                  <i class="fa fa-external-link" aria-hidden="true"></i>
                 {else}
-                  <i class="fa fa-sticky-note"></i>
+                  <i class="fa fa-sticky-note" aria-hidden="true"></i>
                 {/if}
 
                 <span class="linklist-link">{$value.title}</span>
@@ -177,7 +177,7 @@
           <div class="linklist-item-infos clear">
             {if="$value.tags"}
               <div class="linklist-item-tags">
-                <i class="fa fa-tags"></i>
+                <i class="fa fa-tags" aria-hidden="true"></i>
                 {$tag_counter=count($value.taglist)}
                 {loop="value.taglist"}
                   <span class="label label-tag" title="{$strAddTag}">
@@ -216,7 +216,7 @@
                     <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible">
                       <span class="linklist-item-infos-controls-item ctrl-pin">
                         <span title="{$strSticky}" class="pin-link pinned-link pure-u-0 pure-u-lg-visible">
-                          <i class="fa fa-thumb-tack"></i>
+                          <i class="fa fa-thumb-tack" aria-hidden="true"></i>
                         </span>
                       </span>
                     </div>
@@ -226,7 +226,7 @@
                   {if="!$hide_timestamps || $is_logged_in"}
                     {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink}
                     <span class="linkdate" title="{$updated}">
-                      <i class="fa fa-clock-o"></i>
+                      <i class="fa fa-clock-o" aria-hidden="true"></i>
                       {$value.created|format_date}
                       {if="$value.updated_timestamp"}*{/if}
                       &middot;
@@ -248,7 +248,7 @@
               </div><div
                 {ignore}do not add space or line break between these div - Firefox issue{/ignore}
                 class="linklist-item-infos-url pure-u-lg-5-12 pure-u-1">
-                <a href="{$value.real_url}" title="{$value.title}">
+                <a href="{$value.real_url}" aria-label="{$value.title}" title="{$value.title}">
                   <i class="fa fa-link" aria-hidden="true"></i> {$value.url}
                 </a>
                 <div class="linklist-item-buttons pure-u-0 pure-u-lg-visible">
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index ce858e8c..0899826b 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -1,4 +1,4 @@
-</div>
+</main>
 
 <div class="pure-g">
   <div class="pure-u-2-24"></div>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 0ba1993f..4f063dc3 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -7,7 +7,7 @@
         {$shaarlititle}
       </a>
       </header>
-      <a href="#" class="menu-toggle" id="menu-toggle" aria-label="Menu"><s class="bar" aria-hidden="true"></s><s class="bar" aria-hidden="true"></s></a>
+      <a href="#" class="menu-toggle" id="menu-toggle" aria-label="{'Menu'|t}"><s class="bar" aria-hidden="true"></s><s class="bar" aria-hidden="true"></s></a>
     </div>
   </div>
   <div class="pure-u-1">
@@ -99,37 +99,37 @@
   </div>
 </div>
 
-<div id="content" class="container">
+<main id="content" class="container" role="main">
   <div id="search" class="subheader-form searchform-block header-search">
     <form method="GET" class="pure-form searchform" name="searchform">
-      <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}"
+      <input type="text" id="searchform_value" name="searchterm" aria-label="{'Search text'|t}" placeholder="{'Search text'|t}"
              {if="!empty($search_term)"}
              value="{$search_term}"
              {/if}
       >
-      <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}"
+      <input type="text" name="searchtags" id="tagfilter_value" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
              {if="!empty($search_tags)"}
              value="{$search_tags}"
              {/if}
       autocomplete="off" data-multiple data-autofirst data-minChars="1"
       data-list="{loop="$tags"}{$key}, {/loop}"
       >
-      <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+      <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
     </form>
   </div>
   <div id="actions" class="subheader-form">
     <div class="pure-g">
       <div class="pure-u-1">
         <a href="" id="actions-delete" class="button">
-          <i class="fa fa-trash"></i>
+          <i class="fa fa-trash" aria-hidden="true"></i>
           {'Delete'|t}
         </a>&nbsp;
         <a href="" class="actions-change-visibility button" data-visibility="public">
-          <i class="fa fa-globe"></i>
+          <i class="fa fa-globe" aria-hidden="true"></i>
           {'Set public'|t}
         </a>&nbsp;
         <a href="" class="actions-change-visibility button" data-visibility="private">
-          <i class="fa fa-user-secret"></i>
+          <i class="fa fa-user-secret" aria-hidden="true"></i>
           {'Set private'|t}
         </a>
       </div>
@@ -138,15 +138,15 @@
   {if="!$is_logged_in"}
     <form method="post" name="loginform">
       <div class="subheader-form header-login-form" id="header-login-form">
-        <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3">
-        <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5">
+        <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}" >
+        <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" >
         <div class="remember-me">
-          <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6" checked>
+          <input type="checkbox" name="longlastingsession" id="longlastingsession" checked>
           <label for="longlastingsession">{'Remember me'|t}</label>
         </div>
         <input type="hidden" name="token" value="{$token}">
         <input type="hidden" name="returnurl">
-        <input type="submit" value="Login" tabindex="7">
+        <input type="submit" value="Login">
       </div>
     </form>
   {/if}
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 5a959244..73359949 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -32,13 +32,13 @@
         {/loop}
       </div>
 
-      <div id="picwall-container" class="picwall-container">
+      <div id="picwall-container" class="picwall-container" role="list">
         {loop="$linksToDisplay"}
-          <div class="picwall-pictureframe">
+          <div class="picwall-pictureframe" role="listitem">
             {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
             <img data-src="{$value.thumbnail}#" class="b-lazy"
                  src=""
-                 alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" />
+                 alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
             <a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
             {loop="$value.picwall_plugin"}
               {$value}
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html
index bedf3f8c..b9c0b162 100644
--- a/tpl/default/tag.cloud.html
+++ b/tpl/default/tag.cloud.html
@@ -26,14 +26,14 @@
       <div class="pure-u-1 pure-u-lg-1-2">
         <form method="GET">
           <input type="hidden" name="do" value="tagcloud">
-          <input type="text" name="searchtags" placeholder="{'Filter by tag'|t}"
+          <input type="text" name="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
                  {if="!empty($search_tags)"}
                     value="{$search_tags}"
                  {/if}
           autocomplete="off" data-multiple data-autofirst data-minChars="1"
           data-list="{loop="$tags"}{$key}, {/loop}"
           >
-          <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+          <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
         </form>
       </div>
       <div class="pure-u-lg-1-4"></div>
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html
index 41eab246..d5777465 100644
--- a/tpl/default/tag.list.html
+++ b/tpl/default/tag.list.html
@@ -26,14 +26,14 @@
       <div class="pure-u-1 pure-u-lg-1-2">
         <form method="GET">
           <input type="hidden" name="do" value="taglist">
-          <input type="text" name="searchtags" placeholder="{'Filter by tag'|t}"
+          <input type="text" name="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
                  {if="!empty($search_tags)"}
                  value="{$search_tags}"
                  {/if}
           autocomplete="off" data-multiple data-autofirst data-minChars="1"
           data-list="{loop="$tags"}{$key}, {/loop}"
           >
-          <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+          <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
         </form>
       </div>
       <div class="pure-u-lg-1-4"></div>
@@ -50,9 +50,9 @@
         <div class="tag-list-item pure-g" data-tag="{$key}">
           <div class="pure-u-1">
             {if="$is_logged_in===true"}
-              <a href="#" class="delete-tag"><i class="fa fa-trash"></i></a>&nbsp;&nbsp;
-              <a href="?do=changetag&fromtag={$key|urlencode}" class="rename-tag">
-                <i class="fa fa-pencil-square-o {$key}"></i>
+              <a href="#" class="delete-tag" aria-label="{'Delete'|t}"><i class="fa fa-trash" aria-hidden="true"></i></a>&nbsp;&nbsp;
+              <a href="?do=changetag&fromtag={$key|urlencode}" class="rename-tag" aria-label="{'Rename tag'|t}">
+                <i class="fa fa-pencil-square-o {$key}" aria-hidden="true"></i>
               </a>
             {/if}
 
@@ -66,7 +66,7 @@
           {if="$is_logged_in===true"}
             <div class="rename-tag-form pure-u-1">
               <input type="text" name="{$key}" value="{$key}" class="rename-tag-input" />
-              <a href="#" class="validate-rename-tag"><i class="fa fa-check"></i></a>
+              <a href="#" class="validate-rename-tag"><i class="fa fa-check" aria-hidden="true"></i></a>
             </div>
           {/if}
         </div>