Skip to content

E
edx-platform
Commit fe5fc448 by caesar2164
Options

Merge pull request #1948 from edx/feature/giulio/accessibility 

Feature/giulio/accessibility
parents 729ca900 91e2a39e
Showing with 67 additions and 43 deletions
lms/static/sass/shared/_modal.scss
......@@ -149,7 +149,7 @@
}
label {
color: #999;
color: #646464;
&.field-error {
display: block;
......
lms/templates/courseware/courseware.html
......@@ -156,7 +156,7 @@
<div id="calculator_wrapper">
<form id="calculator">
<div class="input-wrapper">
<input type="text" id="calculator_input" />
<input type="text" id="calculator_input" title="Calculator Input Field" />
<div class="help-wrapper">
<a href="#">Hints</a>
......@@ -176,8 +176,8 @@
</dl>
</div>
</div>
<input id="calculator_button" type="submit" value="="/>
<input type="text" id="calculator_output" readonly />
<input id="calculator_button" type="submit" title="Calculate" value="="/>
<input type="text" id="calculator_output" title="Calculator Output Field" readonly />
</form>
</div>
......
lms/templates/forgot_password_modal.html
......@@ -12,19 +12,19 @@
</div>
<form id="pwd_reset_form" action="${reverse('password_reset')}" method="post" data-remote="true">
<label for="id_email">E-mail address:</label>
<input id="id_email" type="email" name="email" maxlength="75" placeholder="Your E-mail"/>
<label for="pwd_reset_email">E-mail address:</label>
<input id="pwd_reset_email" type="email" name="email" maxlength="75" placeholder="Your E-mail"/>
<div class="submit">
<input type="submit" id="pwd_reset_button" value="Reset my password" />
</div>
</form>
</div>
<div class="close-modal">
<a href="#" class="close-modal" title="Close Modal">
<div class="inner">
<p>&#10005;</p>
</div>
</div>
</a>
</div>
</section>
......@@ -40,5 +40,10 @@
$('#pwd_error').stop().css("display", "block");
}
});
// removing close link's default behavior
$('#login-modal .close-modal').click(function(e) {
e.preventDefault();
});
})(this)
</script>
lms/templates/login_modal.html
......@@ -9,14 +9,17 @@
</header>
<form id="login_form" class="login_form" method="post" data-remote="true" action="/login">
<label>E-mail</label>
<input name="email" type="email">
<label>Password</label>
<input name="password" type="password">
<label class="remember-me">
<input name="remember" type="checkbox" value="true">
<label for="login_email">E-mail</label>
<input id="login_email" type="email" name="email" placeholder="e.g. yourname@domain.com" />
<label for="login_password">Password</label>
<input id="login_password" type="password" name="password" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" />
<label for="login_remember_me" class="remember-me">
<input id="login_remember_me" type="checkbox" name="remember" value="true" />
Remember me
</label>
<div class="submit">
<input name="submit" type="submit" value="Access My Courses">
</div>
......@@ -34,11 +37,11 @@
% endif
</section>
<div class="close-modal">
<a href="#" class="close-modal" title="Close Modal">
<div class="inner">
<p>&#10005;</p>
</div>
</div>
</a>
</div>
</section>
......@@ -59,5 +62,10 @@
$('#login_error').html(json.value).stop().css("display", "block");
}
});
// removing close link's default behavior
$('#login-modal .close-modal').click(function(e) {
e.preventDefault();
});
})(this)
</script>
lms/templates/seq_module.html
......@@ -10,7 +10,8 @@
<li>
<a class="seq_${item['type']} inactive progress-${item['progress_status']}"
data-id="${item['id']}"
data-element="${idx+1}">
data-element="${idx+1}"
href="javascript:void(0);">
<p>${item['title']}</p>
</a>
</li>
......
lms/templates/signup_modal.html
......@@ -20,27 +20,31 @@
<div class="input-group">
% if has_extauth_info is UNDEFINED:
<label data-field="email">E-mail*</label>
<input name="email" type="email" placeholder="eg. yourname@domain.com">
<label data-field="password">Password*</label>
<input name="password" type="password" placeholder="****">
<label data-field="username">Public Username*</label>
<input name="username" type="text" placeholder="Shown on forums">
<label data-field="name">Full Name*</label>
<input name="name" type="text" placeholder="For your certificate">
<label data-field="email" for="signup_email">E-mail *</label>
<input id="signup_email" type="email" name="email" placeholder="e.g. yourname@domain.com" required />
<label data-field="password" for="signup_password">Password *</label>
<input id="signup_password" type="password" name="password" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" required />
<label data-field="username" for="signup_username">Public Username *</label>
<input id="signup_username" type="text" name="username" placeholder="e.g. yourname (shown on forums)" required />
<label data-field="name" for="signup_fullname">Full Name *</label>
<input id="signup_fullname" type="text" name="name" placeholder="e.g. Your Name (for certificates)" required />
% else:
<p><i>Welcome</i> ${extauth_email}</p><br/>
<p><i>Enter a public username:</i></p>
<label data-field="username">Public Username*</label>
<input name="username" type="text" value="${extauth_username}" placeholder="Shown on forums">
<label data-field="username" for="signup_username">Public Username *</label>
<input id="signup_username" type="text" name="username" value="${extauth_username}" placeholder="e.g. yourname (shown on forums)" required />
% endif
</div>
<div class="input-group">
<section class="citizenship">
<label data-field="level_of_education">Ed. completed</label>
<label data-field="level_of_education" for="signup_ed_level">Ed. Completed</label>
<div class="input-wrapper">
<select name="level_of_education">
<select id="signup_ed_level" name="level_of_education">
<option value="">--</option>
%for code, ed_level in UserProfile.LEVEL_OF_EDUCATION_CHOICES:
<option value="${code}">${ed_level}</option>
......@@ -50,9 +54,9 @@
</section>
<section class="gender">
<label data-field="gender">Gender</label>
<label data-field="gender" for="signup_gender">Gender</label>
<div class="input-wrapper">
<select name="gender">
<select id="signup_gender" name="gender">
<option value="">--</option>
%for code, gender in UserProfile.GENDER_CHOICES:
<option value="${code}">${gender}</option>
......@@ -62,9 +66,9 @@
</section>
<section class="date-of-birth">
<label data-field="date-of-birth">Year of birth</label>
<label data-field="date-of-birth" for="signup_birth_year">Year of birth</label>
<div class="input-wrapper">
<select name="year_of_birth">
<select id="signup_birth_year" name="year_of_birth">
<option value="">--</option>
%for year in UserProfile.VALID_YEARS:
<option value="${year}">${year}</option>
......@@ -74,22 +78,23 @@
</div>
</section>
<label data-field="mailing_address">Mailing address</label>
<textarea name="mailing_address"></textarea>
<label data-field="goals">Goals in signing up for edX</label>
<textarea name="goals"></textarea>
<label data-field="mailing_address" for="signup_mailing_address">Mailing address</label>
<textarea id="signup_mailing_address" name="mailing_address"></textarea>
<label data-field="goals" for="signup_goals">Goals in signing up for edX</label>
<textarea name="goals" id="signup_goals"></textarea>
</div>
<div class="input-group">
<label data-field="terms_of_service" class="terms-of-service">
<input name="terms_of_service" type="checkbox" value="true">
<label data-field="terms_of_service" class="terms-of-service" for="signup_tos">
<input id="signup_tos" name="terms_of_service" type="checkbox" value="true">
I agree to the
<a href="${reverse('tos')}" target="_blank">Terms of Service</a>*
</label>
<label data-field="honor_code" class="honor-code">
<input name="honor_code" type="checkbox" value="true">
<label data-field="honor_code" class="honor-code" for="signup_honor">
<input id="signup_honor" name="honor_code" type="checkbox" value="true">
I agree to the
<a href="${reverse('honor')}" target="_blank">Honor Code</a>*
</label>
......@@ -110,11 +115,11 @@
</div>
<div class="close-modal">
<a href="#" class="close-modal" title="Close Modal">
<div class="inner">
<p>&#10005;</p>
</div>
</div>
</a>
</div>
</section>
......@@ -129,5 +134,10 @@
$("[data-field='"+json.field+"']").addClass('field-error')
}
});
// removing close link's default behavior
$('#login-modal .close-modal').click(function(e) {
e.preventDefault();
});
})(this)
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment