Changeset [48ebd53cd84ea80ed28aaded4062e046edb1207b] by Alex Grunenfelder
Revision 48ebd53cd84ea80ed28aaded4062e046edb1207b,
committed by Alex Grunenfelder
· December 17th, 2009 @ 03:39 PM
Merge branch 'master' of git://github.com/greenbuilding/greenbuildingbrain
- 'master' of git://github.com/greenbuilding/greenbuildingbrain: map zoomlevel to 14 and set the zoomlevel, for alex use jquery load tactics to run map initialiser changed respond order on map controller index page html then js ie thought the map was a text blob, perhaps a doctype will set it straight? js was being a bastard in ie, go figgure audiofile controlelr updates mod on audiotour listen view renamed audio files added another audio file demo modified audio controller to handle tour 5555 small cleanup of code http://github.com/greenbuilding/greenbuildingbrain/commit/48ebd53cd...
11 changed files
-
A
public/audio/4444.mp3 -
A
public/audio/5555.mp3 -
A
public/audio/6666.mp3 -
R
public/audio/convention_centre.mp3 -
M
app/controllers/audiofiles_controller.rb -
M
app/controllers/map_controller.rb -
M
app/models/item.rb -
M
app/views/audiofiles/listen.xml.erb -
M
app/views/dashboard/index.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/layouts/map.html.erb