diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml index 4b433c524..ae83e0e99 100644 --- a/app/views/albums/_new_album.haml +++ b/app/views/albums/_new_album.haml @@ -1,5 +1,6 @@ = form_for Album.new do |f| = f.error_messages %p - = f.text_field :name, :value => "tell me something good" - = f.submit 'oh yeah!', :class => 'button' + = f.label :name + = f.text_field :name + = f.submit 'create', :class => 'button' diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 0ed095f11..5931461d7 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -1,4 +1,6 @@ %h1.big_text + .back + = link_to "⇧ home", root_path %ul.button_set %li.selected= friends_albums_link %li= your_albums_link diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 3d7cb268c..2ae325c2b 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -18,7 +18,7 @@ %p = link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete %p - = link_to "<< back to album", album_path(@album) + = link_to "⇧ #{@album.name}", album_path(@album) %h4{:class => "show_post_comments"} = "comments (#{@photo.comments.count})" diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml index f5f82f5cc..8347c76d8 100644 --- a/app/views/requests/index.html.haml +++ b/app/views/requests/index.html.haml @@ -1,4 +1,8 @@ -%h1 requests +%h1.big_text + .back + = link_to "⇧ home", root_path + requests + = render "requests/new_request", :request => @request %h3= "currently #{@request_count} requests" diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 92de87103..66a3438d8 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -105,4 +105,6 @@ $(document).ready(function(){ } ); + $("input[type='submit']").addClass("button"); + });//end document ready diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1d6438bec..b72ff7384 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -343,7 +343,7 @@ ul#publisher_content_pickers li { -moz-border-radius: 3px; } .field_with_submit input[type='text'] { - width: 85%; + width: 80%; display: inline; } h1.big_text { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 6affc418e..316982249 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -422,7 +422,7 @@ ul#publisher_content_pickers li .field_with_submit input[type='text'] - :width 85% + :width 80% :display inline