nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
ilya 2010-09-16 11:48:59 -07:00
commit b880602497
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/albums_controller.rb
View file

@ -9,7 +9,8 @@ class AlbumsController < ApplicationController
respond_to :json, :only => [:index, :show] respond_to :json, :only => [:index, :show]
def index def index
@albums = current_user.albums_by_aspect(@aspect).paginate @albums = current_user.albums_by_aspect(@aspect).paginate :page => params[:page], :per_page => 9, :order => 'created_at DESC'
@aspect = :all
respond_with @albums, :aspect => @aspect respond_with @albums, :aspect => @aspect
end end

4
app/controllers/people_controller.rb
View file

@ -11,7 +11,9 @@ class PeopleController < ApplicationController
def index def index
@aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]} @aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
@people = Person.search params[:q] @aspect = :all
@people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC'
respond_with @people respond_with @people
end end

1
app/views/people/index.html.haml
View file

@ -48,3 +48,4 @@
= f.select(:aspect_id, @aspects_dropdown_array) = f.select(:aspect_id, @aspects_dropdown_array)
= f.hidden_field :destination_url, :value => person.diaspora_handle = f.hidden_field :destination_url, :value => person.diaspora_handle
= f.submit "add friend" = f.submit "add friend"
= will_paginate @people

3
public/stylesheets/sessions.css
View file

@ -11,8 +11,11 @@
#flash_alert { #flash_alert {
z-index: 100; z-index: 100;
top: 32px; top: 32px;
position: absolute;
color: black; color: black;
width: 400px; width: 400px;
margin: 0 0 0 -200px;
left: 50%;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
padding: 3px 0; } padding: 3px 0; }