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

app/models/user.rb

@@ -255,12 +255,15 @@ class User
   end
 	 	
   def terse_url
-    terse= self.url.gsub(/https?:\/\//, '')
+    terse = self.url.gsub(/(https?:|www\.)\/\//, '')
-    terse.gsub!(/www\./, '')
     terse = terse.chop! if terse[-1, 1] == '/'
     terse
   end
 
+  def diaspora_handle
+    "#{self.username}@#{self.terse_url}"
+  end
+
   def do_bad_things
     self.password_confirmation = self.password
   end 

app/views/people/index.html.haml

@@ -18,7 +18,11 @@
     %th url
     - for person in @people
       %tr
-        %td= person.real_name
+        - if current_user.friends.include? person
+          %td= link_to person.real_name, person
+        - else
+          %td= person.real_name
+
         %td= person.email
         %td= person.url
         

app/views/requests/_new_request.haml

@@ -5,9 +5,12 @@
 = form_for Request.new do |f|
   = f.error_messages
 
-  Enter a Diaspora URL, Diaspora username, or random email address:  
+  Enter a Diaspora username:  
+  %br
+  %i= "Your Diaspora username is: #{current_user.diaspora_handle}"
+
   %p
-    = f.label :destination_url, "Your Diaspora URL is: #{current_user.username}@#{request.host}"
+    = f.label :destination_url, "Friend's username"
     = f.text_field :destination_url
   = f.hidden_field :group_id, :value => @group.id
   = f.submit

app/views/shared/_group_nav.haml

@@ -1,7 +1,5 @@
 #group_nav
   %ul
-    %li{:class => ("selected" if @group == :all)}
-      = link_to "All Groups", root_url
     - for group in @groups
       %li{:id => group.id, :class => ("selected" if current_group?(group))}
         %span.group_name
@@ -9,9 +7,12 @@
 
     %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
 
-    %li
+    #group_edit_button
-      %span{:class => '⚙'}
+      = link_to "edit", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
-        = link_to "⚙", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
+
+  %ul{ :style => "position:absolute;right:0;bottom:0;"}
+    %li{:class => ("selected" if @group == :all)}
+      = link_to "All Groups", root_url
 
   .yo{ :style => "display:none;"}
     #add_group_pane

app/views/users/edit.html.haml

@@ -25,8 +25,13 @@
             = link_to image_tag(photo.url(:thumb_medium)), "#"
     =will_paginate @photos
 
-
     %h3 Info
+
+    %p
+      %b
+        DIASPORA USERNAME:
+        = @user.diaspora_handle
+
     %p
       = p.label :first_name
       = p.text_field :first_name, :value => @profile.first_name
@@ -38,10 +43,6 @@
     = f.label :email
     = f.text_field :email
 
-  %p
-    = f.label :url
-    = f.text_field :url
-
   #submit_block
     = link_to "Cancel", root_path
     or

public/stylesheets/application.css

@@ -448,12 +448,22 @@ h1.big_text {
   display: none; }
 
 #group_nav {
+  position: relative;
   color: black; }
+  #group_nav #group_edit_button {
+    display: inline;
+    margin-top: 1px;
+    font-size: 12px; }
+    #group_nav #group_edit_button a {
+      color: #999999; }
   #group_nav ul {
     margin-bottom: 0;
+    margin-right: 0;
     padding: 0;
       padding-bottom: 0px;
       padding-top: 35px;
+      padding-right: 0;
+    display: inline-block;
     list-style: none;
     font-size: 14px; }
     #group_nav ul > li {
@@ -462,6 +472,8 @@ h1.big_text {
       margin-right: 0.5em;
       padding: 3px 8px;
       border: 1px solid #555555; }
+      #group_nav ul > li.last-child {
+        margin-right: 0; }
       #group_nav ul > li a {
         color: #999999; }
         #group_nav ul > li a:hover {

public/stylesheets/sass/application.sass

@@ -567,13 +567,28 @@ h1.big_text
     :display none
 
 #group_nav
+  :position relative
   :color #000
+
+  #group_edit_button
+    :display inline
+    :margin
+      :top 1px
+    :font
+      :size 12px
+
+    a
+      :color #999
+
   ul
     :margin
       :bottom 0
+      :right 0
     :padding 0
       :bottom 0px
       :top 35px
+      :right 0
+    :display inline-block
     :list
       :style none
     :font
@@ -589,6 +604,10 @@ h1.big_text
 
       :border 1px solid #555
 
+      &.last-child
+        :margin
+          :right 0
+
       a
         :color #999
         &:hover
@@ -603,6 +622,7 @@ h1.big_text
           :color #999
 
 
+        
     .selected
       :font
         :weight bold

public/stylesheets/sass/ui.sass

@@ -89,8 +89,6 @@ ul.button_set
 .right
   :position absolute
   :right 0
-  :margin
-    :top 5px
 
 .contextual_pane
   :z-index 20

public/stylesheets/ui.css

@@ -57,8 +57,7 @@ ul.button_set {
 
 .right {
   position: absolute;
-  right: 0;
+  right: 0; }
-  margin-top: 5px; }
 
 .contextual_pane {
   z-index: 20;