diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5aaa42f6..17f0e4e7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -21,6 +21,14 @@ module ApplicationHelper end) end + def hide_home_link + @hide_home_link = true + end + + def home_link? + !@hide_home_link + end + JAVASCRIPT_LIBRARIES = { :addthis => 'http://s7.addthis.com/js/250/addthis_widget.js#username=openneo', :bitly => 'http://bit.ly/javascript-api.js?version=latest&login=openneo&apiKey=R_4d0438829b7a99860de1d3edf55d8dc8', diff --git a/app/stylesheets/outfits/_new.sass b/app/stylesheets/outfits/_new.sass index dee34334..6cba026b 100644 --- a/app/stylesheets/outfits/_new.sass +++ b/app/stylesheets/outfits/_new.sass @@ -132,14 +132,3 @@ body.outfits-new +opacity(1) #read-more float: right - #tell-the-world - font-size: 87.5% - left: 0 - position: absolute - top: 0 - img - margin: - bottom: -0.25em - right: .25em - height: 16px - width: 16px diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 37e10162..6f4a9497 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -23,9 +23,7 @@ - else = yield - - if content_for? :home_link - = yield :home_link - - else + - if home_link? %a#home-link{:href => root_path} %span Dress to Impress diff --git a/app/views/outfits/new.html.haml b/app/views/outfits/new.html.haml index 710e74c4..c54853ee 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -1,3 +1,4 @@ +- hide_home_link #outfit-forms #pet-preview = image_tag 'default_preview.png', :alt => '' @@ -98,10 +99,6 @@ = pet_name_tag %button{:type => "submit"} I pwn! -- content_for :home_link do - %button#tell-the-world.button.addthis_button - %img{:src => "http://s7.addthis.com/static/t00/logo1414.gif"} - Tell the world! - content_for :javascripts do - = include_javascript_libraries :jquery, :addthis + = include_javascript_libraries :jquery = include_javascripts :new_outfit_package diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css index 115ee474..7a83afe8 100644 --- a/public/stylesheets/compiled/screen.css +++ b/public/stylesheets/compiled/screen.css @@ -1340,7 +1340,7 @@ body.outfits-edit #preview-outfits > ul > li.loading .outfit-star { } /* line 71, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul > li.loading.active .outfit-star { - background-image: url('/images/loading_current_outfit.gif?1290649989'); + background-image: url('/images/loading_current_outfit.gif?1290738816'); } /* line 73, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul > li h4 { @@ -1559,7 +1559,7 @@ body.outfits-edit #new-outfit.loading .outfit-star { } /* line 71, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit.loading.active .outfit-star { - background-image: url('/images/loading_current_outfit.gif?1290649989'); + background-image: url('/images/loading_current_outfit.gif?1290738816'); } /* line 73, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit h4 { @@ -1941,20 +1941,6 @@ body.outfits-new #sections img:hover { body.outfits-new #read-more { float: right; } -/* line 135, ../../../app/stylesheets/outfits/_new.sass */ -body.outfits-new #tell-the-world { - font-size: 87.5%; - left: 0; - position: absolute; - top: 0; -} -/* line 140, ../../../app/stylesheets/outfits/_new.sass */ -body.outfits-new #tell-the-world img { - margin-bottom: -0.25em; - margin-right: 0.25em; - height: 16px; - width: 16px; -} /* line 2, ../../../app/stylesheets/outfits/_show.sass */ body.outfits-show #title {