clean hub titles

2 files changed, 34 insertions, 11 deletions

diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 8084bf32..e57f7a39 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -150,8 +150,8 @@
             <div role="button" class="content-share">
               SHARE +
             </div>
-            <span role="heading" class="title">{{title}}</span>
-            <span role="heading" class="subtitle">{{subtitle}}</span>
+            <span role="heading" aria-details="{{cleantitle}}" class="title">{{title}}</span>
+            <span role="heading" aria-details="{{cleansubtitle}}"class="subtitle">{{subtitle}}</span>
             <span class="date">
               {{date}}
               <span class="store">
@@ -1087,7 +1087,10 @@
 </div>
 
 <script type="text/html" id="creditcard_template">
-  <input type="number" name="Number" placeholder="CREDIT CARD NUMBER" required>
+  <label for="creditcard_id">Credit Card Number</label>
+  <input type="number" name="Number" aria-placeholder="CREDIT CARD NUMBER" required>
+  <span class='err'></span>
+
   <div class="half-input">
 
     <div class="select-wrapper">
@@ -1128,16 +1131,30 @@
       </select>
     </div>
   </div>
-  <input type="number" name="Cvv" placeholder="SECURITY CODE" required>
+  <label for="cc_cvv">Security Code</label>
+  <input type="number" id="cc_cvv" name="Cvv" aria-placeholder="SECURITY CODE" required>
+  <span class='err'></span>
 </script>
 
 <script type="text/html" id="address_template">
-  <input type="text" name="Name" placeholder="First Name">
-  <input type="text" name="Surname" placeholder="Last Name">
-  <input type="text" name="Address1" placeholder="Address Line 1">
-  <input type="text" name="Address2" placeholder="Address Line 2">
+  <label for="address_name">First Name</label>
+  <input type="text" id="address_name" name="Name" aria-placeholder="First Name">
+  <span class="err"></span>
+
+  <label for="address_surname">Last Name</label>
+  <input type="text" id="address_surname" name="Surname" aria-placeholder="Last Name">
+  <span class="err"></span>
+
+  <label for="address_surname">Address line 1</label>
+  <input type="text" id="address_address1" name="Address1" aria-placeholder="Address Line 1">
+  <span class="err"></span>
+
+  <label for="address_surname">Address line 2</label>
+  <input type="text" id="address_address2" name="Address2" aria-placeholder="Address Line 2">
+  <span class="err"></span>
+
   <div class="half-input">
-    <input type="text" name="City" placeholder="City">
+    <input type="text" name="City" aria-placeholder="City">
     <div class="select-wrapper">
       <span>STATE</span>
       <select name="Province">
@@ -1145,8 +1162,9 @@
       </select>
     </div>
   </div>
+
   <div class="half-input">
-    <input type="text" name="ZipCode" placeholder="ZIP" required>
+    <input type="text" name="ZipCode" aria-placeholder="ZIP" required>
     <div class="country-wrapper-static">
       <span class="country-label">UNITED STATES</span>
 <!-- 
@@ -1156,7 +1174,10 @@
  -->
     </div>
   </div>
-  <input type="number" name="Phone" placeholder="PHONE NUMBER">
+
+  <label for="address_phone">Phone Number</label>
+  <input type="number" id="address_phone" name="Phone" aria-placeholder="PHONE NUMBER">
+  <span class="err"></span>
 <!--
   <div class="checkbox-container save_as_default">
     <div class="checkbox-row">
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index c12e656f..e06faf44 100755
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
@@ -57,6 +57,8 @@ var HubView = ScrollableView.extend({
                          .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY"))
                          .replace(/{{title}}/, row.title)
                          .replace(/{{subtitle}}/, row.subtitle)
+                         .replace(/{{cleantitle}}/, stonewash(row.title))
+                         .replace(/{{cleansubtitle}}/, stonewash(row.subtitle))
                          .replace(/{{link}}/, row.link)
                          .replace(/{{body}}/, row.body.replace(/\n/g, "<br>"))
     var $t = $(t)