Added search form on the places index page.

krio · Jun 21, 2015 · 0e2a5fd · 0e2a5fd
1 parent 5bb04dc
commit 0e2a5fd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -458,3 +458,6 @@ DEPENDENCIES
   unicorn
   webrat
   will_paginate (~> 3.0)
+
+BUNDLED WITH
+   1.10.3
diff --git a/app/views/places/_search_form.html.haml b/app/views/places/_search_form.html.haml
@@ -0,0 +1,6 @@
+%form{:action => search_places_path, :method => :get, :class => 'form-inline', :role => 'form'}
+  .form-group
+    = label_tag :new_place, "Change location:", :class => 'sr-only'
+    = text_field_tag :new_place, '', :class => 'form-control', :placeholder => "New location..."
+  = submit_tag "Search", :class => 'btn btn-primary'
+%br/
diff --git a/app/views/places/index.html.haml b/app/views/places/index.html.haml
@@ -1,4 +1,4 @@
 -content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} Community Map"
-
+= render partial: 'search_form'
 %div#placesmap
 
diff --git a/app/views/places/show.html.haml b/app/views/places/show.html.haml
@@ -1,11 +1,6 @@
 -content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} members near #{@place}"
 
-%form{:action => search_places_path, :method => :get, :class => 'form-inline', :role => 'form'}
-  .form-group
-    = label_tag :new_place, "Change location:", :class => 'sr-only'
-    = text_field_tag :new_place, '', :class => 'form-control', :placeholder => "New location..."
-  = submit_tag "Search", :class => 'btn btn-primary'
-%br/
+= render partial: 'search_form'
 
 %div#placesmap{ :style => "height:300px"}
 

diff --git a/config/database.yml b/config/database.yml
@@ -3,6 +3,7 @@ development:
   database: growstuff_dev
   host: localhost
   user: postgres
+  password: password
 
 test:
   adapter: postgresql
-Original file line number
+Diff line change
@@ Expand Up / @@ -458,3 +458,6 @@ DEPENDENCIES @@
       unicorn
       webrat
       will_paginate (~> 3.0)
+    BUNDLED WITH
+.10.3