diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb index 8e3b074..92f3565 100644 --- a/app/views/plans/new.html.erb +++ b/app/views/plans/new.html.erb @@ -10,6 +10,21 @@ <%= form_for @plan, method: :post, remote: true do |f| %>
+ +
+

<%= _('What research project are you planning?') %>

+ + + + <% default_name = (current_user.firstname.blank? ? _('My Plan') : current_user.firstname + _(' Plan')) %> + +
+ <%= _('If applying for funding, state the title exactly as in the proposal.') %> +
+
+

<%= _('Where will the research be conducted?') %>

@@ -18,15 +33,18 @@ <%= _('Select the primary research organisation responsible') %> - <%= render partial: "shared/accessible_combobox", locals: {name: 'plan[org_name]', - id: 'plan_org_name', - default_selection: @default_org, - models: @orgs, - attribute: 'name'} %> + <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[org_name]', + id: 'plan_org_name', + default_selection: @default_org, + models: @orgs, + attribute: 'name'} %> - <%= _('My research organization is not on the list or no research organization is associated with this plan')%> + <%= _('My research organization is not on the list') %> + <%= _(' or ') %> + <%= _('no research organization is associated with this plan')%>
@@ -38,11 +56,12 @@ <%= _('Select the funding organisation') %> - <%= render partial: "shared/accessible_combobox", locals: {name: 'plan[funder_name]', - id: 'plan_funder_name', - default_selection: nil, - models: @funders, - attribute: 'name'} %> + <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[funder_name]', + id: 'plan_funder_name', + default_selection: nil, + models: @funders, + attribute: 'name'} %> @@ -53,18 +72,6 @@
- - -
-

<%= _('What is the subject of your proposal?') %>

- - - - <% default_name = (current_user.firstname.blank? ? _('My Plan') : current_user.firstname + _(' Plan')) %> - -
diff --git a/lib/assets/javascripts/dmproadmap.scss b/lib/assets/javascripts/dmproadmap.scss deleted file mode 100644 index 4605a72..0000000 --- a/lib/assets/javascripts/dmproadmap.scss +++ /dev/null @@ -1,128 +0,0 @@ -@import "font-awesome"; - -$font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; - -$white: #FFF; - -$primary-color: #F49700; -$disabled-button-color: #CCC; -$reverse-text: #FFF; - -/* See `.combobox-clear-button` for an example of this mixin in use */ -@mixin icon($icon) { - @extend .fa; - @extend .fa-#{$icon}:before; -} - -.right { - float: right; -} - -.main_header { - margin-bottom: 20px; -} - -.main { - - form { - - .white-fieldset { - background-color: $white; - padding: 0 25px 25px 25px; - margin-bottom: 25px; - - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - - label, input[type="checkbox"], .combobox-container { - margin-left: 15px; - } - - input[type="text"] { - width: 350px; - margin-bottom: 15px; - } - - input[type="checkbox"] { - vertical-align: top; - } - } - - input[type=submit] { - background-color: $primary-color; - color: $reverse-text; - padding: 10px 30px; - font-size: 12pt; - - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - } - input[type=submit]:disabled { - background-color: $disabled-button-color; - } - - } - -} - -/* Accessible JQuery combobox */ -/* ----------------------------------------- */ -.invisible { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} - -.combobox-container { - position: relative; - max-width: 385px; - - font-family: $font-family; -} - -.combobox-suggestions { - position: absolute; - left: 0; - width: 362px; - margin-top: -10px; - background: #fff; - z-index: 99; -} -.combobox-suggestion { - color: #666; - border-bottom: 1px solid #000; - border-left: 1px solid #000; - border-right: 1px solid #000; - padding: 5px 10px 5px 10px; - cursor: pointer; - text-align: left; -} -.combobox-suggestion:first-child { - border-top: 1px solid #000; -} -.combobox-suggestion:hover, -.combobox-suggestion:focus { - color: $white; - background-color: $primary-color; -} - -.combobox-clear-button { - @include icon(times-circle); - display: inline; - position: absolute; - border: none; - background: transparent; - padding-top: 3px; - font-size: 16pt; -} - -/* http://geektnt.com/how-to-remove-x-from-search-input-field-on-chrome-and-ie.html */ -.js-combobox[type=text]::-ms-clear { display: none; width: 0; height: 0; } -.js-combobox[type=text]::-ms-reveal { display: none; width: 0; height: 0; } \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss index cf05d3b..df80e0b 100644 --- a/lib/assets/stylesheets/dmproadmap.scss +++ b/lib/assets/stylesheets/dmproadmap.scss @@ -35,8 +35,8 @@ margin-left: 15px; } - input[type="text"], .combobox-like { - width: 350px; + input[type="text"] { + width: 450px; margin-bottom: 15px; margin-left: 15px; }