You can create a new one if your group isn’t listed
<%= f.select :lead_group_id do %>
<%=options_for_select(groups, initiative.lead_group&.id) %>
@@ -161,14 +161,14 @@
<% end %>
- <%= f.form_field :partner_groups_role do %>
- <%= f.label :partner_groups_role %>
- <%= f.text_field :partner_groups_role %>
+ <%= f.form_field :specialist_advice do %>
+ <%= f.label :specialist_advice, 'Have you had any specialist advice on this project?' %>
+ <%= f.text_area :specialist_advice, placeholder: "For example: 'Stroud Valleys Project provided saplings and advice on tree planting'" %>
<% end %>
<%= f.form_field :related_initiatives do %>
- <%= f.label :related_initiatives %>
- <%= f.text_area :related_initiatives, placeholder: 'Enter the names of any related initiatives here' %>
+ <%= f.label :related_initiatives, 'Have you collaborated with other local projects to get going?' %>
+ <%= f.text_area :related_initiatives, placeholder: 'Enter the details of any related initiative' %>
<% end %>
<% end %>
@@ -177,7 +177,6 @@
<%= javascript_packs_with_chunks_tag 'initiative_solution_picker', 'data-turbolinks-track': 'reload' %>
<% end %>
-
Solutions
<%= f.form_field :solution do %>
<%= f.label 'What categories does your project relate to?' %>
diff --git a/db/migrate/20210416144942_add_specialist_advice_to_initiatives.rb b/db/migrate/20210416144942_add_specialist_advice_to_initiatives.rb
new file mode 100644
index 0000000..17b7ff3
--- /dev/null
+++ b/db/migrate/20210416144942_add_specialist_advice_to_initiatives.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSpecialistAdviceToInitiatives < ActiveRecord::Migration[6.0]
+ def change
+ add_column :initiatives, :specialist_advice, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 51c1ce1..8143974 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2021_04_16_134738) do
+ActiveRecord::Schema.define(version: 2021_04_16_144942) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -149,6 +149,7 @@
t.string "publication_status"
t.string "carbon_saving_strategy"
t.boolean "consent_to_share_phone"
+ t.string "specialist_advice"
t.index ["lead_group_id"], name: "index_initiatives_on_lead_group_id"
t.index ["owner_id"], name: "index_initiatives_on_owner_id"
t.index ["parish_id"], name: "index_initiatives_on_parish_id"
diff --git a/frontend/styles/application.css b/frontend/styles/application.css
index 6626aaf..9da3b6e 100644
--- a/frontend/styles/application.css
+++ b/frontend/styles/application.css
@@ -17,6 +17,7 @@
@import "./components/explore";
@import "./components/header";
@import "./components/help";
+@import "./components/hint";
@import "./components/initiative";
@import "./components/footer";
@import "./components/form-field";
diff --git a/frontend/styles/components/form-field.css b/frontend/styles/components/form-field.css
index 1a5e598..0dc5fed 100644
--- a/frontend/styles/components/form-field.css
+++ b/frontend/styles/components/form-field.css
@@ -109,6 +109,19 @@ textarea.FormField-input {
color: green;
}
+.FormField select {
+ background-color: white;
+ border: 1px solid var(--FormField-input-borderColor);
+ border-radius: 5px;
+ padding: 10px;
+ width: 100%;
+
+ &:focus {
+ border-color: var(--FormField-borderColorFocus);
+ outline: none;
+ }
+}
+
@keyframes blinker {
50% {
diff --git a/frontend/styles/components/hint.css b/frontend/styles/components/hint.css
new file mode 100644
index 0000000..d2d4b4e
--- /dev/null
+++ b/frontend/styles/components/hint.css
@@ -0,0 +1,3 @@
+.Hint {
+ color: #737373;
+}