From 2519ab081e3a0e6c1d9b09b20c1b5e1e6d8256a2 Mon Sep 17 00:00:00 2001
From: Dr Kim Foale <kim@gfsc.studio>
Date: Thu, 23 Dec 2021 13:32:28 +0000
Subject: [PATCH] Improve text on neighbourhood page, remove block comment

---
 app/views/admin/neighbourhoods/_form.html.erb |  6 ++--
 app/views/admin/neighbourhoods/edit.html.erb  | 31 +++----------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/app/views/admin/neighbourhoods/_form.html.erb b/app/views/admin/neighbourhoods/_form.html.erb
index dff15e07e..c26f542c1 100644
--- a/app/views/admin/neighbourhoods/_form.html.erb
+++ b/app/views/admin/neighbourhoods/_form.html.erb
@@ -30,10 +30,10 @@
   </div>
 
   <% unless @neighbourhood.new_record? %>
-    <h2>Relations</h2>
+    <h2>Geography</h2>
     <div class="row">
       <div class="col-md-6">
-        <h3>Ancestors</h3>
+        <h3>Is a part of&hellip;</h3>
         <ul>
           <% @neighbourhood.ancestors.each do |parent| %>
             <li><%= link_to(parent, edit_admin_neighbourhood_path(parent)) if parent.to_s.length > 0 %></li>
@@ -41,7 +41,7 @@
         </ul>
       </div>
       <div class="col-md-6">
-        <h3>Children</h3>
+        <h3>Contains&hellip;</h3>
         <ul>
           <% @neighbourhood.children.each do |parent| %>
             <li><%= link_to(parent, edit_admin_neighbourhood_path(parent)) if parent.to_s.length > 0 %></li>
diff --git a/app/views/admin/neighbourhoods/edit.html.erb b/app/views/admin/neighbourhoods/edit.html.erb
index c8187d5cc..0e505474b 100644
--- a/app/views/admin/neighbourhoods/edit.html.erb
+++ b/app/views/admin/neighbourhoods/edit.html.erb
@@ -2,30 +2,7 @@
   const currentInfo = <%= @neighbourhood.to_json.html_safe %>
 </script>
 
-<%
-=begin%>
- <div id="js-ward-picker"> 
-<%
-=end%>
-  <%= render_component "admin_edit",
-         model: :neighbourhood, 
-         title: @neighbourhood.name 
-  %>
-  <%
-=begin%>
-  NOTE: removing this for now!
- <% if policy(@neighbourhood).new? %>
-    <h2>Overwrite with ward info</h2>
-    <div class="row">
-      <div class="col-md-6">
-        <div class="form-group">
-          <label class="form-control-label" for="ward-input">Quick add by ward code (WD19CD). Warning: will overwrite all the above fields!</label>
-          <input class="form-control bg-danger text-white" id="ward-lookup" v-model="wardSearch" v-on:change="lookupWard()" placeholder="E01234567"></input>
-        </div>
-      </div>
-    </div>
-  <% end %> 
-<%
-</div>
-=end%>
-
+<%= render_component "admin_edit",
+        model: :neighbourhood, 
+        title: @neighbourhood.name 
+%>