From ed7537d4301de196603f51d451b498f53b050e77 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 30 Aug 2016 17:49:17 -0400
Subject: [PATCH] (html) Add missing ARIA labels

---
 UI/Contacts/English.lproj/Localizable.strings |  5 ++-
 .../English.lproj/Localizable.strings         |  3 ++
 .../English.lproj/Localizable.strings         |  9 +++++
 .../ContactsUI/UIxContactFoldersView.wox      | 11 ++++---
 .../PreferencesUI/UIxAccountEditor.wox        |  3 +-
 UI/Templates/PreferencesUI/UIxPreferences.wox | 10 ++++--
 .../UIxAppointmentViewTemplate.wox            | 33 ++++++++++++++-----
 .../SchedulerUI/UIxReminderEditor.wox         |  6 ++--
 8 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 0e5b11701..6dce6e5e1 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -249,4 +249,7 @@
 "Sucessfully subscribed to address book" = "Sucessfully subscribed to address book";
 
 /* Aria label for scope of search on contacts */
-"Search scope" = "Search scope";
\ No newline at end of file
+"Search scope" = "Search scope";
+
+/* Aria label for avatar button to select and unselect a card */
+"Toggle item" = "Toggle item";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 3d7d3bb51..87d8b7f4f 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -292,6 +292,9 @@
 "Connection error" = "Connection error";
 "Service temporarily unavailable" = "Service temporarily unavailable";
 
+/* Aria label for filter enable checkbox */
+"Enable filter" = "Enable filter";
+
 /* Filters - UIxFilterEditor */
 "Filter name" = "Filter name";
 /* Button label */
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 0dd662120..f3d76c9ab 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -366,6 +366,15 @@
 "zoom_50" = "50%";
 "zoom_25" = "25%";
 
+/* Arial label for reminder units */
+"Reminder units" = "Reminder units";
+
+/* Aria label for reminder time position (after or before) */
+"Reminder position" = "Reminder position";
+
+/* Aria label for reminder relation with event (start or end) */
+"Reminder relation" = "Reminder relation";
+
 /* transparency */
 "Show Time as Free" = "Show Time as Free";
 
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 9efe4b236..737cef02e 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -50,6 +50,7 @@
             <md-list-item ng-repeat="folder in app.service.$addressbooks track by folder.id"
                           ng-click="app.select($event, folder)"
                           ng-dblclick="app.edit(folder)"
+                          aria-label="{{::folder.name}}"
                           ui-sref="app.addressbook({addressbookId: folder.id})"
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1"
                           sg-droppable="app.isDroppableFolder(dragFolder, folder)"
@@ -443,6 +444,7 @@
                 </div>
                 <div class="sg-tile-icons"><!-- spacer --></div>
                 <div class="md-secondary sg-avatar-selectable"
+                     label:aria-label="Toggle item"
                      ng-class="{ 'sg-avatar-selected': currentCard.selected }"
                      ng-click="addressbook.toggleCardSelection($event, currentCard)">
                   <!-- <div class="md-avatar sg-avatar-selected" -->
@@ -450,10 +452,11 @@
                     <!-- selected avatar -->
                   <!-- </div> -->
                   <sg-avatar-image
-                     ng-if="currentCard.$isCard()"
-                     sg-email="currentCard.$preferredEmail(addressbook.selectedFolder.constructor.$query.value)"
-                     sg-src="currentCard.photoURL"
-                     size="40">
+                      aria-disabled="true"
+                      ng-if="currentCard.$isCard()"
+                      sg-email="currentCard.$preferredEmail(addressbook.selectedFolder.constructor.$query.value)"
+                      sg-src="currentCard.photoURL"
+                      size="40">
                     <!-- contact avatar -->
                   </sg-avatar-image>
                   <div class="md-avatar sg-avatar-list"
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index 2ca493782..3143a8ed6 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -147,7 +147,8 @@
     </md-dialog-content>
     <md-dialog-actions>
       <md-button type="button" ng-click="$AccountDialogController.cancel()"><var:string label:value="Cancel"/></md-button>
-      <md-button ng-disabled="accountForm.$invalid"
+      <md-button aria-label="{{::'OK' | loc}}"
+                 ng-disabled="accountForm.$invalid"
                  ng-click="$AccountDialogController.save()"
                  ng-bind="::'OK' | loc"><!-- OK --></md-button>
     </md-dialog-actions>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index db97ab9d9..36f989063 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -555,10 +555,12 @@
 
             <div layout="row" layout-align="start center" flex="50" flex-xs="100">
               <md-checkbox
-                  class="md-align-top-left" ng-model="app.preferences.defaults.SOGoMailAddOutgoingAddresses"
+                  class="md-align-top-left"
+                  ng-model="app.preferences.defaults.SOGoMailAddOutgoingAddresses"
                   ng-true-value="1"
                   ng-false-value="0"
-                  label:arial-label="When sending mail, add unknown recipients to my">
+                  label:aria-label="When sending mail, add unknown recipients to my">
+                <!-- SOGoMailAddOutgoingAddresses -->
               </md-checkbox>
 
               <md-input-container class="md-block md-flex">
@@ -687,13 +689,15 @@
                   </md-button>
                   <md-checkbox
                       style="margin-bottom: 0;"
+                      label:aria-label="Enable filter"
                       ng-model="app.preferences.defaults.SOGoSieveFilters[$index].active"
                       ng-true-value="1"
                       ng-false-value="0">
                     <!-- active or not-->
                   </md-checkbox>
                   <md-input-container class="md-flex">
-	            <input type="text" ng-model="app.preferences.defaults.SOGoSieveFilters[$index].name"/>
+	            <input type="text" label:aria-label="Filter name"
+                           ng-model="app.preferences.defaults.SOGoSieveFilters[$index].name"/>
                   </md-input-container>
                   <md-button class="sg-icon-button" type="button"
                              ng-click="app.editMailFilter($event, $index, preferencesForm)"
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
index 1a1dc3323..3be33563c 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
@@ -194,7 +194,7 @@
         <md-list-item>
           <md-icon>insert_invitation</md-icon>
           <md-input-container>
-            <md-select ng-model="editor.component.reply">
+            <md-select label:aria-label="Reply" ng-model="editor.component.reply">
               <var:foreach list="replyList" item="item">
                 <md-option var:value="item">
                   <var:string value="itemReplyText"/>
@@ -226,9 +226,12 @@
         </md-list-item>
         <!-- reminder -->
         <md-list-item ng-show="editor.component.userHasRSVP">
-          <md-checkbox ng-model="editor.component.$hasAlarm"
-                       label:aria-label="Reminder"><!-- reminder --></md-checkbox>
-          <p><var:string label:value="Reminder"/></p>
+          <md-icon>alarm</md-icon>
+          <p>
+            <md-checkbox style="margin-bottom: 0"
+                         ng-model="editor.component.$hasAlarm"
+                         label:aria-label="Reminder"><var:string label:value="Reminder"/></md-checkbox>
+          </p>
         </md-list-item>
       </md-list>
       <div class="sg-inset" ng-show="editor.component.userHasRSVP">
@@ -262,12 +265,14 @@
         <md-menu-content>
           <md-menu-item>
             <md-button class="md-warn"
+                       label:aria-label="Delete This Occurrence"
                        ng-click="editor.deleteOccurrence()">
               <md-icon>repeat_one</md-icon> <var:string label:value="Delete This Occurrence"/>
             </md-button>
           </md-menu-item>
           <md-menu-item>
             <md-button class="md-warn"
+                       label:aria-label="Delete All Occurrences"
                        ng-click="editor.deleteAllOccurrences()">
               <md-icon>repeat</md-icon> <var:string label:value="Delete All Occurrences"/>
             </md-button>
@@ -283,12 +288,14 @@
         </md-button>
         <md-menu-content>
           <md-menu-item>
-            <md-button type="button" ng-click="editor.edit()">
+            <md-button type="button" label:aria-label="Edit This Occurrence"
+                       ng-click="editor.edit()">
               <md-icon>repeat_one</md-icon> <var:string label:value="Edit This Occurrence"/>
             </md-button>
           </md-menu-item>
           <md-menu-item>
-            <md-button type="button" ng-click="editor.editAllOccurrences()">
+            <md-button type="button" label:aria-label="Edit All Occurrences"
+                       ng-click="editor.editAllOccurrences()">
               <md-icon>repeat</md-icon> <var:string label:value="Edit All Occurrences"/>
             </md-button>
           </md-menu-item>
@@ -303,7 +310,9 @@
         <var:string label:value="Delete"/>
       </md-button>
       <div class="md-flex"><!-- spacer --></div>
-      <md-button type="button" ng-click="editor.reply()">
+      <md-button type="button"
+                 label:aria-label="Update"
+                 ng-click="editor.reply()">
         <var:string label:value="Update"/>
       </md-button>
     </md-dialog-actions>
@@ -319,12 +328,14 @@
         <md-menu-content>
           <md-menu-item>
             <md-button class="md-warn"
+                       label:aria-label="Delete This Occurrence"
                        ng-click="editor.deleteOccurrence()">
               <md-icon>repeat_one</md-icon> <var:string label:value="Delete This Occurrence"/>
             </md-button>
           </md-menu-item>
           <md-menu-item>
             <md-button class="md-warn"
+                       label:aria-label="Delete All Occurrences"
                        ng-click="editor.deleteAllOccurrences()">
               <md-icon>repeat</md-icon> <var:string label:value="Delete All Occurrences"/>
             </md-button>
@@ -340,12 +351,16 @@
         </md-button>
         <md-menu-content>
           <md-menu-item>
-            <md-button type="button" ng-click="editor.reply()">
+            <md-button type="button"
+                       label:aria-label="Update This Occurrence"
+                       ng-click="editor.reply()">
               <md-icon>repeat_one</md-icon> <var:string label:value="Update This Occurrence"/>
             </md-button>
           </md-menu-item>
           <md-menu-item>
-            <md-button type="button" ng-click="editor.replyAllOccurrences()">
+            <md-button type="button"
+                       label:arial-label="Update All Occurrences"
+                       ng-click="editor.replyAllOccurrences()">
               <md-icon>repeat</md-icon> <var:string label:value="Update All Occurrences"/>
             </md-button>
           </md-menu-item>
diff --git a/UI/Templates/SchedulerUI/UIxReminderEditor.wox b/UI/Templates/SchedulerUI/UIxReminderEditor.wox
index 08903ea7f..31b4e327a 100644
--- a/UI/Templates/SchedulerUI/UIxReminderEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxReminderEditor.wox
@@ -9,21 +9,21 @@
       <input type="number" label:aria-label="quantity" ng-model="editor.component.alarm.quantity"/>
     </md-input-container>
     <md-input-container>
-      <md-select ng-model="editor.component.alarm.unit">
+      <md-select label:aria-label="Reminder units" ng-model="editor.component.alarm.unit">
         <var:foreach list="unitsList" item="item">
           <md-option var:value="item"><var:string value="itemText"/></md-option>
         </var:foreach>
       </md-select>
     </md-input-container>
     <md-input-container>
-      <md-select ng-model="editor.component.alarm.reference">
+      <md-select label:aria-label="Reminder position" ng-model="editor.component.alarm.reference">
         <var:foreach list="referencesList" item="item">
           <md-option var:value="item"><var:string value="itemText"/></md-option>
         </var:foreach>
       </md-select>
     </md-input-container>
     <md-input-container>
-      <md-select ng-model="editor.component.alarm.relation">
+      <md-select label:aria-label="Reminder relation" ng-model="editor.component.alarm.relation">
         <var:foreach list="relationsList" item="item">
           <md-option var:value="item"><var:string value="itemText"/></md-option>
         </var:foreach>