From 734ce5e2fb65162ac914154b5c94433b1202775f Mon Sep 17 00:00:00 2001 From: Ahsan Ulhaq Date: Wed, 29 Apr 2015 12:26:39 +0500 Subject: [PATCH 1/3] aria-describedby has broken IDref on Sign in email form AC-97 --- lms/templates/student_account/form_field.underscore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/templates/student_account/form_field.underscore b/lms/templates/student_account/form_field.underscore index d56431191f..f18a62813b 100644 --- a/lms/templates/student_account/form_field.underscore +++ b/lms/templates/student_account/form_field.underscore @@ -40,7 +40,8 @@ type="<%= type %>" name="<%= name %>" class="input-block <% if ( type === 'checkbox' ) { %>checkbox<% } %>" - aria-describedby="<%= form %>-<%= name %>-desc" + <% if ( type !== 'password' ) { %> + aria-describedby="<%= form %>-<%= name %>-desc"<% } %> <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %> <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %> <% if ( required ) { %> aria-required="true" required<% } %> @@ -52,7 +53,7 @@ <% if ( placeholder ) { %> placeholder="<%= placeholder %>"<% } %> value="<%- defaultValue %>" /> - <% if ( instructions ) { %> <%= instructions %><% } %> + <% if ( instructions ) { %> <%= instructions %><% } %> <% } %> <% if ( type === 'checkbox' ) { %> @@ -65,4 +66,4 @@ <% if( form === 'login' && name === 'password' ) { %> <%- gettext("Forgot password?") %> <% } %> - + \ No newline at end of file From 3ec676e61b3f2ec697ba995edfc16ced7f96f369 Mon Sep 17 00:00:00 2001 From: Ahsan Ulhaq Date: Wed, 29 Apr 2015 18:18:47 +0500 Subject: [PATCH 2/3] change indentaion and add new line --- lms/templates/student_account/form_field.underscore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/templates/student_account/form_field.underscore b/lms/templates/student_account/form_field.underscore index f18a62813b..bd2eede884 100644 --- a/lms/templates/student_account/form_field.underscore +++ b/lms/templates/student_account/form_field.underscore @@ -40,8 +40,9 @@ type="<%= type %>" name="<%= name %>" class="input-block <% if ( type === 'checkbox' ) { %>checkbox<% } %>" - <% if ( type !== 'password' ) { %> - aria-describedby="<%= form %>-<%= name %>-desc"<% } %> + <% if ( type !== 'password' ) { %> + aria-describedby="<%= form %>-<%= name %>-desc" + <% } %> <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %> <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %> <% if ( required ) { %> aria-required="true" required<% } %> @@ -66,4 +67,4 @@ <% if( form === 'login' && name === 'password' ) { %> <%- gettext("Forgot password?") %> <% } %> - \ No newline at end of file + From 6d451ccd47a25bdbc04c48528884a75d0d2cc5db Mon Sep 17 00:00:00 2001 From: Ahsan Ulhaq Date: Thu, 30 Apr 2015 16:42:03 +0500 Subject: [PATCH 3/3] change three line structure to one line --- lms/templates/student_account/form_field.underscore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lms/templates/student_account/form_field.underscore b/lms/templates/student_account/form_field.underscore index bd2eede884..943b070940 100644 --- a/lms/templates/student_account/form_field.underscore +++ b/lms/templates/student_account/form_field.underscore @@ -40,9 +40,7 @@ type="<%= type %>" name="<%= name %>" class="input-block <% if ( type === 'checkbox' ) { %>checkbox<% } %>" - <% if ( type !== 'password' ) { %> - aria-describedby="<%= form %>-<%= name %>-desc" - <% } %> + <% if ( type !== 'password' ) { %> aria-describedby="<%= form %>-<%= name %>-desc" <% } %> <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %> <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %> <% if ( required ) { %> aria-required="true" required<% } %>