Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

finished the map popover. added a pg database

  • Loading branch information...
commit a45ddd0332aa6e6cc05ab5bea6f6fdaf02423c32 1 parent c435cf4
@timwingfield timwingfield authored
View
2  app/assets/javascripts/backbone/templates/location.jst.eco
@@ -5,7 +5,7 @@
</div>
<div class="span2 pull-right">
<button class="btn btn-primary checkin" href="#">Check-in</button>
- <a class="btn btn-inverse map" href="<%= @model.get "map" %>">Map</a>
+ <a class="btn btn-inverse map" href="#">Map</a>
</div>
</div>
View
24 config/database.yml
@@ -4,25 +4,29 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
- adapter: sqlite3
- database: db/development.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: zambia_development
pool: 5
- timeout: 5000
+ username: zambia
+ password: latte
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test: &test
- adapter: sqlite3
- database: db/test.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: zambia_test
pool: 5
- timeout: 5000
+ username: zambia
+ password: latte
production:
- adapter: sqlite3
- database: db/production.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: zambia
pool: 5
- timeout: 5000
cucumber:
- <<: *test
+ <<: *test
View
9 config/initializers/locations.rb
@@ -3,17 +3,20 @@
:coffeeshop => "Stauf's",
:day => "Thursday",
:time => "7:00",
- :map => "http://maps.google.com/maps?q=1277+Grandview+Avenue,+OH,+43212&hl=en&ll=39.985604,-83.044968&spn=0.045969,0.075703&hnear=1277+Grandview+Ave,+Columbus,+Franklin,+Ohio+43212&t=m&z=14&iwloc=A&output=embed" },
+ :map => "http://maps.google.com/maps?q=1277+Grandview+Avenue,+OH,+43212&hl=en&ll=39.985604,-83.044968&spn=0.045969,0.075703&hnear=1277+Grandview+Ave,+Columbus,+Franklin,+Ohio+43212&t=m&z=14&iwloc=A&output=embed",
+ :id => "cbus-staufs" },
{ :city => "Chicago",
:coffeeshop => "Starbucks Chicago & Franklin",
:day => "Tuesday",
:time => "7:00",
- :map => "http://maps.google.com/maps?q=750+North+Franklin+Street,+IL,+60654&hl=en&ll=41.89755,-87.635708&spn=0.044657,0.075703&hnear=750+N+Franklin+St,+Chicago,+Illinois+60654&t=m&z=14&output=embed" },
+ :map => "http://maps.google.com/maps?q=750+North+Franklin+Street,+IL,+60654&hl=en&ll=41.89755,-87.635708&spn=0.044657,0.075703&hnear=750+N+Franklin+St,+Chicago,+Illinois+60654&t=m&z=14&output=embed",
+ :id => "chi-sbux" },
{ :city => "London",
:coffeeshop => "Costa Coffee Sheperds Bush",
:day => "Friday",
:time => "7:30",
- :map => "http://maps.google.com/maps?q=Costa+Coffee+Shepherds+Bush,+UK,+W12+8LP&hl=en&ll=51.504896,-0.219662&spn=0.009336,0.018926&hq=Costa+Coffee+Shepherds+Bush,+UK,+W12+8LP&radius=15000&t=m&z=16&output=embed" },
+ :map => "http://maps.google.com/maps?q=Costa+Coffee+Shepherds+Bush,+UK,+W12+8LP&hl=en&ll=51.504896,-0.219662&spn=0.009336,0.018926&hq=Costa+Coffee+Shepherds+Bush,+UK,+W12+8LP&radius=15000&t=m&z=16&output=embed",
+ :id => "london-costa" },
]
Please sign in to comment.
Something went wrong with that request. Please try again.