Merge remote branch 'tomk/ui-cosmetics'

app/views/aspects/_edit_aspect_pane.html.haml

@@ -15,7 +15,7 @@
   %hr
   = form_for aspect do |asp|
     = asp.text_field :name, :value => aspect.name
-    = asp.submit "Rename Aspect"
+    = asp.submit t('.rename_aspect')
 
   %hr
   .big_buttons

app/views/aspects/manage.html.haml

@@ -17,8 +17,6 @@
   .span-4.append-1.last
     .requests
       %h3=t('.requests')
-      %i
-        %p= "#{t('.drag_to_add')} =>"
 
       %ul.dropzone
         - if @remote_requests.size < 1
@@ -32,6 +30,10 @@
                 .circle
               = link_to person_image_tag(hash[:sender]), hash[:sender]
 
+      - if @remote_requests.size > 0
+        %p
+          %i= "#{t('.drag_to_add')} =>"
+
       = render 'shared/invitations', :invites => @invites
 
     %div{:style=>"color:rgb(252,252,252);"}

app/views/invitations/new.html.haml

@@ -38,10 +38,11 @@
       %p
         = invite.submit t('.send_an_invitation')
 
-  .span-4.last
+  - if !@emails_delivered.empty?
-    #already_invited_pane
+    .span-4.last
-      %h4
+      #already_invited_pane
-        = t('.already_invited')
+        %h4
-      - for email in @emails_delivered
+          = t('.already_invited')
-        = email
+        - for email in @emails_delivered
+          = email
 

config/locales/diaspora/de.yml

@@ -61,6 +61,7 @@ de:
       add_existing: "Bestehenden Kontakt hinzufügen"
       confirm_remove_aspect: "Möchtest du diesen Aspekt wirklich löschen?"
       remove_aspect: "Diesen Aspekt löschen"
+      rename_aspect: "Aspekt umbennenen"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
       aspect_not_empty: "Aspekt ist nicht leer"

config/locales/diaspora/en.yml

@@ -183,6 +183,7 @@ en:
           remove_aspect: "Delete this aspect"
           confirm_remove_aspect: "Are you sure you want to delete this aspect?"
           add_existing: "Add an existing contact"
+          rename_aspect: "Rename aspect"
   notifications:
       request_accepted: "accepted your share request."
       new_request: "offered to share with you."

public/stylesheets/sass/application.sass

@@ -729,6 +729,7 @@ label
   input
     :height 100%
     :width 100%
+    :cursor pointer
 
 #publisher
   :color #999