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

app/views/groups/edit.html.haml

@@ -9,15 +9,22 @@
   = "Editing Groups"
 
 %ul#group_list
+
 - for group in @groups
-  %li{:class => 'group'}
-    = group.name
+
+  %li.group
+    %h3= group.name
+
     %ul{:id => group.id}
-      dummy person for dropping onto 
-      -for person in group.people
-        %li{:class => 'person', :id => person.id, :from_group_id => group.id}
-          = image_tag(person.profile.image_url(:thumb_small),:size => "30x30")  unless person.profile.image_url.nil?
-          = person.real_name
+      -if group.people.size < 1
+        %li.grey Drag to add people
+
+      -else
+        -for person in group.people
+
+          %li.person{:id => person.id, :from_group_id => group.id}
+            = image_tag(person.profile.image_url(:thumb_small),:size => "30x30") unless person.profile.image_url.nil?
+            = person.real_name
 %p
   %br
   = link_to 'Update Groups', '#', :class => 'button', :id => "move_friends_link"

app/views/shared/_group_friends.haml

@@ -4,7 +4,6 @@
 
   - unless @group == :all
     = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
-    = link_to "Edit", (edit_group_path(@group)), :class => "buttion"
   
     .yo{:style => 'display:none'}
       #add_request_pane

app/views/shared/_group_nav.haml

@@ -6,11 +6,13 @@
       %li{:id => group.id, :class => ("selected" if current_group?(group))}
         %span.group_name
           = link_for_group group
-        %span{:class => '⚙'}
-          = link_to "⚙", "#", :class => "edit_group_button"
 
     %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
 
+    %li
+      %span{:class => '⚙'}
+        = link_to "⚙", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
+
   .yo{ :style => "display:none;"}
     #add_group_pane
       = render "groups/new_group"

public/stylesheets/application.css

@@ -310,11 +310,11 @@ label {
   font-weight: normal; }
 
 #publisher {
-  padding-bottom: 20px;
   color: #999999;
   position: relative;
   height: 63px;
-  margin-bottom: 5px; }
+  margin-bottom: 10px;
+  border-bottom: 1px solid #666666; }
   #publisher .avatar {
     float: left;
     margin-right: 15px; }
@@ -462,21 +462,16 @@ h1.big_text {
       margin-right: 0.5em;
       padding: 3px 8px;
       border: 1px solid #555555; }
-      #group_nav ul > li:hover {
-        background-color: #444444; }
-        #group_nav ul > li:hover a {
-          color: #999999; }
       #group_nav ul > li a {
         color: #999999; }
         #group_nav ul > li a:hover {
           background: none; }
         #group_nav ul > li a.editable:hover {
           background: yellow; }
-    #group_nav ul .⚙ {
-      margin-left: 4px;
-      margin-right: -4px; }
-      #group_nav ul .⚙ a {
-        color: black; }
+      #group_nav ul > li:hover {
+        background-color: #444444; }
+        #group_nav ul > li:hover a {
+          color: #999999; }
     #group_nav ul .selected {
       font-weight: bold;
       background-color: white;
@@ -486,8 +481,6 @@ h1.big_text {
         background-color: #eeeeee; }
       #group_nav ul .selected a {
         color: black; }
-      #group_nav ul .selected .⚙ a {
-        color: #333333; }
 
 #add_photo_loader {
   position: absolute;
@@ -577,3 +570,25 @@ h1.big_text {
 .editing, .editing:hover {
   background-color: yellow;
   border: 1px #666666 solid; }
+
+.group {
+  list-style: none; }
+  .group ul {
+    min-height: 20px;
+    margin: 0;
+      margin-left: 1em;
+      margin-bottom: 25px;
+    background-color: #efefef;
+    border: 1px solid #cccccc;
+    border-radius: 3px;
+    list-style: none;
+    padding: 15px; }
+    .group ul li {
+      margin-left: 0;
+      padding: 5px;
+      cursor: move; }
+      .group ul li img {
+        display: inline-block; }
+    .group ul .grey {
+      font-style: italic;
+      color: #666666; }

public/stylesheets/sass/application.sass

@@ -381,13 +381,13 @@ label
     :weight normal
 
 #publisher
-  :padding
-    :bottom 20px
   :color #999
   :position relative
   :height 63px
   :margin
-    :bottom 5px
+    :bottom 10px
+  :border
+    :bottom 1px solid #666
 
   .avatar
     :float left
@@ -577,6 +577,7 @@ h1.big_text
       :style none
     :font
       :size 14px
+
     > li
       :background
         :color #444
@@ -587,12 +588,6 @@ h1.big_text
 
       :border 1px solid #555
 
-      &:hover
-        :background
-          :color #444
-        a
-          :color #999
-
       a
         :color #999
         &:hover
@@ -600,12 +595,12 @@ h1.big_text
         &.editable:hover
           :background yellow
 
-    .⚙
-      :margin
-        :left 4px
-        :right -4px
-      a
-        :color #000
+      &:hover
+        :background
+          :color #444
+        a
+          :color #999
+
         
     .selected
       :font
@@ -621,11 +616,6 @@ h1.big_text
       a
         :color #000
 
-      .⚙
-        a
-          :color #333
-
-
 #add_photo_loader
   :position absolute
   :display none
@@ -748,3 +738,37 @@ h1.big_text
   :background
     :color yellow
   :border 1px #666 solid
+
+
+.group
+  :list
+    :style none
+  ul
+    :min-height 20px
+    :margin 0
+      :left 1em
+      :bottom 25px
+    :background
+      :color #efefef
+    :border 1px solid #ccc
+    :border
+      :radius 3px
+    :list
+      :style none
+    :padding 15px
+
+    li
+      :margin
+        :left 0
+      :padding 5px 
+      :cursor move
+
+      img
+        :display inline-block
+
+    .grey
+      :font
+        :style italic
+      :color #666
+
+