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

app/controllers/groups_controller.rb

@@ -5,7 +5,7 @@ class GroupsController < ApplicationController
   respond_to :json, :only => :show
 
   def index
-    @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :order => 'created_at DESC'
+    @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
     @group = :all
   end
 
@@ -27,7 +27,7 @@ class GroupsController < ApplicationController
   def show
     @group   = Group.find_by_id params[:id]
     @friends = @group.people
-    @posts   = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC'
+    @posts   = current_user.visible_posts( :by_members_of => @group ).paginate :per_page => 15, :order => 'created_at DESC'
 
     respond_with @group
   end

app/controllers/users_controller.rb

@@ -7,7 +7,6 @@ class UsersController < ApplicationController
   def show
     @user         = User.find_by_id params[:id]
     @user_profile = @user.person.profile
-
     respond_with @user
   end
 
@@ -21,6 +20,6 @@ class UsersController < ApplicationController
   def update
     @user = User.find_by_id params[:id]
     @user.update_profile params[:user]
-    respond_with @user
+    respond_with(@user, :location => root_url)
   end
 end 

app/views/layouts/application.html.haml

@@ -50,7 +50,7 @@
               = owner_image_tag 
               = link_to current_user.real_name, current_user.person
             %li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
-            %li.settings= link_to "settings", edit_user_path(current_user)
+            %li.settings= link_to "edit profile", edit_user_path(current_user)
             %li.logout= link_to "logout", destroy_user_session_path
 
         = render "shared/group_nav"

app/views/users/new.html.haml

@@ -1,13 +0,0 @@
-- title "New User"
-
-= form_for @user do |f|
-  = f.error_messages
-  %p
-    = f.label :password
-    %br
-    = f.password_field :password
-  %p
-    = f.submit
-
-
-%p= link_to "Back to List", users_path

app/views/users/show.html.haml

@@ -1,11 +0,0 @@
-.span-20.last
-  %h1= "#{@user.real_name}"
-- if @user_profile
-  %p
-    %b url 
-  %p
-    = @user.url
-  %p
-    %b Serialized Key
-  %p
-    = @user.serialized_key

public/stylesheets/application.css

@@ -24,7 +24,7 @@ a {
 #flash_notice,
 #flash_error,
 #flash_alert {
-  z-index: 3;
+  z-index: 100;
   top: 32px;
   position: absolute;
   color: black;

public/stylesheets/sass/application.sass

@@ -25,7 +25,7 @@ a
 #flash_notice,
 #flash_error,
 #flash_alert
-  :z-index 3
+  :z-index 100
   :top 32px
   :position absolute
   :color #000