Changeset [e6cd18f12d6a56098a64311c7ffc9c97c075a57f] by graemeworthy

Revision e6cd18f12d6a56098a64311c7ffc9c97c075a57f, committed by graemeworthy · February 18th, 2010 @ 10:19 AM

Merge branch 'master' of github.com:greenbuilding/greenbuildingbrain into featured

'master' of github.com:greenbuilding/greenbuildingbrain: (131 commits) improved alex's column changes so they don't affect gbb theme add more items to the front page changes to footer layout and sponsor page changes to spoonsor page. layout changes to search button adjust homepage thumbnail cols to isabel's specs IE fixes added the IE8 js back in since it fixes something in the building view on ie6 removing ie7 fixes that weren't actually needed backed out ie7 fix that seemed required by bad closing on conditional fixed typo in ie7 conditional styles added script type to script for map removed call to IE8 file as it's not actually needed small menu fix for ie7 more blueprint compliance changes, and cleanup of edit block for ie6 some IE fixes from prior to kalin's ie8 js a small issue on the ie7 items/index page ported ie layout fixes to items/show and items/index, for ie6 and ie7 fixed overflowing column error on ie6 an ie7 loads of fixes for ie7 and ie6 front page ...

Conflicts:

app/views/items/show.widget.erb

http://github.com/greenbuilding/greenbuildingbrain/commit/e6cd18f12...

120 changed files

A app/controllers/static_controller.rb
A app/helpers/static_helper.rb
A app/models/infrastructure.rb
A app/models/neighbourhood.rb
A app/models/open_space.rb
A app/models/program.rb
A app/views/dashboard/_buildings.html.erb
A app/views/dashboard/_buildings2.html.erb
A app/views/dashboard/_buildings3.html.erb
A app/views/dashboard/_buildings4.html.erb
A app/views/dashboard/_companies.html.erb
A app/views/dashboard/_infrastructure.html.erb
A app/views/dashboard/_recentbuildings.html.erb
A app/views/dashboard/_showcase2010.html.erb
A app/views/dashboard/_top_contributors.html.erb
A app/views/layouts/_gbb_nav_menu.html.erb
A app/views/layouts/_gg_nav_menu.html.erb
A app/views/static/about.html.erb
A app/views/static/privacy.html.erb
A app/views/static/sponsors.html.erb
A app/views/static/tos.html.erb
A public/images/DCSandOGBS_logos-stacked.gif
A public/images/DCSandOGBS_logos.gif
A public/images/GBB-logo.gif
A public/images/box-header-orange.gif
A public/images/building-page-bg.gif
A public/images/building-page-shadow.gif
A public/images/gbb-blank-page-bg.gif
A public/images/gbb-building-page-bg.gif
A public/images/gbb-home-page-bg.gif
A public/images/gbb-logo.gif
A public/images/gbb-search-page-bg.gif
A public/images/gg-about_box_bg.jpg
A public/images/gg-blank-page-bg.gif
A public/images/gg-building-page-bg.gif
A public/images/gg-home-page-bg.gif
A public/images/gg-logo.gif
A public/images/gg-search-page-bg.gif
A public/images/gg-sponsor_logos.png
A public/images/gg-sponsor_page-logos.gif
A public/images/gg-sponsor_page-logos.png
A public/images/home-page-bg.gif
A public/images/home-shadow.gif
A public/images/sponsor_logos-color.gif
A public/images/sponsor_logos.gif
A public/javascripts/IE8.js
A public/stylesheets/css.css
A public/stylesheets/gg.css
A public/stylesheets/ie7-ag.css
A spec/controllers/static_controller_spec.rb
A spec/fixtures/infrastructures.yml
A spec/fixtures/neighbourhoods.yml
A spec/fixtures/open_spaces.yml
A spec/helpers/static_helper_spec.rb
A spec/models/infrastructure_spec.rb
A spec/models/neighbourhood_spec.rb
A spec/models/open_space_spec.rb
A spec/models/program_spec.rb
R app/controllers/legal_controller.rb
R app/controllers/sponsors_controller.rb
R app/helpers/legal_helper.rb
R app/helpers/sponsors_helper.rb
R app/views/legal/privacy.html.erb
R app/views/legal/tos.html.erb
R app/views/sponsors/index.html.erb
R spec/controllers/legal_controller_spec.rb
R spec/controllers/sponsors_controller_spec.rb
R spec/helpers/legal_helper_spec.rb
R spec/helpers/sponsors_helper_spec.rb
M app/controllers/application_controller.rb
M app/controllers/dashboard_controller.rb
M app/controllers/items_controller.rb
M app/controllers/js_controller.rb
M app/controllers/tags_controller.rb
M app/controllers/user_sessions_controller.rb
M app/controllers/users_controller.rb
M app/helpers/application_helper.rb
M app/helpers/items_helper.rb
M app/models/company.rb
M app/models/item.rb
M app/models/picture.rb
M app/models/project_team_member.rb
M app/models/tag.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/items/_address.html.erb
M app/views/items/_certifications.html.erb
M app/views/items/_description.html.erb
M app/views/items/_gallery.html.erb
M app/views/items/_picture.html.erb
M app/views/items/_project_team.html.erb
M app/views/items/_ratings.html.erb
M app/views/items/_recent_comments.html.erb
M app/views/items/_stats.html.erb
M app/views/items/_summary.html.erb
M app/views/items/_tags.html.erb
M app/views/items/_toc.html.erb
M app/views/items/_version_info.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/items/summary.html.erb
M app/views/layouts/_footer.html.erb
M app/views/layouts/_header.html.erb
M app/views/layouts/_map_header.html.erb
M app/views/layouts/application.html.erb
M app/views/pictures/show.html.erb
M app/views/tags/index.html.erb
M app/views/user_sessions/new.html.erb
M config/asset_packages.yml
M config/routes.rb
M public/stylesheets/GBBstyles.css
M public/stylesheets/ie.css
M public/stylesheets/old_gbb.css
M public/stylesheets/print.css
M public/stylesheets/screen.css
M public/stylesheets/src/grid.png
M spec/controllers/items_controller_spec.rb
M spec/models/picture_spec.rb