From b364e0ec38996ecc418a05528594ea3fd3bd614e Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 15 Nov 2018 11:05:50 +0100
Subject: [PATCH] Improves pages markup

---
 app/views/pages/accessibility.html.erb | 161 ++++++++++++++-----------
 app/views/pages/conditions.html.erb    |   8 +-
 app/views/pages/privacy.html.erb       |  12 +-
 config/locales/en/pages.yml            |   3 +-
 4 files changed, 97 insertions(+), 87 deletions(-)

diff --git a/app/views/pages/accessibility.html.erb b/app/views/pages/accessibility.html.erb
index cf956e3e8..fe28dbc74 100644
--- a/app/views/pages/accessibility.html.erb
+++ b/app/views/pages/accessibility.html.erb
@@ -1,99 +1,114 @@
-<% provide :title do %><%= t('pages.titles.accessibility') %><% end %>
+<% provide :title do %><%= t("pages.titles.accessibility") %><% end %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: page_url("accessibility") %>
 <% end %>
 
 <div class="row">
-<div class="small-12 column">
+  <div class="small-12 column">
 
-  <h1><%= t('.title') %></h1>
-  <%= simple_format(t('.description')) %>
+    <h1><%= t("pages.accessibility.title") %></h1>
+    <%= simple_format(t("pages.accessibility.description")) %>
 
-  <ul>
-    <% t('.examples').each do |example| %>
-      <li><%= example %></li>
-    <% end %>
-  </ul>
+    <ul>
+      <% t("pages.accessibility.examples").each do |example| %>
+        <li><%= example %></li>
+      <% end %>
+    </ul>
 
-  <h2><%= t('.keyboard_shortcuts.title') %></h2>
+    <h2><%= t("pages.accessibility.keyboard_shortcuts.title") %></h2>
 
-  <p><%= t('.keyboard_shortcuts.navigation_table.description') %></p>
+    <p><%= t("pages.accessibility.keyboard_shortcuts.navigation_table.description") %></p>
 
-  <div class="small-12 medium-6">
-    <table>
-      <caption class="show-for-sr"><%= t('.keyboard_shortcuts.navigation_table.caption') %></caption>
-      <thead>
-        <tr>
-          <th scope="col" class="text-center"><%= t('.keyboard_shortcuts.navigation_table.key_header') %></th>
-          <th scope="col"><%= t('.keyboard_shortcuts.navigation_table.page_header') %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% t('.keyboard_shortcuts.navigation_table.rows').each do |row| %>
+    <div class="small-12 medium-6">
+      <table>
+        <caption class="show-for-sr">
+          <%= t("pages.accessibility.keyboard_shortcuts.navigation_table.caption") %>
+        </caption>
+        <thead>
           <tr>
-            <td class="text-center"><%= row[:key_column] %></td>
-            <td><%= row[:page_column] %></td>
+            <th scope="col" class="text-center">
+              <%= t("pages.accessibility.keyboard_shortcuts.navigation_table.key_header") %>
+            </th>
+            <th scope="col">
+              <%= t("pages.accessibility.keyboard_shortcuts.navigation_table.page_header") %>
+            </th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
+        </thead>
+        <tbody>
+          <% t("pages.accessibility.keyboard_shortcuts.navigation_table.rows").each do |row| %>
+            <tr>
+              <td class="text-center"><%= row[:key_column] %></td>
+              <td><%= row[:page_column] %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
 
-  <p><%= t('.keyboard_shortcuts.browser_table.description') %></p>
+    <p><%= t("pages.accessibility.keyboard_shortcuts.browser_table.description") %></p>
 
-  <div class="small-12 medium-6">
-    <table>
-      <caption class="show-for-sr"><%= t('.keyboard_shortcuts.browser_table.caption') %></caption>
-      <thead>
-        <tr>
-          <th scope="col"><%= t('.keyboard_shortcuts.browser_table.browser_header') %></th>
-          <th scope="col"><%= t('.keyboard_shortcuts.browser_table.key_header') %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% t('.keyboard_shortcuts.browser_table.rows').each do |row| %>
+    <div class="small-12 medium-6">
+      <table>
+        <caption class="show-for-sr">
+          <%= t("pages.accessibility.keyboard_shortcuts.browser_table.caption") %>
+        </caption>
+        <thead>
           <tr>
-            <td><%= row[:browser_column] %></td>
-            <td><%= row[:key_column] %></td>
+            <th scope="col">
+              <%= t("pages.accessibility.keyboard_shortcuts.browser_table.browser_header") %>
+            </th>
+            <th scope="col">
+              <%= t("pages.accessibility.keyboard_shortcuts.browser_table.key_header") %>
+            </th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
+        </thead>
+        <tbody>
+          <% t("pages.accessibility.keyboard_shortcuts.browser_table.rows").each do |row| %>
+            <tr>
+              <td><%= row[:browser_column] %></td>
+              <td><%= row[:key_column] %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
 
-  <h2><%= t('.textsize.title') %></h2>
-  <p><%= t('.textsize.browser_settings_table.description') %></p>
+    <h2><%= t("pages.accessibility.textsize.title") %></h2>
+    <p><%= t("pages.accessibility.textsize.browser_settings_table.description") %></p>
 
-  <div class="small-12 medium-6">
-    <table>
-      <thead>
-        <tr>
-          <th scope="col"><%= t('.textsize.browser_settings_table.browser_header') %></th>
-          <th scope="col"><%= t('.textsize.browser_settings_table.action_header') %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% t('.textsize.browser_settings_table.rows').each do |row| %>
+    <div class="small-12 medium-6">
+      <table>
+        <thead>
           <tr>
-            <td><%= row[:browser_column] %></td>
-            <td><%= row[:action_column] %></td>
+            <th scope="col">
+              <%= t("pages.accessibility.textsize.browser_settings_table.browser_header") %>
+            </th>
+            <th scope="col">
+              <%= t("pages.accessibility.textsize.browser_settings_table.action_header") %>
+            </th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
+        </thead>
+        <tbody>
+          <% t("pages.accessibility.textsize.browser_settings_table.rows").each do |row| %>
+            <tr>
+              <td><%= row[:browser_column] %></td>
+              <td><%= row[:action_column] %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
 
-  <p><%= t('.textsize.browser_shortcuts_table.description') %></p>
+    <p><%= t("pages.accessibility.textsize.browser_shortcuts_table.description") %></p>
 
-  <ul>
-    <% t('.textsize.browser_shortcuts_table.rows').each do |row| %>
-      <li><code><%= row[:shortcut_column] %></code> <%= row[:description_column] %></li>
-    <% end  %>
-  </ul>
+    <ul>
+      <% t("pages.accessibility.textsize.browser_shortcuts_table.rows").each do |row| %>
+        <li><code><%= row[:shortcut_column] %></code> <%= row[:description_column] %></li>
+      <% end %>
+    </ul>
 
-  <h2><%= t('.compatibility.title') %></h2>
-
-  <p><%= t('.compatibility.description_html') %></p>
+    <h2><%= t("pages.accessibility.compatibility.title") %></h2>
 
+    <p><%= t("pages.accessibility.compatibility.description_html") %></p>
   </div>
 </div>
diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb
index f85c61542..340513d1e 100644
--- a/app/views/pages/conditions.html.erb
+++ b/app/views/pages/conditions.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t('pages.titles.conditions') %><% end %>
+<% provide :title do %><%= t("pages.titles.conditions") %><% end %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: page_url("conditions") %>
 <% end %>
@@ -6,9 +6,9 @@
 <div class="row margin-top">
 
   <div class="small-12 medium-9 column">
-    <h1><%= t('.title') %></h1>
-    <h2><%= t('.subtitle') %></h2>
-    <p><%= t('.description') %></p>
+    <h1><%= t("pages.conditions.title") %></h1>
+    <h2><%= t("pages.conditions.subtitle") %></h2>
+    <p><%= t("pages.conditions.description") %></p>
   </div>
 
   <div class="small-12 medium-3 column">
diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb
index f18e32bbc..3c76d3c18 100644
--- a/app/views/pages/privacy.html.erb
+++ b/app/views/pages/privacy.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t('pages.titles.privacy') %><% end %>
+<% provide :title do %><%= t("pages.titles.privacy") %><% end %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: page_url("privacy") %>
 <% end %>
@@ -6,12 +6,11 @@
 <div class="row margin-top">
 
   <div class="small-12 medium-9 column">
-
-    <h1><%= t(".title") %></h1>
-    <h2><%= t('.subtitle') %></h2>
+    <h1><%= t("pages.privacy.title") %></h1>
+    <h2><%= t("pages.privacy.subtitle") %></h2>
 
     <ol>
-      <% t('.info_items').each do |item| %>
+      <% t("pages.privacy.info_items").each do |item| %>
         <% if item.key? :text %>
           <li><%= item[:text] %></li>
         <% else %>
@@ -26,12 +25,9 @@
         <% end %>
       <% end %>
     </ol>
-
   </div>
 
   <div class="small-12 medium-3 column">
     <%= render '/shared/print' %>
   </div>
-
 </div>
-
diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml
index be7cad3ef..07de222f8 100644
--- a/config/locales/en/pages.yml
+++ b/config/locales/en/pages.yml
@@ -155,8 +155,7 @@ en:
               description_column: Decreases text size
       compatibility:
         title: Compatibility with standards and visual design
-        description_html: 'All pages of this website comply with the <strong> Accessibility Guidelines </strong> or General Principles of Accessible Design established by the Working Group <abbr title = "Web Accessibility Initiative" lang = "en"> WAI </ abbr> belonging to W3C.'
-
+        description_html: 'All pages of this website comply with the <strong>Accessibility Guidelines</strong> or General Principles of Accessible Design established by the Working Group <abbr title="Web Accessibility Initiative" lang="en">WAI</abbr> belonging to W3C.'
     titles:
       accessibility: Accessibility
       conditions: Terms of use