diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 476c6cc..5a8687c 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -332,7 +332,7 @@ params.require(:plan).permit(:org_id, :org_name, :funder_id, :funder_name, :template_id, :title, :visibility, :grant_number, :description, :identifier, :principal_investigator, :principal_investigator_email, :principal_investigator_identifier, - :data_contact, :data_contact_email, :guidance_group_ids) + :data_contact, :data_contact_email, :data_contact_phone, :guidance_group_ids) end def save_guidance_selections(guidance_group_ids) diff --git a/app/models/plan.rb b/app/models/plan.rb index 6579f97..fd828e4 100644 --- a/app/models/plan.rb +++ b/app/models/plan.rb @@ -32,8 +32,8 @@ :exported_plans, :project, :title, :template, :grant_number, :identifier, :principal_investigator, :principal_investigator_identifier, :description, :data_contact, :funder_name, :visibility, :exported_plans, - :roles, :users, :org, :data_contact_email, :principal_investigator_email, - :as => [:default, :admin] + :roles, :users, :org, :data_contact_email, :data_contact_phone, + :principal_investigator_email, :as => [:default, :admin] accepts_nested_attributes_for :roles # public is a Ruby keyword so using publicly diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb index 6a483ba..692c43c 100644 --- a/app/views/devise/registrations/_personal_details.html.erb +++ b/app/views/devise/registrations/_personal_details.html.erb @@ -17,7 +17,7 @@
<%= f.label(:email, _('Email'), class: 'required') %> - <%= f.email_field(:email, class: 'left-indent required input-large', + <%= f.email_field(:email, class: 'left-indent required input-small', title: _('Please enter your current password below when changing your email address.'), value: @user.email) %> @@ -34,7 +34,7 @@
<%= f.label(:recovery_email, _('Recovery email'), class: 'required') %> - <%= f.email_field(:recovery_email, class: 'left-indent required input-large', + <%= f.email_field(:recovery_email, class: 'left-indent required input-small', title: _('This email will be used to recover your account if you change institutions'), value: @user.recovery_email) %> <%= f.label(:password, _('Password'), class: 'required') %> - <%= f.password_field(:password, class: 'left-indent required input-large') %> + <%= f.password_field(:password, class: 'left-indent required input-small') %>
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb index ff6b3ed..2c62b02 100644 --- a/app/views/plans/_edit_details.html.erb +++ b/app/views/plans/_edit_details.html.erb @@ -58,13 +58,13 @@
- <%= f.label _('ORCID ID'), for: :principal_investigator_identifier, 'aria-label': _('Principal Investigator ORCID ID') %> + <%= f.label _('ORCID iD'), for: :principal_investigator_identifier, 'aria-label': _('Principal Investigator ORCID iD') %> <%= f.text_field :principal_investigator_identifier, class: 'input-small left-indent' %>
<%= f.label _('Email'), for: :principal_investigator_email, 'aria-label': _('Principal Investigator Email') %> - <%= f.email_field :principal_investigator_email, class: 'input-large left-indent' %> + <%= f.email_field :principal_investigator_email, class: 'input-small left-indent' %>
@@ -82,10 +82,13 @@ <%= f.label _('Name'), for: :data_contact, 'aria-label': _('Data Contact Name') %> <%= f.text_field :data_contact, class: 'input-small left-indent' %> - +
+ <%= f.label _('Phone'), for: :data_contact_phone, 'aria-label': _('Data Contact Phone') %> + <%= f.telephone_field :data_contact_phone, class: 'input-small left-indent' %> +
<%= f.label _('Email'), for: :data_contact_email, 'aria-label': _('Data Contact Email') %> - <%= f.email_field :data_contact_email, class: 'input-large left-indent' %> + <%= f.email_field :data_contact_email, class: 'input-small left-indent' %>
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss index 150ff0b..640f8f9 100644 --- a/lib/assets/stylesheets/dmproadmap/forms.scss +++ b/lib/assets/stylesheets/dmproadmap/forms.scss @@ -5,7 +5,7 @@ /* ================================================ */ textarea, input[type="text"], input[type="email"], input[type="password"], -input[type="search"], select { +input[type="search"], input[type="tel"], select { font-family: $font-family; font-size: 14px; border-radius: 3px; @@ -26,7 +26,7 @@ } textarea:focus, select:focus, -input[type="text"]:focus, input[type="email"]:focus, input[type="password"]:focus, +input[type="text"]:focus, input[type="email"]:focus, input[type="password"]:focus, input[type="tel"]:focus, input[type="search"]:focus, input[type="checkbox"]:focus, input[type="radio"]:focus { box-shadow: 0 0 8px $light-grey; } @@ -103,7 +103,9 @@ .mce-tinymce { display: inline-block; margin: 10px 5px 15px 15px; - width: 70%; + min-width: 350px; + max-width: 550px; + width: 78%; } label, @@ -220,7 +222,9 @@ width: 70%; } .input-large { - width: 350px; /* 50%; */ + min-width: 340px; + max-width: 540px; + width: 75%; } .input-medium { width: 30%; @@ -229,7 +233,9 @@ width: 32%; } .input-small { - width: 150px; /* 10%; */ + min-width: 180px; + max-width: 340px; + width: 45%; } /* Used for the jquery autocomplete combobox on side-by-side fieldsets */ .fixed-width-large { @@ -472,12 +478,18 @@ #new_user.register-form { .inline { width: 46%; - + margin-right: 5px; #user_firstname, #user_surname { width: 92%; } } + #user_org_name { + width: 78%; + } + #other-org-link { + margin-bottom: 5px; + } } div#forgot-password-link { vertical-align: bottom;