From 8acdba8bdd2be14c2408518812660431fa9e59fb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 24 Sep 2011 18:06:10 +0100 Subject: [PATCH] Upgrade to rails 3.1.0 --- Gemfile | 13 +- Gemfile.lock | 141 +- {public => app/assets}/images/RSS.gif | Bin {public => app/assets}/images/anon_large.png | Bin {public => app/assets}/images/anon_small.png | Bin {public => app/assets}/images/aol.png | Bin {public => app/assets}/images/arrow.png | Bin .../assets}/images/browse/allotments.png | Bin .../assets}/images/browse/alpinehut.p.16.png | Bin .../assets}/images/browse/atm2.p.16.png | Bin .../assets}/images/browse/bank2.p.16.png | Bin .../assets}/images/browse/bar.p.16.png | Bin .../assets}/images/browse/bridge.20.png | Bin .../assets}/images/browse/bridleway.20.png | Bin .../assets}/images/browse/brownfield.png | Bin .../assets}/images/browse/building.png | Bin .../images/browse/bus_station.n.16.png | Bin .../assets}/images/browse/bus_stop.p.16.png | Bin .../assets}/images/browse/byway.20.png | Bin .../assets}/images/browse/cafe.p.16.png | Bin .../assets}/images/browse/camping.n.16.png | Bin .../assets}/images/browse/car_share.p.16.png | Bin .../images/browse/caravan_park.p.24.png | Bin .../assets}/images/browse/cemetery.png | Bin .../assets}/images/browse/centre.png | Bin .../assets}/images/browse/cinema.p.16.png | Bin .../assets}/images/browse/commercial.png | Bin .../assets}/images/browse/common.png | Bin .../assets}/images/browse/cycleway.20.png | Bin .../images/browse/drinkingtap.p.16.png | Bin .../images/browse/education_nursery.p.16.png | Bin .../images/browse/education_school.p.16.png | Bin .../browse/education_university.p.16.png | Bin {public => app/assets}/images/browse/farm.png | Bin .../assets}/images/browse/fast_food.p.16.png | Bin .../images/browse/firestation.p.16.png | Bin .../assets}/images/browse/footway.20.png | Bin .../assets}/images/browse/forest.png | Bin .../assets}/images/browse/fuel.p.16.png | Bin .../assets}/images/browse/gate2.p.16.png | Bin {public => app/assets}/images/browse/golf.png | Bin .../assets}/images/browse/halt.p.16.png | Bin .../images/browse/health_dentist.p.16.png | Bin .../images/browse/health_doctors.p.16.png | Bin .../images/browse/health_opticians.p.16.png | Bin .../images/browse/health_veterinary.p.16.png | Bin .../assets}/images/browse/heathland.png | Bin .../assets}/images/browse/hospital.p.16.png | Bin .../assets}/images/browse/hostel.p.16.png | Bin .../assets}/images/browse/hotel.p.16.png | Bin .../assets}/images/browse/industrial.png | Bin {public => app/assets}/images/browse/lake.png | Bin .../images/browse/level_crossing.p.16.png | Bin .../assets}/images/browse/library.p.16.png | Bin .../assets}/images/browse/light_rail.20.png | Bin .../assets}/images/browse/lighthouse.p.16.png | Bin .../assets}/images/browse/military.png | Bin .../assets}/images/browse/mini_round.p.16.png | Bin .../assets}/images/browse/motorway.20.png | Bin .../assets}/images/browse/museum.p.16.png | Bin {public => app/assets}/images/browse/park.png | Bin .../assets}/images/browse/parking.p.16.png | Bin .../assets}/images/browse/pharmacy.p.16.png | Bin .../assets}/images/browse/pitch.png | Bin .../images/browse/place_of_worship.png | Bin .../browse/place_of_worship_unknown3.p.16.png | Bin .../assets}/images/browse/police.p.16.png | Bin .../assets}/images/browse/post_box.p.16.png | Bin .../images/browse/post_office.p.16.png | Bin .../assets}/images/browse/primary.20.png | Bin .../assets}/images/browse/prison.p.16.png | Bin .../assets}/images/browse/pub.p.16.png | Bin .../assets}/images/browse/rail.20.png | Bin .../assets}/images/browse/recycling.p.16.png | Bin .../assets}/images/browse/reserve.png | Bin .../assets}/images/browse/residential.png | Bin .../assets}/images/browse/restaurant.p.16.png | Bin .../assets}/images/browse/retail.png | Bin .../assets}/images/browse/runway.20.png | Bin .../assets}/images/browse/school.png | Bin .../assets}/images/browse/secondary.20.png | Bin .../assets}/images/browse/service.20.png | Bin .../assets}/images/browse/shelter2.p.16.png | Bin .../images/browse/shop_bakery.p.16.png | Bin .../images/browse/shop_bicycle.p.16.png | Bin .../assets}/images/browse/shop_books.p.16.png | Bin .../images/browse/shop_butcher.p.16.png | Bin .../images/browse/shop_clothes.p.16.png | Bin .../images/browse/shop_convenience.p.16.png | Bin .../assets}/images/browse/shop_diy.p.16.png | Bin .../images/browse/shop_estateagent2.p.16.png | Bin .../assets}/images/browse/shop_fish.p.16.png | Bin .../images/browse/shop_garden_centre.p.16.png | Bin .../assets}/images/browse/shop_gift.p.16.png | Bin .../images/browse/shop_greengrocer.p.16.png | Bin .../images/browse/shop_hairdresser.p.16.png | Bin .../images/browse/shop_jewelry.p.16.png | Bin .../images/browse/shop_supermarket.p.16.png | Bin .../assets}/images/browse/station.p.16.png | Bin .../assets}/images/browse/subway.20.png | Bin .../assets}/images/browse/taxiway.20.png | Bin .../assets}/images/browse/telephone.p.16.png | Bin .../assets}/images/browse/theatre.p.16.png | Bin .../assets}/images/browse/toilets.p.16.png | Bin .../assets}/images/browse/tourist.png | Bin .../images/browse/tourist_castle.p.16.png | Bin .../images/browse/tourist_memorial.p.16.png | Bin .../images/browse/tourist_monument.p.16.png | Bin .../images/browse/tourist_picnic.p.16.png | Bin .../images/browse/tourist_ruin.p.16.png | Bin .../images/browse/tourist_windmill.p.16.png | Bin .../images/browse/tourist_wreck.p.16.png | Bin .../assets}/images/browse/traffic_light.png | Bin .../assets}/images/browse/tram.20.png | Bin .../browse/transport_parking_bicycle.p.16.png | Bin .../browse/transport_rental_bicycle.p.16.png | Bin .../browse/transport_rental_car.p.16.png | Bin .../assets}/images/browse/tree.p.16.png | Bin .../assets}/images/browse/trunk.20.png | Bin .../assets}/images/browse/tunnel.20.png | Bin .../images/browse/turning_circle.p.16.png | Bin .../assets}/images/browse/unclassified.20.png | Bin .../assets}/images/browse/view_point.p.16.png | Bin {public => app/assets}/images/browse/wood.png | Bin {public => app/assets}/images/cc_button.png | Bin {public => app/assets}/images/google.png | Bin .../assets}/images/key/mapnik/admin.png | Bin .../assets}/images/key/mapnik/allotments.png | Bin .../assets}/images/key/mapnik/apron.png | Bin .../assets}/images/key/mapnik/bridge.png | Bin .../assets}/images/key/mapnik/bridleway.png | Bin .../assets}/images/key/mapnik/brownfield.png | Bin .../assets}/images/key/mapnik/building.png | Bin .../assets}/images/key/mapnik/byway.png | Bin .../assets}/images/key/mapnik/cable.png | Bin .../assets}/images/key/mapnik/cemetery.png | Bin .../assets}/images/key/mapnik/centre.png | Bin .../assets}/images/key/mapnik/commercial.png | Bin .../assets}/images/key/mapnik/common.png | Bin .../images/key/mapnik/construction.png | Bin .../assets}/images/key/mapnik/cycleway.png | Bin .../assets}/images/key/mapnik/destination.png | Bin .../assets}/images/key/mapnik/farm.png | Bin .../assets}/images/key/mapnik/footway.png | Bin .../assets}/images/key/mapnik/forest.png | Bin .../assets}/images/key/mapnik/golf.png | Bin .../assets}/images/key/mapnik/heathland.png | Bin .../assets}/images/key/mapnik/industrial.png | Bin .../assets}/images/key/mapnik/lake.png | Bin .../assets}/images/key/mapnik/military.png | Bin .../assets}/images/key/mapnik/motorway.png | Bin .../assets}/images/key/mapnik/park.png | Bin .../assets}/images/key/mapnik/permissive.png | Bin .../assets}/images/key/mapnik/pitch.png | Bin .../assets}/images/key/mapnik/primary.png | Bin .../assets}/images/key/mapnik/primary12.png | Bin .../assets}/images/key/mapnik/private.png | Bin .../assets}/images/key/mapnik/rail.png | Bin .../assets}/images/key/mapnik/rail13.png | Bin .../assets}/images/key/mapnik/reserve.png | Bin .../assets}/images/key/mapnik/resident.png | Bin .../assets}/images/key/mapnik/retail.png | Bin .../assets}/images/key/mapnik/runway.png | Bin .../assets}/images/key/mapnik/school.png | Bin .../assets}/images/key/mapnik/secondary.png | Bin .../assets}/images/key/mapnik/secondary12.png | Bin .../assets}/images/key/mapnik/station.png | Bin .../assets}/images/key/mapnik/subway.png | Bin .../assets}/images/key/mapnik/summit.png | Bin .../assets}/images/key/mapnik/tourist.png | Bin .../assets}/images/key/mapnik/track.png | Bin .../assets}/images/key/mapnik/tram.png | Bin .../assets}/images/key/mapnik/trunk.png | Bin .../assets}/images/key/mapnik/trunk12.png | Bin .../assets}/images/key/mapnik/tunnel.png | Bin .../images/key/mapnik/unclassified.png | Bin .../images/key/mapnik/unclassified13.png | Bin .../assets}/images/key/mapnik/unsurfaced.png | Bin .../assets}/images/key/mapnik/wood.png | Bin .../assets}/images/key/osmarender/admin.png | Bin .../images/key/osmarender/allotments.png | Bin .../images/key/osmarender/bridleway.png | Bin .../images/key/osmarender/brownfield.png | Bin .../images/key/osmarender/building.png | Bin .../assets}/images/key/osmarender/byway.png | Bin .../images/key/osmarender/cemetery.png | Bin .../assets}/images/key/osmarender/centre.png | Bin .../images/key/osmarender/commercial.png | Bin .../assets}/images/key/osmarender/common.png | Bin .../images/key/osmarender/cycleway.png | Bin .../assets}/images/key/osmarender/farm.png | Bin .../assets}/images/key/osmarender/footway.png | Bin .../assets}/images/key/osmarender/forest.png | Bin .../images/key/osmarender/heathland.png | Bin .../images/key/osmarender/industrial.png | Bin .../assets}/images/key/osmarender/lake.png | Bin .../assets}/images/key/osmarender/mapkey.png | Bin .../images/key/osmarender/military.png | Bin .../images/key/osmarender/motorway.png | Bin .../assets}/images/key/osmarender/park.png | Bin .../assets}/images/key/osmarender/pitch.png | Bin .../assets}/images/key/osmarender/primary.png | Bin .../assets}/images/key/osmarender/rail.png | Bin .../assets}/images/key/osmarender/reserve.png | Bin .../images/key/osmarender/resident.png | Bin .../assets}/images/key/osmarender/retail.png | Bin .../assets}/images/key/osmarender/school.png | Bin .../images/key/osmarender/secondary.png | Bin .../assets}/images/key/osmarender/station.png | Bin .../assets}/images/key/osmarender/subway.png | Bin .../assets}/images/key/osmarender/summit.png | Bin .../assets}/images/key/osmarender/tourist.png | Bin .../assets}/images/key/osmarender/track.png | Bin .../assets}/images/key/osmarender/tram.png | Bin .../assets}/images/key/osmarender/trunk.png | Bin .../images/key/osmarender/unsurfaced.png | Bin .../assets}/images/key/osmarender/wood.png | Bin .../assets}/images/mag_map-rss2.0.png | Bin {public => app/assets}/images/map_zoomin.png | Bin {public => app/assets}/images/map_zoomout.png | Bin {public => app/assets}/images/myopenid.png | Bin {public => app/assets}/images/new.png | Bin {public => app/assets}/images/openid.png | Bin .../assets}/images/openid_input.png | Bin .../assets}/images/openid_small.png | Bin {public => app/assets}/images/osm_logo.png | Bin {public => app/assets}/images/osm_logo.svg | 0 .../assets}/images/roles/administrator.png | Bin .../images/roles/blank_administrator.png | Bin .../assets}/images/roles/blank_moderator.png | Bin .../assets}/images/roles/moderator.png | Bin {public => app/assets}/images/searching.gif | Bin {public => app/assets}/images/sotm.png | Bin {public => app/assets}/images/tab_bottom.gif | Bin {public => app/assets}/images/wordpress.png | Bin {public => app/assets}/images/yahoo.png | Bin {public => app/assets}/javascripts/map.js | 0 {public => app/assets}/javascripts/menu.js | 0 {public => app/assets}/javascripts/pngfix.js | 0 {public => app/assets}/javascripts/site.js | 6 + .../assets}/javascripts/swfobject.js | 0 app/assets/stylesheets/browse.css.scss | 143 + .../assets/stylesheets/common.css.scss | 4 +- app/assets/stylesheets/large-ltr.css | 5 + app/assets/stylesheets/large-rtl.css | 5 + {public => app/assets}/stylesheets/large.css | 0 .../assets/stylesheets/ltr.css.scss | 2 +- app/assets/stylesheets/print-ltr.css | 4 + app/assets/stylesheets/print-rtl.css | 4 + {public => app/assets}/stylesheets/print.css | 0 .../assets/stylesheets/rtl.css.scss | 2 +- app/assets/stylesheets/small-ltr.css | 5 + app/assets/stylesheets/small-rtl.css | 5 + .../assets/stylesheets/small.css.scss | 2 +- app/views/layouts/_head.html.erb | 18 +- config/application.rb | 18 +- config/environments/development.rb | 11 +- config/environments/production.rb | 38 +- config/environments/test.rb | 9 +- config/initializers/wrap_parameters.rb | 14 + public/javascripts/application.js | 2 - public/javascripts/controls.js | 965 --- public/javascripts/dragdrop.js | 974 --- public/javascripts/effects.js | 1123 --- public/javascripts/prototype.js | 6001 ----------------- public/javascripts/rails.js | 191 - public/stylesheets/browse.css | 143 - 267 files changed, 356 insertions(+), 9492 deletions(-) rename {public => app/assets}/images/RSS.gif (100%) rename {public => app/assets}/images/anon_large.png (100%) rename {public => app/assets}/images/anon_small.png (100%) rename {public => app/assets}/images/aol.png (100%) rename {public => app/assets}/images/arrow.png (100%) rename {public => app/assets}/images/browse/allotments.png (100%) rename {public => app/assets}/images/browse/alpinehut.p.16.png (100%) rename {public => app/assets}/images/browse/atm2.p.16.png (100%) rename {public => app/assets}/images/browse/bank2.p.16.png (100%) rename {public => app/assets}/images/browse/bar.p.16.png (100%) rename {public => app/assets}/images/browse/bridge.20.png (100%) rename {public => app/assets}/images/browse/bridleway.20.png (100%) rename {public => app/assets}/images/browse/brownfield.png (100%) rename {public => app/assets}/images/browse/building.png (100%) rename {public => app/assets}/images/browse/bus_station.n.16.png (100%) rename {public => app/assets}/images/browse/bus_stop.p.16.png (100%) rename {public => app/assets}/images/browse/byway.20.png (100%) rename {public => app/assets}/images/browse/cafe.p.16.png (100%) rename {public => app/assets}/images/browse/camping.n.16.png (100%) rename {public => app/assets}/images/browse/car_share.p.16.png (100%) rename {public => app/assets}/images/browse/caravan_park.p.24.png (100%) rename {public => app/assets}/images/browse/cemetery.png (100%) rename {public => app/assets}/images/browse/centre.png (100%) rename {public => app/assets}/images/browse/cinema.p.16.png (100%) rename {public => app/assets}/images/browse/commercial.png (100%) rename {public => app/assets}/images/browse/common.png (100%) rename {public => app/assets}/images/browse/cycleway.20.png (100%) rename {public => app/assets}/images/browse/drinkingtap.p.16.png (100%) rename {public => app/assets}/images/browse/education_nursery.p.16.png (100%) rename {public => app/assets}/images/browse/education_school.p.16.png (100%) rename {public => app/assets}/images/browse/education_university.p.16.png (100%) rename {public => app/assets}/images/browse/farm.png (100%) rename {public => app/assets}/images/browse/fast_food.p.16.png (100%) rename {public => app/assets}/images/browse/firestation.p.16.png (100%) rename {public => app/assets}/images/browse/footway.20.png (100%) rename {public => app/assets}/images/browse/forest.png (100%) rename {public => app/assets}/images/browse/fuel.p.16.png (100%) rename {public => app/assets}/images/browse/gate2.p.16.png (100%) rename {public => app/assets}/images/browse/golf.png (100%) rename {public => app/assets}/images/browse/halt.p.16.png (100%) rename {public => app/assets}/images/browse/health_dentist.p.16.png (100%) rename {public => app/assets}/images/browse/health_doctors.p.16.png (100%) rename {public => app/assets}/images/browse/health_opticians.p.16.png (100%) rename {public => app/assets}/images/browse/health_veterinary.p.16.png (100%) rename {public => app/assets}/images/browse/heathland.png (100%) rename {public => app/assets}/images/browse/hospital.p.16.png (100%) rename {public => app/assets}/images/browse/hostel.p.16.png (100%) rename {public => app/assets}/images/browse/hotel.p.16.png (100%) rename {public => app/assets}/images/browse/industrial.png (100%) rename {public => app/assets}/images/browse/lake.png (100%) rename {public => app/assets}/images/browse/level_crossing.p.16.png (100%) rename {public => app/assets}/images/browse/library.p.16.png (100%) rename {public => app/assets}/images/browse/light_rail.20.png (100%) rename {public => app/assets}/images/browse/lighthouse.p.16.png (100%) rename {public => app/assets}/images/browse/military.png (100%) rename {public => app/assets}/images/browse/mini_round.p.16.png (100%) rename {public => app/assets}/images/browse/motorway.20.png (100%) rename {public => app/assets}/images/browse/museum.p.16.png (100%) rename {public => app/assets}/images/browse/park.png (100%) rename {public => app/assets}/images/browse/parking.p.16.png (100%) rename {public => app/assets}/images/browse/pharmacy.p.16.png (100%) rename {public => app/assets}/images/browse/pitch.png (100%) rename {public => app/assets}/images/browse/place_of_worship.png (100%) rename {public => app/assets}/images/browse/place_of_worship_unknown3.p.16.png (100%) rename {public => app/assets}/images/browse/police.p.16.png (100%) rename {public => app/assets}/images/browse/post_box.p.16.png (100%) rename {public => app/assets}/images/browse/post_office.p.16.png (100%) rename {public => app/assets}/images/browse/primary.20.png (100%) rename {public => app/assets}/images/browse/prison.p.16.png (100%) rename {public => app/assets}/images/browse/pub.p.16.png (100%) rename {public => app/assets}/images/browse/rail.20.png (100%) rename {public => app/assets}/images/browse/recycling.p.16.png (100%) rename {public => app/assets}/images/browse/reserve.png (100%) rename {public => app/assets}/images/browse/residential.png (100%) rename {public => app/assets}/images/browse/restaurant.p.16.png (100%) rename {public => app/assets}/images/browse/retail.png (100%) rename {public => app/assets}/images/browse/runway.20.png (100%) rename {public => app/assets}/images/browse/school.png (100%) rename {public => app/assets}/images/browse/secondary.20.png (100%) rename {public => app/assets}/images/browse/service.20.png (100%) rename {public => app/assets}/images/browse/shelter2.p.16.png (100%) rename {public => app/assets}/images/browse/shop_bakery.p.16.png (100%) rename {public => app/assets}/images/browse/shop_bicycle.p.16.png (100%) rename {public => app/assets}/images/browse/shop_books.p.16.png (100%) rename {public => app/assets}/images/browse/shop_butcher.p.16.png (100%) rename {public => app/assets}/images/browse/shop_clothes.p.16.png (100%) rename {public => app/assets}/images/browse/shop_convenience.p.16.png (100%) rename {public => app/assets}/images/browse/shop_diy.p.16.png (100%) rename {public => app/assets}/images/browse/shop_estateagent2.p.16.png (100%) rename {public => app/assets}/images/browse/shop_fish.p.16.png (100%) rename {public => app/assets}/images/browse/shop_garden_centre.p.16.png (100%) rename {public => app/assets}/images/browse/shop_gift.p.16.png (100%) rename {public => app/assets}/images/browse/shop_greengrocer.p.16.png (100%) rename {public => app/assets}/images/browse/shop_hairdresser.p.16.png (100%) rename {public => app/assets}/images/browse/shop_jewelry.p.16.png (100%) rename {public => app/assets}/images/browse/shop_supermarket.p.16.png (100%) rename {public => app/assets}/images/browse/station.p.16.png (100%) rename {public => app/assets}/images/browse/subway.20.png (100%) rename {public => app/assets}/images/browse/taxiway.20.png (100%) rename {public => app/assets}/images/browse/telephone.p.16.png (100%) rename {public => app/assets}/images/browse/theatre.p.16.png (100%) rename {public => app/assets}/images/browse/toilets.p.16.png (100%) rename {public => app/assets}/images/browse/tourist.png (100%) rename {public => app/assets}/images/browse/tourist_castle.p.16.png (100%) rename {public => app/assets}/images/browse/tourist_memorial.p.16.png (100%) rename {public => app/assets}/images/browse/tourist_monument.p.16.png (100%) rename {public => app/assets}/images/browse/tourist_picnic.p.16.png (100%) rename {public => app/assets}/images/browse/tourist_ruin.p.16.png (100%) rename {public => app/assets}/images/browse/tourist_windmill.p.16.png (100%) rename {public => app/assets}/images/browse/tourist_wreck.p.16.png (100%) rename {public => app/assets}/images/browse/traffic_light.png (100%) rename {public => app/assets}/images/browse/tram.20.png (100%) rename {public => app/assets}/images/browse/transport_parking_bicycle.p.16.png (100%) rename {public => app/assets}/images/browse/transport_rental_bicycle.p.16.png (100%) rename {public => app/assets}/images/browse/transport_rental_car.p.16.png (100%) rename {public => app/assets}/images/browse/tree.p.16.png (100%) rename {public => app/assets}/images/browse/trunk.20.png (100%) rename {public => app/assets}/images/browse/tunnel.20.png (100%) rename {public => app/assets}/images/browse/turning_circle.p.16.png (100%) rename {public => app/assets}/images/browse/unclassified.20.png (100%) rename {public => app/assets}/images/browse/view_point.p.16.png (100%) rename {public => app/assets}/images/browse/wood.png (100%) rename {public => app/assets}/images/cc_button.png (100%) rename {public => app/assets}/images/google.png (100%) rename {public => app/assets}/images/key/mapnik/admin.png (100%) rename {public => app/assets}/images/key/mapnik/allotments.png (100%) rename {public => app/assets}/images/key/mapnik/apron.png (100%) rename {public => app/assets}/images/key/mapnik/bridge.png (100%) rename {public => app/assets}/images/key/mapnik/bridleway.png (100%) rename {public => app/assets}/images/key/mapnik/brownfield.png (100%) rename {public => app/assets}/images/key/mapnik/building.png (100%) rename {public => app/assets}/images/key/mapnik/byway.png (100%) rename {public => app/assets}/images/key/mapnik/cable.png (100%) rename {public => app/assets}/images/key/mapnik/cemetery.png (100%) rename {public => app/assets}/images/key/mapnik/centre.png (100%) rename {public => app/assets}/images/key/mapnik/commercial.png (100%) rename {public => app/assets}/images/key/mapnik/common.png (100%) rename {public => app/assets}/images/key/mapnik/construction.png (100%) rename {public => app/assets}/images/key/mapnik/cycleway.png (100%) rename {public => app/assets}/images/key/mapnik/destination.png (100%) rename {public => app/assets}/images/key/mapnik/farm.png (100%) rename {public => app/assets}/images/key/mapnik/footway.png (100%) rename {public => app/assets}/images/key/mapnik/forest.png (100%) rename {public => app/assets}/images/key/mapnik/golf.png (100%) rename {public => app/assets}/images/key/mapnik/heathland.png (100%) rename {public => app/assets}/images/key/mapnik/industrial.png (100%) rename {public => app/assets}/images/key/mapnik/lake.png (100%) rename {public => app/assets}/images/key/mapnik/military.png (100%) rename {public => app/assets}/images/key/mapnik/motorway.png (100%) rename {public => app/assets}/images/key/mapnik/park.png (100%) rename {public => app/assets}/images/key/mapnik/permissive.png (100%) rename {public => app/assets}/images/key/mapnik/pitch.png (100%) rename {public => app/assets}/images/key/mapnik/primary.png (100%) rename {public => app/assets}/images/key/mapnik/primary12.png (100%) rename {public => app/assets}/images/key/mapnik/private.png (100%) rename {public => app/assets}/images/key/mapnik/rail.png (100%) rename {public => app/assets}/images/key/mapnik/rail13.png (100%) rename {public => app/assets}/images/key/mapnik/reserve.png (100%) rename {public => app/assets}/images/key/mapnik/resident.png (100%) rename {public => app/assets}/images/key/mapnik/retail.png (100%) rename {public => app/assets}/images/key/mapnik/runway.png (100%) rename {public => app/assets}/images/key/mapnik/school.png (100%) rename {public => app/assets}/images/key/mapnik/secondary.png (100%) rename {public => app/assets}/images/key/mapnik/secondary12.png (100%) rename {public => app/assets}/images/key/mapnik/station.png (100%) rename {public => app/assets}/images/key/mapnik/subway.png (100%) rename {public => app/assets}/images/key/mapnik/summit.png (100%) rename {public => app/assets}/images/key/mapnik/tourist.png (100%) rename {public => app/assets}/images/key/mapnik/track.png (100%) rename {public => app/assets}/images/key/mapnik/tram.png (100%) rename {public => app/assets}/images/key/mapnik/trunk.png (100%) rename {public => app/assets}/images/key/mapnik/trunk12.png (100%) rename {public => app/assets}/images/key/mapnik/tunnel.png (100%) rename {public => app/assets}/images/key/mapnik/unclassified.png (100%) rename {public => app/assets}/images/key/mapnik/unclassified13.png (100%) rename {public => app/assets}/images/key/mapnik/unsurfaced.png (100%) rename {public => app/assets}/images/key/mapnik/wood.png (100%) rename {public => app/assets}/images/key/osmarender/admin.png (100%) rename {public => app/assets}/images/key/osmarender/allotments.png (100%) rename {public => app/assets}/images/key/osmarender/bridleway.png (100%) rename {public => app/assets}/images/key/osmarender/brownfield.png (100%) rename {public => app/assets}/images/key/osmarender/building.png (100%) rename {public => app/assets}/images/key/osmarender/byway.png (100%) rename {public => app/assets}/images/key/osmarender/cemetery.png (100%) rename {public => app/assets}/images/key/osmarender/centre.png (100%) rename {public => app/assets}/images/key/osmarender/commercial.png (100%) rename {public => app/assets}/images/key/osmarender/common.png (100%) rename {public => app/assets}/images/key/osmarender/cycleway.png (100%) rename {public => app/assets}/images/key/osmarender/farm.png (100%) rename {public => app/assets}/images/key/osmarender/footway.png (100%) rename {public => app/assets}/images/key/osmarender/forest.png (100%) rename {public => app/assets}/images/key/osmarender/heathland.png (100%) rename {public => app/assets}/images/key/osmarender/industrial.png (100%) rename {public => app/assets}/images/key/osmarender/lake.png (100%) rename {public => app/assets}/images/key/osmarender/mapkey.png (100%) rename {public => app/assets}/images/key/osmarender/military.png (100%) rename {public => app/assets}/images/key/osmarender/motorway.png (100%) rename {public => app/assets}/images/key/osmarender/park.png (100%) rename {public => app/assets}/images/key/osmarender/pitch.png (100%) rename {public => app/assets}/images/key/osmarender/primary.png (100%) rename {public => app/assets}/images/key/osmarender/rail.png (100%) rename {public => app/assets}/images/key/osmarender/reserve.png (100%) rename {public => app/assets}/images/key/osmarender/resident.png (100%) rename {public => app/assets}/images/key/osmarender/retail.png (100%) rename {public => app/assets}/images/key/osmarender/school.png (100%) rename {public => app/assets}/images/key/osmarender/secondary.png (100%) rename {public => app/assets}/images/key/osmarender/station.png (100%) rename {public => app/assets}/images/key/osmarender/subway.png (100%) rename {public => app/assets}/images/key/osmarender/summit.png (100%) rename {public => app/assets}/images/key/osmarender/tourist.png (100%) rename {public => app/assets}/images/key/osmarender/track.png (100%) rename {public => app/assets}/images/key/osmarender/tram.png (100%) rename {public => app/assets}/images/key/osmarender/trunk.png (100%) rename {public => app/assets}/images/key/osmarender/unsurfaced.png (100%) rename {public => app/assets}/images/key/osmarender/wood.png (100%) rename {public => app/assets}/images/mag_map-rss2.0.png (100%) rename {public => app/assets}/images/map_zoomin.png (100%) rename {public => app/assets}/images/map_zoomout.png (100%) rename {public => app/assets}/images/myopenid.png (100%) rename {public => app/assets}/images/new.png (100%) rename {public => app/assets}/images/openid.png (100%) rename {public => app/assets}/images/openid_input.png (100%) rename {public => app/assets}/images/openid_small.png (100%) rename {public => app/assets}/images/osm_logo.png (100%) rename {public => app/assets}/images/osm_logo.svg (100%) rename {public => app/assets}/images/roles/administrator.png (100%) rename {public => app/assets}/images/roles/blank_administrator.png (100%) rename {public => app/assets}/images/roles/blank_moderator.png (100%) rename {public => app/assets}/images/roles/moderator.png (100%) rename {public => app/assets}/images/searching.gif (100%) rename {public => app/assets}/images/sotm.png (100%) rename {public => app/assets}/images/tab_bottom.gif (100%) rename {public => app/assets}/images/wordpress.png (100%) rename {public => app/assets}/images/yahoo.png (100%) rename {public => app/assets}/javascripts/map.js (100%) rename {public => app/assets}/javascripts/menu.js (100%) rename {public => app/assets}/javascripts/pngfix.js (100%) rename {public => app/assets}/javascripts/site.js (98%) rename {public => app/assets}/javascripts/swfobject.js (100%) create mode 100644 app/assets/stylesheets/browse.css.scss rename public/stylesheets/common.css => app/assets/stylesheets/common.css.scss (99%) create mode 100644 app/assets/stylesheets/large-ltr.css create mode 100644 app/assets/stylesheets/large-rtl.css rename {public => app/assets}/stylesheets/large.css (100%) rename public/stylesheets/ltr.css => app/assets/stylesheets/ltr.css.scss (97%) create mode 100644 app/assets/stylesheets/print-ltr.css create mode 100644 app/assets/stylesheets/print-rtl.css rename {public => app/assets}/stylesheets/print.css (100%) rename public/stylesheets/rtl.css => app/assets/stylesheets/rtl.css.scss (97%) create mode 100644 app/assets/stylesheets/small-ltr.css create mode 100644 app/assets/stylesheets/small-rtl.css rename public/stylesheets/small.css => app/assets/stylesheets/small.css.scss (98%) create mode 100644 config/initializers/wrap_parameters.rb delete mode 100644 public/javascripts/application.js delete mode 100644 public/javascripts/controls.js delete mode 100644 public/javascripts/dragdrop.js delete mode 100644 public/javascripts/effects.js delete mode 100644 public/javascripts/prototype.js delete mode 100644 public/javascripts/rails.js delete mode 100644 public/stylesheets/browse.css diff --git a/Gemfile b/Gemfile index 2de8c0cf2..a6df39774 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.10' +gem 'rails', '3.1.0' gem 'pg' gem 'arel', '>= 2.0.9' @@ -14,12 +14,13 @@ gem 'sanitize' gem 'rails-i18n-updater' gem 'validates_email_format_of', '>= 1.5.1' gem 'open_id_authentication', '>= 1.1.0' +gem 'prototype-rails' # Should only load if memcache is in use #gem 'memcached' # Should only load if we're not in database offline mode -gem 'composite_primary_keys', '= 3.1.10' +gem 'composite_primary_keys', '= 4.0.0' # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators @@ -27,3 +28,11 @@ gem 'composite_primary_keys', '= 3.1.10' group :development, :test do gem 'timecop' end + +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', " ~> 3.1.0" + gem 'coffee-rails', "~> 3.1.0" + gem 'uglifier' +end diff --git a/Gemfile.lock b/Gemfile.lock index 7bd2eeeb2..99087080f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,49 +2,60 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - abstract (1.0.0) - actionmailer (3.0.10) - actionpack (= 3.0.10) - mail (~> 2.2.19) - actionpack (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.10) - activesupport (= 3.0.10) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - arel (~> 2.0.10) - tzinfo (~> 0.3.23) - activeresource (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - activesupport (3.0.10) + actionmailer (3.1.0) + actionpack (= 3.1.0) + mail (~> 2.3.0) + actionpack (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + builder (~> 3.0.0) + erubis (~> 2.7.0) + i18n (~> 0.6) + rack (~> 1.3.2) + rack-cache (~> 1.0.3) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.0) + activemodel (3.1.0) + activesupport (= 3.1.0) + bcrypt-ruby (~> 3.0.0) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activeresource (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + activesupport (3.1.0) + multi_json (~> 1.0) addressable (2.2.6) - arel (2.0.10) - builder (2.1.2) - composite_primary_keys (3.1.10) - activerecord (>= 3.0.5, ~> 3.0.0) - erubis (2.6.6) - abstract (>= 1.0.0) + arel (2.2.1) + bcrypt-ruby (3.0.0) + builder (3.0.0) + coffee-rails (3.1.0) + coffee-script (>= 2.2.0) + railties (~> 3.1.0.rc1) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.1.2) + composite_primary_keys (4.0.0) + activerecord (~> 3.1.0) + erubis (2.7.0) + execjs (1.2.4) + multi_json (~> 1.0) faraday (0.7.4) addressable (~> 2.2.6) multipart-post (~> 1.1.0) rack (< 2, >= 1.1.0) + hike (1.2.1) httpclient (2.2.1) - i18n (0.5.0) + i18n (0.6.0) libxml-ruby (2.2.2) - mail (2.2.19) - activesupport (>= 2.3.6) + mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -65,44 +76,64 @@ GEM rack-openid (~> 1.3) pg (0.11.0) polyglot (0.3.2) - rack (1.2.3) - rack-mount (0.6.14) + prototype-rails (3.1.0) + rails (~> 3.1) + rack (1.3.2) + rack-cache (1.0.3) + rack (>= 0.4) + rack-mount (0.8.3) rack (>= 1.0.0) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.5.7) + rack-ssl (1.3.2) + rack + rack-test (0.6.1) rack (>= 1.0) - rails (3.0.10) - actionmailer (= 3.0.10) - actionpack (= 3.0.10) - activerecord (= 3.0.10) - activeresource (= 3.0.10) - activesupport (= 3.0.10) + rails (3.1.0) + actionmailer (= 3.1.0) + actionpack (= 3.1.0) + activerecord (= 3.1.0) + activeresource (= 3.1.0) + activesupport (= 3.1.0) bundler (~> 1.0) - railties (= 3.0.10) + railties (= 3.1.0) rails-i18n-updater (1.0.1) actionpack activesupport rails - railties (3.0.10) - actionpack (= 3.0.10) - activesupport (= 3.0.10) + railties (3.1.0) + actionpack (= 3.1.0) + activesupport (= 3.1.0) + rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.4) + thor (~> 0.14.6) rake (0.9.2) rdoc (3.9.4) rmagick (2.13.1) ruby-openid (2.1.8) sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) + nokogiri (< 1.6, >= 1.4.4) + sass (3.1.7) + sass-rails (3.1.0) + actionpack (~> 3.1.0) + railties (~> 3.1.0) + sass (>= 3.1.4) + sprockets (2.0.0) + hike (~> 1.2) + rack (~> 1.0) + tilt (!= 1.3.0, ~> 1.1) thor (0.14.6) + tilt (1.3.3) timecop (0.3.5) treetop (1.4.10) polyglot polyglot (>= 0.3.1) tzinfo (0.3.29) + uglifier (1.0.2) + execjs (>= 0.3.0) + multi_json (>= 1.0.2) validates_email_format_of (1.5.1) PLATFORMS @@ -111,16 +142,20 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) arel (>= 2.0.9) - composite_primary_keys (= 3.1.10) + coffee-rails (~> 3.1.0) + composite_primary_keys (= 4.0.0) httpclient libxml-ruby (>= 2.0.5) oauth (>= 0.4.4) oauth-plugin (>= 0.4.0.pre4) open_id_authentication (>= 1.1.0) pg - rails (= 3.0.10) + prototype-rails + rails (= 3.1.0) rails-i18n-updater rmagick sanitize + sass-rails (~> 3.1.0) timecop + uglifier validates_email_format_of (>= 1.5.1) diff --git a/public/images/RSS.gif b/app/assets/images/RSS.gif similarity index 100% rename from public/images/RSS.gif rename to app/assets/images/RSS.gif diff --git a/public/images/anon_large.png b/app/assets/images/anon_large.png similarity index 100% rename from public/images/anon_large.png rename to app/assets/images/anon_large.png diff --git a/public/images/anon_small.png b/app/assets/images/anon_small.png similarity index 100% rename from public/images/anon_small.png rename to app/assets/images/anon_small.png diff --git a/public/images/aol.png b/app/assets/images/aol.png similarity index 100% rename from public/images/aol.png rename to app/assets/images/aol.png diff --git a/public/images/arrow.png b/app/assets/images/arrow.png similarity index 100% rename from public/images/arrow.png rename to app/assets/images/arrow.png diff --git a/public/images/browse/allotments.png b/app/assets/images/browse/allotments.png similarity index 100% rename from public/images/browse/allotments.png rename to app/assets/images/browse/allotments.png diff --git a/public/images/browse/alpinehut.p.16.png b/app/assets/images/browse/alpinehut.p.16.png similarity index 100% rename from public/images/browse/alpinehut.p.16.png rename to app/assets/images/browse/alpinehut.p.16.png diff --git a/public/images/browse/atm2.p.16.png b/app/assets/images/browse/atm2.p.16.png similarity index 100% rename from public/images/browse/atm2.p.16.png rename to app/assets/images/browse/atm2.p.16.png diff --git a/public/images/browse/bank2.p.16.png b/app/assets/images/browse/bank2.p.16.png similarity index 100% rename from public/images/browse/bank2.p.16.png rename to app/assets/images/browse/bank2.p.16.png diff --git a/public/images/browse/bar.p.16.png b/app/assets/images/browse/bar.p.16.png similarity index 100% rename from public/images/browse/bar.p.16.png rename to app/assets/images/browse/bar.p.16.png diff --git a/public/images/browse/bridge.20.png b/app/assets/images/browse/bridge.20.png similarity index 100% rename from public/images/browse/bridge.20.png rename to app/assets/images/browse/bridge.20.png diff --git a/public/images/browse/bridleway.20.png b/app/assets/images/browse/bridleway.20.png similarity index 100% rename from public/images/browse/bridleway.20.png rename to app/assets/images/browse/bridleway.20.png diff --git a/public/images/browse/brownfield.png b/app/assets/images/browse/brownfield.png similarity index 100% rename from public/images/browse/brownfield.png rename to app/assets/images/browse/brownfield.png diff --git a/public/images/browse/building.png b/app/assets/images/browse/building.png similarity index 100% rename from public/images/browse/building.png rename to app/assets/images/browse/building.png diff --git a/public/images/browse/bus_station.n.16.png b/app/assets/images/browse/bus_station.n.16.png similarity index 100% rename from public/images/browse/bus_station.n.16.png rename to app/assets/images/browse/bus_station.n.16.png diff --git a/public/images/browse/bus_stop.p.16.png b/app/assets/images/browse/bus_stop.p.16.png similarity index 100% rename from public/images/browse/bus_stop.p.16.png rename to app/assets/images/browse/bus_stop.p.16.png diff --git a/public/images/browse/byway.20.png b/app/assets/images/browse/byway.20.png similarity index 100% rename from public/images/browse/byway.20.png rename to app/assets/images/browse/byway.20.png diff --git a/public/images/browse/cafe.p.16.png b/app/assets/images/browse/cafe.p.16.png similarity index 100% rename from public/images/browse/cafe.p.16.png rename to app/assets/images/browse/cafe.p.16.png diff --git a/public/images/browse/camping.n.16.png b/app/assets/images/browse/camping.n.16.png similarity index 100% rename from public/images/browse/camping.n.16.png rename to app/assets/images/browse/camping.n.16.png diff --git a/public/images/browse/car_share.p.16.png b/app/assets/images/browse/car_share.p.16.png similarity index 100% rename from public/images/browse/car_share.p.16.png rename to app/assets/images/browse/car_share.p.16.png diff --git a/public/images/browse/caravan_park.p.24.png b/app/assets/images/browse/caravan_park.p.24.png similarity index 100% rename from public/images/browse/caravan_park.p.24.png rename to app/assets/images/browse/caravan_park.p.24.png diff --git a/public/images/browse/cemetery.png b/app/assets/images/browse/cemetery.png similarity index 100% rename from public/images/browse/cemetery.png rename to app/assets/images/browse/cemetery.png diff --git a/public/images/browse/centre.png b/app/assets/images/browse/centre.png similarity index 100% rename from public/images/browse/centre.png rename to app/assets/images/browse/centre.png diff --git a/public/images/browse/cinema.p.16.png b/app/assets/images/browse/cinema.p.16.png similarity index 100% rename from public/images/browse/cinema.p.16.png rename to app/assets/images/browse/cinema.p.16.png diff --git a/public/images/browse/commercial.png b/app/assets/images/browse/commercial.png similarity index 100% rename from public/images/browse/commercial.png rename to app/assets/images/browse/commercial.png diff --git a/public/images/browse/common.png b/app/assets/images/browse/common.png similarity index 100% rename from public/images/browse/common.png rename to app/assets/images/browse/common.png diff --git a/public/images/browse/cycleway.20.png b/app/assets/images/browse/cycleway.20.png similarity index 100% rename from public/images/browse/cycleway.20.png rename to app/assets/images/browse/cycleway.20.png diff --git a/public/images/browse/drinkingtap.p.16.png b/app/assets/images/browse/drinkingtap.p.16.png similarity index 100% rename from public/images/browse/drinkingtap.p.16.png rename to app/assets/images/browse/drinkingtap.p.16.png diff --git a/public/images/browse/education_nursery.p.16.png b/app/assets/images/browse/education_nursery.p.16.png similarity index 100% rename from public/images/browse/education_nursery.p.16.png rename to app/assets/images/browse/education_nursery.p.16.png diff --git a/public/images/browse/education_school.p.16.png b/app/assets/images/browse/education_school.p.16.png similarity index 100% rename from public/images/browse/education_school.p.16.png rename to app/assets/images/browse/education_school.p.16.png diff --git a/public/images/browse/education_university.p.16.png b/app/assets/images/browse/education_university.p.16.png similarity index 100% rename from public/images/browse/education_university.p.16.png rename to app/assets/images/browse/education_university.p.16.png diff --git a/public/images/browse/farm.png b/app/assets/images/browse/farm.png similarity index 100% rename from public/images/browse/farm.png rename to app/assets/images/browse/farm.png diff --git a/public/images/browse/fast_food.p.16.png b/app/assets/images/browse/fast_food.p.16.png similarity index 100% rename from public/images/browse/fast_food.p.16.png rename to app/assets/images/browse/fast_food.p.16.png diff --git a/public/images/browse/firestation.p.16.png b/app/assets/images/browse/firestation.p.16.png similarity index 100% rename from public/images/browse/firestation.p.16.png rename to app/assets/images/browse/firestation.p.16.png diff --git a/public/images/browse/footway.20.png b/app/assets/images/browse/footway.20.png similarity index 100% rename from public/images/browse/footway.20.png rename to app/assets/images/browse/footway.20.png diff --git a/public/images/browse/forest.png b/app/assets/images/browse/forest.png similarity index 100% rename from public/images/browse/forest.png rename to app/assets/images/browse/forest.png diff --git a/public/images/browse/fuel.p.16.png b/app/assets/images/browse/fuel.p.16.png similarity index 100% rename from public/images/browse/fuel.p.16.png rename to app/assets/images/browse/fuel.p.16.png diff --git a/public/images/browse/gate2.p.16.png b/app/assets/images/browse/gate2.p.16.png similarity index 100% rename from public/images/browse/gate2.p.16.png rename to app/assets/images/browse/gate2.p.16.png diff --git a/public/images/browse/golf.png b/app/assets/images/browse/golf.png similarity index 100% rename from public/images/browse/golf.png rename to app/assets/images/browse/golf.png diff --git a/public/images/browse/halt.p.16.png b/app/assets/images/browse/halt.p.16.png similarity index 100% rename from public/images/browse/halt.p.16.png rename to app/assets/images/browse/halt.p.16.png diff --git a/public/images/browse/health_dentist.p.16.png b/app/assets/images/browse/health_dentist.p.16.png similarity index 100% rename from public/images/browse/health_dentist.p.16.png rename to app/assets/images/browse/health_dentist.p.16.png diff --git a/public/images/browse/health_doctors.p.16.png b/app/assets/images/browse/health_doctors.p.16.png similarity index 100% rename from public/images/browse/health_doctors.p.16.png rename to app/assets/images/browse/health_doctors.p.16.png diff --git a/public/images/browse/health_opticians.p.16.png b/app/assets/images/browse/health_opticians.p.16.png similarity index 100% rename from public/images/browse/health_opticians.p.16.png rename to app/assets/images/browse/health_opticians.p.16.png diff --git a/public/images/browse/health_veterinary.p.16.png b/app/assets/images/browse/health_veterinary.p.16.png similarity index 100% rename from public/images/browse/health_veterinary.p.16.png rename to app/assets/images/browse/health_veterinary.p.16.png diff --git a/public/images/browse/heathland.png b/app/assets/images/browse/heathland.png similarity index 100% rename from public/images/browse/heathland.png rename to app/assets/images/browse/heathland.png diff --git a/public/images/browse/hospital.p.16.png b/app/assets/images/browse/hospital.p.16.png similarity index 100% rename from public/images/browse/hospital.p.16.png rename to app/assets/images/browse/hospital.p.16.png diff --git a/public/images/browse/hostel.p.16.png b/app/assets/images/browse/hostel.p.16.png similarity index 100% rename from public/images/browse/hostel.p.16.png rename to app/assets/images/browse/hostel.p.16.png diff --git a/public/images/browse/hotel.p.16.png b/app/assets/images/browse/hotel.p.16.png similarity index 100% rename from public/images/browse/hotel.p.16.png rename to app/assets/images/browse/hotel.p.16.png diff --git a/public/images/browse/industrial.png b/app/assets/images/browse/industrial.png similarity index 100% rename from public/images/browse/industrial.png rename to app/assets/images/browse/industrial.png diff --git a/public/images/browse/lake.png b/app/assets/images/browse/lake.png similarity index 100% rename from public/images/browse/lake.png rename to app/assets/images/browse/lake.png diff --git a/public/images/browse/level_crossing.p.16.png b/app/assets/images/browse/level_crossing.p.16.png similarity index 100% rename from public/images/browse/level_crossing.p.16.png rename to app/assets/images/browse/level_crossing.p.16.png diff --git a/public/images/browse/library.p.16.png b/app/assets/images/browse/library.p.16.png similarity index 100% rename from public/images/browse/library.p.16.png rename to app/assets/images/browse/library.p.16.png diff --git a/public/images/browse/light_rail.20.png b/app/assets/images/browse/light_rail.20.png similarity index 100% rename from public/images/browse/light_rail.20.png rename to app/assets/images/browse/light_rail.20.png diff --git a/public/images/browse/lighthouse.p.16.png b/app/assets/images/browse/lighthouse.p.16.png similarity index 100% rename from public/images/browse/lighthouse.p.16.png rename to app/assets/images/browse/lighthouse.p.16.png diff --git a/public/images/browse/military.png b/app/assets/images/browse/military.png similarity index 100% rename from public/images/browse/military.png rename to app/assets/images/browse/military.png diff --git a/public/images/browse/mini_round.p.16.png b/app/assets/images/browse/mini_round.p.16.png similarity index 100% rename from public/images/browse/mini_round.p.16.png rename to app/assets/images/browse/mini_round.p.16.png diff --git a/public/images/browse/motorway.20.png b/app/assets/images/browse/motorway.20.png similarity index 100% rename from public/images/browse/motorway.20.png rename to app/assets/images/browse/motorway.20.png diff --git a/public/images/browse/museum.p.16.png b/app/assets/images/browse/museum.p.16.png similarity index 100% rename from public/images/browse/museum.p.16.png rename to app/assets/images/browse/museum.p.16.png diff --git a/public/images/browse/park.png b/app/assets/images/browse/park.png similarity index 100% rename from public/images/browse/park.png rename to app/assets/images/browse/park.png diff --git a/public/images/browse/parking.p.16.png b/app/assets/images/browse/parking.p.16.png similarity index 100% rename from public/images/browse/parking.p.16.png rename to app/assets/images/browse/parking.p.16.png diff --git a/public/images/browse/pharmacy.p.16.png b/app/assets/images/browse/pharmacy.p.16.png similarity index 100% rename from public/images/browse/pharmacy.p.16.png rename to app/assets/images/browse/pharmacy.p.16.png diff --git a/public/images/browse/pitch.png b/app/assets/images/browse/pitch.png similarity index 100% rename from public/images/browse/pitch.png rename to app/assets/images/browse/pitch.png diff --git a/public/images/browse/place_of_worship.png b/app/assets/images/browse/place_of_worship.png similarity index 100% rename from public/images/browse/place_of_worship.png rename to app/assets/images/browse/place_of_worship.png diff --git a/public/images/browse/place_of_worship_unknown3.p.16.png b/app/assets/images/browse/place_of_worship_unknown3.p.16.png similarity index 100% rename from public/images/browse/place_of_worship_unknown3.p.16.png rename to app/assets/images/browse/place_of_worship_unknown3.p.16.png diff --git a/public/images/browse/police.p.16.png b/app/assets/images/browse/police.p.16.png similarity index 100% rename from public/images/browse/police.p.16.png rename to app/assets/images/browse/police.p.16.png diff --git a/public/images/browse/post_box.p.16.png b/app/assets/images/browse/post_box.p.16.png similarity index 100% rename from public/images/browse/post_box.p.16.png rename to app/assets/images/browse/post_box.p.16.png diff --git a/public/images/browse/post_office.p.16.png b/app/assets/images/browse/post_office.p.16.png similarity index 100% rename from public/images/browse/post_office.p.16.png rename to app/assets/images/browse/post_office.p.16.png diff --git a/public/images/browse/primary.20.png b/app/assets/images/browse/primary.20.png similarity index 100% rename from public/images/browse/primary.20.png rename to app/assets/images/browse/primary.20.png diff --git a/public/images/browse/prison.p.16.png b/app/assets/images/browse/prison.p.16.png similarity index 100% rename from public/images/browse/prison.p.16.png rename to app/assets/images/browse/prison.p.16.png diff --git a/public/images/browse/pub.p.16.png b/app/assets/images/browse/pub.p.16.png similarity index 100% rename from public/images/browse/pub.p.16.png rename to app/assets/images/browse/pub.p.16.png diff --git a/public/images/browse/rail.20.png b/app/assets/images/browse/rail.20.png similarity index 100% rename from public/images/browse/rail.20.png rename to app/assets/images/browse/rail.20.png diff --git a/public/images/browse/recycling.p.16.png b/app/assets/images/browse/recycling.p.16.png similarity index 100% rename from public/images/browse/recycling.p.16.png rename to app/assets/images/browse/recycling.p.16.png diff --git a/public/images/browse/reserve.png b/app/assets/images/browse/reserve.png similarity index 100% rename from public/images/browse/reserve.png rename to app/assets/images/browse/reserve.png diff --git a/public/images/browse/residential.png b/app/assets/images/browse/residential.png similarity index 100% rename from public/images/browse/residential.png rename to app/assets/images/browse/residential.png diff --git a/public/images/browse/restaurant.p.16.png b/app/assets/images/browse/restaurant.p.16.png similarity index 100% rename from public/images/browse/restaurant.p.16.png rename to app/assets/images/browse/restaurant.p.16.png diff --git a/public/images/browse/retail.png b/app/assets/images/browse/retail.png similarity index 100% rename from public/images/browse/retail.png rename to app/assets/images/browse/retail.png diff --git a/public/images/browse/runway.20.png b/app/assets/images/browse/runway.20.png similarity index 100% rename from public/images/browse/runway.20.png rename to app/assets/images/browse/runway.20.png diff --git a/public/images/browse/school.png b/app/assets/images/browse/school.png similarity index 100% rename from public/images/browse/school.png rename to app/assets/images/browse/school.png diff --git a/public/images/browse/secondary.20.png b/app/assets/images/browse/secondary.20.png similarity index 100% rename from public/images/browse/secondary.20.png rename to app/assets/images/browse/secondary.20.png diff --git a/public/images/browse/service.20.png b/app/assets/images/browse/service.20.png similarity index 100% rename from public/images/browse/service.20.png rename to app/assets/images/browse/service.20.png diff --git a/public/images/browse/shelter2.p.16.png b/app/assets/images/browse/shelter2.p.16.png similarity index 100% rename from public/images/browse/shelter2.p.16.png rename to app/assets/images/browse/shelter2.p.16.png diff --git a/public/images/browse/shop_bakery.p.16.png b/app/assets/images/browse/shop_bakery.p.16.png similarity index 100% rename from public/images/browse/shop_bakery.p.16.png rename to app/assets/images/browse/shop_bakery.p.16.png diff --git a/public/images/browse/shop_bicycle.p.16.png b/app/assets/images/browse/shop_bicycle.p.16.png similarity index 100% rename from public/images/browse/shop_bicycle.p.16.png rename to app/assets/images/browse/shop_bicycle.p.16.png diff --git a/public/images/browse/shop_books.p.16.png b/app/assets/images/browse/shop_books.p.16.png similarity index 100% rename from public/images/browse/shop_books.p.16.png rename to app/assets/images/browse/shop_books.p.16.png diff --git a/public/images/browse/shop_butcher.p.16.png b/app/assets/images/browse/shop_butcher.p.16.png similarity index 100% rename from public/images/browse/shop_butcher.p.16.png rename to app/assets/images/browse/shop_butcher.p.16.png diff --git a/public/images/browse/shop_clothes.p.16.png b/app/assets/images/browse/shop_clothes.p.16.png similarity index 100% rename from public/images/browse/shop_clothes.p.16.png rename to app/assets/images/browse/shop_clothes.p.16.png diff --git a/public/images/browse/shop_convenience.p.16.png b/app/assets/images/browse/shop_convenience.p.16.png similarity index 100% rename from public/images/browse/shop_convenience.p.16.png rename to app/assets/images/browse/shop_convenience.p.16.png diff --git a/public/images/browse/shop_diy.p.16.png b/app/assets/images/browse/shop_diy.p.16.png similarity index 100% rename from public/images/browse/shop_diy.p.16.png rename to app/assets/images/browse/shop_diy.p.16.png diff --git a/public/images/browse/shop_estateagent2.p.16.png b/app/assets/images/browse/shop_estateagent2.p.16.png similarity index 100% rename from public/images/browse/shop_estateagent2.p.16.png rename to app/assets/images/browse/shop_estateagent2.p.16.png diff --git a/public/images/browse/shop_fish.p.16.png b/app/assets/images/browse/shop_fish.p.16.png similarity index 100% rename from public/images/browse/shop_fish.p.16.png rename to app/assets/images/browse/shop_fish.p.16.png diff --git a/public/images/browse/shop_garden_centre.p.16.png b/app/assets/images/browse/shop_garden_centre.p.16.png similarity index 100% rename from public/images/browse/shop_garden_centre.p.16.png rename to app/assets/images/browse/shop_garden_centre.p.16.png diff --git a/public/images/browse/shop_gift.p.16.png b/app/assets/images/browse/shop_gift.p.16.png similarity index 100% rename from public/images/browse/shop_gift.p.16.png rename to app/assets/images/browse/shop_gift.p.16.png diff --git a/public/images/browse/shop_greengrocer.p.16.png b/app/assets/images/browse/shop_greengrocer.p.16.png similarity index 100% rename from public/images/browse/shop_greengrocer.p.16.png rename to app/assets/images/browse/shop_greengrocer.p.16.png diff --git a/public/images/browse/shop_hairdresser.p.16.png b/app/assets/images/browse/shop_hairdresser.p.16.png similarity index 100% rename from public/images/browse/shop_hairdresser.p.16.png rename to app/assets/images/browse/shop_hairdresser.p.16.png diff --git a/public/images/browse/shop_jewelry.p.16.png b/app/assets/images/browse/shop_jewelry.p.16.png similarity index 100% rename from public/images/browse/shop_jewelry.p.16.png rename to app/assets/images/browse/shop_jewelry.p.16.png diff --git a/public/images/browse/shop_supermarket.p.16.png b/app/assets/images/browse/shop_supermarket.p.16.png similarity index 100% rename from public/images/browse/shop_supermarket.p.16.png rename to app/assets/images/browse/shop_supermarket.p.16.png diff --git a/public/images/browse/station.p.16.png b/app/assets/images/browse/station.p.16.png similarity index 100% rename from public/images/browse/station.p.16.png rename to app/assets/images/browse/station.p.16.png diff --git a/public/images/browse/subway.20.png b/app/assets/images/browse/subway.20.png similarity index 100% rename from public/images/browse/subway.20.png rename to app/assets/images/browse/subway.20.png diff --git a/public/images/browse/taxiway.20.png b/app/assets/images/browse/taxiway.20.png similarity index 100% rename from public/images/browse/taxiway.20.png rename to app/assets/images/browse/taxiway.20.png diff --git a/public/images/browse/telephone.p.16.png b/app/assets/images/browse/telephone.p.16.png similarity index 100% rename from public/images/browse/telephone.p.16.png rename to app/assets/images/browse/telephone.p.16.png diff --git a/public/images/browse/theatre.p.16.png b/app/assets/images/browse/theatre.p.16.png similarity index 100% rename from public/images/browse/theatre.p.16.png rename to app/assets/images/browse/theatre.p.16.png diff --git a/public/images/browse/toilets.p.16.png b/app/assets/images/browse/toilets.p.16.png similarity index 100% rename from public/images/browse/toilets.p.16.png rename to app/assets/images/browse/toilets.p.16.png diff --git a/public/images/browse/tourist.png b/app/assets/images/browse/tourist.png similarity index 100% rename from public/images/browse/tourist.png rename to app/assets/images/browse/tourist.png diff --git a/public/images/browse/tourist_castle.p.16.png b/app/assets/images/browse/tourist_castle.p.16.png similarity index 100% rename from public/images/browse/tourist_castle.p.16.png rename to app/assets/images/browse/tourist_castle.p.16.png diff --git a/public/images/browse/tourist_memorial.p.16.png b/app/assets/images/browse/tourist_memorial.p.16.png similarity index 100% rename from public/images/browse/tourist_memorial.p.16.png rename to app/assets/images/browse/tourist_memorial.p.16.png diff --git a/public/images/browse/tourist_monument.p.16.png b/app/assets/images/browse/tourist_monument.p.16.png similarity index 100% rename from public/images/browse/tourist_monument.p.16.png rename to app/assets/images/browse/tourist_monument.p.16.png diff --git a/public/images/browse/tourist_picnic.p.16.png b/app/assets/images/browse/tourist_picnic.p.16.png similarity index 100% rename from public/images/browse/tourist_picnic.p.16.png rename to app/assets/images/browse/tourist_picnic.p.16.png diff --git a/public/images/browse/tourist_ruin.p.16.png b/app/assets/images/browse/tourist_ruin.p.16.png similarity index 100% rename from public/images/browse/tourist_ruin.p.16.png rename to app/assets/images/browse/tourist_ruin.p.16.png diff --git a/public/images/browse/tourist_windmill.p.16.png b/app/assets/images/browse/tourist_windmill.p.16.png similarity index 100% rename from public/images/browse/tourist_windmill.p.16.png rename to app/assets/images/browse/tourist_windmill.p.16.png diff --git a/public/images/browse/tourist_wreck.p.16.png b/app/assets/images/browse/tourist_wreck.p.16.png similarity index 100% rename from public/images/browse/tourist_wreck.p.16.png rename to app/assets/images/browse/tourist_wreck.p.16.png diff --git a/public/images/browse/traffic_light.png b/app/assets/images/browse/traffic_light.png similarity index 100% rename from public/images/browse/traffic_light.png rename to app/assets/images/browse/traffic_light.png diff --git a/public/images/browse/tram.20.png b/app/assets/images/browse/tram.20.png similarity index 100% rename from public/images/browse/tram.20.png rename to app/assets/images/browse/tram.20.png diff --git a/public/images/browse/transport_parking_bicycle.p.16.png b/app/assets/images/browse/transport_parking_bicycle.p.16.png similarity index 100% rename from public/images/browse/transport_parking_bicycle.p.16.png rename to app/assets/images/browse/transport_parking_bicycle.p.16.png diff --git a/public/images/browse/transport_rental_bicycle.p.16.png b/app/assets/images/browse/transport_rental_bicycle.p.16.png similarity index 100% rename from public/images/browse/transport_rental_bicycle.p.16.png rename to app/assets/images/browse/transport_rental_bicycle.p.16.png diff --git a/public/images/browse/transport_rental_car.p.16.png b/app/assets/images/browse/transport_rental_car.p.16.png similarity index 100% rename from public/images/browse/transport_rental_car.p.16.png rename to app/assets/images/browse/transport_rental_car.p.16.png diff --git a/public/images/browse/tree.p.16.png b/app/assets/images/browse/tree.p.16.png similarity index 100% rename from public/images/browse/tree.p.16.png rename to app/assets/images/browse/tree.p.16.png diff --git a/public/images/browse/trunk.20.png b/app/assets/images/browse/trunk.20.png similarity index 100% rename from public/images/browse/trunk.20.png rename to app/assets/images/browse/trunk.20.png diff --git a/public/images/browse/tunnel.20.png b/app/assets/images/browse/tunnel.20.png similarity index 100% rename from public/images/browse/tunnel.20.png rename to app/assets/images/browse/tunnel.20.png diff --git a/public/images/browse/turning_circle.p.16.png b/app/assets/images/browse/turning_circle.p.16.png similarity index 100% rename from public/images/browse/turning_circle.p.16.png rename to app/assets/images/browse/turning_circle.p.16.png diff --git a/public/images/browse/unclassified.20.png b/app/assets/images/browse/unclassified.20.png similarity index 100% rename from public/images/browse/unclassified.20.png rename to app/assets/images/browse/unclassified.20.png diff --git a/public/images/browse/view_point.p.16.png b/app/assets/images/browse/view_point.p.16.png similarity index 100% rename from public/images/browse/view_point.p.16.png rename to app/assets/images/browse/view_point.p.16.png diff --git a/public/images/browse/wood.png b/app/assets/images/browse/wood.png similarity index 100% rename from public/images/browse/wood.png rename to app/assets/images/browse/wood.png diff --git a/public/images/cc_button.png b/app/assets/images/cc_button.png similarity index 100% rename from public/images/cc_button.png rename to app/assets/images/cc_button.png diff --git a/public/images/google.png b/app/assets/images/google.png similarity index 100% rename from public/images/google.png rename to app/assets/images/google.png diff --git a/public/images/key/mapnik/admin.png b/app/assets/images/key/mapnik/admin.png similarity index 100% rename from public/images/key/mapnik/admin.png rename to app/assets/images/key/mapnik/admin.png diff --git a/public/images/key/mapnik/allotments.png b/app/assets/images/key/mapnik/allotments.png similarity index 100% rename from public/images/key/mapnik/allotments.png rename to app/assets/images/key/mapnik/allotments.png diff --git a/public/images/key/mapnik/apron.png b/app/assets/images/key/mapnik/apron.png similarity index 100% rename from public/images/key/mapnik/apron.png rename to app/assets/images/key/mapnik/apron.png diff --git a/public/images/key/mapnik/bridge.png b/app/assets/images/key/mapnik/bridge.png similarity index 100% rename from public/images/key/mapnik/bridge.png rename to app/assets/images/key/mapnik/bridge.png diff --git a/public/images/key/mapnik/bridleway.png b/app/assets/images/key/mapnik/bridleway.png similarity index 100% rename from public/images/key/mapnik/bridleway.png rename to app/assets/images/key/mapnik/bridleway.png diff --git a/public/images/key/mapnik/brownfield.png b/app/assets/images/key/mapnik/brownfield.png similarity index 100% rename from public/images/key/mapnik/brownfield.png rename to app/assets/images/key/mapnik/brownfield.png diff --git a/public/images/key/mapnik/building.png b/app/assets/images/key/mapnik/building.png similarity index 100% rename from public/images/key/mapnik/building.png rename to app/assets/images/key/mapnik/building.png diff --git a/public/images/key/mapnik/byway.png b/app/assets/images/key/mapnik/byway.png similarity index 100% rename from public/images/key/mapnik/byway.png rename to app/assets/images/key/mapnik/byway.png diff --git a/public/images/key/mapnik/cable.png b/app/assets/images/key/mapnik/cable.png similarity index 100% rename from public/images/key/mapnik/cable.png rename to app/assets/images/key/mapnik/cable.png diff --git a/public/images/key/mapnik/cemetery.png b/app/assets/images/key/mapnik/cemetery.png similarity index 100% rename from public/images/key/mapnik/cemetery.png rename to app/assets/images/key/mapnik/cemetery.png diff --git a/public/images/key/mapnik/centre.png b/app/assets/images/key/mapnik/centre.png similarity index 100% rename from public/images/key/mapnik/centre.png rename to app/assets/images/key/mapnik/centre.png diff --git a/public/images/key/mapnik/commercial.png b/app/assets/images/key/mapnik/commercial.png similarity index 100% rename from public/images/key/mapnik/commercial.png rename to app/assets/images/key/mapnik/commercial.png diff --git a/public/images/key/mapnik/common.png b/app/assets/images/key/mapnik/common.png similarity index 100% rename from public/images/key/mapnik/common.png rename to app/assets/images/key/mapnik/common.png diff --git a/public/images/key/mapnik/construction.png b/app/assets/images/key/mapnik/construction.png similarity index 100% rename from public/images/key/mapnik/construction.png rename to app/assets/images/key/mapnik/construction.png diff --git a/public/images/key/mapnik/cycleway.png b/app/assets/images/key/mapnik/cycleway.png similarity index 100% rename from public/images/key/mapnik/cycleway.png rename to app/assets/images/key/mapnik/cycleway.png diff --git a/public/images/key/mapnik/destination.png b/app/assets/images/key/mapnik/destination.png similarity index 100% rename from public/images/key/mapnik/destination.png rename to app/assets/images/key/mapnik/destination.png diff --git a/public/images/key/mapnik/farm.png b/app/assets/images/key/mapnik/farm.png similarity index 100% rename from public/images/key/mapnik/farm.png rename to app/assets/images/key/mapnik/farm.png diff --git a/public/images/key/mapnik/footway.png b/app/assets/images/key/mapnik/footway.png similarity index 100% rename from public/images/key/mapnik/footway.png rename to app/assets/images/key/mapnik/footway.png diff --git a/public/images/key/mapnik/forest.png b/app/assets/images/key/mapnik/forest.png similarity index 100% rename from public/images/key/mapnik/forest.png rename to app/assets/images/key/mapnik/forest.png diff --git a/public/images/key/mapnik/golf.png b/app/assets/images/key/mapnik/golf.png similarity index 100% rename from public/images/key/mapnik/golf.png rename to app/assets/images/key/mapnik/golf.png diff --git a/public/images/key/mapnik/heathland.png b/app/assets/images/key/mapnik/heathland.png similarity index 100% rename from public/images/key/mapnik/heathland.png rename to app/assets/images/key/mapnik/heathland.png diff --git a/public/images/key/mapnik/industrial.png b/app/assets/images/key/mapnik/industrial.png similarity index 100% rename from public/images/key/mapnik/industrial.png rename to app/assets/images/key/mapnik/industrial.png diff --git a/public/images/key/mapnik/lake.png b/app/assets/images/key/mapnik/lake.png similarity index 100% rename from public/images/key/mapnik/lake.png rename to app/assets/images/key/mapnik/lake.png diff --git a/public/images/key/mapnik/military.png b/app/assets/images/key/mapnik/military.png similarity index 100% rename from public/images/key/mapnik/military.png rename to app/assets/images/key/mapnik/military.png diff --git a/public/images/key/mapnik/motorway.png b/app/assets/images/key/mapnik/motorway.png similarity index 100% rename from public/images/key/mapnik/motorway.png rename to app/assets/images/key/mapnik/motorway.png diff --git a/public/images/key/mapnik/park.png b/app/assets/images/key/mapnik/park.png similarity index 100% rename from public/images/key/mapnik/park.png rename to app/assets/images/key/mapnik/park.png diff --git a/public/images/key/mapnik/permissive.png b/app/assets/images/key/mapnik/permissive.png similarity index 100% rename from public/images/key/mapnik/permissive.png rename to app/assets/images/key/mapnik/permissive.png diff --git a/public/images/key/mapnik/pitch.png b/app/assets/images/key/mapnik/pitch.png similarity index 100% rename from public/images/key/mapnik/pitch.png rename to app/assets/images/key/mapnik/pitch.png diff --git a/public/images/key/mapnik/primary.png b/app/assets/images/key/mapnik/primary.png similarity index 100% rename from public/images/key/mapnik/primary.png rename to app/assets/images/key/mapnik/primary.png diff --git a/public/images/key/mapnik/primary12.png b/app/assets/images/key/mapnik/primary12.png similarity index 100% rename from public/images/key/mapnik/primary12.png rename to app/assets/images/key/mapnik/primary12.png diff --git a/public/images/key/mapnik/private.png b/app/assets/images/key/mapnik/private.png similarity index 100% rename from public/images/key/mapnik/private.png rename to app/assets/images/key/mapnik/private.png diff --git a/public/images/key/mapnik/rail.png b/app/assets/images/key/mapnik/rail.png similarity index 100% rename from public/images/key/mapnik/rail.png rename to app/assets/images/key/mapnik/rail.png diff --git a/public/images/key/mapnik/rail13.png b/app/assets/images/key/mapnik/rail13.png similarity index 100% rename from public/images/key/mapnik/rail13.png rename to app/assets/images/key/mapnik/rail13.png diff --git a/public/images/key/mapnik/reserve.png b/app/assets/images/key/mapnik/reserve.png similarity index 100% rename from public/images/key/mapnik/reserve.png rename to app/assets/images/key/mapnik/reserve.png diff --git a/public/images/key/mapnik/resident.png b/app/assets/images/key/mapnik/resident.png similarity index 100% rename from public/images/key/mapnik/resident.png rename to app/assets/images/key/mapnik/resident.png diff --git a/public/images/key/mapnik/retail.png b/app/assets/images/key/mapnik/retail.png similarity index 100% rename from public/images/key/mapnik/retail.png rename to app/assets/images/key/mapnik/retail.png diff --git a/public/images/key/mapnik/runway.png b/app/assets/images/key/mapnik/runway.png similarity index 100% rename from public/images/key/mapnik/runway.png rename to app/assets/images/key/mapnik/runway.png diff --git a/public/images/key/mapnik/school.png b/app/assets/images/key/mapnik/school.png similarity index 100% rename from public/images/key/mapnik/school.png rename to app/assets/images/key/mapnik/school.png diff --git a/public/images/key/mapnik/secondary.png b/app/assets/images/key/mapnik/secondary.png similarity index 100% rename from public/images/key/mapnik/secondary.png rename to app/assets/images/key/mapnik/secondary.png diff --git a/public/images/key/mapnik/secondary12.png b/app/assets/images/key/mapnik/secondary12.png similarity index 100% rename from public/images/key/mapnik/secondary12.png rename to app/assets/images/key/mapnik/secondary12.png diff --git a/public/images/key/mapnik/station.png b/app/assets/images/key/mapnik/station.png similarity index 100% rename from public/images/key/mapnik/station.png rename to app/assets/images/key/mapnik/station.png diff --git a/public/images/key/mapnik/subway.png b/app/assets/images/key/mapnik/subway.png similarity index 100% rename from public/images/key/mapnik/subway.png rename to app/assets/images/key/mapnik/subway.png diff --git a/public/images/key/mapnik/summit.png b/app/assets/images/key/mapnik/summit.png similarity index 100% rename from public/images/key/mapnik/summit.png rename to app/assets/images/key/mapnik/summit.png diff --git a/public/images/key/mapnik/tourist.png b/app/assets/images/key/mapnik/tourist.png similarity index 100% rename from public/images/key/mapnik/tourist.png rename to app/assets/images/key/mapnik/tourist.png diff --git a/public/images/key/mapnik/track.png b/app/assets/images/key/mapnik/track.png similarity index 100% rename from public/images/key/mapnik/track.png rename to app/assets/images/key/mapnik/track.png diff --git a/public/images/key/mapnik/tram.png b/app/assets/images/key/mapnik/tram.png similarity index 100% rename from public/images/key/mapnik/tram.png rename to app/assets/images/key/mapnik/tram.png diff --git a/public/images/key/mapnik/trunk.png b/app/assets/images/key/mapnik/trunk.png similarity index 100% rename from public/images/key/mapnik/trunk.png rename to app/assets/images/key/mapnik/trunk.png diff --git a/public/images/key/mapnik/trunk12.png b/app/assets/images/key/mapnik/trunk12.png similarity index 100% rename from public/images/key/mapnik/trunk12.png rename to app/assets/images/key/mapnik/trunk12.png diff --git a/public/images/key/mapnik/tunnel.png b/app/assets/images/key/mapnik/tunnel.png similarity index 100% rename from public/images/key/mapnik/tunnel.png rename to app/assets/images/key/mapnik/tunnel.png diff --git a/public/images/key/mapnik/unclassified.png b/app/assets/images/key/mapnik/unclassified.png similarity index 100% rename from public/images/key/mapnik/unclassified.png rename to app/assets/images/key/mapnik/unclassified.png diff --git a/public/images/key/mapnik/unclassified13.png b/app/assets/images/key/mapnik/unclassified13.png similarity index 100% rename from public/images/key/mapnik/unclassified13.png rename to app/assets/images/key/mapnik/unclassified13.png diff --git a/public/images/key/mapnik/unsurfaced.png b/app/assets/images/key/mapnik/unsurfaced.png similarity index 100% rename from public/images/key/mapnik/unsurfaced.png rename to app/assets/images/key/mapnik/unsurfaced.png diff --git a/public/images/key/mapnik/wood.png b/app/assets/images/key/mapnik/wood.png similarity index 100% rename from public/images/key/mapnik/wood.png rename to app/assets/images/key/mapnik/wood.png diff --git a/public/images/key/osmarender/admin.png b/app/assets/images/key/osmarender/admin.png similarity index 100% rename from public/images/key/osmarender/admin.png rename to app/assets/images/key/osmarender/admin.png diff --git a/public/images/key/osmarender/allotments.png b/app/assets/images/key/osmarender/allotments.png similarity index 100% rename from public/images/key/osmarender/allotments.png rename to app/assets/images/key/osmarender/allotments.png diff --git a/public/images/key/osmarender/bridleway.png b/app/assets/images/key/osmarender/bridleway.png similarity index 100% rename from public/images/key/osmarender/bridleway.png rename to app/assets/images/key/osmarender/bridleway.png diff --git a/public/images/key/osmarender/brownfield.png b/app/assets/images/key/osmarender/brownfield.png similarity index 100% rename from public/images/key/osmarender/brownfield.png rename to app/assets/images/key/osmarender/brownfield.png diff --git a/public/images/key/osmarender/building.png b/app/assets/images/key/osmarender/building.png similarity index 100% rename from public/images/key/osmarender/building.png rename to app/assets/images/key/osmarender/building.png diff --git a/public/images/key/osmarender/byway.png b/app/assets/images/key/osmarender/byway.png similarity index 100% rename from public/images/key/osmarender/byway.png rename to app/assets/images/key/osmarender/byway.png diff --git a/public/images/key/osmarender/cemetery.png b/app/assets/images/key/osmarender/cemetery.png similarity index 100% rename from public/images/key/osmarender/cemetery.png rename to app/assets/images/key/osmarender/cemetery.png diff --git a/public/images/key/osmarender/centre.png b/app/assets/images/key/osmarender/centre.png similarity index 100% rename from public/images/key/osmarender/centre.png rename to app/assets/images/key/osmarender/centre.png diff --git a/public/images/key/osmarender/commercial.png b/app/assets/images/key/osmarender/commercial.png similarity index 100% rename from public/images/key/osmarender/commercial.png rename to app/assets/images/key/osmarender/commercial.png diff --git a/public/images/key/osmarender/common.png b/app/assets/images/key/osmarender/common.png similarity index 100% rename from public/images/key/osmarender/common.png rename to app/assets/images/key/osmarender/common.png diff --git a/public/images/key/osmarender/cycleway.png b/app/assets/images/key/osmarender/cycleway.png similarity index 100% rename from public/images/key/osmarender/cycleway.png rename to app/assets/images/key/osmarender/cycleway.png diff --git a/public/images/key/osmarender/farm.png b/app/assets/images/key/osmarender/farm.png similarity index 100% rename from public/images/key/osmarender/farm.png rename to app/assets/images/key/osmarender/farm.png diff --git a/public/images/key/osmarender/footway.png b/app/assets/images/key/osmarender/footway.png similarity index 100% rename from public/images/key/osmarender/footway.png rename to app/assets/images/key/osmarender/footway.png diff --git a/public/images/key/osmarender/forest.png b/app/assets/images/key/osmarender/forest.png similarity index 100% rename from public/images/key/osmarender/forest.png rename to app/assets/images/key/osmarender/forest.png diff --git a/public/images/key/osmarender/heathland.png b/app/assets/images/key/osmarender/heathland.png similarity index 100% rename from public/images/key/osmarender/heathland.png rename to app/assets/images/key/osmarender/heathland.png diff --git a/public/images/key/osmarender/industrial.png b/app/assets/images/key/osmarender/industrial.png similarity index 100% rename from public/images/key/osmarender/industrial.png rename to app/assets/images/key/osmarender/industrial.png diff --git a/public/images/key/osmarender/lake.png b/app/assets/images/key/osmarender/lake.png similarity index 100% rename from public/images/key/osmarender/lake.png rename to app/assets/images/key/osmarender/lake.png diff --git a/public/images/key/osmarender/mapkey.png b/app/assets/images/key/osmarender/mapkey.png similarity index 100% rename from public/images/key/osmarender/mapkey.png rename to app/assets/images/key/osmarender/mapkey.png diff --git a/public/images/key/osmarender/military.png b/app/assets/images/key/osmarender/military.png similarity index 100% rename from public/images/key/osmarender/military.png rename to app/assets/images/key/osmarender/military.png diff --git a/public/images/key/osmarender/motorway.png b/app/assets/images/key/osmarender/motorway.png similarity index 100% rename from public/images/key/osmarender/motorway.png rename to app/assets/images/key/osmarender/motorway.png diff --git a/public/images/key/osmarender/park.png b/app/assets/images/key/osmarender/park.png similarity index 100% rename from public/images/key/osmarender/park.png rename to app/assets/images/key/osmarender/park.png diff --git a/public/images/key/osmarender/pitch.png b/app/assets/images/key/osmarender/pitch.png similarity index 100% rename from public/images/key/osmarender/pitch.png rename to app/assets/images/key/osmarender/pitch.png diff --git a/public/images/key/osmarender/primary.png b/app/assets/images/key/osmarender/primary.png similarity index 100% rename from public/images/key/osmarender/primary.png rename to app/assets/images/key/osmarender/primary.png diff --git a/public/images/key/osmarender/rail.png b/app/assets/images/key/osmarender/rail.png similarity index 100% rename from public/images/key/osmarender/rail.png rename to app/assets/images/key/osmarender/rail.png diff --git a/public/images/key/osmarender/reserve.png b/app/assets/images/key/osmarender/reserve.png similarity index 100% rename from public/images/key/osmarender/reserve.png rename to app/assets/images/key/osmarender/reserve.png diff --git a/public/images/key/osmarender/resident.png b/app/assets/images/key/osmarender/resident.png similarity index 100% rename from public/images/key/osmarender/resident.png rename to app/assets/images/key/osmarender/resident.png diff --git a/public/images/key/osmarender/retail.png b/app/assets/images/key/osmarender/retail.png similarity index 100% rename from public/images/key/osmarender/retail.png rename to app/assets/images/key/osmarender/retail.png diff --git a/public/images/key/osmarender/school.png b/app/assets/images/key/osmarender/school.png similarity index 100% rename from public/images/key/osmarender/school.png rename to app/assets/images/key/osmarender/school.png diff --git a/public/images/key/osmarender/secondary.png b/app/assets/images/key/osmarender/secondary.png similarity index 100% rename from public/images/key/osmarender/secondary.png rename to app/assets/images/key/osmarender/secondary.png diff --git a/public/images/key/osmarender/station.png b/app/assets/images/key/osmarender/station.png similarity index 100% rename from public/images/key/osmarender/station.png rename to app/assets/images/key/osmarender/station.png diff --git a/public/images/key/osmarender/subway.png b/app/assets/images/key/osmarender/subway.png similarity index 100% rename from public/images/key/osmarender/subway.png rename to app/assets/images/key/osmarender/subway.png diff --git a/public/images/key/osmarender/summit.png b/app/assets/images/key/osmarender/summit.png similarity index 100% rename from public/images/key/osmarender/summit.png rename to app/assets/images/key/osmarender/summit.png diff --git a/public/images/key/osmarender/tourist.png b/app/assets/images/key/osmarender/tourist.png similarity index 100% rename from public/images/key/osmarender/tourist.png rename to app/assets/images/key/osmarender/tourist.png diff --git a/public/images/key/osmarender/track.png b/app/assets/images/key/osmarender/track.png similarity index 100% rename from public/images/key/osmarender/track.png rename to app/assets/images/key/osmarender/track.png diff --git a/public/images/key/osmarender/tram.png b/app/assets/images/key/osmarender/tram.png similarity index 100% rename from public/images/key/osmarender/tram.png rename to app/assets/images/key/osmarender/tram.png diff --git a/public/images/key/osmarender/trunk.png b/app/assets/images/key/osmarender/trunk.png similarity index 100% rename from public/images/key/osmarender/trunk.png rename to app/assets/images/key/osmarender/trunk.png diff --git a/public/images/key/osmarender/unsurfaced.png b/app/assets/images/key/osmarender/unsurfaced.png similarity index 100% rename from public/images/key/osmarender/unsurfaced.png rename to app/assets/images/key/osmarender/unsurfaced.png diff --git a/public/images/key/osmarender/wood.png b/app/assets/images/key/osmarender/wood.png similarity index 100% rename from public/images/key/osmarender/wood.png rename to app/assets/images/key/osmarender/wood.png diff --git a/public/images/mag_map-rss2.0.png b/app/assets/images/mag_map-rss2.0.png similarity index 100% rename from public/images/mag_map-rss2.0.png rename to app/assets/images/mag_map-rss2.0.png diff --git a/public/images/map_zoomin.png b/app/assets/images/map_zoomin.png similarity index 100% rename from public/images/map_zoomin.png rename to app/assets/images/map_zoomin.png diff --git a/public/images/map_zoomout.png b/app/assets/images/map_zoomout.png similarity index 100% rename from public/images/map_zoomout.png rename to app/assets/images/map_zoomout.png diff --git a/public/images/myopenid.png b/app/assets/images/myopenid.png similarity index 100% rename from public/images/myopenid.png rename to app/assets/images/myopenid.png diff --git a/public/images/new.png b/app/assets/images/new.png similarity index 100% rename from public/images/new.png rename to app/assets/images/new.png diff --git a/public/images/openid.png b/app/assets/images/openid.png similarity index 100% rename from public/images/openid.png rename to app/assets/images/openid.png diff --git a/public/images/openid_input.png b/app/assets/images/openid_input.png similarity index 100% rename from public/images/openid_input.png rename to app/assets/images/openid_input.png diff --git a/public/images/openid_small.png b/app/assets/images/openid_small.png similarity index 100% rename from public/images/openid_small.png rename to app/assets/images/openid_small.png diff --git a/public/images/osm_logo.png b/app/assets/images/osm_logo.png similarity index 100% rename from public/images/osm_logo.png rename to app/assets/images/osm_logo.png diff --git a/public/images/osm_logo.svg b/app/assets/images/osm_logo.svg similarity index 100% rename from public/images/osm_logo.svg rename to app/assets/images/osm_logo.svg diff --git a/public/images/roles/administrator.png b/app/assets/images/roles/administrator.png similarity index 100% rename from public/images/roles/administrator.png rename to app/assets/images/roles/administrator.png diff --git a/public/images/roles/blank_administrator.png b/app/assets/images/roles/blank_administrator.png similarity index 100% rename from public/images/roles/blank_administrator.png rename to app/assets/images/roles/blank_administrator.png diff --git a/public/images/roles/blank_moderator.png b/app/assets/images/roles/blank_moderator.png similarity index 100% rename from public/images/roles/blank_moderator.png rename to app/assets/images/roles/blank_moderator.png diff --git a/public/images/roles/moderator.png b/app/assets/images/roles/moderator.png similarity index 100% rename from public/images/roles/moderator.png rename to app/assets/images/roles/moderator.png diff --git a/public/images/searching.gif b/app/assets/images/searching.gif similarity index 100% rename from public/images/searching.gif rename to app/assets/images/searching.gif diff --git a/public/images/sotm.png b/app/assets/images/sotm.png similarity index 100% rename from public/images/sotm.png rename to app/assets/images/sotm.png diff --git a/public/images/tab_bottom.gif b/app/assets/images/tab_bottom.gif similarity index 100% rename from public/images/tab_bottom.gif rename to app/assets/images/tab_bottom.gif diff --git a/public/images/wordpress.png b/app/assets/images/wordpress.png similarity index 100% rename from public/images/wordpress.png rename to app/assets/images/wordpress.png diff --git a/public/images/yahoo.png b/app/assets/images/yahoo.png similarity index 100% rename from public/images/yahoo.png rename to app/assets/images/yahoo.png diff --git a/public/javascripts/map.js b/app/assets/javascripts/map.js similarity index 100% rename from public/javascripts/map.js rename to app/assets/javascripts/map.js diff --git a/public/javascripts/menu.js b/app/assets/javascripts/menu.js similarity index 100% rename from public/javascripts/menu.js rename to app/assets/javascripts/menu.js diff --git a/public/javascripts/pngfix.js b/app/assets/javascripts/pngfix.js similarity index 100% rename from public/javascripts/pngfix.js rename to app/assets/javascripts/pngfix.js diff --git a/public/javascripts/site.js b/app/assets/javascripts/site.js similarity index 98% rename from public/javascripts/site.js rename to app/assets/javascripts/site.js index 813b3ae92..be16dd059 100644 --- a/public/javascripts/site.js +++ b/app/assets/javascripts/site.js @@ -1,3 +1,9 @@ +//= require prototype +//= require prototype_ujs +//= require effects +//= require dragdrop +//= require controls + /* * Called as the user scrolls/zooms around to aniplate hrefs of the * view tab and various other links diff --git a/public/javascripts/swfobject.js b/app/assets/javascripts/swfobject.js similarity index 100% rename from public/javascripts/swfobject.js rename to app/assets/javascripts/swfobject.js diff --git a/app/assets/stylesheets/browse.css.scss b/app/assets/stylesheets/browse.css.scss new file mode 100644 index 000000000..dd1bf30c2 --- /dev/null +++ b/app/assets/stylesheets/browse.css.scss @@ -0,0 +1,143 @@ +.node { padding-left: 25px; } +.way { padding-left: 25px; } +.relation { padding-left: 25px; } + +.deleted { text-decoration: line-through; } + +/* Nodes (and ways as areas) */ + +.aeroway.aerodrome { background: image-url('browse/aerodrome.p.16.png') no-repeat center left; } + +.amenity.atm { background: image-url('browse/atm2.p.16.png') no-repeat center left; } +.amenity.bank { background: image-url('browse/bank2.p.16.png') no-repeat center left; } +.amenity.bar { background: image-url('browse/bar.p.16.png') no-repeat center left; } +.amenity.bicycle_parking { background: image-url('browse/transport_parking_bicycle.p.16.png') no-repeat center left; } +.amenity.bicycle_rental { background: image-url('browse/transport_rental_bicycle.p.16.png') no-repeat center left; } +.amenity.bus_station { background: image-url('browse/bus_station.n.16.png') no-repeat center left; } +.amenity.cafe { background: image-url('browse/cafe.p.16.png') no-repeat center left; } +.amenity.car_rental { background: image-url('browse/transport_rental_car.p.16.png') no-repeat center left; } +.amenity.car_sharing { background: image-url('browse/car_share.p.16.png') no-repeat center left; } +.amenity.cinema { background: image-url('browse/cinema.p.16.png') no-repeat center left; } +.amenity.dentist { background: image-url('browse/health_dentist.p.16.png') no-repeat center left; } +.amenity.doctors { background: image-url('browse/health_doctors.p.16.png') no-repeat center left; } +.amenity.drinking_water { background: image-url('browse/drinkingtap.p.16.png') no-repeat center left; } +.amenity.fast_food { background: image-url('browse/fast_food.p.16.png') no-repeat center left; } +.amenity.fire_station { background: image-url('browse/firestation.p.16.png') no-repeat center left; } +.amenity.fuel { background: image-url('browse/fuel.p.16.png') no-repeat center left; } +.amenity.hospital { background: image-url('browse/hospital.p.16.png') no-repeat center left; } +.amenity.library { background: image-url('browse/library.p.16.png') no-repeat center left; } +.amenity.nursery { background: image-url('browse/education_nursery.p.16.png') no-repeat center left; } +.amenity.parking { background: image-url('browse/parking.p.16.png') no-repeat center left; } +.amenity.pharmacy { background: image-url('browse/pharmacy.p.16.png') no-repeat center left; } +.amenity.place_of_worship { background: image-url('browse/place_of_worship_unknown3.p.16.png') no-repeat center left; } +.amenity.police { background: image-url('browse/police.p.16.png') no-repeat center left; } +.amenity.post_box { background: image-url('browse/post_box.p.16.png') no-repeat center left; } +.amenity.post_office { background: image-url('browse/post_office.p.16.png') no-repeat center left; } +.amenity.prison { background: image-url('browse/prison.p.16.png') no-repeat center left; } +.amenity.pub { background: image-url('browse/pub.p.16.png') no-repeat center left; } +.amenity.restaurant { background: image-url('browse/restaurant.p.16.png') no-repeat center left; } +.amenity.recycling { background: image-url('browse/recycling.p.16.png') no-repeat center left; } +.amenity.school { background: image-url('browse/education_school.p.16.png') no-repeat center left; } +.amenity.shelter { background: image-url('browse/shelter2.p.16.png') no-repeat center left; } +.amenity.telephone { background: image-url('browse/telephone.p.16.png') no-repeat center left; } +.amenity.theatre { background: image-url('browse/theatre.p.16.png') no-repeat center left; } +.amenity.toilets { background: image-url('browse/toilets.p.16.png') no-repeat center left; } +.amenity.university { background: image-url('browse/education_university.p.16.png') no-repeat center left; } +.amenity.veterinary { background: image-url('browse/health_veterinary.p.16.png') no-repeat center left; } + +.barrier.gate { background: image-url('browse/gate2.p.16.png') no-repeat center left; } + +.highway.bus_stop { background: image-url('browse/bus_stop.p.16.png') no-repeat center left; } +.highway.mini_roundabout { background: image-url('browse/mini_round.p.16.png') no-repeat center left; } +.highway.traffic_signals { background: image-url('browse/traffic_light.png') no-repeat center left; } +.highway.turning_circle { background: image-url('browse/turning_circle.p.16.png') no-repeat center left; } + +.historic.castle { background: image-url('browse/tourist_castle.p.16.png') no-repeat center left; } +.historic.memorial { background: image-url('browse/tourist_memorial.p.16.png') no-repeat center left; } +.historic.monument { background: image-url('browse/tourist_monument.p.16.png') no-repeat center left; } +.historic.ruins { background: image-url('browse/tourist_ruins.p.16.png') no-repeat center left; } +.historic.wreck { background: image-url('browse/tourist_wreck.p.16.png') no-repeat center left; } + +.man_made.lighthouse { background: image-url('browse/lighthouse.p.16.png') no-repeat center left; } +.man_made.windmill { background: image-url('browse/tourist_windmill.p.16.png') no-repeat center left; } + +.natural.tree { background: image-url('browse/tree.p.16.png') no-repeat center left; } + +.railway.halt { background: image-url('browse/halt.p.16.png') no-repeat center left; } +.railway.station { background: image-url('browse/station.p.16.png') no-repeat center left; } +.railway.level_crossing { background: image-url('browse/level_crossing.p.16.png') no-repeat center left; } + +.shop { background: image-url('browse/shop_convenience.p.16.png') no-repeat center left; } +.shop.bakery { background: image-url('browse/shop_bakery.p.16.png') no-repeat center left; } +.shop.bicycle { background: image-url('browse/shop_bicycle.p.16.png') no-repeat center left; } +.shop.books { background: image-url('browse/shop_books.p.16.png') no-repeat center left; } +.shop.butcher { background: image-url('browse/shop_butcher.p.16.png') no-repeat center left; } +.shop.clothes { background: image-url('browse/shop_clothes.p.16.png') no-repeat center left; } +.shop.convenience { background: image-url('browse/shop_convenience.p.16.png') no-repeat center left; } +.shop.diy { background: image-url('browse/shop_diy.p.16.png') no-repeat center left; } +.shop.estate_agent { background: image-url('browse/shop_estateagent2.p.16.png') no-repeat center left; } +.shop.fish { background: image-url('browse/shop_fish.p.16.png') no-repeat center left; } +.shop.garden_centre { background: image-url('browse/shop_garden_centre.p.16.png') no-repeat center left; } +.shop.gift { background: image-url('browse/shop_gift.p.16.png') no-repeat center left; } +.shop.greengrocer { background: image-url('browse/shop_greengrocer.p.16.png') no-repeat center left; } +.shop.hairdresser { background: image-url('browse/shop_hairdresser.p.16.png') no-repeat center left; } +.shop.jewelry { background: image-url('browse/shop_jewelry.p.16.png') no-repeat center left; } +.shop.supermarket { background: image-url('browse/shop_supermarket.p.16.png') no-repeat center left; } + +.tourism.alpine_hut { background: image-url('browse/alpinehut.p.16.png') no-repeat center left; } +.tourism.camp_site { background: image-url('browse/camping.n.16.png') no-repeat center left; } +.tourism.caravan_site { background: image-url('browse/caravan_park.n.16.png') no-repeat center left; } +.tourism.hostel { background: image-url('browse/hostel.p.16.png') no-repeat center left; } +.tourism.hotel { background: image-url('browse/hotel.p.16.png') no-repeat center left; } +.tourism.museum { background: image-url('browse/museum.p.16.png') no-repeat center left; } +.tourism.picnic_site { background: image-url('browse/tourist_picnic.p.16.png') no-repeat center left; } +.tourism.viewpoint { background: image-url('browse/view_point.p.16.png') no-repeat center left; } + +/* Ways */ + +.aeroway.runway { background: image-url('browse/runway.20.png') no-repeat center left; } +.aeroway.taxiway { background: image-url('browse/taxiway.20.png') no-repeat center left; } + +.building { background: image-url('browse/building.png') no-repeat center left; } + +.highway.bridleway { background: image-url('browse/bridleway.20.png') no-repeat center left; } +.highway.byway { background: image-url('browse/byway.20.png') no-repeat center left; } +.highway.cycleway { background: image-url('browse/cycleway.20.png') no-repeat center left; } +.highway.footway { background: image-url('browse/footway.20.png') no-repeat center left; } +.highway.motorway { background: image-url('browse/motorway.20.png') no-repeat center left; } +.highway.motorway_link { background: image-url('browse/motorway.20.png') no-repeat center left; } +.highway.pedestrian { background: image-url('browse/service.20.png') no-repeat center left; } +.highway.primary { background: image-url('browse/primary.20.png') no-repeat center left; } +.highway.primary_link { background: image-url('browse/primary.20.png') no-repeat center left; } +.highway.residential { background: image-url('browse/unclassified.20.png') no-repeat center left; } +.highway.secondary { background: image-url('browse/secondary.20.png') no-repeat center left; } +.highway.secondary_link { background: image-url('browse/secondary.20.png') no-repeat center left; } +.highway.service { background: image-url('browse/service.20.png') no-repeat center left; } +.highway.trunk { background: image-url('browse/trunk.20.png') no-repeat center left; } +.highway.trunk_link { background: image-url('browse/trunk.20.png') no-repeat center left; } +.highway.unclassified { background: image-url('browse/unclassified.20.png') no-repeat center left; } + +.landuse.brownfield { background: image-url('browse/brownfield.png') no-repeat center left; } +.landuse.cemetery { background: image-url('browse/cemetery.png') no-repeat center left; } +.landuse.commercial { background: image-url('browse/commercial.png') no-repeat center left; } +.landuse.farm { background: image-url('browse/farm.png') no-repeat center left; } +.landuse.forest { background: image-url('browse/forest.png') no-repeat center left; } +.landuse.industrial { background: image-url('browse/industrial.png') no-repeat center left; } +.landuse.military { background: image-url('browse/military.png') no-repeat center left; } +.landuse.residential { background: image-url('browse/residential.png') no-repeat center left; } +.landuse.retail { background: image-url('browse/retail.png') no-repeat center left; } +.landuse.tourism { background: image-url('browse/tourism.png') no-repeat center left; } +.landuse.wood { background: image-url('browse/wood.png') no-repeat center left; } + +.leisure.golf_course { background: image-url('browse/golf.png') no-repeat center left; } +.leisure.park { background: image-url('browse/park.png') no-repeat center left; } +.leisure.pitch { background: image-url('browse/pitch.png') no-repeat center left; } +.leisure.nature_reserve { background: image-url('browse/reserve.png') no-repeat center left; } + +.natural.heath { background: image-url('browse/heathland.png') no-repeat center left; } +.natural.water { background: image-url('browse/lake.png') no-repeat center left; } + +.railway.light_rail { background: image-url('browse/light_rail.20.png') no-repeat center left; } +.railway.rail { background: image-url('browse/rail.20.png') no-repeat center left; } +.railway.subway { background: image-url('browse/subway.20.png') no-repeat center left; } +.railway.tram { background: image-url('browse/tram.20.png') no-repeat center left; } diff --git a/public/stylesheets/common.css b/app/assets/stylesheets/common.css.scss similarity index 99% rename from public/stylesheets/common.css rename to app/assets/stylesheets/common.css.scss index 974edac44..1c8f72c24 100644 --- a/public/stylesheets/common.css +++ b/app/assets/stylesheets/common.css.scss @@ -266,7 +266,7 @@ hr { height: 20px; margin: 0px; padding-top: 5px; - background: url('../images/tab_bottom.gif') repeat-x bottom; + background: image-url('tab_bottom.gif') repeat-x bottom; } #tabnav li @@ -320,7 +320,7 @@ hr { padding-top: 5px; font-size: 13px; line-height: 14px; - background: url('../images/tab_bottom.gif') repeat-x bottom; + background: image-url('tab_bottom.gif') repeat-x bottom; } .greeting-bar-unread { diff --git a/app/assets/stylesheets/large-ltr.css b/app/assets/stylesheets/large-ltr.css new file mode 100644 index 000000000..c28c0a5a0 --- /dev/null +++ b/app/assets/stylesheets/large-ltr.css @@ -0,0 +1,5 @@ +/* + *= require common + *= require large + *= require ltr + */ diff --git a/app/assets/stylesheets/large-rtl.css b/app/assets/stylesheets/large-rtl.css new file mode 100644 index 000000000..3ac337c18 --- /dev/null +++ b/app/assets/stylesheets/large-rtl.css @@ -0,0 +1,5 @@ +/* + *= require common + *= require large + *= require rtl + */ diff --git a/public/stylesheets/large.css b/app/assets/stylesheets/large.css similarity index 100% rename from public/stylesheets/large.css rename to app/assets/stylesheets/large.css diff --git a/public/stylesheets/ltr.css b/app/assets/stylesheets/ltr.css.scss similarity index 97% rename from public/stylesheets/ltr.css rename to app/assets/stylesheets/ltr.css.scss index fc7c04226..d557ba618 100644 --- a/public/stylesheets/ltr.css +++ b/app/assets/stylesheets/ltr.css.scss @@ -230,6 +230,6 @@ form#termsForm input#agree { } input.openid_url { - background: url('../images/openid_input.png') repeat-y left white; + background: image-url('openid_input.png') repeat-y left white; padding-left: 16px; } diff --git a/app/assets/stylesheets/print-ltr.css b/app/assets/stylesheets/print-ltr.css new file mode 100644 index 000000000..5f3ae8f7c --- /dev/null +++ b/app/assets/stylesheets/print-ltr.css @@ -0,0 +1,4 @@ +/* + *= require print + *= require ltr + */ diff --git a/app/assets/stylesheets/print-rtl.css b/app/assets/stylesheets/print-rtl.css new file mode 100644 index 000000000..5ef840645 --- /dev/null +++ b/app/assets/stylesheets/print-rtl.css @@ -0,0 +1,4 @@ +/* + *= require print + *= require rtl + */ diff --git a/public/stylesheets/print.css b/app/assets/stylesheets/print.css similarity index 100% rename from public/stylesheets/print.css rename to app/assets/stylesheets/print.css diff --git a/public/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css.scss similarity index 97% rename from public/stylesheets/rtl.css rename to app/assets/stylesheets/rtl.css.scss index d95600419..b4ae98dbc 100644 --- a/public/stylesheets/rtl.css +++ b/app/assets/stylesheets/rtl.css.scss @@ -231,6 +231,6 @@ form#termsForm input#agree { } input.openid_url { - background: url('../images/openid_input.png') repeat-y right white; + background: image-url('openid_input.png') repeat-y right white; padding-right: 16px; } diff --git a/app/assets/stylesheets/small-ltr.css b/app/assets/stylesheets/small-ltr.css new file mode 100644 index 000000000..532d9faae --- /dev/null +++ b/app/assets/stylesheets/small-ltr.css @@ -0,0 +1,5 @@ +/* + *= require common + *= require small + *= require ltr + */ diff --git a/app/assets/stylesheets/small-rtl.css b/app/assets/stylesheets/small-rtl.css new file mode 100644 index 000000000..26dac5dc7 --- /dev/null +++ b/app/assets/stylesheets/small-rtl.css @@ -0,0 +1,5 @@ +/* + *= require common + *= require small + *= require rtl + */ diff --git a/public/stylesheets/small.css b/app/assets/stylesheets/small.css.scss similarity index 98% rename from public/stylesheets/small.css rename to app/assets/stylesheets/small.css.scss index d0067a618..4b561349d 100644 --- a/public/stylesheets/small.css +++ b/app/assets/stylesheets/small.css.scss @@ -25,7 +25,7 @@ h1 { padding-left: 3px; padding-top: 5px; margin-top: 18px; - background: url('../images/tab_bottom.gif') repeat-x bottom; + background: image-url('tab_bottom.gif') repeat-x bottom; font-size: 10px; line-height: 10px; } diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 5dfc49aa0..e315ef373 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,17 +1,13 @@ <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'rails' %> - <%= javascript_include_tag 'site' %> - <%= javascript_include_tag 'menu' %> - - <%= stylesheet_link_tag 'common' %> - <%= stylesheet_link_tag t('html.dir') %> - - <%= stylesheet_link_tag 'small', :media => "only screen and (max-width:641px)" %> - <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 642px)" %> - <%= stylesheet_link_tag 'print', :media => "print" %> + <%= javascript_include_tag "site" %> + <%= javascript_include_tag "menu" %> + + <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %> + <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %> + <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %> + <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> diff --git a/config/application.rb b/config/application.rb index 040ce93e2..d257696fe 100644 --- a/config/application.rb +++ b/config/application.rb @@ -4,9 +4,12 @@ require File.expand_path('../preinitializer', __FILE__) require 'rails/all' -# If you have a Gemfile, require the gems listed there, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) if defined?(Bundler) +if defined?(Bundler) + # If you precompile assets before deploying to production, use this line + Bundler.require *Rails.groups(:assets => %w(development test)) + # If you want your assets lazily compiled in production, use this line + # Bundler.require(:default, :assets, Rails.env) +end module OpenStreetMap class Application < Rails::Application @@ -32,15 +35,18 @@ module OpenStreetMap # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - # JavaScript files you want as :defaults (application.js is always included). - # config.action_view.javascript_expansions[:defaults] = %w(jquery rails) - # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation] + # Enable the asset pipeline + config.assets.enabled = true + + # Version of your assets, change this if you want to expire all your assets + config.assets.version = '1.0' + # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types diff --git a/config/environments/development.rb b/config/environments/development.rb index 49d237870..12cf912bc 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -3,7 +3,7 @@ OpenStreetMap::Application.configure do # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development - # since you don't have to restart the webserver when you make code changes. + # since you don't have to restart the web server when you make code changes. config.cache_classes = false # Log error messages when you accidentally call methods on nil. @@ -11,7 +11,7 @@ OpenStreetMap::Application.configure do # Show full error reports and disable caching config.consider_all_requests_local = true - config.action_view.debug_rjs = true +# config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send @@ -22,5 +22,10 @@ OpenStreetMap::Application.configure do # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin -end + # Do not compress assets + config.assets.compress = false + + # Expands the lines which load the assets + config.assets.debug = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb index d33ada540..2e10a46a1 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,7 +1,6 @@ OpenStreetMap::Application.configure do # Settings specified here will take precedence over those in config/application.rb - # The production environment is meant for finished, "live" apps. # Code is not reloaded between requests config.cache_classes = true @@ -9,14 +8,27 @@ OpenStreetMap::Application.configure do config.consider_all_requests_local = false config.action_controller.perform_caching = true - # Specifies the header that your server uses for sending files - config.action_dispatch.x_sendfile_header = "X-Sendfile" + # Disable Rails's static asset server (Apache or nginx will already do this) + config.serve_static_assets = false + + # Compress JavaScripts and CSS + config.assets.compress = true + + # Don't fallback to assets pipeline if a precompiled asset is missed + config.assets.compile = false + + # Generate digests for assets URLs + config.assets.digest = true - # For nginx: - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' + # Defaults to Rails.root.join("public/assets") + # config.assets.manifest = YOUR_PATH - # If you have no front-end server that supports something like X-Sendfile, - # just comment this out and Rails will serve the files + # Specifies the header that your server uses for sending files + # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true # See everything in the log (default is :info) # config.log_level = :debug @@ -35,13 +47,15 @@ OpenStreetMap::Application.configure do config.cache_store = :mem_cache_store, MEMCACHE end - # Disable Rails's static asset server - # In production, Apache or nginx will already do this - config.serve_static_assets = false - - # Enable serving of images, stylesheets, and javascripts from an asset server + # Enable serving of images, stylesheets, and JavaScripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" + # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) + config.assets.precompile += %w( map.js menu.js pngfix.js site.js swfobject.js ) + config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) + config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) + config.assets.precompile += %w( browse.css ) + # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false diff --git a/config/environments/test.rb b/config/environments/test.rb index 802a77744..fe1d1aa78 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -7,7 +7,11 @@ OpenStreetMap::Application.configure do # and recreated between test runs. Don't rely on the data there! config.cache_classes = true - # Log error messages when you accidentally call methods on nil. + # Configure static asset server for tests with Cache-Control for performance + config.serve_static_assets = true + config.static_cache_control = "public, max-age=3600" + + # Log error messages when you accidentally call methods on nil config.whiny_nils = true # Show full error reports and disable caching @@ -27,4 +31,7 @@ OpenStreetMap::Application.configure do # Print deprecation notices to the stderr config.active_support.deprecation = :stderr + + # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets + config.assets.allow_debugging = true end diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..da4fb076f --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters :format => [:json] +end + +# Disable root element in JSON by default. +ActiveSupport.on_load(:active_record) do + self.include_root_in_json = false +end diff --git a/public/javascripts/application.js b/public/javascripts/application.js deleted file mode 100644 index fe4577696..000000000 --- a/public/javascripts/application.js +++ /dev/null @@ -1,2 +0,0 @@ -// Place your application-specific JavaScript functions and classes here -// This file is automatically included by javascript_include_tag :defaults diff --git a/public/javascripts/controls.js b/public/javascripts/controls.js deleted file mode 100644 index 7392fb664..000000000 --- a/public/javascripts/controls.js +++ /dev/null @@ -1,965 +0,0 @@ -// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 - -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan) -// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com) -// Contributors: -// Richard Livsey -// Rahul Bhargava -// Rob Wills -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -// Autocompleter.Base handles all the autocompletion functionality -// that's independent of the data source for autocompletion. This -// includes drawing the autocompletion menu, observing keyboard -// and mouse events, and similar. -// -// Specific autocompleters need to provide, at the very least, -// a getUpdatedChoices function that will be invoked every time -// the text inside the monitored textbox changes. This method -// should get the text for which to provide autocompletion by -// invoking this.getToken(), NOT by directly accessing -// this.element.value. This is to allow incremental tokenized -// autocompletion. Specific auto-completion logic (AJAX, etc) -// belongs in getUpdatedChoices. -// -// Tokenized incremental autocompletion is enabled automatically -// when an autocompleter is instantiated with the 'tokens' option -// in the options parameter, e.g.: -// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' }); -// will incrementally autocomplete with a comma as the token. -// Additionally, ',' in the above example can be replaced with -// a token array, e.g. { tokens: [',', '\n'] } which -// enables autocompletion on multiple tokens. This is most -// useful when one of the tokens is \n (a newline), as it -// allows smart autocompletion after linebreaks. - -if(typeof Effect == 'undefined') - throw("controls.js requires including script.aculo.us' effects.js library"); - -var Autocompleter = { }; -Autocompleter.Base = Class.create({ - baseInitialize: function(element, update, options) { - element = $(element); - this.element = element; - this.update = $(update); - this.hasFocus = false; - this.changed = false; - this.active = false; - this.index = 0; - this.entryCount = 0; - this.oldElementValue = this.element.value; - - if(this.setOptions) - this.setOptions(options); - else - this.options = options || { }; - - this.options.paramName = this.options.paramName || this.element.name; - this.options.tokens = this.options.tokens || []; - this.options.frequency = this.options.frequency || 0.4; - this.options.minChars = this.options.minChars || 1; - this.options.onShow = this.options.onShow || - function(element, update){ - if(!update.style.position || update.style.position=='absolute') { - update.style.position = 'absolute'; - Position.clone(element, update, { - setHeight: false, - offsetTop: element.offsetHeight - }); - } - Effect.Appear(update,{duration:0.15}); - }; - this.options.onHide = this.options.onHide || - function(element, update){ new Effect.Fade(update,{duration:0.15}) }; - - if(typeof(this.options.tokens) == 'string') - this.options.tokens = new Array(this.options.tokens); - // Force carriage returns as token delimiters anyway - if (!this.options.tokens.include('\n')) - this.options.tokens.push('\n'); - - this.observer = null; - - this.element.setAttribute('autocomplete','off'); - - Element.hide(this.update); - - Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this)); - Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this)); - }, - - show: function() { - if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); - if(!this.iefix && - (Prototype.Browser.IE) && - (Element.getStyle(this.update, 'position')=='absolute')) { - new Insertion.After(this.update, - ''); - this.iefix = $(this.update.id+'_iefix'); - } - if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); - }, - - fixIEOverlapping: function() { - Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); - this.iefix.style.zIndex = 1; - this.update.style.zIndex = 2; - Element.show(this.iefix); - }, - - hide: function() { - this.stopIndicator(); - if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update); - if(this.iefix) Element.hide(this.iefix); - }, - - startIndicator: function() { - if(this.options.indicator) Element.show(this.options.indicator); - }, - - stopIndicator: function() { - if(this.options.indicator) Element.hide(this.options.indicator); - }, - - onKeyPress: function(event) { - if(this.active) - switch(event.keyCode) { - case Event.KEY_TAB: - case Event.KEY_RETURN: - this.selectEntry(); - Event.stop(event); - case Event.KEY_ESC: - this.hide(); - this.active = false; - Event.stop(event); - return; - case Event.KEY_LEFT: - case Event.KEY_RIGHT: - return; - case Event.KEY_UP: - this.markPrevious(); - this.render(); - Event.stop(event); - return; - case Event.KEY_DOWN: - this.markNext(); - this.render(); - Event.stop(event); - return; - } - else - if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || - (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return; - - this.changed = true; - this.hasFocus = true; - - if(this.observer) clearTimeout(this.observer); - this.observer = - setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); - }, - - activate: function() { - this.changed = false; - this.hasFocus = true; - this.getUpdatedChoices(); - }, - - onHover: function(event) { - var element = Event.findElement(event, 'LI'); - if(this.index != element.autocompleteIndex) - { - this.index = element.autocompleteIndex; - this.render(); - } - Event.stop(event); - }, - - onClick: function(event) { - var element = Event.findElement(event, 'LI'); - this.index = element.autocompleteIndex; - this.selectEntry(); - this.hide(); - }, - - onBlur: function(event) { - // needed to make click events working - setTimeout(this.hide.bind(this), 250); - this.hasFocus = false; - this.active = false; - }, - - render: function() { - if(this.entryCount > 0) { - for (var i = 0; i < this.entryCount; i++) - this.index==i ? - Element.addClassName(this.getEntry(i),"selected") : - Element.removeClassName(this.getEntry(i),"selected"); - if(this.hasFocus) { - this.show(); - this.active = true; - } - } else { - this.active = false; - this.hide(); - } - }, - - markPrevious: function() { - if(this.index > 0) this.index--; - else this.index = this.entryCount-1; - this.getEntry(this.index).scrollIntoView(true); - }, - - markNext: function() { - if(this.index < this.entryCount-1) this.index++; - else this.index = 0; - this.getEntry(this.index).scrollIntoView(false); - }, - - getEntry: function(index) { - return this.update.firstChild.childNodes[index]; - }, - - getCurrentEntry: function() { - return this.getEntry(this.index); - }, - - selectEntry: function() { - this.active = false; - this.updateElement(this.getCurrentEntry()); - }, - - updateElement: function(selectedElement) { - if (this.options.updateElement) { - this.options.updateElement(selectedElement); - return; - } - var value = ''; - if (this.options.select) { - var nodes = $(selectedElement).select('.' + this.options.select) || []; - if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); - } else - value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); - - var bounds = this.getTokenBounds(); - if (bounds[0] != -1) { - var newValue = this.element.value.substr(0, bounds[0]); - var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/); - if (whitespace) - newValue += whitespace[0]; - this.element.value = newValue + value + this.element.value.substr(bounds[1]); - } else { - this.element.value = value; - } - this.oldElementValue = this.element.value; - this.element.focus(); - - if (this.options.afterUpdateElement) - this.options.afterUpdateElement(this.element, selectedElement); - }, - - updateChoices: function(choices) { - if(!this.changed && this.hasFocus) { - this.update.innerHTML = choices; - Element.cleanWhitespace(this.update); - Element.cleanWhitespace(this.update.down()); - - if(this.update.firstChild && this.update.down().childNodes) { - this.entryCount = - this.update.down().childNodes.length; - for (var i = 0; i < this.entryCount; i++) { - var entry = this.getEntry(i); - entry.autocompleteIndex = i; - this.addObservers(entry); - } - } else { - this.entryCount = 0; - } - - this.stopIndicator(); - this.index = 0; - - if(this.entryCount==1 && this.options.autoSelect) { - this.selectEntry(); - this.hide(); - } else { - this.render(); - } - } - }, - - addObservers: function(element) { - Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this)); - Event.observe(element, "click", this.onClick.bindAsEventListener(this)); - }, - - onObserverEvent: function() { - this.changed = false; - this.tokenBounds = null; - if(this.getToken().length>=this.options.minChars) { - this.getUpdatedChoices(); - } else { - this.active = false; - this.hide(); - } - this.oldElementValue = this.element.value; - }, - - getToken: function() { - var bounds = this.getTokenBounds(); - return this.element.value.substring(bounds[0], bounds[1]).strip(); - }, - - getTokenBounds: function() { - if (null != this.tokenBounds) return this.tokenBounds; - var value = this.element.value; - if (value.strip().empty()) return [-1, 0]; - var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue); - var offset = (diff == this.oldElementValue.length ? 1 : 0); - var prevTokenPos = -1, nextTokenPos = value.length; - var tp; - for (var index = 0, l = this.options.tokens.length; index < l; ++index) { - tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1); - if (tp > prevTokenPos) prevTokenPos = tp; - tp = value.indexOf(this.options.tokens[index], diff + offset); - if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp; - } - return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]); - } -}); - -Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) { - var boundary = Math.min(newS.length, oldS.length); - for (var index = 0; index < boundary; ++index) - if (newS[index] != oldS[index]) - return index; - return boundary; -}; - -Ajax.Autocompleter = Class.create(Autocompleter.Base, { - initialize: function(element, update, url, options) { - this.baseInitialize(element, update, options); - this.options.asynchronous = true; - this.options.onComplete = this.onComplete.bind(this); - this.options.defaultParams = this.options.parameters || null; - this.url = url; - }, - - getUpdatedChoices: function() { - this.startIndicator(); - - var entry = encodeURIComponent(this.options.paramName) + '=' + - encodeURIComponent(this.getToken()); - - this.options.parameters = this.options.callback ? - this.options.callback(this.element, entry) : entry; - - if(this.options.defaultParams) - this.options.parameters += '&' + this.options.defaultParams; - - new Ajax.Request(this.url, this.options); - }, - - onComplete: function(request) { - this.updateChoices(request.responseText); - } -}); - -// The local array autocompleter. Used when you'd prefer to -// inject an array of autocompletion options into the page, rather -// than sending out Ajax queries, which can be quite slow sometimes. -// -// The constructor takes four parameters. The first two are, as usual, -// the id of the monitored textbox, and id of the autocompletion menu. -// The third is the array you want to autocomplete from, and the fourth -// is the options block. -// -// Extra local autocompletion options: -// - choices - How many autocompletion choices to offer -// -// - partialSearch - If false, the autocompleter will match entered -// text only at the beginning of strings in the -// autocomplete array. Defaults to true, which will -// match text at the beginning of any *word* in the -// strings in the autocomplete array. If you want to -// search anywhere in the string, additionally set -// the option fullSearch to true (default: off). -// -// - fullSsearch - Search anywhere in autocomplete array strings. -// -// - partialChars - How many characters to enter before triggering -// a partial match (unlike minChars, which defines -// how many characters are required to do any match -// at all). Defaults to 2. -// -// - ignoreCase - Whether to ignore case when autocompleting. -// Defaults to true. -// -// It's possible to pass in a custom function as the 'selector' -// option, if you prefer to write your own autocompletion logic. -// In that case, the other options above will not apply unless -// you support them. - -Autocompleter.Local = Class.create(Autocompleter.Base, { - initialize: function(element, update, array, options) { - this.baseInitialize(element, update, options); - this.options.array = array; - }, - - getUpdatedChoices: function() { - this.updateChoices(this.options.selector(this)); - }, - - setOptions: function(options) { - this.options = Object.extend({ - choices: 10, - partialSearch: true, - partialChars: 2, - ignoreCase: true, - fullSearch: false, - selector: function(instance) { - var ret = []; // Beginning matches - var partial = []; // Inside matches - var entry = instance.getToken(); - var count = 0; - - for (var i = 0; i < instance.options.array.length && - ret.length < instance.options.choices ; i++) { - - var elem = instance.options.array[i]; - var foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase()) : - elem.indexOf(entry); - - while (foundPos != -1) { - if (foundPos == 0 && elem.length != entry.length) { - ret.push("
  • " + elem.substr(0, entry.length) + "" + - elem.substr(entry.length) + "
  • "); - break; - } else if (entry.length >= instance.options.partialChars && - instance.options.partialSearch && foundPos != -1) { - if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { - partial.push("
  • " + elem.substr(0, foundPos) + "" + - elem.substr(foundPos, entry.length) + "" + elem.substr( - foundPos + entry.length) + "
  • "); - break; - } - } - - foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : - elem.indexOf(entry, foundPos + 1); - - } - } - if (partial.length) - ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)); - return ""; - } - }, options || { }); - } -}); - -// AJAX in-place editor and collection editor -// Full rewrite by Christophe Porteneuve (April 2007). - -// Use this if you notice weird scrolling problems on some browsers, -// the DOM might be a bit confused when this gets called so do this -// waits 1 ms (with setTimeout) until it does the activation -Field.scrollFreeActivate = function(field) { - setTimeout(function() { - Field.activate(field); - }, 1); -}; - -Ajax.InPlaceEditor = Class.create({ - initialize: function(element, url, options) { - this.url = url; - this.element = element = $(element); - this.prepareOptions(); - this._controls = { }; - arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!! - Object.extend(this.options, options || { }); - if (!this.options.formId && this.element.id) { - this.options.formId = this.element.id + '-inplaceeditor'; - if ($(this.options.formId)) - this.options.formId = ''; - } - if (this.options.externalControl) - this.options.externalControl = $(this.options.externalControl); - if (!this.options.externalControl) - this.options.externalControlOnly = false; - this._originalBackground = this.element.getStyle('background-color') || 'transparent'; - this.element.title = this.options.clickToEditText; - this._boundCancelHandler = this.handleFormCancellation.bind(this); - this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this); - this._boundFailureHandler = this.handleAJAXFailure.bind(this); - this._boundSubmitHandler = this.handleFormSubmission.bind(this); - this._boundWrapperHandler = this.wrapUp.bind(this); - this.registerListeners(); - }, - checkForEscapeOrReturn: function(e) { - if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return; - if (Event.KEY_ESC == e.keyCode) - this.handleFormCancellation(e); - else if (Event.KEY_RETURN == e.keyCode) - this.handleFormSubmission(e); - }, - createControl: function(mode, handler, extraClasses) { - var control = this.options[mode + 'Control']; - var text = this.options[mode + 'Text']; - if ('button' == control) { - var btn = document.createElement('input'); - btn.type = 'submit'; - btn.value = text; - btn.className = 'editor_' + mode + '_button'; - if ('cancel' == mode) - btn.onclick = this._boundCancelHandler; - this._form.appendChild(btn); - this._controls[mode] = btn; - } else if ('link' == control) { - var link = document.createElement('a'); - link.href = '#'; - link.appendChild(document.createTextNode(text)); - link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler; - link.className = 'editor_' + mode + '_link'; - if (extraClasses) - link.className += ' ' + extraClasses; - this._form.appendChild(link); - this._controls[mode] = link; - } - }, - createEditField: function() { - var text = (this.options.loadTextURL ? this.options.loadingText : this.getText()); - var fld; - if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) { - fld = document.createElement('input'); - fld.type = 'text'; - var size = this.options.size || this.options.cols || 0; - if (0 < size) fld.size = size; - } else { - fld = document.createElement('textarea'); - fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows); - fld.cols = this.options.cols || 40; - } - fld.name = this.options.paramName; - fld.value = text; // No HTML breaks conversion anymore - fld.className = 'editor_field'; - if (this.options.submitOnBlur) - fld.onblur = this._boundSubmitHandler; - this._controls.editor = fld; - if (this.options.loadTextURL) - this.loadExternalText(); - this._form.appendChild(this._controls.editor); - }, - createForm: function() { - var ipe = this; - function addText(mode, condition) { - var text = ipe.options['text' + mode + 'Controls']; - if (!text || condition === false) return; - ipe._form.appendChild(document.createTextNode(text)); - }; - this._form = $(document.createElement('form')); - this._form.id = this.options.formId; - this._form.addClassName(this.options.formClassName); - this._form.onsubmit = this._boundSubmitHandler; - this.createEditField(); - if ('textarea' == this._controls.editor.tagName.toLowerCase()) - this._form.appendChild(document.createElement('br')); - if (this.options.onFormCustomization) - this.options.onFormCustomization(this, this._form); - addText('Before', this.options.okControl || this.options.cancelControl); - this.createControl('ok', this._boundSubmitHandler); - addText('Between', this.options.okControl && this.options.cancelControl); - this.createControl('cancel', this._boundCancelHandler, 'editor_cancel'); - addText('After', this.options.okControl || this.options.cancelControl); - }, - destroy: function() { - if (this._oldInnerHTML) - this.element.innerHTML = this._oldInnerHTML; - this.leaveEditMode(); - this.unregisterListeners(); - }, - enterEditMode: function(e) { - if (this._saving || this._editing) return; - this._editing = true; - this.triggerCallback('onEnterEditMode'); - if (this.options.externalControl) - this.options.externalControl.hide(); - this.element.hide(); - this.createForm(); - this.element.parentNode.insertBefore(this._form, this.element); - if (!this.options.loadTextURL) - this.postProcessEditField(); - if (e) Event.stop(e); - }, - enterHover: function(e) { - if (this.options.hoverClassName) - this.element.addClassName(this.options.hoverClassName); - if (this._saving) return; - this.triggerCallback('onEnterHover'); - }, - getText: function() { - return this.element.innerHTML.unescapeHTML(); - }, - handleAJAXFailure: function(transport) { - this.triggerCallback('onFailure', transport); - if (this._oldInnerHTML) { - this.element.innerHTML = this._oldInnerHTML; - this._oldInnerHTML = null; - } - }, - handleFormCancellation: function(e) { - this.wrapUp(); - if (e) Event.stop(e); - }, - handleFormSubmission: function(e) { - var form = this._form; - var value = $F(this._controls.editor); - this.prepareSubmission(); - var params = this.options.callback(form, value) || ''; - if (Object.isString(params)) - params = params.toQueryParams(); - params.editorId = this.element.id; - if (this.options.htmlResponse) { - var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions); - Object.extend(options, { - parameters: params, - onComplete: this._boundWrapperHandler, - onFailure: this._boundFailureHandler - }); - new Ajax.Updater({ success: this.element }, this.url, options); - } else { - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: params, - onComplete: this._boundWrapperHandler, - onFailure: this._boundFailureHandler - }); - new Ajax.Request(this.url, options); - } - if (e) Event.stop(e); - }, - leaveEditMode: function() { - this.element.removeClassName(this.options.savingClassName); - this.removeForm(); - this.leaveHover(); - this.element.style.backgroundColor = this._originalBackground; - this.element.show(); - if (this.options.externalControl) - this.options.externalControl.show(); - this._saving = false; - this._editing = false; - this._oldInnerHTML = null; - this.triggerCallback('onLeaveEditMode'); - }, - leaveHover: function(e) { - if (this.options.hoverClassName) - this.element.removeClassName(this.options.hoverClassName); - if (this._saving) return; - this.triggerCallback('onLeaveHover'); - }, - loadExternalText: function() { - this._form.addClassName(this.options.loadingClassName); - this._controls.editor.disabled = true; - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: 'editorId=' + encodeURIComponent(this.element.id), - onComplete: Prototype.emptyFunction, - onSuccess: function(transport) { - this._form.removeClassName(this.options.loadingClassName); - var text = transport.responseText; - if (this.options.stripLoadedTextTags) - text = text.stripTags(); - this._controls.editor.value = text; - this._controls.editor.disabled = false; - this.postProcessEditField(); - }.bind(this), - onFailure: this._boundFailureHandler - }); - new Ajax.Request(this.options.loadTextURL, options); - }, - postProcessEditField: function() { - var fpc = this.options.fieldPostCreation; - if (fpc) - $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate'](); - }, - prepareOptions: function() { - this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions); - Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks); - [this._extraDefaultOptions].flatten().compact().each(function(defs) { - Object.extend(this.options, defs); - }.bind(this)); - }, - prepareSubmission: function() { - this._saving = true; - this.removeForm(); - this.leaveHover(); - this.showSaving(); - }, - registerListeners: function() { - this._listeners = { }; - var listener; - $H(Ajax.InPlaceEditor.Listeners).each(function(pair) { - listener = this[pair.value].bind(this); - this._listeners[pair.key] = listener; - if (!this.options.externalControlOnly) - this.element.observe(pair.key, listener); - if (this.options.externalControl) - this.options.externalControl.observe(pair.key, listener); - }.bind(this)); - }, - removeForm: function() { - if (!this._form) return; - this._form.remove(); - this._form = null; - this._controls = { }; - }, - showSaving: function() { - this._oldInnerHTML = this.element.innerHTML; - this.element.innerHTML = this.options.savingText; - this.element.addClassName(this.options.savingClassName); - this.element.style.backgroundColor = this._originalBackground; - this.element.show(); - }, - triggerCallback: function(cbName, arg) { - if ('function' == typeof this.options[cbName]) { - this.options[cbName](this, arg); - } - }, - unregisterListeners: function() { - $H(this._listeners).each(function(pair) { - if (!this.options.externalControlOnly) - this.element.stopObserving(pair.key, pair.value); - if (this.options.externalControl) - this.options.externalControl.stopObserving(pair.key, pair.value); - }.bind(this)); - }, - wrapUp: function(transport) { - this.leaveEditMode(); - // Can't use triggerCallback due to backward compatibility: requires - // binding + direct element - this._boundComplete(transport, this.element); - } -}); - -Object.extend(Ajax.InPlaceEditor.prototype, { - dispose: Ajax.InPlaceEditor.prototype.destroy -}); - -Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, { - initialize: function($super, element, url, options) { - this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions; - $super(element, url, options); - }, - - createEditField: function() { - var list = document.createElement('select'); - list.name = this.options.paramName; - list.size = 1; - this._controls.editor = list; - this._collection = this.options.collection || []; - if (this.options.loadCollectionURL) - this.loadCollection(); - else - this.checkForExternalText(); - this._form.appendChild(this._controls.editor); - }, - - loadCollection: function() { - this._form.addClassName(this.options.loadingClassName); - this.showLoadingText(this.options.loadingCollectionText); - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: 'editorId=' + encodeURIComponent(this.element.id), - onComplete: Prototype.emptyFunction, - onSuccess: function(transport) { - var js = transport.responseText.strip(); - if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check - throw('Server returned an invalid collection representation.'); - this._collection = eval(js); - this.checkForExternalText(); - }.bind(this), - onFailure: this.onFailure - }); - new Ajax.Request(this.options.loadCollectionURL, options); - }, - - showLoadingText: function(text) { - this._controls.editor.disabled = true; - var tempOption = this._controls.editor.firstChild; - if (!tempOption) { - tempOption = document.createElement('option'); - tempOption.value = ''; - this._controls.editor.appendChild(tempOption); - tempOption.selected = true; - } - tempOption.update((text || '').stripScripts().stripTags()); - }, - - checkForExternalText: function() { - this._text = this.getText(); - if (this.options.loadTextURL) - this.loadExternalText(); - else - this.buildOptionList(); - }, - - loadExternalText: function() { - this.showLoadingText(this.options.loadingText); - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: 'editorId=' + encodeURIComponent(this.element.id), - onComplete: Prototype.emptyFunction, - onSuccess: function(transport) { - this._text = transport.responseText.strip(); - this.buildOptionList(); - }.bind(this), - onFailure: this.onFailure - }); - new Ajax.Request(this.options.loadTextURL, options); - }, - - buildOptionList: function() { - this._form.removeClassName(this.options.loadingClassName); - this._collection = this._collection.map(function(entry) { - return 2 === entry.length ? entry : [entry, entry].flatten(); - }); - var marker = ('value' in this.options) ? this.options.value : this._text; - var textFound = this._collection.any(function(entry) { - return entry[0] == marker; - }.bind(this)); - this._controls.editor.update(''); - var option; - this._collection.each(function(entry, index) { - option = document.createElement('option'); - option.value = entry[0]; - option.selected = textFound ? entry[0] == marker : 0 == index; - option.appendChild(document.createTextNode(entry[1])); - this._controls.editor.appendChild(option); - }.bind(this)); - this._controls.editor.disabled = false; - Field.scrollFreeActivate(this._controls.editor); - } -}); - -//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! **** -//**** This only exists for a while, in order to let **** -//**** users adapt to the new API. Read up on the new **** -//**** API and convert your code to it ASAP! **** - -Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) { - if (!options) return; - function fallback(name, expr) { - if (name in options || expr === undefined) return; - options[name] = expr; - }; - fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' : - options.cancelLink == options.cancelButton == false ? false : undefined))); - fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' : - options.okLink == options.okButton == false ? false : undefined))); - fallback('highlightColor', options.highlightcolor); - fallback('highlightEndColor', options.highlightendcolor); -}; - -Object.extend(Ajax.InPlaceEditor, { - DefaultOptions: { - ajaxOptions: { }, - autoRows: 3, // Use when multi-line w/ rows == 1 - cancelControl: 'link', // 'link'|'button'|false - cancelText: 'cancel', - clickToEditText: 'Click to edit', - externalControl: null, // id|elt - externalControlOnly: false, - fieldPostCreation: 'activate', // 'activate'|'focus'|false - formClassName: 'inplaceeditor-form', - formId: null, // id|elt - highlightColor: '#ffff99', - highlightEndColor: '#ffffff', - hoverClassName: '', - htmlResponse: true, - loadingClassName: 'inplaceeditor-loading', - loadingText: 'Loading...', - okControl: 'button', // 'link'|'button'|false - okText: 'ok', - paramName: 'value', - rows: 1, // If 1 and multi-line, uses autoRows - savingClassName: 'inplaceeditor-saving', - savingText: 'Saving...', - size: 0, - stripLoadedTextTags: false, - submitOnBlur: false, - textAfterControls: '', - textBeforeControls: '', - textBetweenControls: '' - }, - DefaultCallbacks: { - callback: function(form) { - return Form.serialize(form); - }, - onComplete: function(transport, element) { - // For backward compatibility, this one is bound to the IPE, and passes - // the element directly. It was too often customized, so we don't break it. - new Effect.Highlight(element, { - startcolor: this.options.highlightColor, keepBackgroundImage: true }); - }, - onEnterEditMode: null, - onEnterHover: function(ipe) { - ipe.element.style.backgroundColor = ipe.options.highlightColor; - if (ipe._effect) - ipe._effect.cancel(); - }, - onFailure: function(transport, ipe) { - alert('Error communication with the server: ' + transport.responseText.stripTags()); - }, - onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls. - onLeaveEditMode: null, - onLeaveHover: function(ipe) { - ipe._effect = new Effect.Highlight(ipe.element, { - startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor, - restorecolor: ipe._originalBackground, keepBackgroundImage: true - }); - } - }, - Listeners: { - click: 'enterEditMode', - keydown: 'checkForEscapeOrReturn', - mouseover: 'enterHover', - mouseout: 'leaveHover' - } -}); - -Ajax.InPlaceCollectionEditor.DefaultOptions = { - loadingCollectionText: 'Loading options...' -}; - -// Delayed observer, like Form.Element.Observer, -// but waits for delay after last key input -// Ideal for live-search fields - -Form.Element.DelayedObserver = Class.create({ - initialize: function(element, delay, callback) { - this.delay = delay || 0.5; - this.element = $(element); - this.callback = callback; - this.timer = null; - this.lastValue = $F(this.element); - Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); - }, - delayedListener: function(event) { - if(this.lastValue == $F(this.element)) return; - if(this.timer) clearTimeout(this.timer); - this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000); - this.lastValue = $F(this.element); - }, - onTimerEvent: function() { - this.timer = null; - this.callback(this.element, $F(this.element)); - } -}); \ No newline at end of file diff --git a/public/javascripts/dragdrop.js b/public/javascripts/dragdrop.js deleted file mode 100644 index 15c6dbca6..000000000 --- a/public/javascripts/dragdrop.js +++ /dev/null @@ -1,974 +0,0 @@ -// script.aculo.us dragdrop.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 - -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -if(Object.isUndefined(Effect)) - throw("dragdrop.js requires including script.aculo.us' effects.js library"); - -var Droppables = { - drops: [], - - remove: function(element) { - this.drops = this.drops.reject(function(d) { return d.element==$(element) }); - }, - - add: function(element) { - element = $(element); - var options = Object.extend({ - greedy: true, - hoverclass: null, - tree: false - }, arguments[1] || { }); - - // cache containers - if(options.containment) { - options._containers = []; - var containment = options.containment; - if(Object.isArray(containment)) { - containment.each( function(c) { options._containers.push($(c)) }); - } else { - options._containers.push($(containment)); - } - } - - if(options.accept) options.accept = [options.accept].flatten(); - - Element.makePositioned(element); // fix IE - options.element = element; - - this.drops.push(options); - }, - - findDeepestChild: function(drops) { - deepest = drops[0]; - - for (i = 1; i < drops.length; ++i) - if (Element.isParent(drops[i].element, deepest.element)) - deepest = drops[i]; - - return deepest; - }, - - isContained: function(element, drop) { - var containmentNode; - if(drop.tree) { - containmentNode = element.treeNode; - } else { - containmentNode = element.parentNode; - } - return drop._containers.detect(function(c) { return containmentNode == c }); - }, - - isAffected: function(point, element, drop) { - return ( - (drop.element!=element) && - ((!drop._containers) || - this.isContained(element, drop)) && - ((!drop.accept) || - (Element.classNames(element).detect( - function(v) { return drop.accept.include(v) } ) )) && - Position.within(drop.element, point[0], point[1]) ); - }, - - deactivate: function(drop) { - if(drop.hoverclass) - Element.removeClassName(drop.element, drop.hoverclass); - this.last_active = null; - }, - - activate: function(drop) { - if(drop.hoverclass) - Element.addClassName(drop.element, drop.hoverclass); - this.last_active = drop; - }, - - show: function(point, element) { - if(!this.drops.length) return; - var drop, affected = []; - - this.drops.each( function(drop) { - if(Droppables.isAffected(point, element, drop)) - affected.push(drop); - }); - - if(affected.length>0) - drop = Droppables.findDeepestChild(affected); - - if(this.last_active && this.last_active != drop) this.deactivate(this.last_active); - if (drop) { - Position.within(drop.element, point[0], point[1]); - if(drop.onHover) - drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); - - if (drop != this.last_active) Droppables.activate(drop); - } - }, - - fire: function(event, element) { - if(!this.last_active) return; - Position.prepare(); - - if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) - if (this.last_active.onDrop) { - this.last_active.onDrop(element, this.last_active.element, event); - return true; - } - }, - - reset: function() { - if(this.last_active) - this.deactivate(this.last_active); - } -}; - -var Draggables = { - drags: [], - observers: [], - - register: function(draggable) { - if(this.drags.length == 0) { - this.eventMouseUp = this.endDrag.bindAsEventListener(this); - this.eventMouseMove = this.updateDrag.bindAsEventListener(this); - this.eventKeypress = this.keyPress.bindAsEventListener(this); - - Event.observe(document, "mouseup", this.eventMouseUp); - Event.observe(document, "mousemove", this.eventMouseMove); - Event.observe(document, "keypress", this.eventKeypress); - } - this.drags.push(draggable); - }, - - unregister: function(draggable) { - this.drags = this.drags.reject(function(d) { return d==draggable }); - if(this.drags.length == 0) { - Event.stopObserving(document, "mouseup", this.eventMouseUp); - Event.stopObserving(document, "mousemove", this.eventMouseMove); - Event.stopObserving(document, "keypress", this.eventKeypress); - } - }, - - activate: function(draggable) { - if(draggable.options.delay) { - this._timeout = setTimeout(function() { - Draggables._timeout = null; - window.focus(); - Draggables.activeDraggable = draggable; - }.bind(this), draggable.options.delay); - } else { - window.focus(); // allows keypress events if window isn't currently focused, fails for Safari - this.activeDraggable = draggable; - } - }, - - deactivate: function() { - this.activeDraggable = null; - }, - - updateDrag: function(event) { - if(!this.activeDraggable) return; - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - // Mozilla-based browsers fire successive mousemove events with - // the same coordinates, prevent needless redrawing (moz bug?) - if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; - this._lastPointer = pointer; - - this.activeDraggable.updateDrag(event, pointer); - }, - - endDrag: function(event) { - if(this._timeout) { - clearTimeout(this._timeout); - this._timeout = null; - } - if(!this.activeDraggable) return; - this._lastPointer = null; - this.activeDraggable.endDrag(event); - this.activeDraggable = null; - }, - - keyPress: function(event) { - if(this.activeDraggable) - this.activeDraggable.keyPress(event); - }, - - addObserver: function(observer) { - this.observers.push(observer); - this._cacheObserverCallbacks(); - }, - - removeObserver: function(element) { // element instead of observer fixes mem leaks - this.observers = this.observers.reject( function(o) { return o.element==element }); - this._cacheObserverCallbacks(); - }, - - notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' - if(this[eventName+'Count'] > 0) - this.observers.each( function(o) { - if(o[eventName]) o[eventName](eventName, draggable, event); - }); - if(draggable.options[eventName]) draggable.options[eventName](draggable, event); - }, - - _cacheObserverCallbacks: function() { - ['onStart','onEnd','onDrag'].each( function(eventName) { - Draggables[eventName+'Count'] = Draggables.observers.select( - function(o) { return o[eventName]; } - ).length; - }); - } -}; - -/*--------------------------------------------------------------------------*/ - -var Draggable = Class.create({ - initialize: function(element) { - var defaults = { - handle: false, - reverteffect: function(element, top_offset, left_offset) { - var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02; - new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur, - queue: {scope:'_draggable', position:'end'} - }); - }, - endeffect: function(element) { - var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0; - new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, - queue: {scope:'_draggable', position:'end'}, - afterFinish: function(){ - Draggable._dragging[element] = false - } - }); - }, - zindex: 1000, - revert: false, - quiet: false, - scroll: false, - scrollSensitivity: 20, - scrollSpeed: 15, - snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } - delay: 0 - }; - - if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) - Object.extend(defaults, { - starteffect: function(element) { - element._opacity = Element.getOpacity(element); - Draggable._dragging[element] = true; - new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); - } - }); - - var options = Object.extend(defaults, arguments[1] || { }); - - this.element = $(element); - - if(options.handle && Object.isString(options.handle)) - this.handle = this.element.down('.'+options.handle, 0); - - if(!this.handle) this.handle = $(options.handle); - if(!this.handle) this.handle = this.element; - - if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { - options.scroll = $(options.scroll); - this._isScrollChild = Element.childOf(this.element, options.scroll); - } - - Element.makePositioned(this.element); // fix IE - - this.options = options; - this.dragging = false; - - this.eventMouseDown = this.initDrag.bindAsEventListener(this); - Event.observe(this.handle, "mousedown", this.eventMouseDown); - - Draggables.register(this); - }, - - destroy: function() { - Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); - Draggables.unregister(this); - }, - - currentDelta: function() { - return([ - parseInt(Element.getStyle(this.element,'left') || '0'), - parseInt(Element.getStyle(this.element,'top') || '0')]); - }, - - initDrag: function(event) { - if(!Object.isUndefined(Draggable._dragging[this.element]) && - Draggable._dragging[this.element]) return; - if(Event.isLeftClick(event)) { - // abort on form elements, fixes a Firefox issue - var src = Event.element(event); - if((tag_name = src.tagName.toUpperCase()) && ( - tag_name=='INPUT' || - tag_name=='SELECT' || - tag_name=='OPTION' || - tag_name=='BUTTON' || - tag_name=='TEXTAREA')) return; - - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var pos = this.element.cumulativeOffset(); - this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); - - Draggables.activate(this); - Event.stop(event); - } - }, - - startDrag: function(event) { - this.dragging = true; - if(!this.delta) - this.delta = this.currentDelta(); - - if(this.options.zindex) { - this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); - this.element.style.zIndex = this.options.zindex; - } - - if(this.options.ghosting) { - this._clone = this.element.cloneNode(true); - this._originallyAbsolute = (this.element.getStyle('position') == 'absolute'); - if (!this._originallyAbsolute) - Position.absolutize(this.element); - this.element.parentNode.insertBefore(this._clone, this.element); - } - - if(this.options.scroll) { - if (this.options.scroll == window) { - var where = this._getWindowScroll(this.options.scroll); - this.originalScrollLeft = where.left; - this.originalScrollTop = where.top; - } else { - this.originalScrollLeft = this.options.scroll.scrollLeft; - this.originalScrollTop = this.options.scroll.scrollTop; - } - } - - Draggables.notify('onStart', this, event); - - if(this.options.starteffect) this.options.starteffect(this.element); - }, - - updateDrag: function(event, pointer) { - if(!this.dragging) this.startDrag(event); - - if(!this.options.quiet){ - Position.prepare(); - Droppables.show(pointer, this.element); - } - - Draggables.notify('onDrag', this, event); - - this.draw(pointer); - if(this.options.change) this.options.change(this); - - if(this.options.scroll) { - this.stopScrolling(); - - var p; - if (this.options.scroll == window) { - with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } - } else { - p = Position.page(this.options.scroll); - p[0] += this.options.scroll.scrollLeft + Position.deltaX; - p[1] += this.options.scroll.scrollTop + Position.deltaY; - p.push(p[0]+this.options.scroll.offsetWidth); - p.push(p[1]+this.options.scroll.offsetHeight); - } - var speed = [0,0]; - if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity); - if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity); - if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity); - if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); - this.startScrolling(speed); - } - - // fix AppleWebKit rendering - if(Prototype.Browser.WebKit) window.scrollBy(0,0); - - Event.stop(event); - }, - - finishDrag: function(event, success) { - this.dragging = false; - - if(this.options.quiet){ - Position.prepare(); - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - Droppables.show(pointer, this.element); - } - - if(this.options.ghosting) { - if (!this._originallyAbsolute) - Position.relativize(this.element); - delete this._originallyAbsolute; - Element.remove(this._clone); - this._clone = null; - } - - var dropped = false; - if(success) { - dropped = Droppables.fire(event, this.element); - if (!dropped) dropped = false; - } - if(dropped && this.options.onDropped) this.options.onDropped(this.element); - Draggables.notify('onEnd', this, event); - - var revert = this.options.revert; - if(revert && Object.isFunction(revert)) revert = revert(this.element); - - var d = this.currentDelta(); - if(revert && this.options.reverteffect) { - if (dropped == 0 || revert != 'failure') - this.options.reverteffect(this.element, - d[1]-this.delta[1], d[0]-this.delta[0]); - } else { - this.delta = d; - } - - if(this.options.zindex) - this.element.style.zIndex = this.originalZ; - - if(this.options.endeffect) - this.options.endeffect(this.element); - - Draggables.deactivate(this); - Droppables.reset(); - }, - - keyPress: function(event) { - if(event.keyCode!=Event.KEY_ESC) return; - this.finishDrag(event, false); - Event.stop(event); - }, - - endDrag: function(event) { - if(!this.dragging) return; - this.stopScrolling(); - this.finishDrag(event, true); - Event.stop(event); - }, - - draw: function(point) { - var pos = this.element.cumulativeOffset(); - if(this.options.ghosting) { - var r = Position.realOffset(this.element); - pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; - } - - var d = this.currentDelta(); - pos[0] -= d[0]; pos[1] -= d[1]; - - if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { - pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; - pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; - } - - var p = [0,1].map(function(i){ - return (point[i]-pos[i]-this.offset[i]) - }.bind(this)); - - if(this.options.snap) { - if(Object.isFunction(this.options.snap)) { - p = this.options.snap(p[0],p[1],this); - } else { - if(Object.isArray(this.options.snap)) { - p = p.map( function(v, i) { - return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this)); - } else { - p = p.map( function(v) { - return (v/this.options.snap).round()*this.options.snap }.bind(this)); - } - }} - - var style = this.element.style; - if((!this.options.constraint) || (this.options.constraint=='horizontal')) - style.left = p[0] + "px"; - if((!this.options.constraint) || (this.options.constraint=='vertical')) - style.top = p[1] + "px"; - - if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering - }, - - stopScrolling: function() { - if(this.scrollInterval) { - clearInterval(this.scrollInterval); - this.scrollInterval = null; - Draggables._lastScrollPointer = null; - } - }, - - startScrolling: function(speed) { - if(!(speed[0] || speed[1])) return; - this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; - this.lastScrolled = new Date(); - this.scrollInterval = setInterval(this.scroll.bind(this), 10); - }, - - scroll: function() { - var current = new Date(); - var delta = current - this.lastScrolled; - this.lastScrolled = current; - if(this.options.scroll == window) { - with (this._getWindowScroll(this.options.scroll)) { - if (this.scrollSpeed[0] || this.scrollSpeed[1]) { - var d = delta / 1000; - this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] ); - } - } - } else { - this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; - this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; - } - - Position.prepare(); - Droppables.show(Draggables._lastPointer, this.element); - Draggables.notify('onDrag', this); - if (this._isScrollChild) { - Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer); - Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000; - Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000; - if (Draggables._lastScrollPointer[0] < 0) - Draggables._lastScrollPointer[0] = 0; - if (Draggables._lastScrollPointer[1] < 0) - Draggables._lastScrollPointer[1] = 0; - this.draw(Draggables._lastScrollPointer); - } - - if(this.options.change) this.options.change(this); - }, - - _getWindowScroll: function(w) { - var T, L, W, H; - with (w.document) { - if (w.document.documentElement && documentElement.scrollTop) { - T = documentElement.scrollTop; - L = documentElement.scrollLeft; - } else if (w.document.body) { - T = body.scrollTop; - L = body.scrollLeft; - } - if (w.innerWidth) { - W = w.innerWidth; - H = w.innerHeight; - } else if (w.document.documentElement && documentElement.clientWidth) { - W = documentElement.clientWidth; - H = documentElement.clientHeight; - } else { - W = body.offsetWidth; - H = body.offsetHeight; - } - } - return { top: T, left: L, width: W, height: H }; - } -}); - -Draggable._dragging = { }; - -/*--------------------------------------------------------------------------*/ - -var SortableObserver = Class.create({ - initialize: function(element, observer) { - this.element = $(element); - this.observer = observer; - this.lastValue = Sortable.serialize(this.element); - }, - - onStart: function() { - this.lastValue = Sortable.serialize(this.element); - }, - - onEnd: function() { - Sortable.unmark(); - if(this.lastValue != Sortable.serialize(this.element)) - this.observer(this.element) - } -}); - -var Sortable = { - SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, - - sortables: { }, - - _findRootElement: function(element) { - while (element.tagName.toUpperCase() != "BODY") { - if(element.id && Sortable.sortables[element.id]) return element; - element = element.parentNode; - } - }, - - options: function(element) { - element = Sortable._findRootElement($(element)); - if(!element) return; - return Sortable.sortables[element.id]; - }, - - destroy: function(element){ - element = $(element); - var s = Sortable.sortables[element.id]; - - if(s) { - Draggables.removeObserver(s.element); - s.droppables.each(function(d){ Droppables.remove(d) }); - s.draggables.invoke('destroy'); - - delete Sortable.sortables[s.element.id]; - } - }, - - create: function(element) { - element = $(element); - var options = Object.extend({ - element: element, - tag: 'li', // assumes li children, override with tag: 'tagname' - dropOnEmpty: false, - tree: false, - treeTag: 'ul', - overlap: 'vertical', // one of 'vertical', 'horizontal' - constraint: 'vertical', // one of 'vertical', 'horizontal', false - containment: element, // also takes array of elements (or id's); or false - handle: false, // or a CSS class - only: false, - delay: 0, - hoverclass: null, - ghosting: false, - quiet: false, - scroll: false, - scrollSensitivity: 20, - scrollSpeed: 15, - format: this.SERIALIZE_RULE, - - // these take arrays of elements or ids and can be - // used for better initialization performance - elements: false, - handles: false, - - onChange: Prototype.emptyFunction, - onUpdate: Prototype.emptyFunction - }, arguments[1] || { }); - - // clear any old sortable with same element - this.destroy(element); - - // build options for the draggables - var options_for_draggable = { - revert: true, - quiet: options.quiet, - scroll: options.scroll, - scrollSpeed: options.scrollSpeed, - scrollSensitivity: options.scrollSensitivity, - delay: options.delay, - ghosting: options.ghosting, - constraint: options.constraint, - handle: options.handle }; - - if(options.starteffect) - options_for_draggable.starteffect = options.starteffect; - - if(options.reverteffect) - options_for_draggable.reverteffect = options.reverteffect; - else - if(options.ghosting) options_for_draggable.reverteffect = function(element) { - element.style.top = 0; - element.style.left = 0; - }; - - if(options.endeffect) - options_for_draggable.endeffect = options.endeffect; - - if(options.zindex) - options_for_draggable.zindex = options.zindex; - - // build options for the droppables - var options_for_droppable = { - overlap: options.overlap, - containment: options.containment, - tree: options.tree, - hoverclass: options.hoverclass, - onHover: Sortable.onHover - }; - - var options_for_tree = { - onHover: Sortable.onEmptyHover, - overlap: options.overlap, - containment: options.containment, - hoverclass: options.hoverclass - }; - - // fix for gecko engine - Element.cleanWhitespace(element); - - options.draggables = []; - options.droppables = []; - - // drop on empty handling - if(options.dropOnEmpty || options.tree) { - Droppables.add(element, options_for_tree); - options.droppables.push(element); - } - - (options.elements || this.findElements(element, options) || []).each( function(e,i) { - var handle = options.handles ? $(options.handles[i]) : - (options.handle ? $(e).select('.' + options.handle)[0] : e); - options.draggables.push( - new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); - Droppables.add(e, options_for_droppable); - if(options.tree) e.treeNode = element; - options.droppables.push(e); - }); - - if(options.tree) { - (Sortable.findTreeElements(element, options) || []).each( function(e) { - Droppables.add(e, options_for_tree); - e.treeNode = element; - options.droppables.push(e); - }); - } - - // keep reference - this.sortables[element.identify()] = options; - - // for onupdate - Draggables.addObserver(new SortableObserver(element, options.onUpdate)); - - }, - - // return all suitable-for-sortable elements in a guaranteed order - findElements: function(element, options) { - return Element.findChildren( - element, options.only, options.tree ? true : false, options.tag); - }, - - findTreeElements: function(element, options) { - return Element.findChildren( - element, options.only, options.tree ? true : false, options.treeTag); - }, - - onHover: function(element, dropon, overlap) { - if(Element.isParent(dropon, element)) return; - - if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) { - return; - } else if(overlap>0.5) { - Sortable.mark(dropon, 'before'); - if(dropon.previousSibling != element) { - var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering - dropon.parentNode.insertBefore(element, dropon); - if(dropon.parentNode!=oldParentNode) - Sortable.options(oldParentNode).onChange(element); - Sortable.options(dropon.parentNode).onChange(element); - } - } else { - Sortable.mark(dropon, 'after'); - var nextElement = dropon.nextSibling || null; - if(nextElement != element) { - var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering - dropon.parentNode.insertBefore(element, nextElement); - if(dropon.parentNode!=oldParentNode) - Sortable.options(oldParentNode).onChange(element); - Sortable.options(dropon.parentNode).onChange(element); - } - } - }, - - onEmptyHover: function(element, dropon, overlap) { - var oldParentNode = element.parentNode; - var droponOptions = Sortable.options(dropon); - - if(!Element.isParent(dropon, element)) { - var index; - - var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); - var child = null; - - if(children) { - var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); - - for (index = 0; index < children.length; index += 1) { - if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { - offset -= Element.offsetSize (children[index], droponOptions.overlap); - } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) { - child = index + 1 < children.length ? children[index + 1] : null; - break; - } else { - child = children[index]; - break; - } - } - } - - dropon.insertBefore(element, child); - - Sortable.options(oldParentNode).onChange(element); - droponOptions.onChange(element); - } - }, - - unmark: function() { - if(Sortable._marker) Sortable._marker.hide(); - }, - - mark: function(dropon, position) { - // mark on ghosting only - var sortable = Sortable.options(dropon.parentNode); - if(sortable && !sortable.ghosting) return; - - if(!Sortable._marker) { - Sortable._marker = - ($('dropmarker') || Element.extend(document.createElement('DIV'))). - hide().addClassName('dropmarker').setStyle({position:'absolute'}); - document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); - } - var offsets = dropon.cumulativeOffset(); - Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); - - if(position=='after') - if(sortable.overlap == 'horizontal') - Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); - else - Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); - - Sortable._marker.show(); - }, - - _tree: function(element, options, parent) { - var children = Sortable.findElements(element, options) || []; - - for (var i = 0; i < children.length; ++i) { - var match = children[i].id.match(options.format); - - if (!match) continue; - - var child = { - id: encodeURIComponent(match ? match[1] : null), - element: element, - parent: parent, - children: [], - position: parent.children.length, - container: $(children[i]).down(options.treeTag) - }; - - /* Get the element containing the children and recurse over it */ - if (child.container) - this._tree(child.container, options, child); - - parent.children.push (child); - } - - return parent; - }, - - tree: function(element) { - element = $(element); - var sortableOptions = this.options(element); - var options = Object.extend({ - tag: sortableOptions.tag, - treeTag: sortableOptions.treeTag, - only: sortableOptions.only, - name: element.id, - format: sortableOptions.format - }, arguments[1] || { }); - - var root = { - id: null, - parent: null, - children: [], - container: element, - position: 0 - }; - - return Sortable._tree(element, options, root); - }, - - /* Construct a [i] index for a particular node */ - _constructIndex: function(node) { - var index = ''; - do { - if (node.id) index = '[' + node.position + ']' + index; - } while ((node = node.parent) != null); - return index; - }, - - sequence: function(element) { - element = $(element); - var options = Object.extend(this.options(element), arguments[1] || { }); - - return $(this.findElements(element, options) || []).map( function(item) { - return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; - }); - }, - - setSequence: function(element, new_sequence) { - element = $(element); - var options = Object.extend(this.options(element), arguments[2] || { }); - - var nodeMap = { }; - this.findElements(element, options).each( function(n) { - if (n.id.match(options.format)) - nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; - n.parentNode.removeChild(n); - }); - - new_sequence.each(function(ident) { - var n = nodeMap[ident]; - if (n) { - n[1].appendChild(n[0]); - delete nodeMap[ident]; - } - }); - }, - - serialize: function(element) { - element = $(element); - var options = Object.extend(Sortable.options(element), arguments[1] || { }); - var name = encodeURIComponent( - (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); - - if (options.tree) { - return Sortable.tree(element, arguments[1]).children.map( function (item) { - return [name + Sortable._constructIndex(item) + "[id]=" + - encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); - }).flatten().join('&'); - } else { - return Sortable.sequence(element, arguments[1]).map( function(item) { - return name + "[]=" + encodeURIComponent(item); - }).join('&'); - } - } -}; - -// Returns true if child is contained within element -Element.isParent = function(child, element) { - if (!child.parentNode || child == element) return false; - if (child.parentNode == element) return true; - return Element.isParent(child.parentNode, element); -}; - -Element.findChildren = function(element, only, recursive, tagName) { - if(!element.hasChildNodes()) return null; - tagName = tagName.toUpperCase(); - if(only) only = [only].flatten(); - var elements = []; - $A(element.childNodes).each( function(e) { - if(e.tagName && e.tagName.toUpperCase()==tagName && - (!only || (Element.classNames(e).detect(function(v) { return only.include(v) })))) - elements.push(e); - if(recursive) { - var grandchildren = Element.findChildren(e, only, recursive, tagName); - if(grandchildren) elements.push(grandchildren); - } - }); - - return (elements.length>0 ? elements.flatten() : []); -}; - -Element.offsetSize = function (element, type) { - return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')]; -}; \ No newline at end of file diff --git a/public/javascripts/effects.js b/public/javascripts/effects.js deleted file mode 100644 index c81e6c7d5..000000000 --- a/public/javascripts/effects.js +++ /dev/null @@ -1,1123 +0,0 @@ -// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 - -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// Contributors: -// Justin Palmer (http://encytemedia.com/) -// Mark Pilgrim (http://diveintomark.org/) -// Martin Bialasinki -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -// converts rgb() and #xxx to #xxxxxx format, -// returns self (or first argument) if not convertable -String.prototype.parseColor = function() { - var color = '#'; - if (this.slice(0,4) == 'rgb(') { - var cols = this.slice(4,this.length-1).split(','); - var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); - } else { - if (this.slice(0,1) == '#') { - if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); - if (this.length==7) color = this.toLowerCase(); - } - } - return (color.length==7 ? color : (arguments[0] || this)); -}; - -/*--------------------------------------------------------------------------*/ - -Element.collectTextNodes = function(element) { - return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : - (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); - }).flatten().join(''); -}; - -Element.collectTextNodesIgnoreClass = function(element, className) { - return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : - ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? - Element.collectTextNodesIgnoreClass(node, className) : '')); - }).flatten().join(''); -}; - -Element.setContentZoom = function(element, percent) { - element = $(element); - element.setStyle({fontSize: (percent/100) + 'em'}); - if (Prototype.Browser.WebKit) window.scrollBy(0,0); - return element; -}; - -Element.getInlineOpacity = function(element){ - return $(element).style.opacity || ''; -}; - -Element.forceRerendering = function(element) { - try { - element = $(element); - var n = document.createTextNode(' '); - element.appendChild(n); - element.removeChild(n); - } catch(e) { } -}; - -/*--------------------------------------------------------------------------*/ - -var Effect = { - _elementDoesNotExistError: { - name: 'ElementDoesNotExistError', - message: 'The specified DOM element does not exist, but is required for this effect to operate' - }, - Transitions: { - linear: Prototype.K, - sinoidal: function(pos) { - return (-Math.cos(pos*Math.PI)/2) + .5; - }, - reverse: function(pos) { - return 1-pos; - }, - flicker: function(pos) { - var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4; - return pos > 1 ? 1 : pos; - }, - wobble: function(pos) { - return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5; - }, - pulse: function(pos, pulses) { - return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5; - }, - spring: function(pos) { - return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); - }, - none: function(pos) { - return 0; - }, - full: function(pos) { - return 1; - } - }, - DefaultOptions: { - duration: 1.0, // seconds - fps: 100, // 100= assume 66fps max. - sync: false, // true for combining - from: 0.0, - to: 1.0, - delay: 0.0, - queue: 'parallel' - }, - tagifyText: function(element) { - var tagifyStyle = 'position:relative'; - if (Prototype.Browser.IE) tagifyStyle += ';zoom:1'; - - element = $(element); - $A(element.childNodes).each( function(child) { - if (child.nodeType==3) { - child.nodeValue.toArray().each( function(character) { - element.insertBefore( - new Element('span', {style: tagifyStyle}).update( - character == ' ' ? String.fromCharCode(160) : character), - child); - }); - Element.remove(child); - } - }); - }, - multiple: function(element, effect) { - var elements; - if (((typeof element == 'object') || - Object.isFunction(element)) && - (element.length)) - elements = element; - else - elements = $(element).childNodes; - - var options = Object.extend({ - speed: 0.1, - delay: 0.0 - }, arguments[2] || { }); - var masterDelay = options.delay; - - $A(elements).each( function(element, index) { - new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay })); - }); - }, - PAIRS: { - 'slide': ['SlideDown','SlideUp'], - 'blind': ['BlindDown','BlindUp'], - 'appear': ['Appear','Fade'] - }, - toggle: function(element, effect, options) { - element = $(element); - effect = (effect || 'appear').toLowerCase(); - - return Effect[ Effect.PAIRS[ effect ][ element.visible() ? 1 : 0 ] ](element, Object.extend({ - queue: { position:'end', scope:(element.id || 'global'), limit: 1 } - }, options || {})); - } -}; - -Effect.DefaultOptions.transition = Effect.Transitions.sinoidal; - -/* ------------- core effects ------------- */ - -Effect.ScopedQueue = Class.create(Enumerable, { - initialize: function() { - this.effects = []; - this.interval = null; - }, - _each: function(iterator) { - this.effects._each(iterator); - }, - add: function(effect) { - var timestamp = new Date().getTime(); - - var position = Object.isString(effect.options.queue) ? - effect.options.queue : effect.options.queue.position; - - switch(position) { - case 'front': - // move unstarted effects after this effect - this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { - e.startOn += effect.finishOn; - e.finishOn += effect.finishOn; - }); - break; - case 'with-last': - timestamp = this.effects.pluck('startOn').max() || timestamp; - break; - case 'end': - // start effect after last queued effect has finished - timestamp = this.effects.pluck('finishOn').max() || timestamp; - break; - } - - effect.startOn += timestamp; - effect.finishOn += timestamp; - - if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) - this.effects.push(effect); - - if (!this.interval) - this.interval = setInterval(this.loop.bind(this), 15); - }, - remove: function(effect) { - this.effects = this.effects.reject(function(e) { return e==effect }); - if (this.effects.length == 0) { - clearInterval(this.interval); - this.interval = null; - } - }, - loop: function() { - var timePos = new Date().getTime(); - for(var i=0, len=this.effects.length;i= this.startOn) { - if (timePos >= this.finishOn) { - this.render(1.0); - this.cancel(); - this.event('beforeFinish'); - if (this.finish) this.finish(); - this.event('afterFinish'); - return; - } - var pos = (timePos - this.startOn) / this.totalTime, - frame = (pos * this.totalFrames).round(); - if (frame > this.currentFrame) { - this.render(pos); - this.currentFrame = frame; - } - } - }, - cancel: function() { - if (!this.options.sync) - Effect.Queues.get(Object.isString(this.options.queue) ? - 'global' : this.options.queue.scope).remove(this); - this.state = 'finished'; - }, - event: function(eventName) { - if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this); - if (this.options[eventName]) this.options[eventName](this); - }, - inspect: function() { - var data = $H(); - for(property in this) - if (!Object.isFunction(this[property])) data.set(property, this[property]); - return '#'; - } -}); - -Effect.Parallel = Class.create(Effect.Base, { - initialize: function(effects) { - this.effects = effects || []; - this.start(arguments[1]); - }, - update: function(position) { - this.effects.invoke('render', position); - }, - finish: function(position) { - this.effects.each( function(effect) { - effect.render(1.0); - effect.cancel(); - effect.event('beforeFinish'); - if (effect.finish) effect.finish(position); - effect.event('afterFinish'); - }); - } -}); - -Effect.Tween = Class.create(Effect.Base, { - initialize: function(object, from, to) { - object = Object.isString(object) ? $(object) : object; - var args = $A(arguments), method = args.last(), - options = args.length == 5 ? args[3] : null; - this.method = Object.isFunction(method) ? method.bind(object) : - Object.isFunction(object[method]) ? object[method].bind(object) : - function(value) { object[method] = value }; - this.start(Object.extend({ from: from, to: to }, options || { })); - }, - update: function(position) { - this.method(position); - } -}); - -Effect.Event = Class.create(Effect.Base, { - initialize: function() { - this.start(Object.extend({ duration: 0 }, arguments[0] || { })); - }, - update: Prototype.emptyFunction -}); - -Effect.Opacity = Class.create(Effect.Base, { - initialize: function(element) { - this.element = $(element); - if (!this.element) throw(Effect._elementDoesNotExistError); - // make this work on IE on elements without 'layout' - if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout)) - this.element.setStyle({zoom: 1}); - var options = Object.extend({ - from: this.element.getOpacity() || 0.0, - to: 1.0 - }, arguments[1] || { }); - this.start(options); - }, - update: function(position) { - this.element.setOpacity(position); - } -}); - -Effect.Move = Class.create(Effect.Base, { - initialize: function(element) { - this.element = $(element); - if (!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ - x: 0, - y: 0, - mode: 'relative' - }, arguments[1] || { }); - this.start(options); - }, - setup: function() { - this.element.makePositioned(); - this.originalLeft = parseFloat(this.element.getStyle('left') || '0'); - this.originalTop = parseFloat(this.element.getStyle('top') || '0'); - if (this.options.mode == 'absolute') { - this.options.x = this.options.x - this.originalLeft; - this.options.y = this.options.y - this.originalTop; - } - }, - update: function(position) { - this.element.setStyle({ - left: (this.options.x * position + this.originalLeft).round() + 'px', - top: (this.options.y * position + this.originalTop).round() + 'px' - }); - } -}); - -// for backwards compatibility -Effect.MoveBy = function(element, toTop, toLeft) { - return new Effect.Move(element, - Object.extend({ x: toLeft, y: toTop }, arguments[3] || { })); -}; - -Effect.Scale = Class.create(Effect.Base, { - initialize: function(element, percent) { - this.element = $(element); - if (!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ - scaleX: true, - scaleY: true, - scaleContent: true, - scaleFromCenter: false, - scaleMode: 'box', // 'box' or 'contents' or { } with provided values - scaleFrom: 100.0, - scaleTo: percent - }, arguments[2] || { }); - this.start(options); - }, - setup: function() { - this.restoreAfterFinish = this.options.restoreAfterFinish || false; - this.elementPositioning = this.element.getStyle('position'); - - this.originalStyle = { }; - ['top','left','width','height','fontSize'].each( function(k) { - this.originalStyle[k] = this.element.style[k]; - }.bind(this)); - - this.originalTop = this.element.offsetTop; - this.originalLeft = this.element.offsetLeft; - - var fontSize = this.element.getStyle('font-size') || '100%'; - ['em','px','%','pt'].each( function(fontSizeType) { - if (fontSize.indexOf(fontSizeType)>0) { - this.fontSize = parseFloat(fontSize); - this.fontSizeType = fontSizeType; - } - }.bind(this)); - - this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; - - this.dims = null; - if (this.options.scaleMode=='box') - this.dims = [this.element.offsetHeight, this.element.offsetWidth]; - if (/^content/.test(this.options.scaleMode)) - this.dims = [this.element.scrollHeight, this.element.scrollWidth]; - if (!this.dims) - this.dims = [this.options.scaleMode.originalHeight, - this.options.scaleMode.originalWidth]; - }, - update: function(position) { - var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position); - if (this.options.scaleContent && this.fontSize) - this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType }); - this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale); - }, - finish: function(position) { - if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle); - }, - setDimensions: function(height, width) { - var d = { }; - if (this.options.scaleX) d.width = width.round() + 'px'; - if (this.options.scaleY) d.height = height.round() + 'px'; - if (this.options.scaleFromCenter) { - var topd = (height - this.dims[0])/2; - var leftd = (width - this.dims[1])/2; - if (this.elementPositioning == 'absolute') { - if (this.options.scaleY) d.top = this.originalTop-topd + 'px'; - if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px'; - } else { - if (this.options.scaleY) d.top = -topd + 'px'; - if (this.options.scaleX) d.left = -leftd + 'px'; - } - } - this.element.setStyle(d); - } -}); - -Effect.Highlight = Class.create(Effect.Base, { - initialize: function(element) { - this.element = $(element); - if (!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { }); - this.start(options); - }, - setup: function() { - // Prevent executing on elements not in the layout flow - if (this.element.getStyle('display')=='none') { this.cancel(); return; } - // Disable background image during the effect - this.oldStyle = { }; - if (!this.options.keepBackgroundImage) { - this.oldStyle.backgroundImage = this.element.getStyle('background-image'); - this.element.setStyle({backgroundImage: 'none'}); - } - if (!this.options.endcolor) - this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff'); - if (!this.options.restorecolor) - this.options.restorecolor = this.element.getStyle('background-color'); - // init color calculations - this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this)); - this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this)); - }, - update: function(position) { - this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){ - return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) }); - }, - finish: function() { - this.element.setStyle(Object.extend(this.oldStyle, { - backgroundColor: this.options.restorecolor - })); - } -}); - -Effect.ScrollTo = function(element) { - var options = arguments[1] || { }, - scrollOffsets = document.viewport.getScrollOffsets(), - elementOffsets = $(element).cumulativeOffset(); - - if (options.offset) elementOffsets[1] += options.offset; - - return new Effect.Tween(null, - scrollOffsets.top, - elementOffsets[1], - options, - function(p){ scrollTo(scrollOffsets.left, p.round()); } - ); -}; - -/* ------------- combination effects ------------- */ - -Effect.Fade = function(element) { - element = $(element); - var oldOpacity = element.getInlineOpacity(); - var options = Object.extend({ - from: element.getOpacity() || 1.0, - to: 0.0, - afterFinishInternal: function(effect) { - if (effect.options.to!=0) return; - effect.element.hide().setStyle({opacity: oldOpacity}); - } - }, arguments[1] || { }); - return new Effect.Opacity(element,options); -}; - -Effect.Appear = function(element) { - element = $(element); - var options = Object.extend({ - from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), - to: 1.0, - // force Safari to render floated elements properly - afterFinishInternal: function(effect) { - effect.element.forceRerendering(); - }, - beforeSetup: function(effect) { - effect.element.setOpacity(effect.options.from).show(); - }}, arguments[1] || { }); - return new Effect.Opacity(element,options); -}; - -Effect.Puff = function(element) { - element = $(element); - var oldStyle = { - opacity: element.getInlineOpacity(), - position: element.getStyle('position'), - top: element.style.top, - left: element.style.left, - width: element.style.width, - height: element.style.height - }; - return new Effect.Parallel( - [ new Effect.Scale(element, 200, - { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], - Object.extend({ duration: 1.0, - beforeSetupInternal: function(effect) { - Position.absolutize(effect.effects[0].element); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.hide().setStyle(oldStyle); } - }, arguments[1] || { }) - ); -}; - -Effect.BlindUp = function(element) { - element = $(element); - element.makeClipping(); - return new Effect.Scale(element, 0, - Object.extend({ scaleContent: false, - scaleX: false, - restoreAfterFinish: true, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping(); - } - }, arguments[1] || { }) - ); -}; - -Effect.BlindDown = function(element) { - element = $(element); - var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, - scaleX: false, - scaleFrom: 0, - scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, - restoreAfterFinish: true, - afterSetup: function(effect) { - effect.element.makeClipping().setStyle({height: '0px'}).show(); - }, - afterFinishInternal: function(effect) { - effect.element.undoClipping(); - } - }, arguments[1] || { })); -}; - -Effect.SwitchOff = function(element) { - element = $(element); - var oldOpacity = element.getInlineOpacity(); - return new Effect.Appear(element, Object.extend({ - duration: 0.4, - from: 0, - transition: Effect.Transitions.flicker, - afterFinishInternal: function(effect) { - new Effect.Scale(effect.element, 1, { - duration: 0.3, scaleFromCenter: true, - scaleX: false, scaleContent: false, restoreAfterFinish: true, - beforeSetup: function(effect) { - effect.element.makePositioned().makeClipping(); - }, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity}); - } - }); - } - }, arguments[1] || { })); -}; - -Effect.DropOut = function(element) { - element = $(element); - var oldStyle = { - top: element.getStyle('top'), - left: element.getStyle('left'), - opacity: element.getInlineOpacity() }; - return new Effect.Parallel( - [ new Effect.Move(element, {x: 0, y: 100, sync: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 }) ], - Object.extend( - { duration: 0.5, - beforeSetup: function(effect) { - effect.effects[0].element.makePositioned(); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); - } - }, arguments[1] || { })); -}; - -Effect.Shake = function(element) { - element = $(element); - var options = Object.extend({ - distance: 20, - duration: 0.5 - }, arguments[1] || {}); - var distance = parseFloat(options.distance); - var split = parseFloat(options.duration) / 10.0; - var oldStyle = { - top: element.getStyle('top'), - left: element.getStyle('left') }; - return new Effect.Move(element, - { x: distance, y: 0, duration: split, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { - new Effect.Move(effect.element, - { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) { - effect.element.undoPositioned().setStyle(oldStyle); - }}); }}); }}); }}); }}); }}); -}; - -Effect.SlideDown = function(element) { - element = $(element).cleanWhitespace(); - // SlideDown need to have the content of the element wrapped in a container element with fixed height! - var oldInnerBottom = element.down().getStyle('bottom'); - var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, - scaleX: false, - scaleFrom: window.opera ? 0 : 1, - scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, - restoreAfterFinish: true, - afterSetup: function(effect) { - effect.element.makePositioned(); - effect.element.down().makePositioned(); - if (window.opera) effect.element.setStyle({top: ''}); - effect.element.makeClipping().setStyle({height: '0px'}).show(); - }, - afterUpdateInternal: function(effect) { - effect.element.down().setStyle({bottom: - (effect.dims[0] - effect.element.clientHeight) + 'px' }); - }, - afterFinishInternal: function(effect) { - effect.element.undoClipping().undoPositioned(); - effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); } - }, arguments[1] || { }) - ); -}; - -Effect.SlideUp = function(element) { - element = $(element).cleanWhitespace(); - var oldInnerBottom = element.down().getStyle('bottom'); - var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, window.opera ? 0 : 1, - Object.extend({ scaleContent: false, - scaleX: false, - scaleMode: 'box', - scaleFrom: 100, - scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, - restoreAfterFinish: true, - afterSetup: function(effect) { - effect.element.makePositioned(); - effect.element.down().makePositioned(); - if (window.opera) effect.element.setStyle({top: ''}); - effect.element.makeClipping().show(); - }, - afterUpdateInternal: function(effect) { - effect.element.down().setStyle({bottom: - (effect.dims[0] - effect.element.clientHeight) + 'px' }); - }, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping().undoPositioned(); - effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); - } - }, arguments[1] || { }) - ); -}; - -// Bug in opera makes the TD containing this element expand for a instance after finish -Effect.Squish = function(element) { - return new Effect.Scale(element, window.opera ? 1 : 0, { - restoreAfterFinish: true, - beforeSetup: function(effect) { - effect.element.makeClipping(); - }, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping(); - } - }); -}; - -Effect.Grow = function(element) { - element = $(element); - var options = Object.extend({ - direction: 'center', - moveTransition: Effect.Transitions.sinoidal, - scaleTransition: Effect.Transitions.sinoidal, - opacityTransition: Effect.Transitions.full - }, arguments[1] || { }); - var oldStyle = { - top: element.style.top, - left: element.style.left, - height: element.style.height, - width: element.style.width, - opacity: element.getInlineOpacity() }; - - var dims = element.getDimensions(); - var initialMoveX, initialMoveY; - var moveX, moveY; - - switch (options.direction) { - case 'top-left': - initialMoveX = initialMoveY = moveX = moveY = 0; - break; - case 'top-right': - initialMoveX = dims.width; - initialMoveY = moveY = 0; - moveX = -dims.width; - break; - case 'bottom-left': - initialMoveX = moveX = 0; - initialMoveY = dims.height; - moveY = -dims.height; - break; - case 'bottom-right': - initialMoveX = dims.width; - initialMoveY = dims.height; - moveX = -dims.width; - moveY = -dims.height; - break; - case 'center': - initialMoveX = dims.width / 2; - initialMoveY = dims.height / 2; - moveX = -dims.width / 2; - moveY = -dims.height / 2; - break; - } - - return new Effect.Move(element, { - x: initialMoveX, - y: initialMoveY, - duration: 0.01, - beforeSetup: function(effect) { - effect.element.hide().makeClipping().makePositioned(); - }, - afterFinishInternal: function(effect) { - new Effect.Parallel( - [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), - new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), - new Effect.Scale(effect.element, 100, { - scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, - sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) - ], Object.extend({ - beforeSetup: function(effect) { - effect.effects[0].element.setStyle({height: '0px'}).show(); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); - } - }, options) - ); - } - }); -}; - -Effect.Shrink = function(element) { - element = $(element); - var options = Object.extend({ - direction: 'center', - moveTransition: Effect.Transitions.sinoidal, - scaleTransition: Effect.Transitions.sinoidal, - opacityTransition: Effect.Transitions.none - }, arguments[1] || { }); - var oldStyle = { - top: element.style.top, - left: element.style.left, - height: element.style.height, - width: element.style.width, - opacity: element.getInlineOpacity() }; - - var dims = element.getDimensions(); - var moveX, moveY; - - switch (options.direction) { - case 'top-left': - moveX = moveY = 0; - break; - case 'top-right': - moveX = dims.width; - moveY = 0; - break; - case 'bottom-left': - moveX = 0; - moveY = dims.height; - break; - case 'bottom-right': - moveX = dims.width; - moveY = dims.height; - break; - case 'center': - moveX = dims.width / 2; - moveY = dims.height / 2; - break; - } - - return new Effect.Parallel( - [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), - new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), - new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) - ], Object.extend({ - beforeStartInternal: function(effect) { - effect.effects[0].element.makePositioned().makeClipping(); - }, - afterFinishInternal: function(effect) { - effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } - }, options) - ); -}; - -Effect.Pulsate = function(element) { - element = $(element); - var options = arguments[1] || { }, - oldOpacity = element.getInlineOpacity(), - transition = options.transition || Effect.Transitions.linear, - reverser = function(pos){ - return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5); - }; - - return new Effect.Opacity(element, - Object.extend(Object.extend({ duration: 2.0, from: 0, - afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } - }, options), {transition: reverser})); -}; - -Effect.Fold = function(element) { - element = $(element); - var oldStyle = { - top: element.style.top, - left: element.style.left, - width: element.style.width, - height: element.style.height }; - element.makeClipping(); - return new Effect.Scale(element, 5, Object.extend({ - scaleContent: false, - scaleX: false, - afterFinishInternal: function(effect) { - new Effect.Scale(element, 1, { - scaleContent: false, - scaleY: false, - afterFinishInternal: function(effect) { - effect.element.hide().undoClipping().setStyle(oldStyle); - } }); - }}, arguments[1] || { })); -}; - -Effect.Morph = Class.create(Effect.Base, { - initialize: function(element) { - this.element = $(element); - if (!this.element) throw(Effect._elementDoesNotExistError); - var options = Object.extend({ - style: { } - }, arguments[1] || { }); - - if (!Object.isString(options.style)) this.style = $H(options.style); - else { - if (options.style.include(':')) - this.style = options.style.parseStyle(); - else { - this.element.addClassName(options.style); - this.style = $H(this.element.getStyles()); - this.element.removeClassName(options.style); - var css = this.element.getStyles(); - this.style = this.style.reject(function(style) { - return style.value == css[style.key]; - }); - options.afterFinishInternal = function(effect) { - effect.element.addClassName(effect.options.style); - effect.transforms.each(function(transform) { - effect.element.style[transform.style] = ''; - }); - }; - } - } - this.start(options); - }, - - setup: function(){ - function parseColor(color){ - if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; - color = color.parseColor(); - return $R(0,2).map(function(i){ - return parseInt( color.slice(i*2+1,i*2+3), 16 ); - }); - } - this.transforms = this.style.map(function(pair){ - var property = pair[0], value = pair[1], unit = null; - - if (value.parseColor('#zzzzzz') != '#zzzzzz') { - value = value.parseColor(); - unit = 'color'; - } else if (property == 'opacity') { - value = parseFloat(value); - if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout)) - this.element.setStyle({zoom: 1}); - } else if (Element.CSS_LENGTH.test(value)) { - var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/); - value = parseFloat(components[1]); - unit = (components.length == 3) ? components[2] : null; - } - - var originalValue = this.element.getStyle(property); - return { - style: property.camelize(), - originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), - targetValue: unit=='color' ? parseColor(value) : value, - unit: unit - }; - }.bind(this)).reject(function(transform){ - return ( - (transform.originalValue == transform.targetValue) || - ( - transform.unit != 'color' && - (isNaN(transform.originalValue) || isNaN(transform.targetValue)) - ) - ); - }); - }, - update: function(position) { - var style = { }, transform, i = this.transforms.length; - while(i--) - style[(transform = this.transforms[i]).style] = - transform.unit=='color' ? '#'+ - (Math.round(transform.originalValue[0]+ - (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() + - (Math.round(transform.originalValue[1]+ - (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() + - (Math.round(transform.originalValue[2]+ - (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() : - (transform.originalValue + - (transform.targetValue - transform.originalValue) * position).toFixed(3) + - (transform.unit === null ? '' : transform.unit); - this.element.setStyle(style, true); - } -}); - -Effect.Transform = Class.create({ - initialize: function(tracks){ - this.tracks = []; - this.options = arguments[1] || { }; - this.addTracks(tracks); - }, - addTracks: function(tracks){ - tracks.each(function(track){ - track = $H(track); - var data = track.values().first(); - this.tracks.push($H({ - ids: track.keys().first(), - effect: Effect.Morph, - options: { style: data } - })); - }.bind(this)); - return this; - }, - play: function(){ - return new Effect.Parallel( - this.tracks.map(function(track){ - var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options'); - var elements = [$(ids) || $$(ids)].flatten(); - return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) }); - }).flatten(), - this.options - ); - } -}); - -Element.CSS_PROPERTIES = $w( - 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + - 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + - 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + - 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + - 'fontSize fontWeight height left letterSpacing lineHeight ' + - 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+ - 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + - 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + - 'right textIndent top width wordSpacing zIndex'); - -Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; - -String.__parseStyleElement = document.createElement('div'); -String.prototype.parseStyle = function(){ - var style, styleRules = $H(); - if (Prototype.Browser.WebKit) - style = new Element('div',{style:this}).style; - else { - String.__parseStyleElement.innerHTML = '
    '; - style = String.__parseStyleElement.childNodes[0].style; - } - - Element.CSS_PROPERTIES.each(function(property){ - if (style[property]) styleRules.set(property, style[property]); - }); - - if (Prototype.Browser.IE && this.include('opacity')) - styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]); - - return styleRules; -}; - -if (document.defaultView && document.defaultView.getComputedStyle) { - Element.getStyles = function(element) { - var css = document.defaultView.getComputedStyle($(element), null); - return Element.CSS_PROPERTIES.inject({ }, function(styles, property) { - styles[property] = css[property]; - return styles; - }); - }; -} else { - Element.getStyles = function(element) { - element = $(element); - var css = element.currentStyle, styles; - styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) { - results[property] = css[property]; - return results; - }); - if (!styles.opacity) styles.opacity = element.getOpacity(); - return styles; - }; -} - -Effect.Methods = { - morph: function(element, style) { - element = $(element); - new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { })); - return element; - }, - visualEffect: function(element, effect, options) { - element = $(element); - var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1); - new Effect[klass](element, options); - return element; - }, - highlight: function(element, options) { - element = $(element); - new Effect.Highlight(element, options); - return element; - } -}; - -$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ - 'pulsate shake puff squish switchOff dropOut').each( - function(effect) { - Effect.Methods[effect] = function(element, options){ - element = $(element); - Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options); - return element; - }; - } -); - -$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( - function(f) { Effect.Methods[f] = Element[f]; } -); - -Element.addMethods(Effect.Methods); \ No newline at end of file diff --git a/public/javascripts/prototype.js b/public/javascripts/prototype.js deleted file mode 100644 index 06249a6ae..000000000 --- a/public/javascripts/prototype.js +++ /dev/null @@ -1,6001 +0,0 @@ -/* Prototype JavaScript framework, version 1.7_rc2 - * (c) 2005-2010 Sam Stephenson - * - * Prototype is freely distributable under the terms of an MIT-style license. - * For details, see the Prototype web site: http://www.prototypejs.org/ - * - *--------------------------------------------------------------------------*/ - -var Prototype = { - - Version: '1.7_rc2', - - Browser: (function(){ - var ua = navigator.userAgent; - var isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]'; - return { - IE: !!window.attachEvent && !isOpera, - Opera: isOpera, - WebKit: ua.indexOf('AppleWebKit/') > -1, - Gecko: ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1, - MobileSafari: /Apple.*Mobile/.test(ua) - } - })(), - - BrowserFeatures: { - XPath: !!document.evaluate, - - SelectorsAPI: !!document.querySelector, - - ElementExtensions: (function() { - var constructor = window.Element || window.HTMLElement; - return !!(constructor && constructor.prototype); - })(), - SpecificElementExtensions: (function() { - if (typeof window.HTMLDivElement !== 'undefined') - return true; - - var div = document.createElement('div'), - form = document.createElement('form'), - isSupported = false; - - if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) { - isSupported = true; - } - - div = form = null; - - return isSupported; - })() - }, - - ScriptFragment: ']*>([\\S\\s]*?)<\/script>', - JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/, - - emptyFunction: function() { }, - - K: function(x) { return x } -}; - -if (Prototype.Browser.MobileSafari) - Prototype.BrowserFeatures.SpecificElementExtensions = false; - - -var Abstract = { }; - - -var Try = { - these: function() { - var returnValue; - - for (var i = 0, length = arguments.length; i < length; i++) { - var lambda = arguments[i]; - try { - returnValue = lambda(); - break; - } catch (e) { } - } - - return returnValue; - } -}; - -/* Based on Alex Arnell's inheritance implementation. */ - -var Class = (function() { - - var IS_DONTENUM_BUGGY = (function(){ - for (var p in { toString: 1 }) { - if (p === 'toString') return false; - } - return true; - })(); - - function subclass() {}; - function create() { - var parent = null, properties = $A(arguments); - if (Object.isFunction(properties[0])) - parent = properties.shift(); - - function klass() { - this.initialize.apply(this, arguments); - } - - Object.extend(klass, Class.Methods); - klass.superclass = parent; - klass.subclasses = []; - - if (parent) { - subclass.prototype = parent.prototype; - klass.prototype = new subclass; - parent.subclasses.push(klass); - } - - for (var i = 0, length = properties.length; i < length; i++) - klass.addMethods(properties[i]); - - if (!klass.prototype.initialize) - klass.prototype.initialize = Prototype.emptyFunction; - - klass.prototype.constructor = klass; - return klass; - } - - function addMethods(source) { - var ancestor = this.superclass && this.superclass.prototype, - properties = Object.keys(source); - - if (IS_DONTENUM_BUGGY) { - if (source.toString != Object.prototype.toString) - properties.push("toString"); - if (source.valueOf != Object.prototype.valueOf) - properties.push("valueOf"); - } - - for (var i = 0, length = properties.length; i < length; i++) { - var property = properties[i], value = source[property]; - if (ancestor && Object.isFunction(value) && - value.argumentNames()[0] == "$super") { - var method = value; - value = (function(m) { - return function() { return ancestor[m].apply(this, arguments); }; - })(property).wrap(method); - - value.valueOf = method.valueOf.bind(method); - value.toString = method.toString.bind(method); - } - this.prototype[property] = value; - } - - return this; - } - - return { - create: create, - Methods: { - addMethods: addMethods - } - }; -})(); -(function() { - - var _toString = Object.prototype.toString, - NULL_TYPE = 'Null', - UNDEFINED_TYPE = 'Undefined', - BOOLEAN_TYPE = 'Boolean', - NUMBER_TYPE = 'Number', - STRING_TYPE = 'String', - OBJECT_TYPE = 'Object', - BOOLEAN_CLASS = '[object Boolean]', - NUMBER_CLASS = '[object Number]', - STRING_CLASS = '[object String]', - ARRAY_CLASS = '[object Array]', - NATIVE_JSON_STRINGIFY_SUPPORT = window.JSON && - typeof JSON.stringify === 'function' && - JSON.stringify(0) === '0' && - typeof JSON.stringify(Prototype.K) === 'undefined'; - - function Type(o) { - switch(o) { - case null: return NULL_TYPE; - case (void 0): return UNDEFINED_TYPE; - } - var type = typeof o; - switch(type) { - case 'boolean': return BOOLEAN_TYPE; - case 'number': return NUMBER_TYPE; - case 'string': return STRING_TYPE; - } - return OBJECT_TYPE; - } - - function extend(destination, source) { - for (var property in source) - destination[property] = source[property]; - return destination; - } - - function inspect(object) { - try { - if (isUndefined(object)) return 'undefined'; - if (object === null) return 'null'; - return object.inspect ? object.inspect() : String(object); - } catch (e) { - if (e instanceof RangeError) return '...'; - throw e; - } - } - - function toJSON(value) { - return Str('', { '': value }, []); - } - - function Str(key, holder, stack) { - var value = holder[key], - type = typeof value; - - if (Type(value) === OBJECT_TYPE && typeof value.toJSON === 'function') { - value = value.toJSON(key); - } - - var _class = _toString.call(value); - - switch (_class) { - case NUMBER_CLASS: - case BOOLEAN_CLASS: - case STRING_CLASS: - value = value.valueOf(); - } - - switch (value) { - case null: return 'null'; - case true: return 'true'; - case false: return 'false'; - } - - type = typeof value; - switch (type) { - case 'string': - return value.inspect(true); - case 'number': - return isFinite(value) ? String(value) : 'null'; - case 'object': - - for (var i = 0, length = stack.length; i < length; i++) { - if (stack[i] === value) { throw new TypeError(); } - } - stack.push(value); - - var partial = []; - if (_class === ARRAY_CLASS) { - for (var i = 0, length = value.length; i < length; i++) { - var str = Str(i, value, stack); - partial.push(typeof str === 'undefined' ? 'null' : str); - } - partial = '[' + partial.join(',') + ']'; - } else { - var keys = Object.keys(value); - for (var i = 0, length = keys.length; i < length; i++) { - var key = keys[i], str = Str(key, value, stack); - if (typeof str !== "undefined") { - partial.push(key.inspect(true)+ ':' + str); - } - } - partial = '{' + partial.join(',') + '}'; - } - stack.pop(); - return partial; - } - } - - function stringify(object) { - return JSON.stringify(object); - } - - function toQueryString(object) { - return $H(object).toQueryString(); - } - - function toHTML(object) { - return object && object.toHTML ? object.toHTML() : String.interpret(object); - } - - function keys(object) { - if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); } - var results = []; - for (var property in object) { - if (object.hasOwnProperty(property)) { - results.push(property); - } - } - return results; - } - - function values(object) { - var results = []; - for (var property in object) - results.push(object[property]); - return results; - } - - function clone(object) { - return extend({ }, object); - } - - function isElement(object) { - return !!(object && object.nodeType == 1); - } - - function isArray(object) { - return _toString.call(object) === ARRAY_CLASS; - } - - var hasNativeIsArray = (typeof Array.isArray == 'function') - && Array.isArray([]) && !Array.isArray({}); - - if (hasNativeIsArray) { - isArray = Array.isArray; - } - - function isHash(object) { - return object instanceof Hash; - } - - function isFunction(object) { - return typeof object === "function"; - } - - function isString(object) { - return _toString.call(object) === STRING_CLASS; - } - - function isNumber(object) { - return _toString.call(object) === NUMBER_CLASS; - } - - function isUndefined(object) { - return typeof object === "undefined"; - } - - extend(Object, { - extend: extend, - inspect: inspect, - toJSON: NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON, - toQueryString: toQueryString, - toHTML: toHTML, - keys: Object.keys || keys, - values: values, - clone: clone, - isElement: isElement, - isArray: isArray, - isHash: isHash, - isFunction: isFunction, - isString: isString, - isNumber: isNumber, - isUndefined: isUndefined - }); -})(); -Object.extend(Function.prototype, (function() { - var slice = Array.prototype.slice; - - function update(array, args) { - var arrayLength = array.length, length = args.length; - while (length--) array[arrayLength + length] = args[length]; - return array; - } - - function merge(array, args) { - array = slice.call(array, 0); - return update(array, args); - } - - function argumentNames() { - var names = this.toString().match(/^[\s\(]*function[^(]*\(([^)]*)\)/)[1] - .replace(/\/\/.*?[\r\n]|\/\*(?:.|[\r\n])*?\*\//g, '') - .replace(/\s+/g, '').split(','); - return names.length == 1 && !names[0] ? [] : names; - } - - function bind(context) { - if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this; - var __method = this, args = slice.call(arguments, 1); - return function() { - var a = merge(args, arguments); - return __method.apply(context, a); - } - } - - function bindAsEventListener(context) { - var __method = this, args = slice.call(arguments, 1); - return function(event) { - var a = update([event || window.event], args); - return __method.apply(context, a); - } - } - - function curry() { - if (!arguments.length) return this; - var __method = this, args = slice.call(arguments, 0); - return function() { - var a = merge(args, arguments); - return __method.apply(this, a); - } - } - - function delay(timeout) { - var __method = this, args = slice.call(arguments, 1); - timeout = timeout * 1000; - return window.setTimeout(function() { - return __method.apply(__method, args); - }, timeout); - } - - function defer() { - var args = update([0.01], arguments); - return this.delay.apply(this, args); - } - - function wrap(wrapper) { - var __method = this; - return function() { - var a = update([__method.bind(this)], arguments); - return wrapper.apply(this, a); - } - } - - function methodize() { - if (this._methodized) return this._methodized; - var __method = this; - return this._methodized = function() { - var a = update([this], arguments); - return __method.apply(null, a); - }; - } - - return { - argumentNames: argumentNames, - bind: bind, - bindAsEventListener: bindAsEventListener, - curry: curry, - delay: delay, - defer: defer, - wrap: wrap, - methodize: methodize - } -})()); - - - -(function(proto) { - - - function toISOString() { - return this.getUTCFullYear() + '-' + - (this.getUTCMonth() + 1).toPaddedString(2) + '-' + - this.getUTCDate().toPaddedString(2) + 'T' + - this.getUTCHours().toPaddedString(2) + ':' + - this.getUTCMinutes().toPaddedString(2) + ':' + - this.getUTCSeconds().toPaddedString(2) + 'Z'; - } - - - function toJSON() { - return this.toISOString(); - } - - if (!proto.toISOString) proto.toISOString = toISOString; - if (!proto.toJSON) proto.toJSON = toJSON; - -})(Date.prototype); - - -RegExp.prototype.match = RegExp.prototype.test; - -RegExp.escape = function(str) { - return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1'); -}; -var PeriodicalExecuter = Class.create({ - initialize: function(callback, frequency) { - this.callback = callback; - this.frequency = frequency; - this.currentlyExecuting = false; - - this.registerCallback(); - }, - - registerCallback: function() { - this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - execute: function() { - this.callback(this); - }, - - stop: function() { - if (!this.timer) return; - clearInterval(this.timer); - this.timer = null; - }, - - onTimerEvent: function() { - if (!this.currentlyExecuting) { - try { - this.currentlyExecuting = true; - this.execute(); - this.currentlyExecuting = false; - } catch(e) { - this.currentlyExecuting = false; - throw e; - } - } - } -}); -Object.extend(String, { - interpret: function(value) { - return value == null ? '' : String(value); - }, - specialChar: { - '\b': '\\b', - '\t': '\\t', - '\n': '\\n', - '\f': '\\f', - '\r': '\\r', - '\\': '\\\\' - } -}); - -Object.extend(String.prototype, (function() { - var NATIVE_JSON_PARSE_SUPPORT = window.JSON && - typeof JSON.parse === 'function' && - JSON.parse('{"test": true}').test; - - function prepareReplacement(replacement) { - if (Object.isFunction(replacement)) return replacement; - var template = new Template(replacement); - return function(match) { return template.evaluate(match) }; - } - - function gsub(pattern, replacement) { - var result = '', source = this, match; - replacement = prepareReplacement(replacement); - - if (Object.isString(pattern)) - pattern = RegExp.escape(pattern); - - if (!(pattern.length || pattern.source)) { - replacement = replacement(''); - return replacement + source.split('').join(replacement) + replacement; - } - - while (source.length > 0) { - if (match = source.match(pattern)) { - result += source.slice(0, match.index); - result += String.interpret(replacement(match)); - source = source.slice(match.index + match[0].length); - } else { - result += source, source = ''; - } - } - return result; - } - - function sub(pattern, replacement, count) { - replacement = prepareReplacement(replacement); - count = Object.isUndefined(count) ? 1 : count; - - return this.gsub(pattern, function(match) { - if (--count < 0) return match[0]; - return replacement(match); - }); - } - - function scan(pattern, iterator) { - this.gsub(pattern, iterator); - return String(this); - } - - function truncate(length, truncation) { - length = length || 30; - truncation = Object.isUndefined(truncation) ? '...' : truncation; - return this.length > length ? - this.slice(0, length - truncation.length) + truncation : String(this); - } - - function strip() { - return this.replace(/^\s+/, '').replace(/\s+$/, ''); - } - - function stripTags() { - return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?>|<\/\w+>/gi, ''); - } - - function stripScripts() { - return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); - } - - function extractScripts() { - var matchAll = new RegExp(Prototype.ScriptFragment, 'img'), - matchOne = new RegExp(Prototype.ScriptFragment, 'im'); - return (this.match(matchAll) || []).map(function(scriptTag) { - return (scriptTag.match(matchOne) || ['', ''])[1]; - }); - } - - function evalScripts() { - return this.extractScripts().map(function(script) { return eval(script) }); - } - - function escapeHTML() { - return this.replace(/&/g,'&').replace(//g,'>'); - } - - function unescapeHTML() { - return this.stripTags().replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&'); - } - - - function toQueryParams(separator) { - var match = this.strip().match(/([^?#]*)(#.*)?$/); - if (!match) return { }; - - return match[1].split(separator || '&').inject({ }, function(hash, pair) { - if ((pair = pair.split('='))[0]) { - var key = decodeURIComponent(pair.shift()), - value = pair.length > 1 ? pair.join('=') : pair[0]; - - if (value != undefined) value = decodeURIComponent(value); - - if (key in hash) { - if (!Object.isArray(hash[key])) hash[key] = [hash[key]]; - hash[key].push(value); - } - else hash[key] = value; - } - return hash; - }); - } - - function toArray() { - return this.split(''); - } - - function succ() { - return this.slice(0, this.length - 1) + - String.fromCharCode(this.charCodeAt(this.length - 1) + 1); - } - - function times(count) { - return count < 1 ? '' : new Array(count + 1).join(this); - } - - function camelize() { - return this.replace(/-+(.)?/g, function(match, chr) { - return chr ? chr.toUpperCase() : ''; - }); - } - - function capitalize() { - return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase(); - } - - function underscore() { - return this.replace(/::/g, '/') - .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2') - .replace(/([a-z\d])([A-Z])/g, '$1_$2') - .replace(/-/g, '_') - .toLowerCase(); - } - - function dasherize() { - return this.replace(/_/g, '-'); - } - - function inspect(useDoubleQuotes) { - var escapedString = this.replace(/[\x00-\x1f\\]/g, function(character) { - if (character in String.specialChar) { - return String.specialChar[character]; - } - return '\\u00' + character.charCodeAt().toPaddedString(2, 16); - }); - if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"'; - return "'" + escapedString.replace(/'/g, '\\\'') + "'"; - } - - function unfilterJSON(filter) { - return this.replace(filter || Prototype.JSONFilter, '$1'); - } - - function isJSON() { - var str = this; - if (str.blank()) return false; - str = str.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@'); - str = str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']'); - str = str.replace(/(?:^|:|,)(?:\s*\[)+/g, ''); - return (/^[\],:{}\s]*$/).test(str); - } - - function evalJSON(sanitize) { - var json = this.unfilterJSON(), - cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g; - if (cx.test(json)) { - json = json.replace(cx, function (a) { - return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); - }); - } - try { - if (!sanitize || json.isJSON()) return eval('(' + json + ')'); - } catch (e) { } - throw new SyntaxError('Badly formed JSON string: ' + this.inspect()); - } - - function parseJSON() { - var json = this.unfilterJSON(); - return JSON.parse(json); - } - - function include(pattern) { - return this.indexOf(pattern) > -1; - } - - function startsWith(pattern) { - return this.lastIndexOf(pattern, 0) === 0; - } - - function endsWith(pattern) { - var d = this.length - pattern.length; - return d >= 0 && this.indexOf(pattern, d) === d; - } - - function empty() { - return this == ''; - } - - function blank() { - return /^\s*$/.test(this); - } - - function interpolate(object, pattern) { - return new Template(this, pattern).evaluate(object); - } - - return { - gsub: gsub, - sub: sub, - scan: scan, - truncate: truncate, - strip: String.prototype.trim || strip, - stripTags: stripTags, - stripScripts: stripScripts, - extractScripts: extractScripts, - evalScripts: evalScripts, - escapeHTML: escapeHTML, - unescapeHTML: unescapeHTML, - toQueryParams: toQueryParams, - parseQuery: toQueryParams, - toArray: toArray, - succ: succ, - times: times, - camelize: camelize, - capitalize: capitalize, - underscore: underscore, - dasherize: dasherize, - inspect: inspect, - unfilterJSON: unfilterJSON, - isJSON: isJSON, - evalJSON: NATIVE_JSON_PARSE_SUPPORT ? parseJSON : evalJSON, - include: include, - startsWith: startsWith, - endsWith: endsWith, - empty: empty, - blank: blank, - interpolate: interpolate - }; -})()); - -var Template = Class.create({ - initialize: function(template, pattern) { - this.template = template.toString(); - this.pattern = pattern || Template.Pattern; - }, - - evaluate: function(object) { - if (object && Object.isFunction(object.toTemplateReplacements)) - object = object.toTemplateReplacements(); - - return this.template.gsub(this.pattern, function(match) { - if (object == null) return (match[1] + ''); - - var before = match[1] || ''; - if (before == '\\') return match[2]; - - var ctx = object, expr = match[3], - pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/; - - match = pattern.exec(expr); - if (match == null) return before; - - while (match != null) { - var comp = match[1].startsWith('[') ? match[2].replace(/\\\\]/g, ']') : match[1]; - ctx = ctx[comp]; - if (null == ctx || '' == match[3]) break; - expr = expr.substring('[' == match[3] ? match[1].length : match[0].length); - match = pattern.exec(expr); - } - - return before + String.interpret(ctx); - }); - } -}); -Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; - -var $break = { }; - -var Enumerable = (function() { - function each(iterator, context) { - var index = 0; - try { - this._each(function(value) { - iterator.call(context, value, index++); - }); - } catch (e) { - if (e != $break) throw e; - } - return this; - } - - function eachSlice(number, iterator, context) { - var index = -number, slices = [], array = this.toArray(); - if (number < 1) return array; - while ((index += number) < array.length) - slices.push(array.slice(index, index+number)); - return slices.collect(iterator, context); - } - - function all(iterator, context) { - iterator = iterator || Prototype.K; - var result = true; - this.each(function(value, index) { - result = result && !!iterator.call(context, value, index); - if (!result) throw $break; - }); - return result; - } - - function any(iterator, context) { - iterator = iterator || Prototype.K; - var result = false; - this.each(function(value, index) { - if (result = !!iterator.call(context, value, index)) - throw $break; - }); - return result; - } - - function collect(iterator, context) { - iterator = iterator || Prototype.K; - var results = []; - this.each(function(value, index) { - results.push(iterator.call(context, value, index)); - }); - return results; - } - - function detect(iterator, context) { - var result; - this.each(function(value, index) { - if (iterator.call(context, value, index)) { - result = value; - throw $break; - } - }); - return result; - } - - function findAll(iterator, context) { - var results = []; - this.each(function(value, index) { - if (iterator.call(context, value, index)) - results.push(value); - }); - return results; - } - - function grep(filter, iterator, context) { - iterator = iterator || Prototype.K; - var results = []; - - if (Object.isString(filter)) - filter = new RegExp(RegExp.escape(filter)); - - this.each(function(value, index) { - if (filter.match(value)) - results.push(iterator.call(context, value, index)); - }); - return results; - } - - function include(object) { - if (Object.isFunction(this.indexOf)) - if (this.indexOf(object) != -1) return true; - - var found = false; - this.each(function(value) { - if (value == object) { - found = true; - throw $break; - } - }); - return found; - } - - function inGroupsOf(number, fillWith) { - fillWith = Object.isUndefined(fillWith) ? null : fillWith; - return this.eachSlice(number, function(slice) { - while(slice.length < number) slice.push(fillWith); - return slice; - }); - } - - function inject(memo, iterator, context) { - this.each(function(value, index) { - memo = iterator.call(context, memo, value, index); - }); - return memo; - } - - function invoke(method) { - var args = $A(arguments).slice(1); - return this.map(function(value) { - return value[method].apply(value, args); - }); - } - - function max(iterator, context) { - iterator = iterator || Prototype.K; - var result; - this.each(function(value, index) { - value = iterator.call(context, value, index); - if (result == null || value >= result) - result = value; - }); - return result; - } - - function min(iterator, context) { - iterator = iterator || Prototype.K; - var result; - this.each(function(value, index) { - value = iterator.call(context, value, index); - if (result == null || value < result) - result = value; - }); - return result; - } - - function partition(iterator, context) { - iterator = iterator || Prototype.K; - var trues = [], falses = []; - this.each(function(value, index) { - (iterator.call(context, value, index) ? - trues : falses).push(value); - }); - return [trues, falses]; - } - - function pluck(property) { - var results = []; - this.each(function(value) { - results.push(value[property]); - }); - return results; - } - - function reject(iterator, context) { - var results = []; - this.each(function(value, index) { - if (!iterator.call(context, value, index)) - results.push(value); - }); - return results; - } - - function sortBy(iterator, context) { - return this.map(function(value, index) { - return { - value: value, - criteria: iterator.call(context, value, index) - }; - }).sort(function(left, right) { - var a = left.criteria, b = right.criteria; - return a < b ? -1 : a > b ? 1 : 0; - }).pluck('value'); - } - - function toArray() { - return this.map(); - } - - function zip() { - var iterator = Prototype.K, args = $A(arguments); - if (Object.isFunction(args.last())) - iterator = args.pop(); - - var collections = [this].concat(args).map($A); - return this.map(function(value, index) { - return iterator(collections.pluck(index)); - }); - } - - function size() { - return this.toArray().length; - } - - function inspect() { - return '#'; - } - - - - - - - - - - return { - each: each, - eachSlice: eachSlice, - all: all, - every: all, - any: any, - some: any, - collect: collect, - map: collect, - detect: detect, - findAll: findAll, - select: findAll, - filter: findAll, - grep: grep, - include: include, - member: include, - inGroupsOf: inGroupsOf, - inject: inject, - invoke: invoke, - max: max, - min: min, - partition: partition, - pluck: pluck, - reject: reject, - sortBy: sortBy, - toArray: toArray, - entries: toArray, - zip: zip, - size: size, - inspect: inspect, - find: detect - }; -})(); - -function $A(iterable) { - if (!iterable) return []; - if ('toArray' in Object(iterable)) return iterable.toArray(); - var length = iterable.length || 0, results = new Array(length); - while (length--) results[length] = iterable[length]; - return results; -} - - -function $w(string) { - if (!Object.isString(string)) return []; - string = string.strip(); - return string ? string.split(/\s+/) : []; -} - -Array.from = $A; - - -(function() { - var arrayProto = Array.prototype, - slice = arrayProto.slice, - _each = arrayProto.forEach; // use native browser JS 1.6 implementation if available - - function each(iterator) { - for (var i = 0, length = this.length; i < length; i++) - iterator(this[i]); - } - if (!_each) _each = each; - - function clear() { - this.length = 0; - return this; - } - - function first() { - return this[0]; - } - - function last() { - return this[this.length - 1]; - } - - function compact() { - return this.select(function(value) { - return value != null; - }); - } - - function flatten() { - return this.inject([], function(array, value) { - if (Object.isArray(value)) - return array.concat(value.flatten()); - array.push(value); - return array; - }); - } - - function without() { - var values = slice.call(arguments, 0); - return this.select(function(value) { - return !values.include(value); - }); - } - - function reverse(inline) { - return (inline === false ? this.toArray() : this)._reverse(); - } - - function uniq(sorted) { - return this.inject([], function(array, value, index) { - if (0 == index || (sorted ? array.last() != value : !array.include(value))) - array.push(value); - return array; - }); - } - - function intersect(array) { - return this.uniq().findAll(function(item) { - return array.detect(function(value) { return item === value }); - }); - } - - - function clone() { - return slice.call(this, 0); - } - - function size() { - return this.length; - } - - function inspect() { - return '[' + this.map(Object.inspect).join(', ') + ']'; - } - - function indexOf(item, i) { - i || (i = 0); - var length = this.length; - if (i < 0) i = length + i; - for (; i < length; i++) - if (this[i] === item) return i; - return -1; - } - - function lastIndexOf(item, i) { - i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1; - var n = this.slice(0, i).reverse().indexOf(item); - return (n < 0) ? n : i - n - 1; - } - - function concat() { - var array = slice.call(this, 0), item; - for (var i = 0, length = arguments.length; i < length; i++) { - item = arguments[i]; - if (Object.isArray(item) && !('callee' in item)) { - for (var j = 0, arrayLength = item.length; j < arrayLength; j++) - array.push(item[j]); - } else { - array.push(item); - } - } - return array; - } - - Object.extend(arrayProto, Enumerable); - - if (!arrayProto._reverse) - arrayProto._reverse = arrayProto.reverse; - - Object.extend(arrayProto, { - _each: _each, - clear: clear, - first: first, - last: last, - compact: compact, - flatten: flatten, - without: without, - reverse: reverse, - uniq: uniq, - intersect: intersect, - clone: clone, - toArray: clone, - size: size, - inspect: inspect - }); - - var CONCAT_ARGUMENTS_BUGGY = (function() { - return [].concat(arguments)[0][0] !== 1; - })(1,2) - - if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat; - - if (!arrayProto.indexOf) arrayProto.indexOf = indexOf; - if (!arrayProto.lastIndexOf) arrayProto.lastIndexOf = lastIndexOf; -})(); -function $H(object) { - return new Hash(object); -}; - -var Hash = Class.create(Enumerable, (function() { - function initialize(object) { - this._object = Object.isHash(object) ? object.toObject() : Object.clone(object); - } - - - function _each(iterator) { - for (var key in this._object) { - var value = this._object[key], pair = [key, value]; - pair.key = key; - pair.value = value; - iterator(pair); - } - } - - function set(key, value) { - return this._object[key] = value; - } - - function get(key) { - if (this._object[key] !== Object.prototype[key]) - return this._object[key]; - } - - function unset(key) { - var value = this._object[key]; - delete this._object[key]; - return value; - } - - function toObject() { - return Object.clone(this._object); - } - - - - function keys() { - return this.pluck('key'); - } - - function values() { - return this.pluck('value'); - } - - function index(value) { - var match = this.detect(function(pair) { - return pair.value === value; - }); - return match && match.key; - } - - function merge(object) { - return this.clone().update(object); - } - - function update(object) { - return new Hash(object).inject(this, function(result, pair) { - result.set(pair.key, pair.value); - return result; - }); - } - - function toQueryPair(key, value) { - if (Object.isUndefined(value)) return key; - return key + '=' + encodeURIComponent(String.interpret(value)); - } - - function toQueryString() { - return this.inject([], function(results, pair) { - var key = encodeURIComponent(pair.key), values = pair.value; - - if (values && typeof values == 'object') { - if (Object.isArray(values)) - return results.concat(values.map(toQueryPair.curry(key))); - } else results.push(toQueryPair(key, values)); - return results; - }).join('&'); - } - - function inspect() { - return '#'; - } - - function clone() { - return new Hash(this); - } - - return { - initialize: initialize, - _each: _each, - set: set, - get: get, - unset: unset, - toObject: toObject, - toTemplateReplacements: toObject, - keys: keys, - values: values, - index: index, - merge: merge, - update: update, - toQueryString: toQueryString, - inspect: inspect, - toJSON: toObject, - clone: clone - }; -})()); - -Hash.from = $H; -Object.extend(Number.prototype, (function() { - function toColorPart() { - return this.toPaddedString(2, 16); - } - - function succ() { - return this + 1; - } - - function times(iterator, context) { - $R(0, this, true).each(iterator, context); - return this; - } - - function toPaddedString(length, radix) { - var string = this.toString(radix || 10); - return '0'.times(length - string.length) + string; - } - - function abs() { - return Math.abs(this); - } - - function round() { - return Math.round(this); - } - - function ceil() { - return Math.ceil(this); - } - - function floor() { - return Math.floor(this); - } - - return { - toColorPart: toColorPart, - succ: succ, - times: times, - toPaddedString: toPaddedString, - abs: abs, - round: round, - ceil: ceil, - floor: floor - }; -})()); - -function $R(start, end, exclusive) { - return new ObjectRange(start, end, exclusive); -} - -var ObjectRange = Class.create(Enumerable, (function() { - function initialize(start, end, exclusive) { - this.start = start; - this.end = end; - this.exclusive = exclusive; - } - - function _each(iterator) { - var value = this.start; - while (this.include(value)) { - iterator(value); - value = value.succ(); - } - } - - function include(value) { - if (value < this.start) - return false; - if (this.exclusive) - return value < this.end; - return value <= this.end; - } - - return { - initialize: initialize, - _each: _each, - include: include - }; -})()); - - - -var Ajax = { - getTransport: function() { - return Try.these( - function() {return new XMLHttpRequest()}, - function() {return new ActiveXObject('Msxml2.XMLHTTP')}, - function() {return new ActiveXObject('Microsoft.XMLHTTP')} - ) || false; - }, - - activeRequestCount: 0 -}; - -Ajax.Responders = { - responders: [], - - _each: function(iterator) { - this.responders._each(iterator); - }, - - register: function(responder) { - if (!this.include(responder)) - this.responders.push(responder); - }, - - unregister: function(responder) { - this.responders = this.responders.without(responder); - }, - - dispatch: function(callback, request, transport, json) { - this.each(function(responder) { - if (Object.isFunction(responder[callback])) { - try { - responder[callback].apply(responder, [request, transport, json]); - } catch (e) { } - } - }); - } -}; - -Object.extend(Ajax.Responders, Enumerable); - -Ajax.Responders.register({ - onCreate: function() { Ajax.activeRequestCount++ }, - onComplete: function() { Ajax.activeRequestCount-- } -}); -Ajax.Base = Class.create({ - initialize: function(options) { - this.options = { - method: 'post', - asynchronous: true, - contentType: 'application/x-www-form-urlencoded', - encoding: 'UTF-8', - parameters: '', - evalJSON: true, - evalJS: true - }; - Object.extend(this.options, options || { }); - - this.options.method = this.options.method.toLowerCase(); - - if (Object.isString(this.options.parameters)) - this.options.parameters = this.options.parameters.toQueryParams(); - else if (Object.isHash(this.options.parameters)) - this.options.parameters = this.options.parameters.toObject(); - } -}); -Ajax.Request = Class.create(Ajax.Base, { - _complete: false, - - initialize: function($super, url, options) { - $super(options); - this.transport = Ajax.getTransport(); - this.request(url); - }, - - request: function(url) { - this.url = url; - this.method = this.options.method; - var params = Object.clone(this.options.parameters); - - if (!['get', 'post'].include(this.method)) { - params['_method'] = this.method; - this.method = 'post'; - } - - this.parameters = params; - - if (params = Object.toQueryString(params)) { - if (this.method == 'get') - this.url += (this.url.include('?') ? '&' : '?') + params; - else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) - params += '&_='; - } - - try { - var response = new Ajax.Response(this); - if (this.options.onCreate) this.options.onCreate(response); - Ajax.Responders.dispatch('onCreate', this, response); - - this.transport.open(this.method.toUpperCase(), this.url, - this.options.asynchronous); - - if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1); - - this.transport.onreadystatechange = this.onStateChange.bind(this); - this.setRequestHeaders(); - - this.body = this.method == 'post' ? (this.options.postBody || params) : null; - this.transport.send(this.body); - - /* Force Firefox to handle ready state 4 for synchronous requests */ - if (!this.options.asynchronous && this.transport.overrideMimeType) - this.onStateChange(); - - } - catch (e) { - this.dispatchException(e); - } - }, - - onStateChange: function() { - var readyState = this.transport.readyState; - if (readyState > 1 && !((readyState == 4) && this._complete)) - this.respondToReadyState(this.transport.readyState); - }, - - setRequestHeaders: function() { - var headers = { - 'X-Requested-With': 'XMLHttpRequest', - 'X-Prototype-Version': Prototype.Version, - 'Accept': 'text/javascript, text/html, application/xml, text/xml, */*' - }; - - if (this.method == 'post') { - headers['Content-type'] = this.options.contentType + - (this.options.encoding ? '; charset=' + this.options.encoding : ''); - - /* Force "Connection: close" for older Mozilla browsers to work - * around a bug where XMLHttpRequest sends an incorrect - * Content-length header. See Mozilla Bugzilla #246651. - */ - if (this.transport.overrideMimeType && - (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) - headers['Connection'] = 'close'; - } - - if (typeof this.options.requestHeaders == 'object') { - var extras = this.options.requestHeaders; - - if (Object.isFunction(extras.push)) - for (var i = 0, length = extras.length; i < length; i += 2) - headers[extras[i]] = extras[i+1]; - else - $H(extras).each(function(pair) { headers[pair.key] = pair.value }); - } - - for (var name in headers) - this.transport.setRequestHeader(name, headers[name]); - }, - - success: function() { - var status = this.getStatus(); - return !status || (status >= 200 && status < 300); - }, - - getStatus: function() { - try { - return this.transport.status || 0; - } catch (e) { return 0 } - }, - - respondToReadyState: function(readyState) { - var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this); - - if (state == 'Complete') { - try { - this._complete = true; - (this.options['on' + response.status] - || this.options['on' + (this.success() ? 'Success' : 'Failure')] - || Prototype.emptyFunction)(response, response.headerJSON); - } catch (e) { - this.dispatchException(e); - } - - var contentType = response.getHeader('Content-type'); - if (this.options.evalJS == 'force' - || (this.options.evalJS && this.isSameOrigin() && contentType - && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i))) - this.evalResponse(); - } - - try { - (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON); - Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON); - } catch (e) { - this.dispatchException(e); - } - - if (state == 'Complete') { - this.transport.onreadystatechange = Prototype.emptyFunction; - } - }, - - isSameOrigin: function() { - var m = this.url.match(/^\s*https?:\/\/[^\/]*/); - return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({ - protocol: location.protocol, - domain: document.domain, - port: location.port ? ':' + location.port : '' - })); - }, - - getHeader: function(name) { - try { - return this.transport.getResponseHeader(name) || null; - } catch (e) { return null; } - }, - - evalResponse: function() { - try { - return eval((this.transport.responseText || '').unfilterJSON()); - } catch (e) { - this.dispatchException(e); - } - }, - - dispatchException: function(exception) { - (this.options.onException || Prototype.emptyFunction)(this, exception); - Ajax.Responders.dispatch('onException', this, exception); - } -}); - -Ajax.Request.Events = - ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; - - - - - - - - -Ajax.Response = Class.create({ - initialize: function(request){ - this.request = request; - var transport = this.transport = request.transport, - readyState = this.readyState = transport.readyState; - - if ((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) { - this.status = this.getStatus(); - this.statusText = this.getStatusText(); - this.responseText = String.interpret(transport.responseText); - this.headerJSON = this._getHeaderJSON(); - } - - if (readyState == 4) { - var xml = transport.responseXML; - this.responseXML = Object.isUndefined(xml) ? null : xml; - this.responseJSON = this._getResponseJSON(); - } - }, - - status: 0, - - statusText: '', - - getStatus: Ajax.Request.prototype.getStatus, - - getStatusText: function() { - try { - return this.transport.statusText || ''; - } catch (e) { return '' } - }, - - getHeader: Ajax.Request.prototype.getHeader, - - getAllHeaders: function() { - try { - return this.getAllResponseHeaders(); - } catch (e) { return null } - }, - - getResponseHeader: function(name) { - return this.transport.getResponseHeader(name); - }, - - getAllResponseHeaders: function() { - return this.transport.getAllResponseHeaders(); - }, - - _getHeaderJSON: function() { - var json = this.getHeader('X-JSON'); - if (!json) return null; - json = decodeURIComponent(escape(json)); - try { - return json.evalJSON(this.request.options.sanitizeJSON || - !this.request.isSameOrigin()); - } catch (e) { - this.request.dispatchException(e); - } - }, - - _getResponseJSON: function() { - var options = this.request.options; - if (!options.evalJSON || (options.evalJSON != 'force' && - !(this.getHeader('Content-type') || '').include('application/json')) || - this.responseText.blank()) - return null; - try { - return this.responseText.evalJSON(options.sanitizeJSON || - !this.request.isSameOrigin()); - } catch (e) { - this.request.dispatchException(e); - } - } -}); - -Ajax.Updater = Class.create(Ajax.Request, { - initialize: function($super, container, url, options) { - this.container = { - success: (container.success || container), - failure: (container.failure || (container.success ? null : container)) - }; - - options = Object.clone(options); - var onComplete = options.onComplete; - options.onComplete = (function(response, json) { - this.updateContent(response.responseText); - if (Object.isFunction(onComplete)) onComplete(response, json); - }).bind(this); - - $super(url, options); - }, - - updateContent: function(responseText) { - var receiver = this.container[this.success() ? 'success' : 'failure'], - options = this.options; - - if (!options.evalScripts) responseText = responseText.stripScripts(); - - if (receiver = $(receiver)) { - if (options.insertion) { - if (Object.isString(options.insertion)) { - var insertion = { }; insertion[options.insertion] = responseText; - receiver.insert(insertion); - } - else options.insertion(receiver, responseText); - } - else receiver.update(responseText); - } - } -}); - -Ajax.PeriodicalUpdater = Class.create(Ajax.Base, { - initialize: function($super, container, url, options) { - $super(options); - this.onComplete = this.options.onComplete; - - this.frequency = (this.options.frequency || 2); - this.decay = (this.options.decay || 1); - - this.updater = { }; - this.container = container; - this.url = url; - - this.start(); - }, - - start: function() { - this.options.onComplete = this.updateComplete.bind(this); - this.onTimerEvent(); - }, - - stop: function() { - this.updater.options.onComplete = undefined; - clearTimeout(this.timer); - (this.onComplete || Prototype.emptyFunction).apply(this, arguments); - }, - - updateComplete: function(response) { - if (this.options.decay) { - this.decay = (response.responseText == this.lastText ? - this.decay * this.options.decay : 1); - - this.lastText = response.responseText; - } - this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency); - }, - - onTimerEvent: function() { - this.updater = new Ajax.Updater(this.container, this.url, this.options); - } -}); - - -function $(element) { - if (arguments.length > 1) { - for (var i = 0, elements = [], length = arguments.length; i < length; i++) - elements.push($(arguments[i])); - return elements; - } - if (Object.isString(element)) - element = document.getElementById(element); - return Element.extend(element); -} - -if (Prototype.BrowserFeatures.XPath) { - document._getElementsByXPath = function(expression, parentElement) { - var results = []; - var query = document.evaluate(expression, $(parentElement) || document, - null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); - for (var i = 0, length = query.snapshotLength; i < length; i++) - results.push(Element.extend(query.snapshotItem(i))); - return results; - }; -} - -/*--------------------------------------------------------------------------*/ - -if (!Node) var Node = { }; - -if (!Node.ELEMENT_NODE) { - Object.extend(Node, { - ELEMENT_NODE: 1, - ATTRIBUTE_NODE: 2, - TEXT_NODE: 3, - CDATA_SECTION_NODE: 4, - ENTITY_REFERENCE_NODE: 5, - ENTITY_NODE: 6, - PROCESSING_INSTRUCTION_NODE: 7, - COMMENT_NODE: 8, - DOCUMENT_NODE: 9, - DOCUMENT_TYPE_NODE: 10, - DOCUMENT_FRAGMENT_NODE: 11, - NOTATION_NODE: 12 - }); -} - - - -(function(global) { - - var HAS_EXTENDED_CREATE_ELEMENT_SYNTAX = (function(){ - try { - var el = document.createElement(''); - return el.tagName.toLowerCase() === 'input' && el.name === 'x'; - } - catch(err) { - return false; - } - })(); - - var element = global.Element; - - global.Element = function(tagName, attributes) { - attributes = attributes || { }; - tagName = tagName.toLowerCase(); - var cache = Element.cache; - if (HAS_EXTENDED_CREATE_ELEMENT_SYNTAX && attributes.name) { - tagName = '<' + tagName + ' name="' + attributes.name + '">'; - delete attributes.name; - return Element.writeAttribute(document.createElement(tagName), attributes); - } - if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName)); - return Element.writeAttribute(cache[tagName].cloneNode(false), attributes); - }; - - Object.extend(global.Element, element || { }); - if (element) global.Element.prototype = element.prototype; - -})(this); - -Element.idCounter = 1; -Element.cache = { }; - -function purgeElement(element) { - var uid = element._prototypeUID; - if (uid) { - Element.stopObserving(element); - element._prototypeUID = void 0; - delete Element.Storage[uid]; - } -} - -Element.Methods = { - visible: function(element) { - return $(element).style.display != 'none'; - }, - - toggle: function(element) { - element = $(element); - Element[Element.visible(element) ? 'hide' : 'show'](element); - return element; - }, - - hide: function(element) { - element = $(element); - element.style.display = 'none'; - return element; - }, - - show: function(element) { - element = $(element); - element.style.display = ''; - return element; - }, - - remove: function(element) { - element = $(element); - element.parentNode.removeChild(element); - return element; - }, - - update: (function(){ - - var SELECT_ELEMENT_INNERHTML_BUGGY = (function(){ - var el = document.createElement("select"), - isBuggy = true; - el.innerHTML = ""; - if (el.options && el.options[0]) { - isBuggy = el.options[0].nodeName.toUpperCase() !== "OPTION"; - } - el = null; - return isBuggy; - })(); - - var TABLE_ELEMENT_INNERHTML_BUGGY = (function(){ - try { - var el = document.createElement("table"); - if (el && el.tBodies) { - el.innerHTML = "test"; - var isBuggy = typeof el.tBodies[0] == "undefined"; - el = null; - return isBuggy; - } - } catch (e) { - return true; - } - })(); - - var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING = (function () { - var s = document.createElement("script"), - isBuggy = false; - try { - s.appendChild(document.createTextNode("")); - isBuggy = !s.firstChild || - s.firstChild && s.firstChild.nodeType !== 3; - } catch (e) { - isBuggy = true; - } - s = null; - return isBuggy; - })(); - - function update(element, content) { - element = $(element); - - var descendants = element.getElementsByTagName('*'), - i = descendants.length; - while (i--) purgeElement(descendants[i]); - - if (content && content.toElement) - content = content.toElement(); - - if (Object.isElement(content)) - return element.update().insert(content); - - content = Object.toHTML(content); - - var tagName = element.tagName.toUpperCase(); - - if (tagName === 'SCRIPT' && SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING) { - element.text = content; - return element; - } - - if (SELECT_ELEMENT_INNERHTML_BUGGY || TABLE_ELEMENT_INNERHTML_BUGGY) { - if (tagName in Element._insertionTranslations.tags) { - while (element.firstChild) { - element.removeChild(element.firstChild); - } - Element._getContentFromAnonymousElement(tagName, content.stripScripts()) - .each(function(node) { - element.appendChild(node) - }); - } - else { - element.innerHTML = content.stripScripts(); - } - } - else { - element.innerHTML = content.stripScripts(); - } - - content.evalScripts.bind(content).defer(); - return element; - } - - return update; - })(), - - replace: function(element, content) { - element = $(element); - if (content && content.toElement) content = content.toElement(); - else if (!Object.isElement(content)) { - content = Object.toHTML(content); - var range = element.ownerDocument.createRange(); - range.selectNode(element); - content.evalScripts.bind(content).defer(); - content = range.createContextualFragment(content.stripScripts()); - } - element.parentNode.replaceChild(content, element); - return element; - }, - - insert: function(element, insertions) { - element = $(element); - - if (Object.isString(insertions) || Object.isNumber(insertions) || - Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML))) - insertions = {bottom:insertions}; - - var content, insert, tagName, childNodes; - - for (var position in insertions) { - content = insertions[position]; - position = position.toLowerCase(); - insert = Element._insertionTranslations[position]; - - if (content && content.toElement) content = content.toElement(); - if (Object.isElement(content)) { - insert(element, content); - continue; - } - - content = Object.toHTML(content); - - tagName = ((position == 'before' || position == 'after') - ? element.parentNode : element).tagName.toUpperCase(); - - childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts()); - - if (position == 'top' || position == 'after') childNodes.reverse(); - childNodes.each(insert.curry(element)); - - content.evalScripts.bind(content).defer(); - } - - return element; - }, - - wrap: function(element, wrapper, attributes) { - element = $(element); - if (Object.isElement(wrapper)) - $(wrapper).writeAttribute(attributes || { }); - else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes); - else wrapper = new Element('div', wrapper); - if (element.parentNode) - element.parentNode.replaceChild(wrapper, element); - wrapper.appendChild(element); - return wrapper; - }, - - inspect: function(element) { - element = $(element); - var result = '<' + element.tagName.toLowerCase(); - $H({'id': 'id', 'className': 'class'}).each(function(pair) { - var property = pair.first(), - attribute = pair.last(), - value = (element[property] || '').toString(); - if (value) result += ' ' + attribute + '=' + value.inspect(true); - }); - return result + '>'; - }, - - recursivelyCollect: function(element, property, maximumLength) { - element = $(element); - maximumLength = maximumLength || -1; - var elements = []; - - while (element = element[property]) { - if (element.nodeType == 1) - elements.push(Element.extend(element)); - if (elements.length == maximumLength) - break; - } - - return elements; - }, - - ancestors: function(element) { - return Element.recursivelyCollect(element, 'parentNode'); - }, - - descendants: function(element) { - return Element.select(element, "*"); - }, - - firstDescendant: function(element) { - element = $(element).firstChild; - while (element && element.nodeType != 1) element = element.nextSibling; - return $(element); - }, - - immediateDescendants: function(element) { - var results = [], child = $(element).firstChild; - while (child) { - if (child.nodeType === 1) { - results.push(Element.extend(child)); - } - child = child.nextSibling; - } - return results; - }, - - previousSiblings: function(element, maximumLength) { - return Element.recursivelyCollect(element, 'previousSibling'); - }, - - nextSiblings: function(element) { - return Element.recursivelyCollect(element, 'nextSibling'); - }, - - siblings: function(element) { - element = $(element); - return Element.previousSiblings(element).reverse() - .concat(Element.nextSiblings(element)); - }, - - match: function(element, selector) { - element = $(element); - if (Object.isString(selector)) - return Prototype.Selector.match(element, selector); - return selector.match(element); - }, - - up: function(element, expression, index) { - element = $(element); - if (arguments.length == 1) return $(element.parentNode); - var ancestors = Element.ancestors(element); - return Object.isNumber(expression) ? ancestors[expression] : - Prototype.Selector.find(ancestors, expression, index); - }, - - down: function(element, expression, index) { - element = $(element); - if (arguments.length == 1) return Element.firstDescendant(element); - return Object.isNumber(expression) ? Element.descendants(element)[expression] : - Element.select(element, expression)[index || 0]; - }, - - previous: function(element, expression, index) { - element = $(element); - if (Object.isNumber(expression)) index = expression, expression = false; - if (!Object.isNumber(index)) index = 0; - - if (expression) { - return Prototype.Selector.find(element.previousSiblings(), expression, index); - } else { - return element.recursivelyCollect("previousSibling", index + 1)[index]; - } - }, - - next: function(element, expression, index) { - element = $(element); - if (Object.isNumber(expression)) index = expression, expression = false; - if (!Object.isNumber(index)) index = 0; - - if (expression) { - return Prototype.Selector.find(element.nextSiblings(), expression, index); - } else { - var maximumLength = Object.isNumber(index) ? index + 1 : 1; - return element.recursivelyCollect("nextSibling", index + 1)[index]; - } - }, - - - select: function(element) { - element = $(element); - var expressions = Array.prototype.slice.call(arguments, 1).join(', '); - return Prototype.Selector.select(expressions, element); - }, - - adjacent: function(element) { - element = $(element); - var expressions = Array.prototype.slice.call(arguments, 1).join(', '); - return Prototype.Selector.select(expressions, element.parentNode).without(element); - }, - - identify: function(element) { - element = $(element); - var id = Element.readAttribute(element, 'id'); - if (id) return id; - do { id = 'anonymous_element_' + Element.idCounter++ } while ($(id)); - Element.writeAttribute(element, 'id', id); - return id; - }, - - readAttribute: function(element, name) { - element = $(element); - if (Prototype.Browser.IE) { - var t = Element._attributeTranslations.read; - if (t.values[name]) return t.values[name](element, name); - if (t.names[name]) name = t.names[name]; - if (name.include(':')) { - return (!element.attributes || !element.attributes[name]) ? null : - element.attributes[name].value; - } - } - return element.getAttribute(name); - }, - - writeAttribute: function(element, name, value) { - element = $(element); - var attributes = { }, t = Element._attributeTranslations.write; - - if (typeof name == 'object') attributes = name; - else attributes[name] = Object.isUndefined(value) ? true : value; - - for (var attr in attributes) { - name = t.names[attr] || attr; - value = attributes[attr]; - if (t.values[attr]) name = t.values[attr](element, value); - if (value === false || value === null) - element.removeAttribute(name); - else if (value === true) - element.setAttribute(name, name); - else element.setAttribute(name, value); - } - return element; - }, - - getHeight: function(element) { - return Element.getDimensions(element).height; - }, - - getWidth: function(element) { - return Element.getDimensions(element).width; - }, - - classNames: function(element) { - return new Element.ClassNames(element); - }, - - hasClassName: function(element, className) { - if (!(element = $(element))) return; - var elementClassName = element.className; - return (elementClassName.length > 0 && (elementClassName == className || - new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName))); - }, - - addClassName: function(element, className) { - if (!(element = $(element))) return; - if (!Element.hasClassName(element, className)) - element.className += (element.className ? ' ' : '') + className; - return element; - }, - - removeClassName: function(element, className) { - if (!(element = $(element))) return; - element.className = element.className.replace( - new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip(); - return element; - }, - - toggleClassName: function(element, className) { - if (!(element = $(element))) return; - return Element[Element.hasClassName(element, className) ? - 'removeClassName' : 'addClassName'](element, className); - }, - - cleanWhitespace: function(element) { - element = $(element); - var node = element.firstChild; - while (node) { - var nextNode = node.nextSibling; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) - element.removeChild(node); - node = nextNode; - } - return element; - }, - - empty: function(element) { - return $(element).innerHTML.blank(); - }, - - descendantOf: function(element, ancestor) { - element = $(element), ancestor = $(ancestor); - - if (element.compareDocumentPosition) - return (element.compareDocumentPosition(ancestor) & 8) === 8; - - if (ancestor.contains) - return ancestor.contains(element) && ancestor !== element; - - while (element = element.parentNode) - if (element == ancestor) return true; - - return false; - }, - - scrollTo: function(element) { - element = $(element); - var pos = Element.cumulativeOffset(element); - window.scrollTo(pos[0], pos[1]); - return element; - }, - - getStyle: function(element, style) { - element = $(element); - style = style == 'float' ? 'cssFloat' : style.camelize(); - var value = element.style[style]; - if (!value || value == 'auto') { - var css = document.defaultView.getComputedStyle(element, null); - value = css ? css[style] : null; - } - if (style == 'opacity') return value ? parseFloat(value) : 1.0; - return value == 'auto' ? null : value; - }, - - getOpacity: function(element) { - return $(element).getStyle('opacity'); - }, - - setStyle: function(element, styles) { - element = $(element); - var elementStyle = element.style, match; - if (Object.isString(styles)) { - element.style.cssText += ';' + styles; - return styles.include('opacity') ? - element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element; - } - for (var property in styles) - if (property == 'opacity') element.setOpacity(styles[property]); - else - elementStyle[(property == 'float' || property == 'cssFloat') ? - (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') : - property] = styles[property]; - - return element; - }, - - setOpacity: function(element, value) { - element = $(element); - element.style.opacity = (value == 1 || value === '') ? '' : - (value < 0.00001) ? 0 : value; - return element; - }, - - makePositioned: function(element) { - element = $(element); - var pos = Element.getStyle(element, 'position'); - if (pos == 'static' || !pos) { - element._madePositioned = true; - element.style.position = 'relative'; - if (Prototype.Browser.Opera) { - element.style.top = 0; - element.style.left = 0; - } - } - return element; - }, - - undoPositioned: function(element) { - element = $(element); - if (element._madePositioned) { - element._madePositioned = undefined; - element.style.position = - element.style.top = - element.style.left = - element.style.bottom = - element.style.right = ''; - } - return element; - }, - - makeClipping: function(element) { - element = $(element); - if (element._overflow) return element; - element._overflow = Element.getStyle(element, 'overflow') || 'auto'; - if (element._overflow !== 'hidden') - element.style.overflow = 'hidden'; - return element; - }, - - undoClipping: function(element) { - element = $(element); - if (!element._overflow) return element; - element.style.overflow = element._overflow == 'auto' ? '' : element._overflow; - element._overflow = null; - return element; - }, - - cumulativeOffset: function(element) { - var valueT = 0, valueL = 0; - if (element.parentNode) { - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - } while (element); - } - return Element._returnOffset(valueL, valueT); - }, - - positionedOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - if (element) { - if (element.tagName.toUpperCase() == 'BODY') break; - var p = Element.getStyle(element, 'position'); - if (p !== 'static') break; - } - } while (element); - return Element._returnOffset(valueL, valueT); - }, - - absolutize: function(element) { - element = $(element); - if (Element.getStyle(element, 'position') == 'absolute') return element; - - var offsets = Element.positionedOffset(element), - top = offsets[1], - left = offsets[0], - width = element.clientWidth, - height = element.clientHeight; - - element._originalLeft = left - parseFloat(element.style.left || 0); - element._originalTop = top - parseFloat(element.style.top || 0); - element._originalWidth = element.style.width; - element._originalHeight = element.style.height; - - element.style.position = 'absolute'; - element.style.top = top + 'px'; - element.style.left = left + 'px'; - element.style.width = width + 'px'; - element.style.height = height + 'px'; - return element; - }, - - relativize: function(element) { - element = $(element); - if (Element.getStyle(element, 'position') == 'relative') return element; - - element.style.position = 'relative'; - var top = parseFloat(element.style.top || 0) - (element._originalTop || 0), - left = parseFloat(element.style.left || 0) - (element._originalLeft || 0); - - element.style.top = top + 'px'; - element.style.left = left + 'px'; - element.style.height = element._originalHeight; - element.style.width = element._originalWidth; - return element; - }, - - cumulativeScrollOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.scrollTop || 0; - valueL += element.scrollLeft || 0; - element = element.parentNode; - } while (element); - return Element._returnOffset(valueL, valueT); - }, - - getOffsetParent: function(element) { - if (element.offsetParent) return $(element.offsetParent); - if (element == document.body) return $(element); - - while ((element = element.parentNode) && element != document.body) - if (Element.getStyle(element, 'position') != 'static') - return $(element); - - return $(document.body); - }, - - viewportOffset: function(forElement) { - var valueT = 0, - valueL = 0, - element = forElement; - - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - - if (element.offsetParent == document.body && - Element.getStyle(element, 'position') == 'absolute') break; - - } while (element = element.offsetParent); - - element = forElement; - do { - if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) { - valueT -= element.scrollTop || 0; - valueL -= element.scrollLeft || 0; - } - } while (element = element.parentNode); - - return Element._returnOffset(valueL, valueT); - }, - - clonePosition: function(element, source) { - var options = Object.extend({ - setLeft: true, - setTop: true, - setWidth: true, - setHeight: true, - offsetTop: 0, - offsetLeft: 0 - }, arguments[2] || { }); - - source = $(source); - var p = Element.viewportOffset(source), delta = [0, 0], parent = null; - - element = $(element); - - if (Element.getStyle(element, 'position') == 'absolute') { - parent = Element.getOffsetParent(element); - delta = Element.viewportOffset(parent); - } - - if (parent == document.body) { - delta[0] -= document.body.offsetLeft; - delta[1] -= document.body.offsetTop; - } - - if (options.setLeft) element.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px'; - if (options.setTop) element.style.top = (p[1] - delta[1] + options.offsetTop) + 'px'; - if (options.setWidth) element.style.width = source.offsetWidth + 'px'; - if (options.setHeight) element.style.height = source.offsetHeight + 'px'; - return element; - } -}; - -Object.extend(Element.Methods, { - getElementsBySelector: Element.Methods.select, - - childElements: Element.Methods.immediateDescendants -}); - -Element._attributeTranslations = { - write: { - names: { - className: 'class', - htmlFor: 'for' - }, - values: { } - } -}; - -if (Prototype.Browser.Opera) { - Element.Methods.getStyle = Element.Methods.getStyle.wrap( - function(proceed, element, style) { - switch (style) { - case 'left': case 'top': case 'right': case 'bottom': - if (proceed(element, 'position') === 'static') return null; - case 'height': case 'width': - if (!Element.visible(element)) return null; - - var dim = parseInt(proceed(element, style), 10); - - if (dim !== element['offset' + style.capitalize()]) - return dim + 'px'; - - var properties; - if (style === 'height') { - properties = ['border-top-width', 'padding-top', - 'padding-bottom', 'border-bottom-width']; - } - else { - properties = ['border-left-width', 'padding-left', - 'padding-right', 'border-right-width']; - } - return properties.inject(dim, function(memo, property) { - var val = proceed(element, property); - return val === null ? memo : memo - parseInt(val, 10); - }) + 'px'; - default: return proceed(element, style); - } - } - ); - - Element.Methods.readAttribute = Element.Methods.readAttribute.wrap( - function(proceed, element, attribute) { - if (attribute === 'title') return element.title; - return proceed(element, attribute); - } - ); -} - -else if (Prototype.Browser.IE) { - Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap( - function(proceed, element) { - element = $(element); - if (!element.parentNode) return $(document.body); - var position = element.getStyle('position'); - if (position !== 'static') return proceed(element); - element.setStyle({ position: 'relative' }); - var value = proceed(element); - element.setStyle({ position: position }); - return value; - } - ); - - $w('positionedOffset viewportOffset').each(function(method) { - Element.Methods[method] = Element.Methods[method].wrap( - function(proceed, element) { - element = $(element); - if (!element.parentNode) return Element._returnOffset(0, 0); - var position = element.getStyle('position'); - if (position !== 'static') return proceed(element); - var offsetParent = element.getOffsetParent(); - if (offsetParent && offsetParent.getStyle('position') === 'fixed') - offsetParent.setStyle({ zoom: 1 }); - element.setStyle({ position: 'relative' }); - var value = proceed(element); - element.setStyle({ position: position }); - return value; - } - ); - }); - - Element.Methods.getStyle = function(element, style) { - element = $(element); - style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize(); - var value = element.style[style]; - if (!value && element.currentStyle) value = element.currentStyle[style]; - - if (style == 'opacity') { - if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/)) - if (value[1]) return parseFloat(value[1]) / 100; - return 1.0; - } - - if (value == 'auto') { - if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none')) - return element['offset' + style.capitalize()] + 'px'; - return null; - } - return value; - }; - - Element.Methods.setOpacity = function(element, value) { - function stripAlpha(filter){ - return filter.replace(/alpha\([^\)]*\)/gi,''); - } - element = $(element); - var currentStyle = element.currentStyle; - if ((currentStyle && !currentStyle.hasLayout) || - (!currentStyle && element.style.zoom == 'normal')) - element.style.zoom = 1; - - var filter = element.getStyle('filter'), style = element.style; - if (value == 1 || value === '') { - (filter = stripAlpha(filter)) ? - style.filter = filter : style.removeAttribute('filter'); - return element; - } else if (value < 0.00001) value = 0; - style.filter = stripAlpha(filter) + - 'alpha(opacity=' + (value * 100) + ')'; - return element; - }; - - Element._attributeTranslations = (function(){ - - var classProp = 'className', - forProp = 'for', - el = document.createElement('div'); - - el.setAttribute(classProp, 'x'); - - if (el.className !== 'x') { - el.setAttribute('class', 'x'); - if (el.className === 'x') { - classProp = 'class'; - } - } - el = null; - - el = document.createElement('label'); - el.setAttribute(forProp, 'x'); - if (el.htmlFor !== 'x') { - el.setAttribute('htmlFor', 'x'); - if (el.htmlFor === 'x') { - forProp = 'htmlFor'; - } - } - el = null; - - return { - read: { - names: { - 'class': classProp, - 'className': classProp, - 'for': forProp, - 'htmlFor': forProp - }, - values: { - _getAttr: function(element, attribute) { - return element.getAttribute(attribute); - }, - _getAttr2: function(element, attribute) { - return element.getAttribute(attribute, 2); - }, - _getAttrNode: function(element, attribute) { - var node = element.getAttributeNode(attribute); - return node ? node.value : ""; - }, - _getEv: (function(){ - - var el = document.createElement('div'), f; - el.onclick = Prototype.emptyFunction; - var value = el.getAttribute('onclick'); - - if (String(value).indexOf('{') > -1) { - f = function(element, attribute) { - attribute = element.getAttribute(attribute); - if (!attribute) return null; - attribute = attribute.toString(); - attribute = attribute.split('{')[1]; - attribute = attribute.split('}')[0]; - return attribute.strip(); - }; - } - else if (value === '') { - f = function(element, attribute) { - attribute = element.getAttribute(attribute); - if (!attribute) return null; - return attribute.strip(); - }; - } - el = null; - return f; - })(), - _flag: function(element, attribute) { - return $(element).hasAttribute(attribute) ? attribute : null; - }, - style: function(element) { - return element.style.cssText.toLowerCase(); - }, - title: function(element) { - return element.title; - } - } - } - } - })(); - - Element._attributeTranslations.write = { - names: Object.extend({ - cellpadding: 'cellPadding', - cellspacing: 'cellSpacing' - }, Element._attributeTranslations.read.names), - values: { - checked: function(element, value) { - element.checked = !!value; - }, - - style: function(element, value) { - element.style.cssText = value ? value : ''; - } - } - }; - - Element._attributeTranslations.has = {}; - - $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' + - 'encType maxLength readOnly longDesc frameBorder').each(function(attr) { - Element._attributeTranslations.write.names[attr.toLowerCase()] = attr; - Element._attributeTranslations.has[attr.toLowerCase()] = attr; - }); - - (function(v) { - Object.extend(v, { - href: v._getAttr2, - src: v._getAttr2, - type: v._getAttr, - action: v._getAttrNode, - disabled: v._flag, - checked: v._flag, - readonly: v._flag, - multiple: v._flag, - onload: v._getEv, - onunload: v._getEv, - onclick: v._getEv, - ondblclick: v._getEv, - onmousedown: v._getEv, - onmouseup: v._getEv, - onmouseover: v._getEv, - onmousemove: v._getEv, - onmouseout: v._getEv, - onfocus: v._getEv, - onblur: v._getEv, - onkeypress: v._getEv, - onkeydown: v._getEv, - onkeyup: v._getEv, - onsubmit: v._getEv, - onreset: v._getEv, - onselect: v._getEv, - onchange: v._getEv - }); - })(Element._attributeTranslations.read.values); - - if (Prototype.BrowserFeatures.ElementExtensions) { - (function() { - function _descendants(element) { - var nodes = element.getElementsByTagName('*'), results = []; - for (var i = 0, node; node = nodes[i]; i++) - if (node.tagName !== "!") // Filter out comment nodes. - results.push(node); - return results; - } - - Element.Methods.down = function(element, expression, index) { - element = $(element); - if (arguments.length == 1) return element.firstDescendant(); - return Object.isNumber(expression) ? _descendants(element)[expression] : - Element.select(element, expression)[index || 0]; - } - })(); - } - -} - -else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) { - Element.Methods.setOpacity = function(element, value) { - element = $(element); - element.style.opacity = (value == 1) ? 0.999999 : - (value === '') ? '' : (value < 0.00001) ? 0 : value; - return element; - }; -} - -else if (Prototype.Browser.WebKit) { - Element.Methods.setOpacity = function(element, value) { - element = $(element); - element.style.opacity = (value == 1 || value === '') ? '' : - (value < 0.00001) ? 0 : value; - - if (value == 1) - if (element.tagName.toUpperCase() == 'IMG' && element.width) { - element.width++; element.width--; - } else try { - var n = document.createTextNode(' '); - element.appendChild(n); - element.removeChild(n); - } catch (e) { } - - return element; - }; - - Element.Methods.cumulativeOffset = function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - if (element.offsetParent == document.body) - if (Element.getStyle(element, 'position') == 'absolute') break; - - element = element.offsetParent; - } while (element); - - return Element._returnOffset(valueL, valueT); - }; -} - -if ('outerHTML' in document.documentElement) { - Element.Methods.replace = function(element, content) { - element = $(element); - - if (content && content.toElement) content = content.toElement(); - if (Object.isElement(content)) { - element.parentNode.replaceChild(content, element); - return element; - } - - content = Object.toHTML(content); - var parent = element.parentNode, tagName = parent.tagName.toUpperCase(); - - if (Element._insertionTranslations.tags[tagName]) { - var nextSibling = element.next(), - fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts()); - parent.removeChild(element); - if (nextSibling) - fragments.each(function(node) { parent.insertBefore(node, nextSibling) }); - else - fragments.each(function(node) { parent.appendChild(node) }); - } - else element.outerHTML = content.stripScripts(); - - content.evalScripts.bind(content).defer(); - return element; - }; -} - -Element._returnOffset = function(l, t) { - var result = [l, t]; - result.left = l; - result.top = t; - return result; -}; - -Element._getContentFromAnonymousElement = function(tagName, html) { - var div = new Element('div'), - t = Element._insertionTranslations.tags[tagName]; - if (t) { - div.innerHTML = t[0] + html + t[1]; - for (var i = t[2]; i--; ) { - div = div.firstChild; - } - } - else { - div.innerHTML = html; - } - return $A(div.childNodes); -}; - -Element._insertionTranslations = { - before: function(element, node) { - element.parentNode.insertBefore(node, element); - }, - top: function(element, node) { - element.insertBefore(node, element.firstChild); - }, - bottom: function(element, node) { - element.appendChild(node); - }, - after: function(element, node) { - element.parentNode.insertBefore(node, element.nextSibling); - }, - tags: { - TABLE: ['', '
    ', 1], - TBODY: ['', '
    ', 2], - TR: ['', '
    ', 3], - TD: ['
    ', '
    ', 4], - SELECT: ['', 1] - } -}; - -(function() { - var tags = Element._insertionTranslations.tags; - Object.extend(tags, { - THEAD: tags.TBODY, - TFOOT: tags.TBODY, - TH: tags.TD - }); -})(); - -Element.Methods.Simulated = { - hasAttribute: function(element, attribute) { - attribute = Element._attributeTranslations.has[attribute] || attribute; - var node = $(element).getAttributeNode(attribute); - return !!(node && node.specified); - } -}; - -Element.Methods.ByTag = { }; - -Object.extend(Element, Element.Methods); - -(function(div) { - - if (!Prototype.BrowserFeatures.ElementExtensions && div['__proto__']) { - window.HTMLElement = { }; - window.HTMLElement.prototype = div['__proto__']; - Prototype.BrowserFeatures.ElementExtensions = true; - } - - div = null; - -})(document.createElement('div')); - -Element.extend = (function() { - - function checkDeficiency(tagName) { - if (typeof window.Element != 'undefined') { - var proto = window.Element.prototype; - if (proto) { - var id = '_' + (Math.random()+'').slice(2), - el = document.createElement(tagName); - proto[id] = 'x'; - var isBuggy = (el[id] !== 'x'); - delete proto[id]; - el = null; - return isBuggy; - } - } - return false; - } - - function extendElementWith(element, methods) { - for (var property in methods) { - var value = methods[property]; - if (Object.isFunction(value) && !(property in element)) - element[property] = value.methodize(); - } - } - - var HTMLOBJECTELEMENT_PROTOTYPE_BUGGY = checkDeficiency('object'); - - if (Prototype.BrowserFeatures.SpecificElementExtensions) { - if (HTMLOBJECTELEMENT_PROTOTYPE_BUGGY) { - return function(element) { - if (element && typeof element._extendedByPrototype == 'undefined') { - var t = element.tagName; - if (t && (/^(?:object|applet|embed)$/i.test(t))) { - extendElementWith(element, Element.Methods); - extendElementWith(element, Element.Methods.Simulated); - extendElementWith(element, Element.Methods.ByTag[t.toUpperCase()]); - } - } - return element; - } - } - return Prototype.K; - } - - var Methods = { }, ByTag = Element.Methods.ByTag; - - var extend = Object.extend(function(element) { - if (!element || typeof element._extendedByPrototype != 'undefined' || - element.nodeType != 1 || element == window) return element; - - var methods = Object.clone(Methods), - tagName = element.tagName.toUpperCase(); - - if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]); - - extendElementWith(element, methods); - - element._extendedByPrototype = Prototype.emptyFunction; - return element; - - }, { - refresh: function() { - if (!Prototype.BrowserFeatures.ElementExtensions) { - Object.extend(Methods, Element.Methods); - Object.extend(Methods, Element.Methods.Simulated); - } - } - }); - - extend.refresh(); - return extend; -})(); - -if (document.documentElement.hasAttribute) { - Element.hasAttribute = function(element, attribute) { - return element.hasAttribute(attribute); - }; -} -else { - Element.hasAttribute = Element.Methods.Simulated.hasAttribute; -} - -Element.addMethods = function(methods) { - var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag; - - if (!methods) { - Object.extend(Form, Form.Methods); - Object.extend(Form.Element, Form.Element.Methods); - Object.extend(Element.Methods.ByTag, { - "FORM": Object.clone(Form.Methods), - "INPUT": Object.clone(Form.Element.Methods), - "SELECT": Object.clone(Form.Element.Methods), - "TEXTAREA": Object.clone(Form.Element.Methods) - }); - } - - if (arguments.length == 2) { - var tagName = methods; - methods = arguments[1]; - } - - if (!tagName) Object.extend(Element.Methods, methods || { }); - else { - if (Object.isArray(tagName)) tagName.each(extend); - else extend(tagName); - } - - function extend(tagName) { - tagName = tagName.toUpperCase(); - if (!Element.Methods.ByTag[tagName]) - Element.Methods.ByTag[tagName] = { }; - Object.extend(Element.Methods.ByTag[tagName], methods); - } - - function copy(methods, destination, onlyIfAbsent) { - onlyIfAbsent = onlyIfAbsent || false; - for (var property in methods) { - var value = methods[property]; - if (!Object.isFunction(value)) continue; - if (!onlyIfAbsent || !(property in destination)) - destination[property] = value.methodize(); - } - } - - function findDOMClass(tagName) { - var klass; - var trans = { - "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph", - "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList", - "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading", - "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote", - "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION": - "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD": - "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR": - "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET": - "FrameSet", "IFRAME": "IFrame" - }; - if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element'; - if (window[klass]) return window[klass]; - klass = 'HTML' + tagName + 'Element'; - if (window[klass]) return window[klass]; - klass = 'HTML' + tagName.capitalize() + 'Element'; - if (window[klass]) return window[klass]; - - var element = document.createElement(tagName), - proto = element['__proto__'] || element.constructor.prototype; - - element = null; - return proto; - } - - var elementPrototype = window.HTMLElement ? HTMLElement.prototype : - Element.prototype; - - if (F.ElementExtensions) { - copy(Element.Methods, elementPrototype); - copy(Element.Methods.Simulated, elementPrototype, true); - } - - if (F.SpecificElementExtensions) { - for (var tag in Element.Methods.ByTag) { - var klass = findDOMClass(tag); - if (Object.isUndefined(klass)) continue; - copy(T[tag], klass.prototype); - } - } - - Object.extend(Element, Element.Methods); - delete Element.ByTag; - - if (Element.extend.refresh) Element.extend.refresh(); - Element.cache = { }; -}; - - -document.viewport = { - - getDimensions: function() { - return { width: this.getWidth(), height: this.getHeight() }; - }, - - getScrollOffsets: function() { - return Element._returnOffset( - window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft, - window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop); - } -}; - -(function(viewport) { - var B = Prototype.Browser, doc = document, element, property = {}; - - function getRootElement() { - if (B.WebKit && !doc.evaluate) - return document; - - if (B.Opera && window.parseFloat(window.opera.version()) < 9.5) - return document.body; - - return document.documentElement; - } - - function define(D) { - if (!element) element = getRootElement(); - - property[D] = 'client' + D; - - viewport['get' + D] = function() { return element[property[D]] }; - return viewport['get' + D](); - } - - viewport.getWidth = define.curry('Width'); - - viewport.getHeight = define.curry('Height'); -})(document.viewport); - - -Element.Storage = { - UID: 1 -}; - -Element.addMethods({ - getStorage: function(element) { - if (!(element = $(element))) return; - - var uid; - if (element === window) { - uid = 0; - } else { - if (typeof element._prototypeUID === "undefined") - element._prototypeUID = Element.Storage.UID++; - uid = element._prototypeUID; - } - - if (!Element.Storage[uid]) - Element.Storage[uid] = $H(); - - return Element.Storage[uid]; - }, - - store: function(element, key, value) { - if (!(element = $(element))) return; - - if (arguments.length === 2) { - Element.getStorage(element).update(key); - } else { - Element.getStorage(element).set(key, value); - } - - return element; - }, - - retrieve: function(element, key, defaultValue) { - if (!(element = $(element))) return; - var hash = Element.getStorage(element), value = hash.get(key); - - if (Object.isUndefined(value)) { - hash.set(key, defaultValue); - value = defaultValue; - } - - return value; - }, - - clone: function(element, deep) { - if (!(element = $(element))) return; - var clone = element.cloneNode(deep); - clone._prototypeUID = void 0; - if (deep) { - var descendants = Element.select(clone, '*'), - i = descendants.length; - while (i--) { - descendants[i]._prototypeUID = void 0; - } - } - return Element.extend(clone); - }, - - purge: function(element) { - if (!(element = $(element))) return; - purgeElement(element); - - var descendants = element.getElementsByTagName('*'), - i = descendants.length; - - while (i--) purgeElement(descendants[i]); - - return null; - } -}); - -(function() { - - function toDecimal(pctString) { - var match = pctString.match(/^(\d+)%?$/i); - if (!match) return null; - return (Number(match[1]) / 100); - } - - function getPixelValue(value, property) { - if (Object.isElement(value)) { - element = value; - value = element.getStyle(property); - } - if (value === null) { - return null; - } - - if ((/^(?:-)?\d+(\.\d+)?(px)?$/i).test(value)) { - return window.parseFloat(value); - } - - if (/\d/.test(value) && element.runtimeStyle) { - var style = element.style.left, rStyle = element.runtimeStyle.left; - element.runtimeStyle.left = element.currentStyle.left; - element.style.left = value || 0; - value = element.style.pixelLeft; - element.style.left = style; - element.runtimeStyle.left = rStyle; - - return value; - } - - if (value.include('%')) { - var decimal = toDecimal(value); - var whole; - if (property.include('left') || property.include('right') || - property.include('width')) { - whole = $(element.parentNode).measure('width'); - } else if (property.include('top') || property.include('bottom') || - property.include('height')) { - whole = $(element.parentNode).measure('height'); - } - - return whole * decimal; - } - - return 0; - } - - function toCSSPixels(number) { - if (Object.isString(number) && number.endsWith('px')) { - return number; - } - return number + 'px'; - } - - function isDisplayed(element) { - var originalElement = element; - while (element && element.parentNode) { - var display = element.getStyle('display'); - if (display === 'none') { - return false; - } - element = $(element.parentNode); - } - return true; - } - - var hasLayout = Prototype.K; - if ('currentStyle' in document.documentElement) { - hasLayout = function(element) { - if (!element.currentStyle.hasLayout) { - element.style.zoom = 1; - } - return element; - }; - } - - function cssNameFor(key) { - if (key.include('border')) key = key + '-width'; - return key.camelize(); - } - - Element.Layout = Class.create(Hash, { - initialize: function($super, element, preCompute) { - $super(); - this.element = $(element); - - Element.Layout.PROPERTIES.each( function(property) { - this._set(property, null); - }, this); - - if (preCompute) { - this._preComputing = true; - this._begin(); - Element.Layout.PROPERTIES.each( this._compute, this ); - this._end(); - this._preComputing = false; - } - }, - - _set: function(property, value) { - return Hash.prototype.set.call(this, property, value); - }, - - set: function(property, value) { - throw "Properties of Element.Layout are read-only."; - }, - - get: function($super, property) { - var value = $super(property); - return value === null ? this._compute(property) : value; - }, - - _begin: function() { - if (this._prepared) return; - - var element = this.element; - if (isDisplayed(element)) { - this._prepared = true; - return; - } - - var originalStyles = { - position: element.style.position || '', - width: element.style.width || '', - visibility: element.style.visibility || '', - display: element.style.display || '' - }; - - element.store('prototype_original_styles', originalStyles); - - var position = element.getStyle('position'), - width = element.getStyle('width'); - - element.setStyle({ - position: 'absolute', - visibility: 'hidden', - display: 'block' - }); - - var positionedWidth = element.getStyle('width'); - - var newWidth; - if (width && (positionedWidth === width)) { - newWidth = getPixelValue(width); - } else if (width && (position === 'absolute' || position === 'fixed')) { - newWidth = getPixelValue(width); - } else { - var parent = element.parentNode, pLayout = $(parent).getLayout(); - - newWidth = pLayout.get('width') - - this.get('margin-left') - - this.get('border-left') - - this.get('padding-left') - - this.get('padding-right') - - this.get('border-right') - - this.get('margin-right'); - } - - element.setStyle({ width: newWidth + 'px' }); - - this._prepared = true; - }, - - _end: function() { - var element = this.element; - var originalStyles = element.retrieve('prototype_original_styles'); - element.store('prototype_original_styles', null); - element.setStyle(originalStyles); - this._prepared = false; - }, - - _compute: function(property) { - var COMPUTATIONS = Element.Layout.COMPUTATIONS; - if (!(property in COMPUTATIONS)) { - throw "Property not found."; - } - return this._set(property, COMPUTATIONS[property].call(this, this.element)); - }, - - toObject: function() { - var args = $A(arguments); - var keys = (args.length === 0) ? Element.Layout.PROPERTIES : - args.join(' ').split(' '); - var obj = {}; - keys.each( function(key) { - if (!Element.Layout.PROPERTIES.include(key)) return; - var value = this.get(key); - if (value != null) obj[key] = value; - }, this); - return obj; - }, - - toHash: function() { - var obj = this.toObject.apply(this, arguments); - return new Hash(obj); - }, - - toCSS: function() { - var args = $A(arguments); - var keys = (args.length === 0) ? Element.Layout.PROPERTIES : - args.join(' ').split(' '); - var css = {}; - - keys.each( function(key) { - if (!Element.Layout.PROPERTIES.include(key)) return; - if (Element.Layout.COMPOSITE_PROPERTIES.include(key)) return; - - var value = this.get(key); - if (value != null) css[cssNameFor(key)] = value + 'px'; - }, this); - return css; - }, - - inspect: function() { - return "#"; - } - }); - - Object.extend(Element.Layout, { - PROPERTIES: $w('height width top left right bottom border-left border-right border-top border-bottom padding-left padding-right padding-top padding-bottom margin-top margin-bottom margin-left margin-right padding-box-width padding-box-height border-box-width border-box-height margin-box-width margin-box-height'), - - COMPOSITE_PROPERTIES: $w('padding-box-width padding-box-height margin-box-width margin-box-height border-box-width border-box-height'), - - COMPUTATIONS: { - 'height': function(element) { - if (!this._preComputing) this._begin(); - - var bHeight = this.get('border-box-height'); - if (bHeight <= 0) return 0; - - var bTop = this.get('border-top'), - bBottom = this.get('border-bottom'); - - var pTop = this.get('padding-top'), - pBottom = this.get('padding-bottom'); - - if (!this._preComputing) this._end(); - - return bHeight - bTop - bBottom - pTop - pBottom; - }, - - 'width': function(element) { - if (!this._preComputing) this._begin(); - - var bWidth = this.get('border-box-width'); - if (bWidth <= 0) return 0; - - var bLeft = this.get('border-left'), - bRight = this.get('border-right'); - - var pLeft = this.get('padding-left'), - pRight = this.get('padding-right'); - - if (!this._preComputing) this._end(); - - return bWidth - bLeft - bRight - pLeft - pRight; - }, - - 'padding-box-height': function(element) { - var height = this.get('height'), - pTop = this.get('padding-top'), - pBottom = this.get('padding-bottom'); - - return height + pTop + pBottom; - }, - - 'padding-box-width': function(element) { - var width = this.get('width'), - pLeft = this.get('padding-left'), - pRight = this.get('padding-right'); - - return width + pLeft + pRight; - }, - - 'border-box-height': function(element) { - return element.offsetHeight; - }, - - 'border-box-width': function(element) { - return element.offsetWidth; - }, - - 'margin-box-height': function(element) { - var bHeight = this.get('border-box-height'), - mTop = this.get('margin-top'), - mBottom = this.get('margin-bottom'); - - if (bHeight <= 0) return 0; - - return bHeight + mTop + mBottom; - }, - - 'margin-box-width': function(element) { - var bWidth = this.get('border-box-width'), - mLeft = this.get('margin-left'), - mRight = this.get('margin-right'); - - if (bWidth <= 0) return 0; - - return bWidth + mLeft + mRight; - }, - - 'top': function(element) { - var offset = element.positionedOffset(); - return offset.top; - }, - - 'bottom': function(element) { - var offset = element.positionedOffset(), - parent = element.getOffsetParent(), - pHeight = parent.measure('height'); - - var mHeight = this.get('border-box-height'); - - return pHeight - mHeight - offset.top; - }, - - 'left': function(element) { - var offset = element.positionedOffset(); - return offset.left; - }, - - 'right': function(element) { - var offset = element.positionedOffset(), - parent = element.getOffsetParent(), - pWidth = parent.measure('width'); - - var mWidth = this.get('border-box-width'); - - return pWidth - mWidth - offset.left; - }, - - 'padding-top': function(element) { - return getPixelValue(element, 'paddingTop'); - }, - - 'padding-bottom': function(element) { - return getPixelValue(element, 'paddingBottom'); - }, - - 'padding-left': function(element) { - return getPixelValue(element, 'paddingLeft'); - }, - - 'padding-right': function(element) { - return getPixelValue(element, 'paddingRight'); - }, - - 'border-top': function(element) { - return Object.isNumber(element.clientTop) ? element.clientTop : - getPixelValue(element, 'borderTopWidth'); - }, - - 'border-bottom': function(element) { - return Object.isNumber(element.clientBottom) ? element.clientBottom : - getPixelValue(element, 'borderBottomWidth'); - }, - - 'border-left': function(element) { - return Object.isNumber(element.clientLeft) ? element.clientLeft : - getPixelValue(element, 'borderLeftWidth'); - }, - - 'border-right': function(element) { - return Object.isNumber(element.clientRight) ? element.clientRight : - getPixelValue(element, 'borderRightWidth'); - }, - - 'margin-top': function(element) { - return getPixelValue(element, 'marginTop'); - }, - - 'margin-bottom': function(element) { - return getPixelValue(element, 'marginBottom'); - }, - - 'margin-left': function(element) { - return getPixelValue(element, 'marginLeft'); - }, - - 'margin-right': function(element) { - return getPixelValue(element, 'marginRight'); - } - } - }); - - if ('getBoundingClientRect' in document.documentElement) { - Object.extend(Element.Layout.COMPUTATIONS, { - 'right': function(element) { - var parent = hasLayout(element.getOffsetParent()); - var rect = element.getBoundingClientRect(), - pRect = parent.getBoundingClientRect(); - - return (pRect.right - rect.right).round(); - }, - - 'bottom': function(element) { - var parent = hasLayout(element.getOffsetParent()); - var rect = element.getBoundingClientRect(), - pRect = parent.getBoundingClientRect(); - - return (pRect.bottom - rect.bottom).round(); - } - }); - } - - Element.Offset = Class.create({ - initialize: function(left, top) { - this.left = left.round(); - this.top = top.round(); - - this[0] = this.left; - this[1] = this.top; - }, - - relativeTo: function(offset) { - return new Element.Offset( - this.left - offset.left, - this.top - offset.top - ); - }, - - inspect: function() { - return "#".interpolate(this); - }, - - toString: function() { - return "[#{left}, #{top}]".interpolate(this); - }, - - toArray: function() { - return [this.left, this.top]; - } - }); - - function getLayout(element, preCompute) { - return new Element.Layout(element, preCompute); - } - - function measure(element, property) { - return $(element).getLayout().get(property); - } - - function getDimensions(element) { - var layout = $(element).getLayout(); - return { - width: layout.get('width'), - height: layout.get('height') - }; - } - - function getOffsetParent(element) { - if (isDetached(element)) return $(document.body); - - var isInline = (Element.getStyle(element, 'display') === 'inline'); - if (!isInline && element.offsetParent) return $(element.offsetParent); - if (element === document.body) return $(element); - - while ((element = element.parentNode) && element !== document.body) { - if (Element.getStyle(element, 'position') !== 'static') { - return (element.nodeName === 'HTML') ? $(document.body) : $(element); - } - } - - return $(document.body); - } - - - function cumulativeOffset(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - } while (element); - return new Element.Offset(valueL, valueT); - } - - function positionedOffset(element) { - var layout = element.getLayout(); - - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - if (element) { - if (isBody(element)) break; - var p = Element.getStyle(element, 'position'); - if (p !== 'static') break; - } - } while (element); - - valueL -= layout.get('margin-top'); - valueT -= layout.get('margin-left'); - - return new Element.Offset(valueL, valueT); - } - - function cumulativeScrollOffset(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.scrollTop || 0; - valueL += element.scrollLeft || 0; - element = element.parentNode; - } while (element); - return new Element.Offset(valueL, valueT); - } - - function viewportOffset(forElement) { - var valueT = 0, valueL = 0, docBody = document.body; - - var element = forElement; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - if (element.offsetParent == docBody && - Element.getStyle(element, 'position') == 'absolute') break; - } while (element = element.offsetParent); - - element = forElement; - do { - if (element != docBody) { - valueT -= element.scrollTop || 0; - valueL -= element.scrollLeft || 0; - } - } while (element = element.parentNode); - return new Element.Offset(valueL, valueT); - } - - function absolutize(element) { - element = $(element); - - if (Element.getStyle(element, 'position') === 'absolute') { - return element; - } - - var offsetParent = getOffsetParent(element); - var eOffset = element.viewportOffset(), - pOffset = offsetParent.viewportOffset(); - - var offset = eOffset.relativeTo(pOffset); - var layout = element.getLayout(); - - element.store('prototype_absolutize_original_styles', { - left: element.getStyle('left'), - top: element.getStyle('top'), - width: element.getStyle('width'), - height: element.getStyle('height') - }); - - element.setStyle({ - position: 'absolute', - top: offset.top + 'px', - left: offset.left + 'px', - width: layout.get('width') + 'px', - height: layout.get('height') + 'px' - }); - - return element; - } - - function relativize(element) { - element = $(element); - if (Element.getStyle(element, 'position') === 'relative') { - return element; - } - - var originalStyles = - element.retrieve('prototype_absolutize_original_styles'); - - if (originalStyles) element.setStyle(originalStyles); - return element; - } - - Element.addMethods({ - getLayout: getLayout, - measure: measure, - getDimensions: getDimensions, - getOffsetParent: getOffsetParent, - cumulativeOffset: cumulativeOffset, - positionedOffset: positionedOffset, - cumulativeScrollOffset: cumulativeScrollOffset, - viewportOffset: viewportOffset, - absolutize: absolutize, - relativize: relativize - }); - - function isBody(element) { - return element.nodeName.toUpperCase() === 'BODY'; - } - - function isDetached(element) { - return element !== document.body && - !Element.descendantOf(element, document.body); - } - - if ('getBoundingClientRect' in document.documentElement) { - Element.addMethods({ - viewportOffset: function(element) { - element = $(element); - if (isDetached(element)) return new Element.Offset(0, 0); - - var rect = element.getBoundingClientRect(), - docEl = document.documentElement; - return new Element.Offset(rect.left - docEl.clientLeft, - rect.top - docEl.clientTop); - }, - - positionedOffset: function(element) { - element = $(element); - var parent = element.getOffsetParent(); - if (isDetached(element)) return new Element.Offset(0, 0); - - if (element.offsetParent && - element.offsetParent.nodeName.toUpperCase() === 'HTML') { - return positionedOffset(element); - } - - var eOffset = element.viewportOffset(), - pOffset = isBody(parent) ? viewportOffset(parent) : - parent.viewportOffset(); - var retOffset = eOffset.relativeTo(pOffset); - - var layout = element.getLayout(); - var top = retOffset.top - layout.get('margin-top'); - var left = retOffset.left - layout.get('margin-left'); - - return new Element.Offset(left, top); - } - }); - } -})(); -window.$$ = function() { - var expression = $A(arguments).join(', '); - return Prototype.Selector.select(expression, document); -}; - -Prototype.Selector = (function() { - - function select() { - throw new Error('Method "Prototype.Selector.select" must be defined.'); - } - - function match() { - throw new Error('Method "Prototype.Selector.match" must be defined.'); - } - - function find(elements, expression, index) { - index = index || 0; - var match = Prototype.Selector.match, length = elements.length, matchIndex = 0, i; - - for (i = 0; i < length; i++) { - if (match(elements[i], expression) && index == matchIndex++) { - return Element.extend(elements[i]); - } - } - } - - function extendElements(elements) { - for (var i = 0, length = elements.length; i < length; i++) { - Element.extend(elements[i]); - } - return elements; - } - - - var K = Prototype.K; - - return { - select: select, - match: match, - find: find, - extendElements: (Element.extend === K) ? K : extendElements, - extendElement: Element.extend - }; -})(); -Prototype._original_property = window.Sizzle; -/*! - * Sizzle CSS Selector Engine - v1.0 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){ - -var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, - done = 0, - toString = Object.prototype.toString, - hasDuplicate = false, - baseHasDuplicate = true; - -[0, 0].sort(function(){ - baseHasDuplicate = false; - return 0; -}); - -var Sizzle = function(selector, context, results, seed) { - results = results || []; - var origContext = context = context || document; - - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { - return []; - } - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context), - soFar = selector; - - while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) { - soFar = m[3]; - - parts.push( m[1] ); - - if ( m[2] ) { - extra = m[3]; - break; - } - } - - if ( parts.length > 1 && origPOS.exec( selector ) ) { - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context ); - } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); - - while ( parts.length ) { - selector = parts.shift(); - - if ( Expr.relative[ selector ] ) - selector += parts.shift(); - - set = posProcess( selector, set ); - } - } - } else { - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { - var ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0]; - } - - if ( context ) { - var ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); - set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set; - - if ( parts.length > 0 ) { - checkSet = makeArray(set); - } else { - prune = false; - } - - while ( parts.length ) { - var cur = parts.pop(), pop = cur; - - if ( !Expr.relative[ cur ] ) { - cur = ""; - } else { - pop = parts.pop(); - } - - if ( pop == null ) { - pop = context; - } - - Expr.relative[ cur ]( checkSet, pop, contextXML ); - } - } else { - checkSet = parts = []; - } - } - - if ( !checkSet ) { - checkSet = set; - } - - if ( !checkSet ) { - throw "Syntax error, unrecognized expression: " + (cur || selector); - } - - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); - } else if ( context && context.nodeType === 1 ) { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) { - results.push( set[i] ); - } - } - } else { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); - } - } - } - } else { - makeArray( checkSet, results ); - } - - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); - } - - return results; -}; - -Sizzle.uniqueSort = function(results){ - if ( sortOrder ) { - hasDuplicate = baseHasDuplicate; - results.sort(sortOrder); - - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[i-1] ) { - results.splice(i--, 1); - } - } - } - } - - return results; -}; - -Sizzle.matches = function(expr, set){ - return Sizzle(expr, null, null, set); -}; - -Sizzle.find = function(expr, context, isXML){ - var set, match; - - if ( !expr ) { - return []; - } - - for ( var i = 0, l = Expr.order.length; i < l; i++ ) { - var type = Expr.order[i], match; - - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - var left = match[1]; - match.splice(1,1); - - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace(/\\/g, ""); - set = Expr.find[ type ]( match, context, isXML ); - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); - break; - } - } - } - } - - if ( !set ) { - set = context.getElementsByTagName("*"); - } - - return {set: set, expr: expr}; -}; - -Sizzle.filter = function(expr, set, inplace, not){ - var old = expr, result = [], curLoop = set, match, anyFound, - isXMLFilter = set && set[0] && isXML(set[0]); - - while ( expr && set.length ) { - for ( var type in Expr.filter ) { - if ( (match = Expr.match[ type ].exec( expr )) != null ) { - var filter = Expr.filter[ type ], found, item; - anyFound = false; - - if ( curLoop == result ) { - result = []; - } - - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); - - if ( !match ) { - anyFound = found = true; - } else if ( match === true ) { - continue; - } - } - - if ( match ) { - for ( var i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); - var pass = not ^ !!found; - - if ( inplace && found != null ) { - if ( pass ) { - anyFound = true; - } else { - curLoop[i] = false; - } - } else if ( pass ) { - result.push( item ); - anyFound = true; - } - } - } - } - - if ( found !== undefined ) { - if ( !inplace ) { - curLoop = result; - } - - expr = expr.replace( Expr.match[ type ], "" ); - - if ( !anyFound ) { - return []; - } - - break; - } - } - } - - if ( expr == old ) { - if ( anyFound == null ) { - throw "Syntax error, unrecognized expression: " + expr; - } else { - break; - } - } - - old = expr; - } - - return curLoop; -}; - -var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], - match: { - ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/ - }, - leftMatch: {}, - attrMap: { - "class": "className", - "for": "htmlFor" - }, - attrHandle: { - href: function(elem){ - return elem.getAttribute("href"); - } - }, - relative: { - "+": function(checkSet, part, isXML){ - var isPartStr = typeof part === "string", - isTag = isPartStr && !/\W/.test(part), - isPartStrNotTag = isPartStr && !isTag; - - if ( isTag && !isXML ) { - part = part.toUpperCase(); - } - - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} - - checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ? - elem || false : - elem === part; - } - } - - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); - } - }, - ">": function(checkSet, part, isXML){ - var isPartStr = typeof part === "string"; - - if ( isPartStr && !/\W/.test(part) ) { - part = isXML ? part : part.toUpperCase(); - - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - var parent = elem.parentNode; - checkSet[i] = parent.nodeName === part ? parent : false; - } - } - } else { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; - } - } - - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); - } - } - }, - "": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - - if ( !/\W/.test(part) ) { - var nodeCheck = part = isXML ? part : part.toUpperCase(); - checkFn = dirNodeCheck; - } - - checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); - }, - "~": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - - if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = isXML ? part : part.toUpperCase(); - checkFn = dirNodeCheck; - } - - checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); - } - }, - find: { - ID: function(match, context, isXML){ - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - return m ? [m] : []; - } - }, - NAME: function(match, context, isXML){ - if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], results = context.getElementsByName(match[1]); - - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); - } - } - - return ret.length === 0 ? null : ret; - } - }, - TAG: function(match, context){ - return context.getElementsByTagName(match[1]); - } - }, - preFilter: { - CLASS: function(match, curLoop, inplace, result, not, isXML){ - match = " " + match[1].replace(/\\/g, "") + " "; - - if ( isXML ) { - return match; - } - - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) { - if ( !inplace ) - result.push( elem ); - } else if ( inplace ) { - curLoop[i] = false; - } - } - } - - return false; - }, - ID: function(match){ - return match[1].replace(/\\/g, ""); - }, - TAG: function(match, curLoop){ - for ( var i = 0; curLoop[i] === false; i++ ){} - return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase(); - }, - CHILD: function(match){ - if ( match[1] == "nth" ) { - var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( - match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); - - match[2] = (test[1] + (test[2] || 1)) - 0; - match[3] = test[3] - 0; - } - - match[0] = done++; - - return match; - }, - ATTR: function(match, curLoop, inplace, result, not, isXML){ - var name = match[1].replace(/\\/g, ""); - - if ( !isXML && Expr.attrMap[name] ) { - match[1] = Expr.attrMap[name]; - } - - if ( match[2] === "~=" ) { - match[4] = " " + match[4] + " "; - } - - return match; - }, - PSEUDO: function(match, curLoop, inplace, result, not){ - if ( match[1] === "not" ) { - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { - match[3] = Sizzle(match[3], null, null, curLoop); - } else { - var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); - if ( !inplace ) { - result.push.apply( result, ret ); - } - return false; - } - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { - return true; - } - - return match; - }, - POS: function(match){ - match.unshift( true ); - return match; - } - }, - filters: { - enabled: function(elem){ - return elem.disabled === false && elem.type !== "hidden"; - }, - disabled: function(elem){ - return elem.disabled === true; - }, - checked: function(elem){ - return elem.checked === true; - }, - selected: function(elem){ - elem.parentNode.selectedIndex; - return elem.selected === true; - }, - parent: function(elem){ - return !!elem.firstChild; - }, - empty: function(elem){ - return !elem.firstChild; - }, - has: function(elem, i, match){ - return !!Sizzle( match[3], elem ).length; - }, - header: function(elem){ - return /h\d/i.test( elem.nodeName ); - }, - text: function(elem){ - return "text" === elem.type; - }, - radio: function(elem){ - return "radio" === elem.type; - }, - checkbox: function(elem){ - return "checkbox" === elem.type; - }, - file: function(elem){ - return "file" === elem.type; - }, - password: function(elem){ - return "password" === elem.type; - }, - submit: function(elem){ - return "submit" === elem.type; - }, - image: function(elem){ - return "image" === elem.type; - }, - reset: function(elem){ - return "reset" === elem.type; - }, - button: function(elem){ - return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON"; - }, - input: function(elem){ - return /input|select|textarea|button/i.test(elem.nodeName); - } - }, - setFilters: { - first: function(elem, i){ - return i === 0; - }, - last: function(elem, i, match, array){ - return i === array.length - 1; - }, - even: function(elem, i){ - return i % 2 === 0; - }, - odd: function(elem, i){ - return i % 2 === 1; - }, - lt: function(elem, i, match){ - return i < match[3] - 0; - }, - gt: function(elem, i, match){ - return i > match[3] - 0; - }, - nth: function(elem, i, match){ - return match[3] - 0 == i; - }, - eq: function(elem, i, match){ - return match[3] - 0 == i; - } - }, - filter: { - PSEUDO: function(elem, match, i, array){ - var name = match[1], filter = Expr.filters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0; - } else if ( name === "not" ) { - var not = match[3]; - - for ( var i = 0, l = not.length; i < l; i++ ) { - if ( not[i] === elem ) { - return false; - } - } - - return true; - } - }, - CHILD: function(elem, match){ - var type = match[1], node = elem; - switch (type) { - case 'only': - case 'first': - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) return false; - } - if ( type == 'first') return true; - node = elem; - case 'last': - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) return false; - } - return true; - case 'nth': - var first = match[2], last = match[3]; - - if ( first == 1 && last == 0 ) { - return true; - } - - var doneName = match[0], - parent = elem.parentNode; - - if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { - var count = 0; - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - node.nodeIndex = ++count; - } - } - parent.sizcache = doneName; - } - - var diff = elem.nodeIndex - last; - if ( first == 0 ) { - return diff == 0; - } else { - return ( diff % first == 0 && diff / first >= 0 ); - } - } - }, - ID: function(elem, match){ - return elem.nodeType === 1 && elem.getAttribute("id") === match; - }, - TAG: function(elem, match){ - return (match === "*" && elem.nodeType === 1) || elem.nodeName === match; - }, - CLASS: function(elem, match){ - return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; - }, - ATTR: function(elem, match){ - var name = match[1], - result = Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), - value = result + "", - type = match[2], - check = match[4]; - - return result == null ? - type === "!=" : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value != check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; - }, - POS: function(elem, match, i, array){ - var name = match[2], filter = Expr.setFilters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } - } - } -}; - -var origPOS = Expr.match.POS; - -for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source ); -} - -var makeArray = function(array, results) { - array = Array.prototype.slice.call( array, 0 ); - - if ( results ) { - results.push.apply( results, array ); - return results; - } - - return array; -}; - -try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 ); - -} catch(e){ - makeArray = function(array, results) { - var ret = results || []; - - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); - } else { - if ( typeof array.length === "number" ) { - for ( var i = 0, l = array.length; i < l; i++ ) { - ret.push( array[i] ); - } - } else { - for ( var i = 0; array[i]; i++ ) { - ret.push( array[i] ); - } - } - } - - return ret; - }; -} - -var sortOrder; - -if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - if ( a == b ) { - hasDuplicate = true; - } - return 0; - } - - var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} else if ( "sourceIndex" in document.documentElement ) { - sortOrder = function( a, b ) { - if ( !a.sourceIndex || !b.sourceIndex ) { - if ( a == b ) { - hasDuplicate = true; - } - return 0; - } - - var ret = a.sourceIndex - b.sourceIndex; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} else if ( document.createRange ) { - sortOrder = function( a, b ) { - if ( !a.ownerDocument || !b.ownerDocument ) { - if ( a == b ) { - hasDuplicate = true; - } - return 0; - } - - var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange(); - aRange.setStart(a, 0); - aRange.setEnd(a, 0); - bRange.setStart(b, 0); - bRange.setEnd(b, 0); - var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange); - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} - -(function(){ - var form = document.createElement("div"), - id = "script" + (new Date).getTime(); - form.innerHTML = ""; - - var root = document.documentElement; - root.insertBefore( form, root.firstChild ); - - if ( !!document.getElementById( id ) ) { - Expr.find.ID = function(match, context, isXML){ - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : []; - } - }; - - Expr.filter.ID = function(elem, match){ - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - return elem.nodeType === 1 && node && node.nodeValue === match; - }; - } - - root.removeChild( form ); - root = form = null; // release memory in IE -})(); - -(function(){ - - var div = document.createElement("div"); - div.appendChild( document.createComment("") ); - - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function(match, context){ - var results = context.getElementsByTagName(match[1]); - - if ( match[1] === "*" ) { - var tmp = []; - - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); - } - } - - results = tmp; - } - - return results; - }; - } - - div.innerHTML = ""; - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { - Expr.attrHandle.href = function(elem){ - return elem.getAttribute("href", 2); - }; - } - - div = null; // release memory in IE -})(); - -if ( document.querySelectorAll ) (function(){ - var oldSizzle = Sizzle, div = document.createElement("div"); - div.innerHTML = "

    "; - - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { - return; - } - - Sizzle = function(query, context, extra, seed){ - context = context || document; - - if ( !seed && context.nodeType === 9 && !isXML(context) ) { - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(e){} - } - - return oldSizzle(query, context, extra, seed); - }; - - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; - } - - div = null; // release memory in IE -})(); - -if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){ - var div = document.createElement("div"); - div.innerHTML = "
    "; - - if ( div.getElementsByClassName("e").length === 0 ) - return; - - div.lastChild.className = "e"; - - if ( div.getElementsByClassName("e").length === 1 ) - return; - - Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function(match, context, isXML) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { - return context.getElementsByClassName(match[1]); - } - }; - - div = null; // release memory in IE -})(); - -function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - var sibDir = dir == "previousSibling" && !isXML; - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - if ( sibDir && elem.nodeType === 1 ){ - elem.sizcache = doneName; - elem.sizset = i; - } - elem = elem[dir]; - var match = false; - - while ( elem ) { - if ( elem.sizcache === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 && !isXML ){ - elem.sizcache = doneName; - elem.sizset = i; - } - - if ( elem.nodeName === cur ) { - match = elem; - break; - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - var sibDir = dir == "previousSibling" && !isXML; - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - if ( sibDir && elem.nodeType === 1 ) { - elem.sizcache = doneName; - elem.sizset = i; - } - elem = elem[dir]; - var match = false; - - while ( elem ) { - if ( elem.sizcache === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 ) { - if ( !isXML ) { - elem.sizcache = doneName; - elem.sizset = i; - } - if ( typeof cur !== "string" ) { - if ( elem === cur ) { - match = true; - break; - } - - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { - match = elem; - break; - } - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -var contains = document.compareDocumentPosition ? function(a, b){ - return a.compareDocumentPosition(b) & 16; -} : function(a, b){ - return a !== b && (a.contains ? a.contains(b) : true); -}; - -var isXML = function(elem){ - return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || - !!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML"; -}; - -var posProcess = function(selector, context){ - var tmpSet = [], later = "", match, - root = context.nodeType ? [context] : context; - - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { - later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); - } - - selector = Expr.relative[selector] ? selector + "*" : selector; - - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet ); - } - - return Sizzle.filter( later, tmpSet ); -}; - - -window.Sizzle = Sizzle; - -})(); - -;(function(engine) { - var extendElements = Prototype.Selector.extendElements; - - function select(selector, scope) { - return extendElements(engine(selector, scope || document)); - } - - function match(element, selector) { - return engine.matches(selector, [element]).length == 1; - } - - Prototype.Selector.engine = engine; - Prototype.Selector.select = select; - Prototype.Selector.match = match; -})(Sizzle); - -window.Sizzle = Prototype._original_property; -delete Prototype._original_property; - -var Form = { - reset: function(form) { - form = $(form); - form.reset(); - return form; - }, - - serializeElements: function(elements, options) { - if (typeof options != 'object') options = { hash: !!options }; - else if (Object.isUndefined(options.hash)) options.hash = true; - var key, value, submitted = false, submit = options.submit; - - var data = elements.inject({ }, function(result, element) { - if (!element.disabled && element.name) { - key = element.name; value = $(element).getValue(); - if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted && - submit !== false && (!submit || key == submit) && (submitted = true)))) { - if (key in result) { - if (!Object.isArray(result[key])) result[key] = [result[key]]; - result[key].push(value); - } - else result[key] = value; - } - } - return result; - }); - - return options.hash ? data : Object.toQueryString(data); - } -}; - -Form.Methods = { - serialize: function(form, options) { - return Form.serializeElements(Form.getElements(form), options); - }, - - getElements: function(form) { - var elements = $(form).getElementsByTagName('*'), - element, - arr = [ ], - serializers = Form.Element.Serializers; - for (var i = 0; element = elements[i]; i++) { - arr.push(element); - } - return arr.inject([], function(elements, child) { - if (serializers[child.tagName.toLowerCase()]) - elements.push(Element.extend(child)); - return elements; - }) - }, - - getInputs: function(form, typeName, name) { - form = $(form); - var inputs = form.getElementsByTagName('input'); - - if (!typeName && !name) return $A(inputs).map(Element.extend); - - for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) { - var input = inputs[i]; - if ((typeName && input.type != typeName) || (name && input.name != name)) - continue; - matchingInputs.push(Element.extend(input)); - } - - return matchingInputs; - }, - - disable: function(form) { - form = $(form); - Form.getElements(form).invoke('disable'); - return form; - }, - - enable: function(form) { - form = $(form); - Form.getElements(form).invoke('enable'); - return form; - }, - - findFirstElement: function(form) { - var elements = $(form).getElements().findAll(function(element) { - return 'hidden' != element.type && !element.disabled; - }); - var firstByIndex = elements.findAll(function(element) { - return element.hasAttribute('tabIndex') && element.tabIndex >= 0; - }).sortBy(function(element) { return element.tabIndex }).first(); - - return firstByIndex ? firstByIndex : elements.find(function(element) { - return /^(?:input|select|textarea)$/i.test(element.tagName); - }); - }, - - focusFirstElement: function(form) { - form = $(form); - form.findFirstElement().activate(); - return form; - }, - - request: function(form, options) { - form = $(form), options = Object.clone(options || { }); - - var params = options.parameters, action = form.readAttribute('action') || ''; - if (action.blank()) action = window.location.href; - options.parameters = form.serialize(true); - - if (params) { - if (Object.isString(params)) params = params.toQueryParams(); - Object.extend(options.parameters, params); - } - - if (form.hasAttribute('method') && !options.method) - options.method = form.method; - - return new Ajax.Request(action, options); - } -}; - -/*--------------------------------------------------------------------------*/ - - -Form.Element = { - focus: function(element) { - $(element).focus(); - return element; - }, - - select: function(element) { - $(element).select(); - return element; - } -}; - -Form.Element.Methods = { - - serialize: function(element) { - element = $(element); - if (!element.disabled && element.name) { - var value = element.getValue(); - if (value != undefined) { - var pair = { }; - pair[element.name] = value; - return Object.toQueryString(pair); - } - } - return ''; - }, - - getValue: function(element) { - element = $(element); - var method = element.tagName.toLowerCase(); - return Form.Element.Serializers[method](element); - }, - - setValue: function(element, value) { - element = $(element); - var method = element.tagName.toLowerCase(); - Form.Element.Serializers[method](element, value); - return element; - }, - - clear: function(element) { - $(element).value = ''; - return element; - }, - - present: function(element) { - return $(element).value != ''; - }, - - activate: function(element) { - element = $(element); - try { - element.focus(); - if (element.select && (element.tagName.toLowerCase() != 'input' || - !(/^(?:button|reset|submit)$/i.test(element.type)))) - element.select(); - } catch (e) { } - return element; - }, - - disable: function(element) { - element = $(element); - element.disabled = true; - return element; - }, - - enable: function(element) { - element = $(element); - element.disabled = false; - return element; - } -}; - -/*--------------------------------------------------------------------------*/ - -var Field = Form.Element; - -var $F = Form.Element.Methods.getValue; - -/*--------------------------------------------------------------------------*/ - -Form.Element.Serializers = { - input: function(element, value) { - switch (element.type.toLowerCase()) { - case 'checkbox': - case 'radio': - return Form.Element.Serializers.inputSelector(element, value); - default: - return Form.Element.Serializers.textarea(element, value); - } - }, - - inputSelector: function(element, value) { - if (Object.isUndefined(value)) return element.checked ? element.value : null; - else element.checked = !!value; - }, - - textarea: function(element, value) { - if (Object.isUndefined(value)) return element.value; - else element.value = value; - }, - - select: function(element, value) { - if (Object.isUndefined(value)) - return this[element.type == 'select-one' ? - 'selectOne' : 'selectMany'](element); - else { - var opt, currentValue, single = !Object.isArray(value); - for (var i = 0, length = element.length; i < length; i++) { - opt = element.options[i]; - currentValue = this.optionValue(opt); - if (single) { - if (currentValue == value) { - opt.selected = true; - return; - } - } - else opt.selected = value.include(currentValue); - } - } - }, - - selectOne: function(element) { - var index = element.selectedIndex; - return index >= 0 ? this.optionValue(element.options[index]) : null; - }, - - selectMany: function(element) { - var values, length = element.length; - if (!length) return null; - - for (var i = 0, values = []; i < length; i++) { - var opt = element.options[i]; - if (opt.selected) values.push(this.optionValue(opt)); - } - return values; - }, - - optionValue: function(opt) { - return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text; - } -}; - -/*--------------------------------------------------------------------------*/ - - -Abstract.TimedObserver = Class.create(PeriodicalExecuter, { - initialize: function($super, element, frequency, callback) { - $super(callback, frequency); - this.element = $(element); - this.lastValue = this.getValue(); - }, - - execute: function() { - var value = this.getValue(); - if (Object.isString(this.lastValue) && Object.isString(value) ? - this.lastValue != value : String(this.lastValue) != String(value)) { - this.callback(this.element, value); - this.lastValue = value; - } - } -}); - -Form.Element.Observer = Class.create(Abstract.TimedObserver, { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.Observer = Class.create(Abstract.TimedObserver, { - getValue: function() { - return Form.serialize(this.element); - } -}); - -/*--------------------------------------------------------------------------*/ - -Abstract.EventObserver = Class.create({ - initialize: function(element, callback) { - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - if (this.element.tagName.toLowerCase() == 'form') - this.registerFormCallbacks(); - else - this.registerCallback(this.element); - }, - - onElementEvent: function() { - var value = this.getValue(); - if (this.lastValue != value) { - this.callback(this.element, value); - this.lastValue = value; - } - }, - - registerFormCallbacks: function() { - Form.getElements(this.element).each(this.registerCallback, this); - }, - - registerCallback: function(element) { - if (element.type) { - switch (element.type.toLowerCase()) { - case 'checkbox': - case 'radio': - Event.observe(element, 'click', this.onElementEvent.bind(this)); - break; - default: - Event.observe(element, 'change', this.onElementEvent.bind(this)); - break; - } - } - } -}); - -Form.Element.EventObserver = Class.create(Abstract.EventObserver, { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.EventObserver = Class.create(Abstract.EventObserver, { - getValue: function() { - return Form.serialize(this.element); - } -}); -(function() { - - var Event = { - KEY_BACKSPACE: 8, - KEY_TAB: 9, - KEY_RETURN: 13, - KEY_ESC: 27, - KEY_LEFT: 37, - KEY_UP: 38, - KEY_RIGHT: 39, - KEY_DOWN: 40, - KEY_DELETE: 46, - KEY_HOME: 36, - KEY_END: 35, - KEY_PAGEUP: 33, - KEY_PAGEDOWN: 34, - KEY_INSERT: 45, - - cache: {} - }; - - var docEl = document.documentElement; - var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl - && 'onmouseleave' in docEl; - - var _isButton; - if (Prototype.Browser.IE) { - var buttonMap = { 0: 1, 1: 4, 2: 2 }; - _isButton = function(event, code) { - return event.button === buttonMap[code]; - }; - } else if (Prototype.Browser.WebKit) { - _isButton = function(event, code) { - switch (code) { - case 0: return event.which == 1 && !event.metaKey; - case 1: return event.which == 1 && event.metaKey; - default: return false; - } - }; - } else { - _isButton = function(event, code) { - return event.which ? (event.which === code + 1) : (event.button === code); - }; - } - - function isLeftClick(event) { return _isButton(event, 0) } - - function isMiddleClick(event) { return _isButton(event, 1) } - - function isRightClick(event) { return _isButton(event, 2) } - - function element(event) { - event = Event.extend(event); - - var node = event.target, type = event.type, - currentTarget = event.currentTarget; - - if (currentTarget && currentTarget.tagName) { - if (type === 'load' || type === 'error' || - (type === 'click' && currentTarget.tagName.toLowerCase() === 'input' - && currentTarget.type === 'radio')) - node = currentTarget; - } - - if (node.nodeType == Node.TEXT_NODE) - node = node.parentNode; - - return Element.extend(node); - } - - function findElement(event, expression) { - var element = Event.element(event); - if (!expression) return element; - while (element) { - if (Object.isElement(element) && Prototype.Selector.match(element, expression)) { - return Element.extend(element); - } - element = element.parentNode; - } - } - - function pointer(event) { - return { x: pointerX(event), y: pointerY(event) }; - } - - function pointerX(event) { - var docElement = document.documentElement, - body = document.body || { scrollLeft: 0 }; - - return event.pageX || (event.clientX + - (docElement.scrollLeft || body.scrollLeft) - - (docElement.clientLeft || 0)); - } - - function pointerY(event) { - var docElement = document.documentElement, - body = document.body || { scrollTop: 0 }; - - return event.pageY || (event.clientY + - (docElement.scrollTop || body.scrollTop) - - (docElement.clientTop || 0)); - } - - - function stop(event) { - Event.extend(event); - event.preventDefault(); - event.stopPropagation(); - - event.stopped = true; - } - - Event.Methods = { - isLeftClick: isLeftClick, - isMiddleClick: isMiddleClick, - isRightClick: isRightClick, - - element: element, - findElement: findElement, - - pointer: pointer, - pointerX: pointerX, - pointerY: pointerY, - - stop: stop - }; - - - var methods = Object.keys(Event.Methods).inject({ }, function(m, name) { - m[name] = Event.Methods[name].methodize(); - return m; - }); - - if (Prototype.Browser.IE) { - function _relatedTarget(event) { - var element; - switch (event.type) { - case 'mouseover': element = event.fromElement; break; - case 'mouseout': element = event.toElement; break; - default: return null; - } - return Element.extend(element); - } - - Object.extend(methods, { - stopPropagation: function() { this.cancelBubble = true }, - preventDefault: function() { this.returnValue = false }, - inspect: function() { return '[object Event]' } - }); - - Event.extend = function(event, element) { - if (!event) return false; - if (event._extendedByPrototype) return event; - - event._extendedByPrototype = Prototype.emptyFunction; - var pointer = Event.pointer(event); - - Object.extend(event, { - target: event.srcElement || element, - relatedTarget: _relatedTarget(event), - pageX: pointer.x, - pageY: pointer.y - }); - - return Object.extend(event, methods); - }; - } else { - Event.prototype = window.Event.prototype || document.createEvent('HTMLEvents').__proto__; - Object.extend(Event.prototype, methods); - Event.extend = Prototype.K; - } - - function _createResponder(element, eventName, handler) { - var registry = Element.retrieve(element, 'prototype_event_registry'); - - if (Object.isUndefined(registry)) { - CACHE.push(element); - registry = Element.retrieve(element, 'prototype_event_registry', $H()); - } - - var respondersForEvent = registry.get(eventName); - if (Object.isUndefined(respondersForEvent)) { - respondersForEvent = []; - registry.set(eventName, respondersForEvent); - } - - if (respondersForEvent.pluck('handler').include(handler)) return false; - - var responder; - if (eventName.include(":")) { - responder = function(event) { - if (Object.isUndefined(event.eventName)) - return false; - - if (event.eventName !== eventName) - return false; - - Event.extend(event, element); - handler.call(element, event); - }; - } else { - if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED && - (eventName === "mouseenter" || eventName === "mouseleave")) { - if (eventName === "mouseenter" || eventName === "mouseleave") { - responder = function(event) { - Event.extend(event, element); - - var parent = event.relatedTarget; - while (parent && parent !== element) { - try { parent = parent.parentNode; } - catch(e) { parent = element; } - } - - if (parent === element) return; - - handler.call(element, event); - }; - } - } else { - responder = function(event) { - Event.extend(event, element); - handler.call(element, event); - }; - } - } - - responder.handler = handler; - respondersForEvent.push(responder); - return responder; - } - - function _destroyCache() { - for (var i = 0, length = CACHE.length; i < length; i++) { - Event.stopObserving(CACHE[i]); - CACHE[i] = null; - } - } - - var CACHE = []; - - if (Prototype.Browser.IE) - window.attachEvent('onunload', _destroyCache); - - if (Prototype.Browser.WebKit) - window.addEventListener('unload', Prototype.emptyFunction, false); - - - var _getDOMEventName = Prototype.K, - translations = { mouseenter: "mouseover", mouseleave: "mouseout" }; - - if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED) { - _getDOMEventName = function(eventName) { - return (translations[eventName] || eventName); - }; - } - - function observe(element, eventName, handler) { - element = $(element); - - var responder = _createResponder(element, eventName, handler); - - if (!responder) return element; - - if (eventName.include(':')) { - if (element.addEventListener) - element.addEventListener("dataavailable", responder, false); - else { - element.attachEvent("ondataavailable", responder); - element.attachEvent("onfilterchange", responder); - } - } else { - var actualEventName = _getDOMEventName(eventName); - - if (element.addEventListener) - element.addEventListener(actualEventName, responder, false); - else - element.attachEvent("on" + actualEventName, responder); - } - - return element; - } - - function stopObserving(element, eventName, handler) { - element = $(element); - - var registry = Element.retrieve(element, 'prototype_event_registry'); - if (!registry) return element; - - if (!eventName) { - registry.each( function(pair) { - var eventName = pair.key; - stopObserving(element, eventName); - }); - return element; - } - - var responders = registry.get(eventName); - if (!responders) return element; - - if (!handler) { - responders.each(function(r) { - stopObserving(element, eventName, r.handler); - }); - return element; - } - - var responder = responders.find( function(r) { return r.handler === handler; }); - if (!responder) return element; - - if (eventName.include(':')) { - if (element.removeEventListener) - element.removeEventListener("dataavailable", responder, false); - else { - element.detachEvent("ondataavailable", responder); - element.detachEvent("onfilterchange", responder); - } - } else { - var actualEventName = _getDOMEventName(eventName); - if (element.removeEventListener) - element.removeEventListener(actualEventName, responder, false); - else - element.detachEvent('on' + actualEventName, responder); - } - - registry.set(eventName, responders.without(responder)); - - return element; - } - - function fire(element, eventName, memo, bubble) { - element = $(element); - - if (Object.isUndefined(bubble)) - bubble = true; - - if (element == document && document.createEvent && !element.dispatchEvent) - element = document.documentElement; - - var event; - if (document.createEvent) { - event = document.createEvent('HTMLEvents'); - event.initEvent('dataavailable', true, true); - } else { - event = document.createEventObject(); - event.eventType = bubble ? 'ondataavailable' : 'onfilterchange'; - } - - event.eventName = eventName; - event.memo = memo || { }; - - if (document.createEvent) - element.dispatchEvent(event); - else - element.fireEvent(event.eventType, event); - - return Event.extend(event); - } - - Event.Handler = Class.create({ - initialize: function(element, eventName, selector, callback) { - this.element = $(element); - this.eventName = eventName; - this.selector = selector; - this.callback = callback; - this.handler = this.handleEvent.bind(this); - }, - - start: function() { - Event.observe(this.element, this.eventName, this.handler); - return this; - }, - - stop: function() { - Event.stopObserving(this.element, this.eventName, this.handler); - return this; - }, - - handleEvent: function(event) { - var element = event.findElement(this.selector); - if (element) this.callback.call(this.element, event, element); - } - }); - - function on(element, eventName, selector, callback) { - element = $(element); - if (Object.isFunction(selector) && Object.isUndefined(callback)) { - callback = selector, selector = null; - } - - return new Event.Handler(element, eventName, selector, callback).start(); - } - - Object.extend(Event, Event.Methods); - - Object.extend(Event, { - fire: fire, - observe: observe, - stopObserving: stopObserving, - on: on - }); - - Element.addMethods({ - fire: fire, - - observe: observe, - - stopObserving: stopObserving, - - on: on - }); - - Object.extend(document, { - fire: fire.methodize(), - - observe: observe.methodize(), - - stopObserving: stopObserving.methodize(), - - on: on.methodize(), - - loaded: false - }); - - if (window.Event) Object.extend(window.Event, Event); - else window.Event = Event; -})(); - -(function() { - /* Support for the DOMContentLoaded event is based on work by Dan Webb, - Matthias Miller, Dean Edwards, John Resig, and Diego Perini. */ - - var timer; - - function fireContentLoadedEvent() { - if (document.loaded) return; - if (timer) window.clearTimeout(timer); - document.loaded = true; - document.fire('dom:loaded'); - } - - function checkReadyState() { - if (document.readyState === 'complete') { - document.stopObserving('readystatechange', checkReadyState); - fireContentLoadedEvent(); - } - } - - function pollDoScroll() { - try { document.documentElement.doScroll('left'); } - catch(e) { - timer = pollDoScroll.defer(); - return; - } - fireContentLoadedEvent(); - } - - if (document.addEventListener) { - document.addEventListener('DOMContentLoaded', fireContentLoadedEvent, false); - } else { - document.observe('readystatechange', checkReadyState); - if (window == top) - timer = pollDoScroll.defer(); - } - - Event.observe(window, 'load', fireContentLoadedEvent); -})(); - -Element.addMethods(); - -/*------------------------------- DEPRECATED -------------------------------*/ - -Hash.toQueryString = Object.toQueryString; - -var Toggle = { display: Element.toggle }; - -Element.Methods.childOf = Element.Methods.descendantOf; - -var Insertion = { - Before: function(element, content) { - return Element.insert(element, {before:content}); - }, - - Top: function(element, content) { - return Element.insert(element, {top:content}); - }, - - Bottom: function(element, content) { - return Element.insert(element, {bottom:content}); - }, - - After: function(element, content) { - return Element.insert(element, {after:content}); - } -}; - -var $continue = new Error('"throw $continue" is deprecated, use "return" instead'); - -var Position = { - includeScrollOffsets: false, - - prepare: function() { - this.deltaX = window.pageXOffset - || document.documentElement.scrollLeft - || document.body.scrollLeft - || 0; - this.deltaY = window.pageYOffset - || document.documentElement.scrollTop - || document.body.scrollTop - || 0; - }, - - within: function(element, x, y) { - if (this.includeScrollOffsets) - return this.withinIncludingScrolloffsets(element, x, y); - this.xcomp = x; - this.ycomp = y; - this.offset = Element.cumulativeOffset(element); - - return (y >= this.offset[1] && - y < this.offset[1] + element.offsetHeight && - x >= this.offset[0] && - x < this.offset[0] + element.offsetWidth); - }, - - withinIncludingScrolloffsets: function(element, x, y) { - var offsetcache = Element.cumulativeScrollOffset(element); - - this.xcomp = x + offsetcache[0] - this.deltaX; - this.ycomp = y + offsetcache[1] - this.deltaY; - this.offset = Element.cumulativeOffset(element); - - return (this.ycomp >= this.offset[1] && - this.ycomp < this.offset[1] + element.offsetHeight && - this.xcomp >= this.offset[0] && - this.xcomp < this.offset[0] + element.offsetWidth); - }, - - overlap: function(mode, element) { - if (!mode) return 0; - if (mode == 'vertical') - return ((this.offset[1] + element.offsetHeight) - this.ycomp) / - element.offsetHeight; - if (mode == 'horizontal') - return ((this.offset[0] + element.offsetWidth) - this.xcomp) / - element.offsetWidth; - }, - - - cumulativeOffset: Element.Methods.cumulativeOffset, - - positionedOffset: Element.Methods.positionedOffset, - - absolutize: function(element) { - Position.prepare(); - return Element.absolutize(element); - }, - - relativize: function(element) { - Position.prepare(); - return Element.relativize(element); - }, - - realOffset: Element.Methods.cumulativeScrollOffset, - - offsetParent: Element.Methods.getOffsetParent, - - page: Element.Methods.viewportOffset, - - clone: function(source, target, options) { - options = options || { }; - return Element.clonePosition(target, source, options); - } -}; - -/*--------------------------------------------------------------------------*/ - -if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){ - function iter(name) { - return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]"; - } - - instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ? - function(element, className) { - className = className.toString().strip(); - var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className); - return cond ? document._getElementsByXPath('.//*' + cond, element) : []; - } : function(element, className) { - className = className.toString().strip(); - var elements = [], classNames = (/\s/.test(className) ? $w(className) : null); - if (!classNames && !className) return elements; - - var nodes = $(element).getElementsByTagName('*'); - className = ' ' + className + ' '; - - for (var i = 0, child, cn; child = nodes[i]; i++) { - if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) || - (classNames && classNames.all(function(name) { - return !name.toString().blank() && cn.include(' ' + name + ' '); - })))) - elements.push(Element.extend(child)); - } - return elements; - }; - - return function(className, parentElement) { - return $(parentElement || document.body).getElementsByClassName(className); - }; -}(Element.Methods); - -/*--------------------------------------------------------------------------*/ - -Element.ClassNames = Class.create(); -Element.ClassNames.prototype = { - initialize: function(element) { - this.element = $(element); - }, - - _each: function(iterator) { - this.element.className.split(/\s+/).select(function(name) { - return name.length > 0; - })._each(iterator); - }, - - set: function(className) { - this.element.className = className; - }, - - add: function(classNameToAdd) { - if (this.include(classNameToAdd)) return; - this.set($A(this).concat(classNameToAdd).join(' ')); - }, - - remove: function(classNameToRemove) { - if (!this.include(classNameToRemove)) return; - this.set($A(this).without(classNameToRemove).join(' ')); - }, - - toString: function() { - return $A(this).join(' '); - } -}; - -Object.extend(Element.ClassNames.prototype, Enumerable); - -/*--------------------------------------------------------------------------*/ - -(function() { - window.Selector = Class.create({ - initialize: function(expression) { - this.expression = expression.strip(); - }, - - findElements: function(rootElement) { - return Prototype.Selector.select(this.expression, rootElement); - }, - - match: function(element) { - return Prototype.Selector.match(element, this.expression); - }, - - toString: function() { - return this.expression; - }, - - inspect: function() { - return "#"; - } - }); - - Object.extend(Selector, { - matchElements: function(elements, expression) { - var match = Prototype.Selector.match, - results = []; - - for (var i = 0, length = elements.length; i < length; i++) { - var element = elements[i]; - if (match(element, expression)) { - results.push(Element.extend(element)); - } - } - return results; - }, - - findElement: function(elements, expression, index) { - index = index || 0; - var matchIndex = 0, element; - for (var i = 0, length = elements.length; i < length; i++) { - element = elements[i]; - if (Prototype.Selector.match(element, expression) && index === matchIndex++) { - return Element.extend(element); - } - } - }, - - findChildElements: function(element, expressions) { - var selector = expressions.toArray().join(', '); - return Prototype.Selector.select(selector, element || document); - } - }); -})(); diff --git a/public/javascripts/rails.js b/public/javascripts/rails.js deleted file mode 100644 index aed6aed36..000000000 --- a/public/javascripts/rails.js +++ /dev/null @@ -1,191 +0,0 @@ -(function() { - // Technique from Juriy Zaytsev - // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ - function isEventSupported(eventName) { - var el = document.createElement('div'); - eventName = 'on' + eventName; - var isSupported = (eventName in el); - if (!isSupported) { - el.setAttribute(eventName, 'return;'); - isSupported = typeof el[eventName] == 'function'; - } - el = null; - return isSupported; - } - - function isForm(element) { - return Object.isElement(element) && element.nodeName.toUpperCase() == 'FORM' - } - - function isInput(element) { - if (Object.isElement(element)) { - var name = element.nodeName.toUpperCase() - return name == 'INPUT' || name == 'SELECT' || name == 'TEXTAREA' - } - else return false - } - - var submitBubbles = isEventSupported('submit'), - changeBubbles = isEventSupported('change') - - if (!submitBubbles || !changeBubbles) { - // augment the Event.Handler class to observe custom events when needed - Event.Handler.prototype.initialize = Event.Handler.prototype.initialize.wrap( - function(init, element, eventName, selector, callback) { - init(element, eventName, selector, callback) - // is the handler being attached to an element that doesn't support this event? - if ( (!submitBubbles && this.eventName == 'submit' && !isForm(this.element)) || - (!changeBubbles && this.eventName == 'change' && !isInput(this.element)) ) { - // "submit" => "emulated:submit" - this.eventName = 'emulated:' + this.eventName - } - } - ) - } - - if (!submitBubbles) { - // discover forms on the page by observing focus events which always bubble - document.on('focusin', 'form', function(focusEvent, form) { - // special handler for the real "submit" event (one-time operation) - if (!form.retrieve('emulated:submit')) { - form.on('submit', function(submitEvent) { - var emulated = form.fire('emulated:submit', submitEvent, true) - // if custom event received preventDefault, cancel the real one too - if (emulated.returnValue === false) submitEvent.preventDefault() - }) - form.store('emulated:submit', true) - } - }) - } - - if (!changeBubbles) { - // discover form inputs on the page - document.on('focusin', 'input, select, texarea', function(focusEvent, input) { - // special handler for real "change" events - if (!input.retrieve('emulated:change')) { - input.on('change', function(changeEvent) { - input.fire('emulated:change', changeEvent, true) - }) - input.store('emulated:change', true) - } - }) - } - - function handleRemote(element) { - var method, url, params; - - var event = element.fire("ajax:before"); - if (event.stopped) return false; - - if (element.tagName.toLowerCase() === 'form') { - method = element.readAttribute('method') || 'post'; - url = element.readAttribute('action'); - params = element.serialize(); - } else { - method = element.readAttribute('data-method') || 'get'; - url = element.readAttribute('href'); - params = {}; - } - - new Ajax.Request(url, { - method: method, - parameters: params, - evalScripts: true, - - onComplete: function(request) { element.fire("ajax:complete", request); }, - onSuccess: function(request) { element.fire("ajax:success", request); }, - onFailure: function(request) { element.fire("ajax:failure", request); } - }); - - element.fire("ajax:after"); - } - - function handleMethod(element) { - var method = element.readAttribute('data-method'), - url = element.readAttribute('href'), - csrf_param = $$('meta[name=csrf-param]')[0], - csrf_token = $$('meta[name=csrf-token]')[0]; - - var form = new Element('form', { method: "POST", action: url, style: "display: none;" }); - element.parentNode.insert(form); - - if (method !== 'post') { - var field = new Element('input', { type: 'hidden', name: '_method', value: method }); - form.insert(field); - } - - if (csrf_param) { - var param = csrf_param.readAttribute('content'), - token = csrf_token.readAttribute('content'), - field = new Element('input', { type: 'hidden', name: param, value: token }); - form.insert(field); - } - - form.submit(); - } - - - document.on("click", "*[data-confirm]", function(event, element) { - var message = element.readAttribute('data-confirm'); - if (!confirm(message)) event.stop(); - }); - - document.on("click", "a[data-remote]", function(event, element) { - if (event.stopped) return; - handleRemote(element); - event.stop(); - }); - - document.on("click", "a[data-method]", function(event, element) { - if (event.stopped) return; - handleMethod(element); - event.stop(); - }); - - document.on("submit", function(event) { - var element = event.findElement(), - message = element.readAttribute('data-confirm'); - if (message && !confirm(message)) { - event.stop(); - return false; - } - - var inputs = element.select("input[type=submit][data-disable-with]"); - inputs.each(function(input) { - input.disabled = true; - input.writeAttribute('data-original-value', input.value); - input.value = input.readAttribute('data-disable-with'); - }); - - var element = event.findElement("form[data-remote]"); - if (element) { - handleRemote(element); - event.stop(); - } - }); - - document.on("ajax:after", "form", function(event, element) { - var inputs = element.select("input[type=submit][disabled=true][data-disable-with]"); - inputs.each(function(input) { - input.value = input.readAttribute('data-original-value'); - input.removeAttribute('data-original-value'); - input.disabled = false; - }); - }); - - Ajax.Responders.register({ - onCreate: function(request) { - var csrf_meta_tag = $$('meta[name=csrf-token]')[0]; - - if (csrf_meta_tag) { - var header = 'X-CSRF-Token', - token = csrf_meta_tag.readAttribute('content'); - - if (!request.options.requestHeaders) { - request.options.requestHeaders = {}; - } - request.options.requestHeaders[header] = token; - } - } - }); -})(); diff --git a/public/stylesheets/browse.css b/public/stylesheets/browse.css deleted file mode 100644 index 3e966e370..000000000 --- a/public/stylesheets/browse.css +++ /dev/null @@ -1,143 +0,0 @@ -.node { padding-left: 25px; } -.way { padding-left: 25px; } -.relation { padding-left: 25px; } - -.deleted { text-decoration: line-through; } - -/* Nodes (and ways as areas) */ - -.aeroway.aerodrome { background: url(/images/browse/aerodrome.p.16.png) no-repeat center left; } - -.amenity.atm { background: url(/images/browse/atm2.p.16.png) no-repeat center left; } -.amenity.bank { background: url(/images/browse/bank2.p.16.png) no-repeat center left; } -.amenity.bar { background: url(/images/browse/bar.p.16.png) no-repeat center left; } -.amenity.bicycle_parking { background: url(/images/browse/transport_parking_bicycle.p.16.png) no-repeat center left; } -.amenity.bicycle_rental { background: url(/images/browse/transport_rental_bicycle.p.16.png) no-repeat center left; } -.amenity.bus_station { background: url(/images/browse/bus_station.n.16.png) no-repeat center left; } -.amenity.cafe { background: url(/images/browse/cafe.p.16.png) no-repeat center left; } -.amenity.car_rental { background: url(/images/browse/transport_rental_car.p.16.png) no-repeat center left; } -.amenity.car_sharing { background: url(/images/browse/car_share.p.16.png) no-repeat center left; } -.amenity.cinema { background: url(/images/browse/cinema.p.16.png) no-repeat center left; } -.amenity.dentist { background: url(/images/browse/health_dentist.p.16.png) no-repeat center left; } -.amenity.doctors { background: url(/images/browse/health_doctors.p.16.png) no-repeat center left; } -.amenity.drinking_water { background: url(/images/browse/drinkingtap.p.16.png) no-repeat center left; } -.amenity.fast_food { background: url(/images/browse/fast_food.p.16.png) no-repeat center left; } -.amenity.fire_station { background: url(/images/browse/firestation.p.16.png) no-repeat center left; } -.amenity.fuel { background: url(/images/browse/fuel.p.16.png) no-repeat center left; } -.amenity.hospital { background: url(/images/browse/hospital.p.16.png) no-repeat center left; } -.amenity.library { background: url(/images/browse/library.p.16.png) no-repeat center left; } -.amenity.nursery { background: url(/images/browse/education_nursery.p.16.png) no-repeat center left; } -.amenity.parking { background: url(/images/browse/parking.p.16.png) no-repeat center left; } -.amenity.pharmacy { background: url(/images/browse/pharmacy.p.16.png) no-repeat center left; } -.amenity.place_of_worship { background: url(/images/browse/place_of_worship_unknown3.p.16.png) no-repeat center left; } -.amenity.police { background: url(/images/browse/police.p.16.png) no-repeat center left; } -.amenity.post_box { background: url(/images/browse/post_box.p.16.png) no-repeat center left; } -.amenity.post_office { background: url(/images/browse/post_office.p.16.png) no-repeat center left; } -.amenity.prison { background: url(/images/browse/prison.p.16.png) no-repeat center left; } -.amenity.pub { background: url(/images/browse/pub.p.16.png) no-repeat center left; } -.amenity.restaurant { background: url(/images/browse/restaurant.p.16.png) no-repeat center left; } -.amenity.recycling { background: url(/images/browse/recycling.p.16.png) no-repeat center left; } -.amenity.school { background: url(/images/browse/education_school.p.16.png) no-repeat center left; } -.amenity.shelter { background: url(/images/browse/shelter2.p.16.png) no-repeat center left; } -.amenity.telephone { background: url(/images/browse/telephone.p.16.png) no-repeat center left; } -.amenity.theatre { background: url(/images/browse/theatre.p.16.png) no-repeat center left; } -.amenity.toilets { background: url(/images/browse/toilets.p.16.png) no-repeat center left; } -.amenity.university { background: url(/images/browse/education_university.p.16.png) no-repeat center left; } -.amenity.veterinary { background: url(/images/browse/health_veterinary.p.16.png) no-repeat center left; } - -.barrier.gate { background: url(/images/browse/gate2.p.16.png) no-repeat center left; } - -.highway.bus_stop { background: url(/images/browse/bus_stop.p.16.png) no-repeat center left; } -.highway.mini_roundabout { background: url(/images/browse/mini_round.p.16.png) no-repeat center left; } -.highway.traffic_signals { background: url(/images/browse/traffic_light.png) no-repeat center left; } -.highway.turning_circle { background: url(/images/browse/turning_circle.p.16.png) no-repeat center left; } - -.historic.castle { background: url(/images/browse/tourist_castle.p.16.png) no-repeat center left; } -.historic.memorial { background: url(/images/browse/tourist_memorial.p.16.png) no-repeat center left; } -.historic.monument { background: url(/images/browse/tourist_monument.p.16.png) no-repeat center left; } -.historic.ruins { background: url(/images/browse/tourist_ruins.p.16.png) no-repeat center left; } -.historic.wreck { background: url(/images/browse/tourist_wreck.p.16.png) no-repeat center left; } - -.man_made.lighthouse { background: url(/images/browse/lighthouse.p.16.png) no-repeat center left; } -.man_made.windmill { background: url(/images/browse/tourist_windmill.p.16.png) no-repeat center left; } - -.natural.tree { background: url(/images/browse/tree.p.16.png) no-repeat center left; } - -.railway.halt { background: url(/images/browse/halt.p.16.png) no-repeat center left; } -.railway.station { background: url(/images/browse/station.p.16.png) no-repeat center left; } -.railway.level_crossing { background: url(/images/browse/level_crossing.p.16.png) no-repeat center left; } - -.shop { background: url(/images/browse/shop_convenience.p.16.png) no-repeat center left; } -.shop.bakery { background: url(/images/browse/shop_bakery.p.16.png) no-repeat center left; } -.shop.bicycle { background: url(/images/browse/shop_bicycle.p.16.png) no-repeat center left; } -.shop.books { background: url(/images/browse/shop_books.p.16.png) no-repeat center left; } -.shop.butcher { background: url(/images/browse/shop_butcher.p.16.png) no-repeat center left; } -.shop.clothes { background: url(/images/browse/shop_clothes.p.16.png) no-repeat center left; } -.shop.convenience { background: url(/images/browse/shop_convenience.p.16.png) no-repeat center left; } -.shop.diy { background: url(/images/browse/shop_diy.p.16.png) no-repeat center left; } -.shop.estate_agent { background: url(/images/browse/shop_estateagent2.p.16.png) no-repeat center left; } -.shop.fish { background: url(/images/browse/shop_fish.p.16.png) no-repeat center left; } -.shop.garden_centre { background: url(/images/browse/shop_garden_centre.p.16.png) no-repeat center left; } -.shop.gift { background: url(/images/browse/shop_gift.p.16.png) no-repeat center left; } -.shop.greengrocer { background: url(/images/browse/shop_greengrocer.p.16.png) no-repeat center left; } -.shop.hairdresser { background: url(/images/browse/shop_hairdresser.p.16.png) no-repeat center left; } -.shop.jewelry { background: url(/images/browse/shop_jewelry.p.16.png) no-repeat center left; } -.shop.supermarket { background: url(/images/browse/shop_supermarket.p.16.png) no-repeat center left; } - -.tourism.alpine_hut { background: url(/images/browse/alpinehut.p.16.png) no-repeat center left; } -.tourism.camp_site { background: url(/images/browse/camping.n.16.png) no-repeat center left; } -.tourism.caravan_site { background: url(/images/browse/caravan_park.n.16.png) no-repeat center left; } -.tourism.hostel { background: url(/images/browse/hostel.p.16.png) no-repeat center left; } -.tourism.hotel { background: url(/images/browse/hotel.p.16.png) no-repeat center left; } -.tourism.museum { background: url(/images/browse/museum.p.16.png) no-repeat center left; } -.tourism.picnic_site { background: url(/images/browse/tourist_picnic.p.16.png) no-repeat center left; } -.tourism.viewpoint { background: url(/images/browse/view_point.p.16.png) no-repeat center left; } - -/* Ways */ - -.aeroway.runway { background: url(/images/browse/runway.20.png) no-repeat center left; } -.aeroway.taxiway { background: url(/images/browse/taxiway.20.png) no-repeat center left; } - -.building { background: url(/images/browse/building.png) no-repeat center left; } - -.highway.bridleway { background: url(/images/browse/bridleway.20.png) no-repeat center left; } -.highway.byway { background: url(/images/browse/byway.20.png) no-repeat center left; } -.highway.cycleway { background: url(/images/browse/cycleway.20.png) no-repeat center left; } -.highway.footway { background: url(/images/browse/footway.20.png) no-repeat center left; } -.highway.motorway { background: url(/images/browse/motorway.20.png) no-repeat center left; } -.highway.motorway_link { background: url(/images/browse/motorway.20.png) no-repeat center left; } -.highway.pedestrian { background: url(/images/browse/service.20.png) no-repeat center left; } -.highway.primary { background: url(/images/browse/primary.20.png) no-repeat center left; } -.highway.primary_link { background: url(/images/browse/primary.20.png) no-repeat center left; } -.highway.residential { background: url(/images/browse/unclassified.20.png) no-repeat center left; } -.highway.secondary { background: url(/images/browse/secondary.20.png) no-repeat center left; } -.highway.secondary_link { background: url(/images/browse/secondary.20.png) no-repeat center left; } -.highway.service { background: url(/images/browse/service.20.png) no-repeat center left; } -.highway.trunk { background: url(/images/browse/trunk.20.png) no-repeat center left; } -.highway.trunk_link { background: url(/images/browse/trunk.20.png) no-repeat center left; } -.highway.unclassified { background: url(/images/browse/unclassified.20.png) no-repeat center left; } - -.landuse.brownfield { background: url(/images/browse/brownfield.png) no-repeat center left; } -.landuse.cemetery { background: url(/images/browse/cemetery.png) no-repeat center left; } -.landuse.commercial { background: url(/images/browse/commercial.png) no-repeat center left; } -.landuse.farm { background: url(/images/browse/farm.png) no-repeat center left; } -.landuse.forest { background: url(/images/browse/forest.png) no-repeat center left; } -.landuse.industrial { background: url(/images/browse/industrial.png) no-repeat center left; } -.landuse.military { background: url(/images/browse/military.png) no-repeat center left; } -.landuse.residential { background: url(/images/browse/residential.png) no-repeat center left; } -.landuse.retail { background: url(/images/browse/retail.png) no-repeat center left; } -.landuse.tourism { background: url(/images/browse/tourism.png) no-repeat center left; } -.landuse.wood { background: url(/images/browse/wood.png) no-repeat center left; } - -.leisure.golf_course { background: url(/images/browse/golf.png) no-repeat center left; } -.leisure.park { background: url(/images/browse/park.png) no-repeat center left; } -.leisure.pitch { background: url(/images/browse/pitch.png) no-repeat center left; } -.leisure.nature_reserve { background: url(/images/browse/reserve.png) no-repeat center left; } - -.natural.heath { background: url(/images/browse/heathland.png) no-repeat center left; } -.natural.water { background: url(/images/browse/lake.png) no-repeat center left; } - -.railway.light_rail { background: url(/images/browse/light_rail.20.png) no-repeat center left; } -.railway.rail { background: url(/images/browse/rail.20.png) no-repeat center left; } -.railway.subway { background: url(/images/browse/subway.20.png) no-repeat center left; } -.railway.tram { background: url(/images/browse/tram.20.png) no-repeat center left; } -- 2.43.2