diff --git a/.gitignore b/.gitignore index d6f866f..f416ed7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,7 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp + +# OS X detritus +.DS_Store + diff --git a/app/assets/images/logos/oakland_nyt.jpg b/app/assets/images/logos/oakland_nyt.jpg new file mode 100644 index 0000000..9df29b0 Binary files /dev/null and b/app/assets/images/logos/oakland_nyt.jpg differ diff --git a/app/assets/images/markers/.DS_Store b/app/assets/images/markers/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/app/assets/images/markers/.DS_Store and /dev/null differ diff --git a/app/views/main/index.html.haml b/app/views/main/index.html.haml index 0b4c544..71d8652 100644 --- a/app/views/main/index.html.haml +++ b/app/views/main/index.html.haml @@ -5,7 +5,8 @@ / = image_tag "logos/adoptasiren.png", :alt => t("titles.main", :thing => t("defaults.thing").titleize), :title => t("titles.main", :thing => t("defaults.thing").titleize) %h2 %br - [ADOPT-A-DRAIN] + Oakland Adopt a Spot + MAINTAIN A DRAIN %h1 \/////////// @@ -23,11 +24,7 @@ = image_tag "logos/cfa.png", :alt => t("sponsors.cfa"), :title => t("sponsors.cfa") #col2 %a{:href => "http://www2.oaklandnet.com/"} - = image_tag "logos/oakland-seal.jpeg", :width => '90px', :alt => t("sponsors.city"), :title => t("sponsors.city") - %p#mayor - %a{:href => "http://www2.oaklandnet.com/"} - = t("sponsors.mayor.name") +", "+ t("sponsors.mayor.title") - + = image_tag "logos/oakland_nyt.jpg", :width => '90px', :alt => t("sponsors.city"), :title => t("sponsors.city") #feedback %p diff --git a/config/locales/en.yml b/config/locales/en.yml index 24c8465..2f682f2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -31,7 +31,7 @@ en: state: "CA" thing: "storm drain" this_thing: "This %{thing}" - tagline: "Claim responsibility for clearing a storm drain entrance and reporting any problems." + tagline: "Volunteer to keep a storm drain clear and report any problems!" tos: "By signing up, you agree to the %{tos}." voice_number: "510-555-1212" zip: "94612"