22 files changed, 118 insertions, 84 deletions
diff --git a/tpl/default/404.html b/tpl/default/404.html
index fd337cad..472566a6 100644
--- a/tpl/default/404.html
+++ b/tpl/default/404.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -8,7 +8,7 @@
  {include="page.header"}
 <div class="center" id="page404" class="page404-container">
  <h2>{'Sorry, nothing to see here.'|t}</h2>
-  <img src="img/sad_star.png">
+  <img src="img/sad_star.png" alt="">
  <p>{$error_message}</p>
 </div>
 {include="page.footer"}
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html
index 55864a02..b4b4a0ec 100644
--- a/tpl/default/addlink.html
+++ b/tpl/default/addlink.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html
index 2d15c92a..ab579433 100644
--- a/tpl/default/changepassword.html
+++ b/tpl/default/changepassword.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -11,10 +11,10 @@
    <h2 class="window-title">{"Change password"|t}</h2>
    <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
      <div>
-        <input type="password" name="oldpassword" placeholder="{'Current password'|t}" class="autofocus">
+        <input type="password" name="oldpassword" aria-label="{'Current password'|t}" placeholder="{'Current password'|t}" class="autofocus">
      </div>
      <div>
-        <input type="password" name="setpassword" placeholder="{'New password'|t}">
+        <input type="password" name="setpassword" aria-label="{'New password'|t}" placeholder="{'New password'|t}">
      </div>
      <input type="hidden" name="token" value="{$token}">
      <div>
diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html
index 6606c4fa..ec6e0b46 100644
--- a/tpl/default/changetag.html
+++ b/tpl/default/changetag.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -11,20 +11,20 @@
    <h2 class="window-title">{"Manage tags"|t}</h2>
    <form method="POST" action="#" name="changetag" id="changetag">
      <div>
-        <input type="text" name="fromtag" placeholder="{'Tag'|t}" value="{$fromtag}"
+        <input type="text" name="fromtag" aria-label="{'Tag'|t}" placeholder="{'Tag'|t}" value="{$fromtag}"
               list="tagsList" autocomplete="off" class="awesomplete autofocus" data-minChars="1">
        <datalist id="tagsList">
          {loop="$tags"}<option>{$key}</option>{/loop}
        </datalist>
      </div>
      <div>
-        <input type="text" name="totag" placeholder="{'New name'|t}"
+        <input type="text" name="totag" aria-label="{'New name'|t}" placeholder="{'New name'|t}"
               list="toTagsList" autocomplete="off" class="awesomplete" data-minChars="1">
        <datalist id="toTagsList">
          {loop="$tags"}<option>{$key}</option>{/loop}
        </datalist>
      </div>
-      <div><i class="fa fa-info-circle"></i> {'Case sensitive'|t}</div>
+      <div><i class="fa fa-info-circle" aria-hidden="true"></i> {'Case sensitive'|t}</div>
      <input type="hidden" name="token" value="{$token}">
      <div>
        <input type="submit" value="{'Rename'|t}" name="renametag">
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 42e32230..83033624 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -215,6 +215,22 @@
      <div class="pure-g">
        <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
          <div class="form-label">
+            <label for="retrieveDescription">
+              <span class="label-name">{'Automatically retrieve description for new bookmarks'|t}</span><br>
+              <span class="label-desc">{'Shaarli will try to retrieve the description from meta HTML headers'|t}</span>
+            </label>
+          </div>
+        </div>
+        <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
+          <div class="form-input">
+            <input type="checkbox" name="retrieveDescription" id="retrieveDescription"
+                 {if="$retrieve_description"}checked{/if}/>
+          </div>
+        </div>
+      </div>
+      <div class="pure-g">
+        <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
+          <div class="form-label">
            <label for="enableApi">
              <span class="label-name">{'Enable REST API'|t}</span><br>
              <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
diff --git a/tpl/default/daily.html b/tpl/default/daily.html
index 2c409478..6b5103a4 100644
--- a/tpl/default/daily.html
+++ b/tpl/default/daily.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -44,7 +44,12 @@
        </div>
      </div>
      <div>
-        <h3 class="window-subtitle">{function="format_date($dayDate, false)"}</h3>
+        <h3 class="window-subtitle">
+          {if="!empty($dayDesc)"}
+            {$dayDesc} -
+          {/if}
+          {function="format_date($dayDate, false)"}
+        </h3>
        <div id="plugin_zone_about_daily" class="plugin_zone">
          {loop="$daily_about_plugin"}
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index d8c57155..df14535d 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/export.html b/tpl/default/export.html
index af1d6e33..99c01b11 100644
--- a/tpl/default/export.html
+++ b/tpl/default/export.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/import.html b/tpl/default/import.html
index bdc9086e..20f854d1 100644
--- a/tpl/default/import.html
+++ b/tpl/default/import.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/install.html b/tpl/default/install.html
index 6199b33d..f0e7040e 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index ed78f40a..a025d53c 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -52,7 +52,7 @@
 {/loop}
 <div id="linklist">
-  <div id="link-count-block" class="pure-g">
+  <div id="link-count-block" class="pure-g link-count-block">
    <div class="pure-u-lg-2-24 pure-u-1-24"></div>
    <div id="link-count-content" class="pure-u-lg-20-24 pure-u-22-24">
      <div class="linkcount pure-u-lg-0 center">
@@ -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"></i></span></a>
+                <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times" aria-hidden="true"></i></span></a>
              </span>
          {/loop}
        {/if}
@@ -146,13 +146,14 @@
              </div>
            {/if}
-            {if="$is_logged_in"}
+            <div class="linklist-item-editbuttons">
-              <div class="linklist-item-editbuttons">
+              {if="$value.sticky"}
-                {if="$value.private"}
+                <span class="label label-sticky">{$strSticky}</span>
-                  <span class="label label-private">{$strPrivate}</span>
+              {/if}
-                {/if}
+              {if="$value.private"}
-              </div>
+                <span class="label label-private">{$strPrivate}</span>
-            {/if}
+              {/if}
+            </div>
            <h2>
              <a href="{$value.real_url}">
@@ -195,18 +196,18 @@
                      <input type="checkbox" class="link-checkbox" value="{$value.id}">
                    </span>
                    <span class="linklist-item-infos-controls-item ctrl-edit">
-                      <a href="?edit_link={$value.id}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link"></i></a>
+                      <a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
                    </span>
                    <span class="linklist-item-infos-controls-item ctrl-delete">
-                      <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}"
+                      <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" aria-label="{$strDelete}"
                         title="{$strDelete}" class="delete-link pure-u-0 pure-u-lg-visible confirm-delete">
-                        <i class="fa fa-trash"></i>
+                        <i class="fa fa-trash" aria-hidden="true"></i>
                      </a>
                    </span>
                    <span class="linklist-item-infos-controls-item ctrl-pin">
                      <a href="?do=pin&amp;id={$value.id}&amp;token={$token}"
-                         title="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if} pure-u-0 pure-u-lg-visible">
+                         title="{$strToggleSticky}" aria-label="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if} pure-u-0 pure-u-lg-visible">
-                        <i class="fa fa-thumb-tack"></i>
+                        <i class="fa fa-thumb-tack" aria-hidden="true"></i>
                      </a>
                    </span>
                  </div>
@@ -248,10 +249,10 @@
                {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}">
-                  <i class="fa fa-link"></i> {$value.url}
+                  <i class="fa fa-link" aria-hidden="true"></i> {$value.url}
                </a>
                <div class="linklist-item-buttons pure-u-0 pure-u-lg-visible">
-                  <a href="#" title="{$strFold}" class="fold-button"><i class="fa fa-chevron-up"></i></a>
+                  <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button"><i class="fa fa-chevron-up" aria-hidden="true"></i></a>
                </div>
              </div>
              <div class="mobile-buttons pure-u-1 pure-u-lg-0">
@@ -264,12 +265,12 @@
                {/if}
                {if="$is_logged_in"}
                  &middot;
-                  <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}"
+                  <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" aria-label="{$strDelete}"
                     title="{$strDelete}" class="delete-link confirm-delete">
-                    <i class="fa fa-trash"></i>
+                    <i class="fa fa-trash" aria-hidden="true"></i>
                  </a>
                  &middot;
-                  <a href="?edit_link={$value.id}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link"></i></a>
+                  <a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
                {/if}
              </div>
            </div>
@@ -286,7 +287,7 @@
    {/loop}
  </div>
-<div id="linklist-paging-bottom-block" class="pure-g">
+<div id="linklist-paging-bottom-block" class="pure-g link-count-block">
  <div class="pure-u-lg-2-24 pure-u-1-24"></div>
  <div id="linklist-paging-bottom-content" class="pure-u-lg-20-24 pure-u-22-24">
    {include="linklist.paging"}
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index fe665a84..68947f92 100644
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -6,21 +6,21 @@
          {'Filters'|t}
        </span>
        {if="$is_logged_in"}
-        <a href="?visibility=private" title="{'Only display private links'|t}"
+        <a href="?visibility=private" aria-label="{'Only display private links'|t}" title="{'Only display private links'|t}"
           class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}"
-        ><i class="fa fa-user-secret"></i></a>
+        ><i class="fa fa-user-secret" aria-hidden="true"></i></a>
-        <a href="?visibility=public" title="{'Only display public links'|t}"
+        <a href="?visibility=public" aria-label="{'Only display public links'|t}" title="{'Only display public links'|t}"
           class="{if="$visibility==='public'"}filter-on{else}filter-off{/if}"
-        ><i class="fa fa-globe"></i></a>
+        ><i class="fa fa-globe" aria-hidden="true"></i></a>
        {/if}
-        <a href="?untaggedonly" title="{'Filter untagged links'|t}"
+        <a href="?untaggedonly" aria-label="{'Filter untagged links'|t}" title="{'Filter untagged links'|t}"
           class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if}
-        ><i class="fa fa-tag"></i></a>
+        ><i class="fa fa-tag" aria-hidden="true"></i></a>
-        <a href="#" title="{'Select all'|t}"
+        <a href="#" aria-label="{'Select all'|t}" title="{'Select all'|t}"
-           class="filter-off select-all-button"
+           class="filter-off select-all-button pure-u-0 pure-u-lg-visible"
-        ><i class="fa fa-check-square-o"></i></a>
+        ><i class="fa fa-check-square-o" aria-hidden="true"></i></a>
-        <a href="#" class="filter-off fold-all pure-u-lg-0" title="{'Fold all'|t}">
+        <a href="#" class="filter-off fold-all pure-u-lg-0" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
-          <i class="fa fa-chevron-up"></i>
+          <i class="fa fa-chevron-up" aria-hidden="true"></i>
        </a>
        {loop="$action_plugin"}
          {$value.attr.class=isset($value.attr.class) ? $value.attr.class : ''}
@@ -59,8 +59,8 @@
      <form method="GET" class="pure-u-0 pure-u-lg-visible">
        <input type="text" name="linksperpage" placeholder="133">
      </form>
-      <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" title="{'Fold all'|t}">
+      <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
-        <i class="fa fa-chevron-up"></i>
+        <i class="fa fa-chevron-up" aria-hidden="true"></i>
      </a>
    </div>
  </div>
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html
index 3cdab65a..761aec0c 100644
--- a/tpl/default/loginform.html
+++ b/tpl/default/loginform.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
@@ -9,7 +9,7 @@
 <div class="pure-g pure-alert pure-alert-error pure-alert-closable center">
  <div class="pure-u-2-24"></div>
  <div class="pure-u-20-24">
-    {'You have been banned after too many failed login attempts. Try again later.'|t}
+    <p>{'You have been banned after too many failed login attempts. Try again later.'|t}</p>
  </div>
  <div class="pure-u-2-24">
    <i class="fa fa-times pure-alert-close"></i>
@@ -22,20 +22,19 @@
      <form method="post" name="loginform">
        <h2 class="window-title">{'Login'|t}</h2>
        <div>
-          <input type="text" name="login" placeholder="{'Username'|t}"
+          <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}"
-             {if="!empty($username)"}value="{$username}"{/if} class="autofocus" tabindex="20">
+             {if="!empty($username)"}value="{$username}"{/if} class="autofocus">
        </div>
        <div>
-          <input type="password" name="password" placeholder="{'Password'|t}" class="autofocus" tabindex="21">
+          <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" class="autofocus">
        </div>
        <div class="remember-me">
          <input type="checkbox" name="longlastingsession" id="longlastingsessionform"
-             {if="$remember_user_default"}checked="checked"{/if}
+             {if="$remember_user_default"}checked="checked"{/if}>
-             tabindex="22">
          <label for="longlastingsessionform">{'Remember me'|t}</label>
        </div>
        <div>
-          <input type="submit" value="{'Login'|t}" class="bigbutton" tabindex="23">
+          <input type="submit" value="{'Login'|t}" class="bigbutton">
        </div>
        <input type="hidden" name="token" value="{$token}">
        {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
@@ -48,4 +47,3 @@
 {include="page.footer"}
 </body>
 </html>
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index 5af39be7..ce858e8c 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -2,7 +2,8 @@
 <div class="pure-g">
  <div class="pure-u-2-24"></div>
-  <div id="footer" class="pure-u-20-24 footer-container">
+  <footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo">
+    <i class="fa fa-shaarli" aria-hidden="true"></i>
    <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
    {if="$is_logged_in===true"}
      {$version}
@@ -13,7 +14,7 @@
      {loop="$plugins_footer.text"}
          {$value}
      {/loop}
-  </div>
+  </footer>
  <div class="pure-u-2-24"></div>
 </div>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 4f6dd4d8..0ba1993f 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -1,11 +1,13 @@
 <div class="shaarli-menu pure-g" id="shaarli-menu">
  <div class="pure-u-lg-0 pure-u-1">
    <div class="pure-menu">
+     <header role="banner">
      <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile">
-        <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" />
+        <i class="fa fa-shaarli" aria-hidden="true"></i>
        {$shaarlititle}
      </a>
-      <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></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>
    </div>
  </div>
  <div class="pure-u-1">
@@ -13,14 +15,14 @@
      <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1">
        <li class="pure-menu-item pure-u-0 pure-u-lg-visible">
          <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop">
-            <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" />
+            <i class="fa fa-shaarli" aria-hidden="true"></i>
            {$shaarlititle}
          </a>
        </li>
        {if="$is_logged_in || $openshaarli"}
          <li class="pure-menu-item">
            <a href="?do=addlink" class="pure-menu-link" id="shaarli-menu-shaare">
-              <i class="fa fa-plus" ></i> {'Shaare'|t}
+              <i class="fa fa-plus" aria-hidden="true"></i> {'Shaare'|t}
            </a>
          </li>
          <li class="pure-menu-item" id="shaarli-menu-tools">
@@ -67,27 +69,27 @@
          <li class="pure-menu-item" id="shaarli-menu-desktop-search">
            <a href="#" class="pure-menu-link subheader-opener"
               data-open-id="search"
-               id="search-button" title="{'Search'|t}">
+               id="search-button" aria-label="{'Search'|t}" title="{'Search'|t}">
-              <i class="fa fa-search"></i>
+              <i class="fa fa-search" aria-hidden="true"></i>
            </a>
          </li>
          <li class="pure-menu-item" id="shaarli-menu-desktop-rss">
-            <a href="?do={$feed_type}{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}">
+            <a href="?do={$feed_type}{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}" aria-label="{'RSS Feed'|t}">
-              <i class="fa fa-rss"></i>
+              <i class="fa fa-rss" aria-hidden="true"></i>
            </a>
          </li>
          {if="!$is_logged_in"}
            <li class="pure-menu-item" id="shaarli-menu-desktop-login">
              <a href="?do=login" class="pure-menu-link"
                 data-open-id="header-login-form"
-                 id="login-button" title="{'Login'|t}">
+                 id="login-button" aria-label="{'Login'|t}" title="{'Login'|t}">
-                <i class="fa fa-user"></i>
+                <i class="fa fa-user" aria-hidden="true"></i>
              </a>
            </li>
          {else}
            <li class="pure-menu-item" id="shaarli-menu-desktop-logout">
-              <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}">
+              <a href="?do=logout" class="pure-menu-link" aria-label="{'Logout'|t}" title="{'Logout'|t}">
-                <i class="fa fa-sign-out"></i>
+                <i class="fa fa-sign-out" aria-hidden="true"></i>
              </a>
            </li>
          {/if}
@@ -118,7 +120,18 @@
  <div id="actions" class="subheader-form">
    <div class="pure-g">
      <div class="pure-u-1">
-        <a href="" id="actions-delete" class="button">{'Delete'|t}</a>
+        <a href="" id="actions-delete" class="button">
+          <i class="fa fa-trash"></i>
+          {'Delete'|t}
+        </a>&nbsp;
+        <a href="" class="actions-change-visibility button" data-visibility="public">
+          <i class="fa fa-globe"></i>
+          {'Set public'|t}
+        </a>&nbsp;
+        <a href="" class="actions-change-visibility button" data-visibility="private">
+          <i class="fa fa-user-secret"></i>
+          {'Set private'|t}
+        </a>
      </div>
    </div>
  </div>
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 4c325487..5a959244 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html
index 82041972..4bfaa934 100644
--- a/tpl/default/pluginsadmin.html
+++ b/tpl/default/pluginsadmin.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html
index 9e52158d..bedf3f8c 100644
--- a/tpl/default/tag.cloud.html
+++ b/tpl/default/tag.cloud.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html
index bcddcd56..41eab246 100644
--- a/tpl/default/tag.list.html
+++ b/tpl/default/tag.list.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/tag.sort.html b/tpl/default/tag.sort.html
index 89acda0d..d24c9f64 100644
--- a/tpl/default/tag.sort.html
+++ b/tpl/default/tag.sort.html
@@ -1,8 +1,8 @@
 <div class="pure-g">
  <div class="pure-u-1 pure-alert pure-alert-success tag-sort">
    {'Sort by:'|t}
-    <a href="?do=tagcloud" title="cloud">{'Cloud'|t}</a> &middot;
+    <a href="?do=tagcloud">{'Cloud'|t}</a> &middot;
-    <a href="?do=taglist&sort=usage" title="cloud">{'Most used'|t}</a> &middot;
+    <a href="?do=taglist&sort=usage">{'Most used'|t}</a> &middot;
-    <a href="?do=taglist&sort=alpha" title="cloud">{'Alphabetical'|t}</a>
+    <a href="?do=taglist&sort=alpha">{'Alphabetical'|t}</a>
  </div>
 </div>
 \ No newline at end of file
diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html
index a8cf904e..f1939798 100644
--- a/tpl/default/thumbnails.html
+++ b/tpl/default/thumbnails.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>
diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index c9ce1eaf..20d0c893 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
 <head>
  {include="includes"}
 </head>