diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index d9089e4e3..b29699997 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -2,14 +2,14 @@ #profile.span-19.last .profile_photo = person_image_link(@person) + + %h1 + = @person.real_name + - unless @person.id == current_user.id + .button.right + = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete %ul - %li - %h1 - = @person.real_name - .button.right - = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete - -unless @person_posts.first.nil? %li %i= "last seen: #{how_long_ago(@person_posts.first)}" @@ -18,16 +18,12 @@ %li url: = @person.url - - unless @latest_status_message.nil? %h1.pinched %span = "\"#{@latest_status_message.message}\"" %span="posted: #{how_long_ago(@latest_status_message)}" - - - .span-20.last - if @person.posts diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e0216a151..2c57c8a82 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -302,6 +302,7 @@ label { border-bottom: 2px #999999 solid; color: #999999; padding: 15px 1em; + padding-bottom: 30px; position: relative; } #new_blog, @@ -323,6 +324,9 @@ ul#publisher_content_pickers li { border-bottom: 3px solid #999999; background-color: rgba(10, 81, 109, 0.1); } +#publisher .right { + padding-right: 15px; } + #image_picker .small_photo { height: 100px; position: relative; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index f4ae31d10..153661b15 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -364,6 +364,7 @@ label :bottom 2px #999 solid :color #999 :padding 15px 1em + :bottom 30px :position relative #new_blog, @@ -389,6 +390,10 @@ ul#publisher_content_pickers li :background :color rgba(10,81,109,0.1) +#publisher .right + :padding + :right 15px + #image_picker .small_photo :height 100px diff --git a/test/selenium/diaspora_selenium b/test/selenium/diaspora_selenium index 32250bf37..25be2c9a0 100644 --- a/test/selenium/diaspora_selenium +++ b/test/selenium/diaspora_selenium @@ -8,7 +8,7 @@ - +
Test Suite
Diaspora_selenium
post_and_delete_status_message_not_testing_websocket
diff --git a/test/selenium/post_and_delete_status_message b/test/selenium/post_and_delete_status_message_not_testing_websocket similarity index 82% rename from test/selenium/post_and_delete_status_message rename to test/selenium/post_and_delete_status_message_not_testing_websocket index 911bd3c7e..bb1cbf7da 100644 --- a/test/selenium/post_and_delete_status_message +++ b/test/selenium/post_and_delete_status_message_not_testing_websocket @@ -4,12 +4,12 @@ -post_and_delete_status_message +post_and_delete_status_message_not_testing_websocket - + @@ -36,6 +36,11 @@ + + + + + @@ -51,6 +56,11 @@ + + + + +
post_and_delete_status_message
post_and_delete_status_message_not_testing_websocket
openstatus_message_submit
refreshAndWait
verifyTextPresent THIS IS A RUNNING SELENIUM TEST AAAAAAAAHAre you sure?
refreshAndWait
verifyTextNotPresent THIS IS A RUNNING SELENIUM TEST AAAAAAAAH