diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
deleted file mode 100644
index 27db57a..0000000
--- a/app/views/devise/confirmations/new.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
<%= t('custom_devise.resend_confirmation') %>
-
-
-
- <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
-
<%= f.label :email %>
-
-
<%= f.submit t('custom_devise.resend_confirmation') %>
- <% end %>
-
- <%= render "devise/shared/links" %>
-
-
-
<%= t "devise.invitations.edit.header" %>
+
<%= _("Create an account to view the plan") %>
+
<%= _("You will need to create an account in order to accept your invitation to view the data management plan (DMP).") %>
- <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
+ <%= form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, id: "invitation_create_account_form"} do |f| %>
<%= devise_error_messages! %>
<%= f.hidden_field :invitation_token %>
-
-
<%= f.label :password %>
-
-
<%= f.label :password_confirmation %>
-
-
<%= f.submit t("devise.invitations.edit.submit_button") %>
+
+
+ <%= f.label(:password, _('New password'), class: 'control-label') %>
+ <%= f.password_field(:password, class: 'form-control', "aria-required": true, "data-validation": "password") %>
+
+
+ <%= f.label(:password_confirmation, _('Password confirmation'), class: 'control-label') %>
+ <%= f.password_field(:password_confirmation, class: 'form-control', "aria-required": true, "data-validation": "password") %>
+
+
+ <%= f.button(_('Create account'), class: "btn btn-default", type: "submit") %>
<% end %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index 27cc107..03ea9dc 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,31 +1,32 @@
-
<%= t('helpers.change_password') %>
+ <%= _('Change your password') %>
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= devise_error_messages! %>
- <%= f.hidden_field :reset_password_token %>
-
-
-
- <%= t('helpers.new_password') %>
- <%= f.password_field :password, :autofocus => true %>
-
-
- <%= t('helpers.password') %>
- <%= f.password_field :password_confirmation %>
-
-
-
- <%= f.submit t('helpers.save'), :class => 'btn btn-primary', role: 'button'%>
-
-
- <% end %>
+ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: {method: :put, id: "user_reset_password_form"}) do |f| %>
+ <%= devise_error_messages! %>
+ <%= f.hidden_field :reset_password_token %>
- <%= render "devise/shared/links" %>
+
+ <%= f.label(:password, _('New password'), class: 'control-label') %>
+ <%= f.password_field(:password, class: 'form-control', "aria-required": true, "data-validation": "password") %>
+
+
+ <%= f.label(:password_confirmation, _('Password confirmation'), class: 'control-label') %>
+ <%= f.password_field(:password_confirmation, class: 'form-control', "aria-required": true, "data-validation": "password") %>
+
+
+
+
+
+
+ <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
+
+ <%= render "devise/shared/links" %>
+ <% end %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index ef24836..a4bfb2e 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -12,24 +12,13 @@
- <%= form_for resource, as: 'user', url: user_password_path, html: {class: "password-reset roadmap-form", method: :post} do |f| %>
+ <%= form_for resource, as: 'user', url: user_password_path, html: {method: :post, id: "user_request_reset_password_form"} do |f| %>
+
+ <%= f.label(:email, _('Email'), class: 'control-label') %>
+ <%= f.email_field(:email, class: 'form-control', "aria-required": true) %>
+
-
-
- <%= f.label(:email, _('Email'), class: 'required') %>
- <%= f.email_field(:email, class: 'left-indent required input-small') %>
-
-
-
- <%= render partial: 'shared/accessible_submit_button',
- locals: {id: 'password-reset-button',
- val: _('Send'),
- disabled_initially: true,
- classes: 'left-indent',
- tooltip: _('Enter a valid email.')} %>
-
-
+ <%= f.button(_('Send'), class: "btn btn-default", type: "submit") %>
<% end %>
\ No newline at end of file
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index bce2ad2..358998f 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -26,6 +26,6 @@
- <%= render partial: 'shared/signin' %>
+ <%= render partial: 'shared/access_controls' %>
\ No newline at end of file
diff --git a/app/views/layouts/_es5_scripts.html.erb b/app/views/layouts/_es5_scripts.html.erb
index 3d4c9b6..20c99c3 100644
--- a/app/views/layouts/_es5_scripts.html.erb
+++ b/app/views/layouts/_es5_scripts.html.erb
@@ -32,9 +32,6 @@
<%= javascript_include_tag 'views/answers/status.js' %>
- <%= javascript_include_tag 'views/contacts/new.js' %>
- <%= javascript_include_tag'views/devise/passwords/new.js' %>
- <%= javascript_include_tag'views/devise/registrations/edit.js' %>
<%= javascript_include_tag 'views/guidances/admin_edit.js' %>
<%= javascript_include_tag 'views/home/index.js' %>
<%= javascript_include_tag 'views/notes/add.js' %>
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index 22f189c..be8cdca 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -42,7 +42,7 @@
<%= _('Sign in') %>
- <%= render partial: 'shared/login_form', layout: 'shared/modal', locals: { id: "header-signin", title: _('Sign in')} %>
+ <%= render partial: 'shared/access_controls', layout: 'shared/modal', locals: { id: "header-signin", title: _('Sign in')} %>
<% end %>
<% end %>
diff --git a/app/views/shared/_access_controls.html.erb b/app/views/shared/_access_controls.html.erb
new file mode 100644
index 0000000..624939d
--- /dev/null
+++ b/app/views/shared/_access_controls.html.erb
@@ -0,0 +1,23 @@
+
+
+
+
+
+ <%= render :partial => 'shared/sign_in_form' %>
+
+
+ <%= render :partial => 'shared/create_account_form', locals: {extended: false} %>
+
+
+
+ <%= f.label(:firstname, _('First Name'), class: 'control-label') %>
+ <%= f.text_field(:firstname, class: 'form-control', "aria-required": true) %>
+
+
+ <%= f.label(:surname, _('Last Name'), class: 'control-label') %>
+ <%= f.text_field(:surname, class: 'form-control', "aria-required": true) %>
+
+
+ <%= f.label(:email, _('Email'), class: 'control-label') %>
+ <%= f.email_field(:email, class: 'form-control', "aria-required": true) %>
+
+
+
+
+
+ <%= f.label(:recovery_email, _('Recovery Email'), class: 'control-label') %>
+ <%= f.email_field(:recovery_email, class: 'form-control', "aria-required": false, "data-validation": 'email') %>
+
+
+ <%= f.label(:password, _('Password'), class: 'control-label') %>
+ <%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
+
+
+
+
+
+
+
+ <%= f.button(_('Sign in'), class: "btn btn-default", type: "submit") %>
+<% end %>
diff --git a/app/views/shared/_login_form.html.erb b/app/views/shared/_login_form.html.erb
deleted file mode 100644
index e080c2a..0000000
--- a/app/views/shared/_login_form.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<%= _('Sign in') %>
-
-<%= form_for resource, as: 'user', url: user_session_path, html: {class: "login-form roadmap-form"} do |f| %>
-
- <% if Rails.application.config.shibboleth_enabled %>
-
-
-
-
-
- <% end %>
-
-
-
-
-
-
-
-
-
-
-<% end %>
diff --git a/app/views/shared/_register_form.html.erb b/app/views/shared/_register_form.html.erb
deleted file mode 100644
index ce4aa1e..0000000
--- a/app/views/shared/_register_form.html.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-<%= _('Create account') %>
-
-<%= form_for resource, as: 'user', url: registration_path("user"), html: {autocomplete: "off", class: "roadmap-form register-form"} do |f| %>
-
-
-
- <%= f.label(:firstname, _('First Name'), class: 'required') %>
- <%= f.text_field(:firstname, class: 'input-small required left-indent') %>
-
-
-
- <%= f.label(:surname, _('Last Name'), class: 'required') %>
- <%= f.text_field(:surname, class: 'input-small required left-indent') %>
-
-
- <%= f.label(:email, _('Email'), class: 'required') %>
- <%= f.email_field(:email, class: 'left-indent required') %>
-
-
-
-
-
-
-
- <%= f.label(:recovery_email, _('Recovery Email'), class: 'required') %>
- <%= f.email_field(:recovery_email,
- class: 'left-indent required',
- title: _('We will only use this address to recover your account if you change institutions')) %>
-
-
-
-
-
-
-
-
-
- <%= render partial: 'shared/accessible_submit_button',
- locals: {id: 'register-button',
- val: _('Create account'),
- disabled_initially: true,
- classes: 'small-input-button left-indent',
- tooltip: _('Enter all of the information above')} %>
-
-
-<% end %>
diff --git a/app/views/shared/_sign_in_form.html.erb b/app/views/shared/_sign_in_form.html.erb
new file mode 100644
index 0000000..a542b5e
--- /dev/null
+++ b/app/views/shared/_sign_in_form.html.erb
@@ -0,0 +1,41 @@
+<%= form_for resource, as: 'user', url: user_session_path, html: {id: "sign_in_form"} do |f| %>
+ <% if Rails.application.config.shibboleth_enabled %>
+
+ <%= _('Sign in with') %>
+
+
+
+ - <%= _('or') %> -
+ <% end %>
+
+
+ <%= f.label(:email, _('Email'), class: 'control-label') %>
+ <%= f.email_field(:email, class: 'form-control', "aria-required": true) %>
+
+
+ <%= f.label :remember_me, raw("#{f.check_box :remember_me}#{_('Remember email')}") %>
+
+
+ <%= f.label(:password, _('Password'), class: 'control-label') %>
+ <%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
+
+
+
+
+
+
+ <%= f.button(_('Sign in'), class: "btn btn-default", type: "submit") %>
+
+ <%= link_to _('Forgot password?'), new_password_path('user') %>
+
+<% end %>
diff --git a/app/views/shared/_signin.html.erb b/app/views/shared/_signin.html.erb
deleted file mode 100644
index dfc7c9b..0000000
--- a/app/views/shared/_signin.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- <%= render :partial => 'shared/login_form' %>
-
-
- <%= render :partial => 'shared/register_form', locals: {extended: false} %>
-
-
-
${msg} `;
+ }
+ return '';
+};
+const ariaDescribedBy = (value) => {
+ if (value) {
+ return { 'aria-describedby': value };
+ }
+ return null;
+};
+const ariaInvalid = (value) => {
+ if (isBoolean(value)) {
+ return { 'aria-invalid': value };
+ }
+ return { 'aria-invalid': false };
+};
+
+const validationStates = {
+ hasWarning: 'has-warning',
+ hasError: 'has-error',
+ hasSuccess: 'has-success' };
+
+const getValidationTypeForElement = (el) => {
+ const validation = $(el).attr('data-validation');
+ // if the specified validation type is defined
+ if (validation) {
+ return validation;
+
+ // Otherwise if the element is required validate based on its type
+ } else if ($(el).attr('aria-required') === 'true') {
+ if ($(el).is('input')) {
+ return $(el).attr('type'); // available types at https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Form_
+ ${VALIDATION_MESSAGE_PASSWORDS_MATCH} `;
+ }
+ return '';
+};
+
+const togglePassword = (password) => {
+ $(password).attr('type', ($(password).attr('type') === 'password' ? 'text' : 'password'));
+};
+
+const isValid = ((pwd, confirmation) =>
+ pwd === confirmation
+);
+
+const valid = (el, block) => {
+ $(el).attr('aria-invalid', false);
+ $(el).parent().removeClass('has-error');
+ $(block).hide();
+};
+const invalid = (el, block) => {
+ $(el).attr('aria-invalid', true);
+ $(el).parent().addClass('has-error');
+ $(block).show();
+};
+
+export const addMatchingPasswordValidator = (options) => {
+ if (isObject(options) && isString(options.selector)) {
+ const id = `${$(options.selector).attr('id')}_password_matcher`;
+
+ const pwd = $(options.selector).find('#user_password');
+ const cnf = $(options.selector).find('#user_password_confirmation');
+ const sbmt = $(options.selector).find('[type="submit"]');
+
+ if (isObject(pwd) && isObject(cnf) && isObject(sbmt)) {
+ if (isValid($(pwd).val(), $(cnf).val())) {
+ $(cnf).parent().append(getHelpBlock(id));
+ $(cnf).attr('aria-describedby', id);
+
+ $(sbmt).click((e) => {
+ if (cnf.val() !== pwd.val()) {
+ e.preventDefault();
+ invalid(cnf, `#${id}`);
+ } else {
+ valid(cnf, `#${id}`);
+ }
+ });
+ }
+ }
+ }
+};
+
+/*
+ * This function is expecting your HTML to be in the following format. Only one toggle
+ * is needed per form. It will toggle all password fields within the containing form:
+ *