From ca58cce86f0957d7f217bf6b3de081eec048f95f Mon Sep 17 00:00:00 2001
From: Michael Stramel <Michael.Stramel@panerabread.com>
Date: Mon, 12 Jan 2015 11:11:01 -0600
Subject: [PATCH 1/5] Added accessibility classes to default inputs

---
 src/directives/decorators/bootstrap/default.html  | 5 +++--
 src/directives/decorators/bootstrap/readonly.html | 2 +-
 src/directives/decorators/bootstrap/textarea.html | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/directives/decorators/bootstrap/default.html b/src/directives/decorators/bootstrap/default.html
index 15f3d5b29..f9b8461fc 100644
--- a/src/directives/decorators/bootstrap/default.html
+++ b/src/directives/decorators/bootstrap/default.html
@@ -1,5 +1,5 @@
 <div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false }">
-  <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
+  <label class="control-label" ng-class="{'sr-only': showTitle()}">{{form.title}}</label>
 
   <input ng-show="form.key"
          type="{{form.type}}"
@@ -13,7 +13,8 @@
          schema-validate="form">
   <span ng-if="form.feedback !== false"
         class="form-control-feedback"
-        ng-class="evalInScope(form.feedback) || {'glyphicon': true, 'glyphicon-ok': hasSuccess(), 'glyphicon-remove': hasError() }"></span>
+        ng-class="evalInScope(form.feedback) || {'glyphicon': true, 'glyphicon-ok': hasSuccess(), 'glyphicon-remove': hasError() }"
+        aria-hidden="true"></span>
   <div class="help-block"
        ng-show="(hasError() && errorMessage(schemaError())) || form.description"
        ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
diff --git a/src/directives/decorators/bootstrap/readonly.html b/src/directives/decorators/bootstrap/readonly.html
index 4f0b1d126..8b2e2b944 100644
--- a/src/directives/decorators/bootstrap/readonly.html
+++ b/src/directives/decorators/bootstrap/readonly.html
@@ -1,5 +1,5 @@
 <div class="form-group">
-  <label ng-show="showTitle()">{{form.title}}</label>
+  <label ng-class="{'sr-only': showTitle()}">{{form.title}}</label>
   <input ng-if="form.type !== 'textarea'" type="text" disabled class="form-control" value="{{$$value$$}}">
   <textarea ng-if="form.type === 'textarea'"  disabled class="form-control">{{$$value$$}}</textarea>
   <div class="help-block" ng-show="form.description" ng-bind-html="form.description"></div>
diff --git a/src/directives/decorators/bootstrap/textarea.html b/src/directives/decorators/bootstrap/textarea.html
index 129efd6aa..f35591111 100644
--- a/src/directives/decorators/bootstrap/textarea.html
+++ b/src/directives/decorators/bootstrap/textarea.html
@@ -1,5 +1,5 @@
 <div class="form-group has-feedback" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
-  <label ng-show="showTitle()">{{form.title}}</label>
+  <label ng-class="{'sr-only': showTitle()}">{{form.title}}</label>
   <textarea class="form-control"
             sf-changed="form"
             placeholder="{{form.placeholder}}"

From 24c6bf37dcda769eee319bf58515e6436dcf8276 Mon Sep 17 00:00:00 2001
From: Michael Stramel <Michael.Stramel@panerabread.com>
Date: Mon, 12 Jan 2015 11:45:29 -0600
Subject: [PATCH 2/5] Fixed tests and logic of displaying `sr-only`

---
 src/directives/decorators/bootstrap/default.html  | 2 +-
 src/directives/decorators/bootstrap/readonly.html | 2 +-
 src/directives/decorators/bootstrap/textarea.html | 2 +-
 test/directives/schema-form-test.js               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/directives/decorators/bootstrap/default.html b/src/directives/decorators/bootstrap/default.html
index 131c313f1..48f56e392 100644
--- a/src/directives/decorators/bootstrap/default.html
+++ b/src/directives/decorators/bootstrap/default.html
@@ -1,6 +1,6 @@
 <div class="form-group schema-form-{{form.type}} {{form.htmlClass}}"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false }">
-  <label class="control-label" ng-class="{'sr-only': showTitle()}">{{form.title}}</label>
+  <label class="control-label" ng-class="{'sr-only': !showTitle()}">{{form.title}}</label>
 
   <input ng-show="form.key"
          type="{{form.type}}"
diff --git a/src/directives/decorators/bootstrap/readonly.html b/src/directives/decorators/bootstrap/readonly.html
index 8b2e2b944..09cd9c4ba 100644
--- a/src/directives/decorators/bootstrap/readonly.html
+++ b/src/directives/decorators/bootstrap/readonly.html
@@ -1,5 +1,5 @@
 <div class="form-group">
-  <label ng-class="{'sr-only': showTitle()}">{{form.title}}</label>
+  <label ng-class="{'sr-only': !showTitle()}">{{form.title}}</label>
   <input ng-if="form.type !== 'textarea'" type="text" disabled class="form-control" value="{{$$value$$}}">
   <textarea ng-if="form.type === 'textarea'"  disabled class="form-control">{{$$value$$}}</textarea>
   <div class="help-block" ng-show="form.description" ng-bind-html="form.description"></div>
diff --git a/src/directives/decorators/bootstrap/textarea.html b/src/directives/decorators/bootstrap/textarea.html
index 206ca139f..75af8ed26 100644
--- a/src/directives/decorators/bootstrap/textarea.html
+++ b/src/directives/decorators/bootstrap/textarea.html
@@ -1,5 +1,5 @@
 <div class="form-group has-feedback {{form.htmlClass}} schema-form-textarea" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
-  <label ng-class="{'sr-only': showTitle()}">{{form.title}}</label>
+  <label ng-class="{'sr-only': !showTitle()}">{{form.title}}</label>
   <textarea class="form-control {{form.fieldHtmlClass}}"
             sf-changed="form"
             placeholder="{{form.placeholder}}"
diff --git a/test/directives/schema-form-test.js b/test/directives/schema-form-test.js
index c78880024..61e69eece 100644
--- a/test/directives/schema-form-test.js
+++ b/test/directives/schema-form-test.js
@@ -779,7 +779,7 @@ describe('directive',function(){
       $rootScope.$apply();
 
       tmpl.children().length.should.be.equal(2);
-      tmpl.children().eq(0).children().eq(0).find('label').hasClass('ng-hide').should.be.true;
+      tmpl.children().eq(0).children().eq(0).find('label').hasClass('sr-only').should.be.true;
       tmpl.children().eq(1).children().eq(0).find('label').hasClass('ng-hide').should.be.true;
     });
   });

From 62178cbf758c773051476a0ff5a7e1eb7bdb8230 Mon Sep 17 00:00:00 2001
From: Michael Stramel <Michael.Stramel@panerabread.com>
Date: Mon, 12 Jan 2015 11:46:13 -0600
Subject: [PATCH 3/5] Prevent progress reporter from displaying passed tests

---
 karma.conf.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/karma.conf.js b/karma.conf.js
index 79b657762..f8e63bd7c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -45,6 +45,12 @@ module.exports = function(config) {
       'src/**/*.html': ['ng-html2js']
     },
 
+    progressReporter: {
+      suppressPassed: true,
+      suppressFailed: false,
+      suppressSkipped: false
+    },
+
     // optionally, configure the reporter
     coverageReporter: {
       type : 'lcov',

From 61b2d09895a9d40302c0d736c04511733c2e2ebf Mon Sep 17 00:00:00 2001
From: Michael Stramel <Michael.Stramel@panerabread.com>
Date: Mon, 12 Jan 2015 11:51:27 -0600
Subject: [PATCH 4/5] Revert karma config change

---
 karma.conf.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index f8e63bd7c..79b657762 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -45,12 +45,6 @@ module.exports = function(config) {
       'src/**/*.html': ['ng-html2js']
     },
 
-    progressReporter: {
-      suppressPassed: true,
-      suppressFailed: false,
-      suppressSkipped: false
-    },
-
     // optionally, configure the reporter
     coverageReporter: {
       type : 'lcov',

From e146362a93dfb8576c8f1b1587957842d2b49339 Mon Sep 17 00:00:00 2001
From: Michael Stramel <Michael.Stramel@panerabread.com>
Date: Mon, 12 Jan 2015 16:23:42 -0600
Subject: [PATCH 5/5] Updated to use sr-only feedback

---
 src/directives/decorators/bootstrap/default.html  | 9 +++++++--
 src/directives/decorators/bootstrap/readonly.html | 4 ++--
 src/directives/decorators/bootstrap/textarea.html | 3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/directives/decorators/bootstrap/default.html b/src/directives/decorators/bootstrap/default.html
index 48f56e392..58ee2c692 100644
--- a/src/directives/decorators/bootstrap/default.html
+++ b/src/directives/decorators/bootstrap/default.html
@@ -1,6 +1,6 @@
 <div class="form-group schema-form-{{form.type}} {{form.htmlClass}}"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false }">
-  <label class="control-label" ng-class="{'sr-only': !showTitle()}">{{form.title}}</label>
+  <label class="control-label" ng-class="{'sr-only': !showTitle()}" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
 
   <input ng-show="form.key"
          type="{{form.type}}"
@@ -8,15 +8,20 @@
          sf-changed="form"
          placeholder="{{form.placeholder}}"
          class="form-control {{form.fieldHtmlClass}}"
+         id="{{form.key.slice(-1)[0]}}"
          ng-model-options="form.ngModelOptions"
          ng-model="$$value$$"
          ng-disabled="form.readonly"
          schema-validate="form"
-         name="{{form.key.slice(-1)[0]}}">
+         name="{{form.key.slice(-1)[0]}}"
+         aria-describedby="{{form.key.slice(-1)[0] + 'Status'}}">
   <span ng-if="form.feedback !== false"
         class="form-control-feedback"
         ng-class="evalInScope(form.feedback) || {'glyphicon': true, 'glyphicon-ok': hasSuccess(), 'glyphicon-remove': hasError() }"
         aria-hidden="true"></span>
+  <span ng-if="hasError() || hasSuccess()"
+        id="{{form.key.slice(-1)[0] + 'Status'}}"
+        class="sr-only">{{ hasSuccess() ? '(success)' : '(error)' }}</span>
   <div class="help-block"
        ng-show="(hasError() && errorMessage(schemaError())) || form.description"
        ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
diff --git a/src/directives/decorators/bootstrap/readonly.html b/src/directives/decorators/bootstrap/readonly.html
index 09cd9c4ba..52059953c 100644
--- a/src/directives/decorators/bootstrap/readonly.html
+++ b/src/directives/decorators/bootstrap/readonly.html
@@ -1,6 +1,6 @@
 <div class="form-group">
-  <label ng-class="{'sr-only': !showTitle()}">{{form.title}}</label>
-  <input ng-if="form.type !== 'textarea'" type="text" disabled class="form-control" value="{{$$value$$}}">
+  <label ng-class="{'sr-only': !showTitle()}" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
+  <input ng-if="form.type !== 'textarea'" type="text" disabled class="form-control" id="{{form.key.slice(-1)[0]}}" value="{{$$value$$}}">
   <textarea ng-if="form.type === 'textarea'"  disabled class="form-control">{{$$value$$}}</textarea>
   <div class="help-block" ng-show="form.description" ng-bind-html="form.description"></div>
 </div>
diff --git a/src/directives/decorators/bootstrap/textarea.html b/src/directives/decorators/bootstrap/textarea.html
index 75af8ed26..eff0ceaf4 100644
--- a/src/directives/decorators/bootstrap/textarea.html
+++ b/src/directives/decorators/bootstrap/textarea.html
@@ -1,6 +1,7 @@
 <div class="form-group has-feedback {{form.htmlClass}} schema-form-textarea" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
-  <label ng-class="{'sr-only': !showTitle()}">{{form.title}}</label>
+  <label ng-class="{'sr-only': !showTitle()}" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
   <textarea class="form-control {{form.fieldHtmlClass}}"
+            id="{{form.key.slice(-1)[0]}}"
             sf-changed="form"
             placeholder="{{form.placeholder}}"
             ng-disabled="form.readonly"