Merging ostatus deletion with selenium start

c245d8c6 · Raphael · 58addca8 · 09958bc2 · c245d8c6 · c245d8c6
--- 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

--- 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;

--- 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

--- a/test/selenium/diaspora_selenium
+++ b/test/selenium/diaspora_selenium
@@ -8,7 +8,7 @@
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
 <tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="../../../Diaspora_selenium">Diaspora_selenium</a></td></tr>
+<tr><td><a href="post_and_delete_status_message_not_testing_websocket">post_and_delete_status_message_not_testing_websocket</a></td></tr>
 </tbody></table>
 </body>
 </html>
--- a/test/selenium/post_and_delete_status_message
+++ b/test/selenium/post_and_delete_status_message
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="http://tom.joindiaspora.com/" />
-<title>post_and_delete_status_message</title>
+<title>post_and_delete_status_message_not_testing_websocket</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">post_and_delete_status_message</td></tr>
+<tr><td rowspan="1" colspan="3">post_and_delete_status_message_not_testing_websocket</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -36,6 +36,11 @@
 	<td>status_message_submit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td></td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>THIS IS A RUNNING SELENIUM TEST AAAAAAAAH</td>
@@ -51,6 +56,11 @@
 	<td>Are you sure?</td>
 	<td></td>
 </tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td></td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>THIS IS A RUNNING SELENIUM TEST AAAAAAAAH</td>