Changeset [4924684baf6d58c32a1bc22595a974ab840d3c9c] by Alex Grunenfelder
Revision 4924684baf6d58c32a1bc22595a974ab840d3c9c,
committed by Alex Grunenfelder
· January 13th, 2010 @ 05:20 PM
committing changes to application.html.erb that were pulled from
master
Merge branch 'master' of
git://github.com/kalin/greenbuildingbrain
- 'master' of git://github.com/kalin/greenbuildingbrain: (25 commits) removed soon to fail spec from sponsors index added blank sponsors page updated map display for buildings without addresses to prompt user to add one, also fixed black facebox when user not logged in switched items/_address to use google static maps api instead of generated map which I broke with the updates to the js libraries fixed missing div in items/index made the search results look halfway respectable updated fonts to experiment with class updated css to produce better search results 'attempting to fix some js stuff by pushing to teh server' fixed searching on map speeded up both map and dashboard loading added missing buildings template moved loading of building map information to separate json file seriously this time gmaps api typo fixed google api key not generating cleaned up js, added asset packager, removed mapstraction for now as it's not being used fixed edit mode a bunch of js cleanup, also quick fix of widget mimetype problem added nina's mp3 intro updated widget to handle situations where there is no photo available refixing that exception ...
Conflicts:
app/views/layouts/application.html.erb
http://github.com/greenbuilding/greenbuildingbrain/commit/4924684ba...
96 changed files
-
A
app/controllers/js_controller.rb -
A
app/controllers/sponsors_controller.rb -
A
app/helpers/js_helper.rb -
A
app/helpers/sponsors_helper.rb -
A
app/views/js/buildings.js.erb -
A
app/views/sponsors/index.html.erb -
A
config/asset_packages.yml -
A
public/flash/soundmanager2.swf -
A
public/flash/soundmanager2_flash9.swf -
A
public/images/no_address.png -
A
spec/controllers/js_controller_spec.rb -
A
spec/controllers/sponsors_controller_spec.rb -
A
spec/helpers/js_helper_spec.rb -
A
spec/helpers/sponsors_helper_spec.rb -
A
spec/views/sponsors/index.html.erb_spec.rb -
A
vendor/plugins/asset_packager/CHANGELOG -
A
vendor/plugins/asset_packager/README -
A
vendor/plugins/asset_packager/Rakefile -
A
vendor/plugins/asset_packager/about.yml -
A
vendor/plugins/asset_packager/init.rb -
A
vendor/plugins/asset_packager/install.rb -
A
vendor/plugins/asset_packager/lib/jsmin.rb -
A
vendor/plugins/asset_packager/lib/synthesis/asset_package.rb -
A
vendor/plugins/asset_packager/lib/synthesis/asset_package_helper.rb -
A
vendor/plugins/asset_packager/tasks/asset_packager_tasks.rake -
A
vendor/plugins/asset_packager/test/asset_package_helper_development_test.rb -
A
vendor/plugins/asset_packager/test/asset_package_helper_production_test.rb -
A
vendor/plugins/asset_packager/test/asset_packager_test.rb -
A
vendor/plugins/asset_packager/test/asset_packages.yml -
A
vendor/plugins/asset_packager/test/assets/javascripts/application.js -
A
vendor/plugins/asset_packager/test/assets/javascripts/bar.js -
A
vendor/plugins/asset_packager/test/assets/javascripts/controls.js -
A
vendor/plugins/asset_packager/test/assets/javascripts/dragdrop.js -
A
vendor/plugins/asset_packager/test/assets/javascripts/effects.js -
A
vendor/plugins/asset_packager/test/assets/javascripts/foo.js -
A
vendor/plugins/asset_packager/test/assets/javascripts/prototype.js -
A
vendor/plugins/asset_packager/test/assets/stylesheets/bar.css -
A
vendor/plugins/asset_packager/test/assets/stylesheets/foo.css -
A
vendor/plugins/asset_packager/test/assets/stylesheets/header.css -
A
vendor/plugins/asset_packager/test/assets/stylesheets/screen.css -
A
vendor/plugins/asset_packager/test/assets/stylesheets/subdir/bar.css -
A
vendor/plugins/asset_packager/test/assets/stylesheets/subdir/foo.css -
A
vendor/plugins/heroku_asset_packager/MIT-LICENSE -
A
vendor/plugins/heroku_asset_packager/README -
A
vendor/plugins/heroku_asset_packager/Rakefile -
A
vendor/plugins/heroku_asset_packager/init.rb -
A
vendor/plugins/heroku_asset_packager/lib/asset_packager_overrides.rb -
A
vendor/plugins/heroku_asset_packager/lib/heroku_asset_packager.rb -
A
vendor/plugins/heroku_asset_packager/tasks/heroku_asset_packager_tasks.rake -
A
vendor/plugins/heroku_asset_packager/test/heroku_asset_packager_test.rb -
A
vendor/plugins/heroku_asset_packager/test/synthesis_assetpackager_stub.rb -
A
vendor/plugins/heroku_asset_packager/test/test_helper.rb -
A
vendor/plugins/heroku_asset_packager/uninstall.rb -
R
public/javascripts/all.js -
R
public/javascripts/clusterer.js -
R
public/javascripts/controls.js -
R
public/javascripts/dragdrop.js -
R
public/javascripts/effects.js -
R
public/javascripts/ie_no_more.js -
R
public/javascripts/js.js -
R
public/javascripts/maps.js -
R
public/javascripts/mapstraction-geocode.js -
R
public/javascripts/mapstraction.js.old -
R
public/javascripts/prototype.js -
R
public/javascripts/scripts.js -
M
app/controllers/application_controller.rb -
M
app/controllers/audiofiles_controller.rb -
M
app/controllers/dashboard_controller.rb -
M
app/controllers/items_controller.rb -
M
app/controllers/map_controller.rb -
M
app/controllers/sessions_controller.rb -
M
app/helpers/application_helper.rb -
M
app/views/audiofiles/index.xml.erb -
M
app/views/audiofiles/listen.xml.erb -
M
app/views/dashboard/index.html.erb -
M
app/views/homepage/dashboard.html.erb -
M
app/views/items/_address.html.erb -
M
app/views/items/_description.html.erb -
M
app/views/items/_summary.html.erb -
M
app/views/items/edit.html.erb -
M
app/views/items/index.html.erb -
M
app/views/items/show.html.erb -
M
app/views/items/show.widget.erb -
M
app/views/layouts/application.html.erb -
M
app/views/layouts/map.html.erb -
M
app/views/map/index.html.erb -
M
app/views/pictures/edit.html.erb -
M
config/environment.rb -
M
config/gmaps_api_key.yml -
M
config/initializers/widget_mime_type.rb -
M
config/routes.rb -
M
public/javascripts/application.js -
M
public/stylesheets/old_gbb.css -
M
public/stylesheets/widget.css -
M
spec/models/item_spec.rb -
M
spec/views/activations/new.html.erb_spec.rb