Commit Graph

11959 Commits

Author SHA1 Message Date
Skud
b02091bc00 Merge pull request #313 from Growstuff/dev
Production push: places
2013-09-12 05:03:21 -07:00
Skud
32e49355ff Merge pull request #312 from Skud/one-more-places-fix
removed marker bounds on hover
2013-09-12 04:46:35 -07:00
Skud
f753211096 removed marker bounds on hover 2013-09-12 21:44:42 +10:00
Skud
32614da4ea Merge pull request #311 from Skud/pretty-maps
use a different, greener cloudmade tileset for maps
2013-09-11 02:19:58 -07:00
Skud
d345a082c8 use a different, greener cloudmade tileset for maps 2013-09-11 19:19:23 +10:00
Skud
191c86f0d5 Merge pull request #310 from Skud/final-places-fixes-really-truly
Final places fixes really truly
2013-09-11 01:22:23 -07:00
Skud
35f3ee8948 limit things-to-map to those with locations (duh) 2013-09-11 18:20:43 +10:00
Skud
e3c736927f removed spurious debug message from places/index 2013-09-11 18:17:19 +10:00
Skud
8f15b30eb7 Merge branch 'master' of heroku.growstuff:growstuff-dev into dev
Conflicts:
	app/assets/javascripts/places.js.erb
2013-09-11 18:12:15 +10:00
Skud
f6c6aa1051 Merge pull request #309 from Skud/places3
Places - one more try!
2013-09-11 01:10:37 -07:00
Skud
e7436de1e1 Merge branch 'places3' of github.com:Skud/growstuff into places3
Conflicts:
	app/assets/javascripts/places.js.erb
2013-09-11 18:08:46 +10:00
Skud
7e65af532d Set Leaflet icon path explicitly.
When we tried to deploy maps on staging, we got the following error
message in our Javascript console:

Error: Couldn't autodetect L.Icon.Default.imagePath, set it manually.

... so we did. The end.
2013-09-11 18:05:38 +10:00
Skud
a75ed5090a Hardcode Cloudmade API key.
Ugh, I know. But it's not any less secure than having it out there in
our Javascript, and it turns out Heroku just downright *refuses* to read
it from an environment variable during asset compilation. I even tried
an experimental Heroku addon
(https://devcenter.heroku.com/articles/labs-user-env-compile) but it
didn't work, so for now let's just do this and get it out there. I'm
sick of messing with it.
2013-09-11 18:03:19 +10:00
Skud
9cd9fa02f6 Merge branch 'master' of heroku.growstuff:growstuff-dev into places3 2013-09-11 17:33:57 +10:00
Skud
8a203deb19 Use experimental user-env-compile heroku addon
It seems that heroku generally denies us access to ENV['...'] during asset
compilation. They have reasonably good reasons for this, and yet I don't
know how else we're meant to get at our API keys (other than hardcoding
them into our config files, which we don't want to do).

So, to work around this, I'm recommending the use of the (experimental,
subject to removal/change, sigh) user-env-compile heroku addon.  This
lets us use ENV during asset compilation.

For more info see
https://devcenter.heroku.com/articles/labs-user-env-compile
2013-09-11 17:32:31 +10:00
Skud
f929f33844 experimenting with tainted vars, again. revert this later. 2013-09-11 16:58:52 +10:00
Skud
8b65ad5b8f experimenting with tainted vars. revert this later. 2013-09-11 16:54:03 +10:00
Skud
75d8b472d1 do env vars show up in the js? 2013-09-11 16:47:11 +10:00
Skud
90f3f0e17c still trying to get cloudmade key working (should be reverted later) 2013-09-11 16:35:20 +10:00
Skud
3582abab73 debugging output for cloudmade key (needs to be reverted later) 2013-09-11 16:29:04 +10:00
Skud
481ef2c4d1 further adventures in finding the cloudmade_key 2013-09-11 16:23:27 +10:00
Skud
541031707f Merge branch 'master' of heroku.growstuff:growstuff-dev into places3 2013-09-11 16:16:27 +10:00
Skud
67a0af3d87 Moved all ERB processing to the outside of functions
I'm not sure if this will do anything or not, but I can't figure out why
else the email address would have been getting inserted by ERB but the
cloudmade key wouldn't be.
2013-09-11 16:14:53 +10:00
Skud
af9023f87e Merge pull request #308 from Skud/places3
Made a config variable for cloudmade_key
2013-09-10 21:28:44 -07:00
Skud
c58a24f851 Made a config variable for cloudmade_key
(because the assets pipeline doesn't seem to want to deal direct with
ENV variables.)
2013-09-11 14:26:56 +10:00
Skud
b39df447b6 Merge pull request #307 from Skud/places3
Places - finally fixed?
2013-09-10 21:00:54 -07:00
Skud
7a57b4818f fixed js == vs === as per sabreuse's recommendation 2013-09-11 14:00:30 +10:00
Skud
80b9285727 reinstate @place instance variable for title 2013-09-11 13:19:51 +10:00
Skud
138318e5f4 Moved searching for nearby members into the model 2013-09-11 13:14:52 +10:00
Skud
7d5643e30d Sort nearby members by distance
Also removed distance/units from the places/show search, since you can
adjust nearness by zooming etc.

At this point the "members near here" stuff at the bottom of the page
exists mostly for accessibility and to give additional detail that we
don't currently show in the popups on the map.

So we're not using distance/units to search for members near here
anymore, but instead are just finding the 30 nearest members to the
specified location, and showing them in order of nearness.
2013-09-11 12:41:01 +10:00
Skud
3cd48f751e Redid places/show using the all-javascript method.
Moved JSON for "what's here?" from members/index to places/index -- we
can improve this later if we want to show things other than members.
2013-09-11 12:14:18 +10:00
Skud
f201f357da reinstated map attribution 2013-09-11 10:28:19 +10:00
Skud
c02772d219 Spike: use pure javascript and JSON API to draw map 2013-09-09 22:15:47 +10:00
pozorvlak
658d46ccf0 Merge pull request #304 from Skud/crop-hierarchy-page
Crop hierarchy page
2013-09-05 05:42:47 -07:00
pozorvlak
0d922acd56 Merge pull request #305 from Skud/explanatory-text
Added explanatory text to the top of the crops/seeds pages
2013-09-05 05:42:26 -07:00
Miles Gould
0bb482d181 Use Leaflet marker clusters.
Doesn't work - clusters don't spiderfy at max zoom, show their
boundaries on hover or split when you get close to them.
2013-09-05 13:40:20 +01:00
Miles Gould
d6972da84f Speed up geocoding/deal better with slow geocoding.
- set limit=1
 - set timeout=10s
2013-09-05 13:10:47 +01:00
Miles Gould
67ed1e2170 Set map height in CSS; smaller for phones.
In future we should consider making classes for different sizes of maps.
2013-09-05 12:25:45 +01:00
Skud
be6d6fd6bd Added a crop hierarchy link to the crop wrangler page 2013-09-02 12:07:58 +10:00
Skud
9e190d7345 Show new hierarchical varieties on crop page 2013-09-02 12:03:28 +10:00
Skud
cf9c1d7aa3 Make all list items use disc style (filled-in circle) 2013-09-02 12:02:34 +10:00
Skud
995f9b2d60 Display crop hierarchy (recursively!) 2013-09-02 12:01:58 +10:00
Skud
4dbfecd315 Added toplevel scope for crops without a parent 2013-09-02 11:52:01 +10:00
Skud
772eec77a7 added routes and controller stuff for crop hierarchy 2013-09-02 11:13:02 +10:00
Skud
a0e81b4570 Added explanatory text to the top of the crops/seeds pages 2013-09-02 11:04:49 +10:00
pozorvlak
3beb2e27f2 Merge pull request #292 from pozorvlak/places2
Added "places" pages to show maps of where members are
2013-08-31 08:12:27 -07:00
Miles Gould
71ea2b0485 Remove "\/" from escaped JavaScript to prevent test errors.
We were getting annoying "couldn't close <p> with </script>" messages
when running tests, because escape_javascript was turning </p> into
<\/p>. We fixed this by gsub'ing \/ to / after calling
escape_javascript. What could possibly go wrong? :-)
2013-08-31 16:07:27 +01:00
Miles Gould
4701bd1b2e Merge branch 'dev' into places2
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
2013-08-31 15:49:30 +01:00
martyhines
b49d548240 Escape pop-up text in place/show 2013-08-31 15:43:25 +01:00
pozorvlak
fd24680a16 Merge pull request #301 from attlebish/hidecrops
Hidecrops
2013-08-31 06:21:00 -07:00