diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index eea3a57..acd9b91 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -3,7 +3,7 @@
<%= _('Create a new plan') %>
- <%= _("Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs.") %>
+ <%= _("Before you get started, we need some information about your research project to set you up with the best DMP template for your needs.") %>
@@ -62,6 +62,7 @@
default_selection: nil,
models: @funders,
attribute: 'name',
+ tooltip: _('Please select a valid funding organisation from the list'),
classes: 'input-full-width'} %>
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index 4fe65ca..2aca224 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -1,5 +1,6 @@
<% if !models.nil? %>
<% json = {} %>
+ <% tooltip = tooltip ||= _('Please select a valid %{entity} from the list.' % {entity: attribute}) %>
<% models.map{|m| json[m[attribute]] = m.id} %>
+ value="<%= default_selection[attribute] unless default_selection.nil? %>"
+ data-toggle="tooltip"
+ data-content="<%= tooltip %>" />
<% models.each do |model| %>
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index 968caa9..d2f475d 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -25,8 +25,10 @@
toggleAutocompleteError($("#plan_org_name"), $(this), msg);
});
$("#plan_funder_id").change(function(){
- var msg = ($(this).val().trim().length <= 0 ? __('Please select a valid funding organisation from the list') : '');
- toggleAutocompleteError($("#plan_funder_name"), $(this), msg);
+ if($("#plan_funder_name").is(":focus")){
+ var msg = ($(this).val().trim().length <= 0 ? __('Please select a valid funding organisation from the list') : '');
+ toggleAutocompleteError($("#plan_funder_name"), $(this), msg);
+ }
});
// Make sure the checkbox is unchecked if we're entering text
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index ab7b83a..7aa8004 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -14,7 +14,7 @@
$medium-grey: #827D7E;
$light-grey: #CCC;
-$primary-color: #454545;
+$primary-color: #4f5253;
$error-color: #FFF;
$error-background: #827D7E;
@@ -25,7 +25,7 @@
$header-height: 165px;
$header-logo-width: 165px;
$header-background: $primary-color;
-//$header-background: linear-gradient(#ED6406, #F59503);
+/* $header-background: linear-gradient(#ED6406, #F59503); */
/* HEADER LOGO POSITIONING */
$header-logo-top-margin: 70px;