Merge branch 'master' of github.com:diaspora/diaspora

app/views/status_messages/show.html.haml

@@ -3,20 +3,14 @@
 -#   the COPYRIGHT file.
 
 
-- title "Status Message"
-
-%p
-  %strong Message:
+%h1
+  = link_to @status_message.person.real_name, @status_message.person
   = auto_link sanitize @status_message.message
   
-%p
-  %strong Owner:
-  = @status_message.person.real_name
 
 %h4= "comments (#{@status_message.comments.count})"
 = render "comments/comments", :post => @status_message
 
 %p
-  = link_to "Destroy", @status_message, :confirm => 'Are you sure?', :method => :delete
-  |
-  = link_to "View All", status_messages_path
+  - if current_user.owns? @status_message
+    = link_to "Destroy", @status_message, :confirm => 'Are you sure?', :method => :delete

lib/diaspora/user/querying.rb

@@ -31,7 +31,8 @@ module Diaspora
       end
 
       def aspect_by_id( id )
-        self.aspects.find( id )
+        id = id.to_id
+        aspects.detect{|x| x.id == id }
       end
 
       def album_by_id( id )

public/javascripts/aspect-edit.js

@@ -47,7 +47,7 @@ $(function() {
         var dropzone = $(this)[0];
 
         if ($(this)[0].id == ui.draggable[0].getAttribute('from_aspect_id')){
-          ui.draggable.css('background-color','#eee');
+          ui.draggable.css('background','none');
         } else {
           ui.draggable.css('background-color','orange');
           $.ajax({
@@ -61,7 +61,6 @@ $(function() {
             }});
 
         }
-      }
       $(this).closest("ul").append(ui.draggable);
     }
   });

public/stylesheets/application.css

@@ -346,12 +346,18 @@ label {
       margin-top: 26px; }
   #publisher textarea {
     width: 600px;
-    height: 40px;
+    height: 42px;
     margin-top: 0;
     margin-bottom: 0;
-    -webkit-box-shadow: 0 1px 0 white; }
+    box-shadow: 0 1px white;
+    -moz-box-shadow: 0 1px white;
+    -webkit-box-shadow: 0 1px white; }
   #publisher .button {
     margin-left: 100px; }
+  #publisher img {
+    -webkit-box-shadow: 0 1px 0 white;
+    border: 1px solid #bbbbbb;
+      border-top: 1px solid #666666; }
 
 #image_picker .small_photo {
   height: 100px;
@@ -463,6 +469,7 @@ h1.big_text {
       display: inline;
       margin-right: 2px; }
       #aspect_nav ul > li a {
+        text-shadow: 0 2px 0 #444444;
         -webkit-border-radius: 3px 3px 0 0;
         -moz-border-radius: 3px 3px 0 0;
         line-height: 22px;
@@ -557,7 +564,8 @@ h1.big_text {
   .requests .grey,
   .remove .grey {
     color: #999999;
-    cursor: default; }
+    cursor: default;
+    text-shadow: 0 2px white; }
   .aspect ul.dropzone,
   .requests ul.dropzone,
   .remove ul.dropzone {

public/stylesheets/fileuploader.css

@@ -3,14 +3,14 @@
 .qq-upload-button {
     display:block; /* or inline-block */
     width: 105px; padding: 7px 0; text-align:center;    
-    background:#880000; border-bottom:1px solid #ddd;color:#fff;
+    background:#333; border-bottom:1px solid #999;color:#fff;
 }
-.qq-upload-button-hover {background:#cc0000;}
+.qq-upload-button-hover {background:#666;}
 .qq-upload-button-focus {outline:1px dotted black;}
 
 .qq-upload-drop-area {
     position:absolute; top:0; left:0; width:100%; height:100%; min-height: 70px; z-index:2;
-    background:#FF9797; text-align:center; 
+    background:#ccc; text-align:center; 
 }
 .qq-upload-drop-area span {
     display:block; position:absolute; top: 50%; width:100%; margin-top:-8px; font-size:16px;
@@ -28,4 +28,4 @@
 .qq-upload-size,.qq-upload-cancel {font-size:11px;}
 
 .qq-upload-failed-text {display:none;}
-.qq-upload-fail .qq-upload-failed-text {display:inline;}
+.qq-upload-fail .qq-upload-failed-text {display:inline;}
\ No newline at end of file

public/stylesheets/sass/application.sass

@@ -453,16 +453,24 @@ label
 
   textarea
     :width 600px
-    :height 40px
+    :height 42px
     :margin
       :top 0
       :bottom 0
 
-    :-webkit-box-shadow 0 1px 0 #fff
+    :box-shadow 0 1px #fff
+    :-moz-box-shadow 0 1px #fff
+    :-webkit-box-shadow 0 1px #fff
 
   .button
     :margin-left 100px
 
+  img
+    :-webkit-box-shadow 0 1px 0 #fff
+    :border 1px solid #bbb
+      :top 1px solid #666
+    
+
 
 #image_picker
   .small_photo
@@ -613,6 +621,7 @@ h1.big_text
         :right 2px
 
       a
+        :text-shadow 0 2px 0 #444
         :-webkit-border-radius 3px 3px 0 0
         :-moz-border-radius 3px 3px 0 0
         :line
@@ -705,8 +714,6 @@ h1.big_text
       :display inline
 
 
-    
-
   .aspect_name
     :position relative
 
@@ -731,6 +738,7 @@ h1.big_text
   .grey
     :color #999
     :cursor default
+    :text-shadow 0 2px #fff
 
   ul.dropzone
     :min-height 20px