app/views/admin/users/edit.html.haml @@ -1,11 +1,14 @@ class Admin::UsersController < ApplicationController - before_filter :find_user, :only => [:edit, :update, :destroy] + before_filter :find_user, :only => [:edit, :update, :destroy, :sync] before_filter :login_required def index @page_title = t('user_admin') - @users = User.all + opts = { :page => params[:page], :order => 'users.followers_count DESC', :per_page => params[:per_page] } + opts[:order] = params[:sort] unless params[:sort].blank? + opts[:conditions] = ["users.name like ? or users.description like ? ", "%#{params[:q]}%","%#{params[:q]}%"] unless params[:q].blank? + @users = User.paginate opts render :layout => false if request.xhr? end @@ -34,6 +37,12 @@ class Admin::UsersController < ApplicationController end end + def sync + @user.sync + flash[:notice] = "Manually synced #{@user.name}" + redirect_to edit_admin_user_path(@user) + end + # PUT /admin/people/chris-lee def update if @user.update_attributes(params[:user]) app/controllers/admin/users_controller.rb @@ -69,7 +69,7 @@ module FloxeeHelper # elsif tweet.organization # link_to tweet.organization.display_name, organization_path(tweet.organization), :class => 'username', :title => tweet.organization.display_name else - link_to tweet.user.screen_name, twitter_user_url(tweet.user.screen_name), :class => 'username', :title => tweet.user.name + link_to tweet.user.screen_name, user_path(tweet.user), :class => 'username', :title => tweet.user.name end end app/helpers/floxee_helper.rb @@ -449,7 +449,7 @@ body button, a.button,input.button :background #efefef url(/images/buttons/bg-button.png) center left repeat-x - :border-style solid + :border-style solid !important :border-width 1px :border-color #ddd #999 #999 #ddd :-moz-border-radius .3em @@ -599,4 +599,6 @@ body.admin :text-align right &.alt td - :background-color = !lighter_blue \ No newline at end of file + :background-color = !lighter_blue + h4 + :margin-bottom 0em \ No newline at end of file app/stylesheets/screen.sass @@ -3,7 +3,8 @@ = render :partial => 'shared/search_filter' #people - unless @users.empty? - + .pagination-info= page_entries_info @users + = will_paginate @users %br.clear %table.people.floxee-admin.index %tr @@ -13,7 +14,9 @@ - for user in @users %tr{:class => cycle('', 'alt')} - %td.name= user.name + %td.name + %h4= link_to(user.name, edit_admin_user_path(user)) + %p= twitter_auto_link(user.description) %td.name= user.login %td.name - form_for([:admin, user], :method => :put) do |f| app/views/admin/users/index.html.haml @@ -2,7 +2,7 @@ ActionController::Routing::Routes.draw do |map| map.namespace :admin do |admin| admin.resources :people, :member => {:confirm_destroy => :get} - admin.resources :users + admin.resources :users, :member => {:sync => :get} end map.paginated_users 'users/page/:page', :controller => 'people', :action => 'index', :page => 1 config/routes.rb 76657523791de32ad6d66a186987cdb56cc6a081 Wynn Netherland wynn@squeejee.com http://github.com/squeejee/floxee/commit/56c76528831bb6d7ad48ea01ebfdcdcba51a2038 56c76528831bb6d7ad48ea01ebfdcdcba51a2038 2009-04-15T10:45:41-07:00 2009-04-15T10:45:41-07:00 Edit page for users eb16c2ba9a92828ce7d28be40af56c09220ca4b0 Wynn Netherland wynn@squeejee.com