Added simple approval and suspended pages. Added filters to redirect users depending on the status. Moved about page to the pages controller

Author: gabceb

app/assets/images/emoticons/sad-meme.png

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/pages.js.coffee

@@ -0,0 +1,3 @@
+// Place all the styles related to the Pages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/pages.css.scss

@@ -6,7 +6,7 @@ def index
   		@all_users = User.find(:all, :conditions => ["id != ?", current_user.id])
 
   		# Note that this reject! will remove users from all_users in order to show users in 2 different tables
-  		@waiting_for_approval_users = @all_users.reject!{|user| user.status.waiting_approval? } || []
+  		@waiting_for_approval_users = @all_users.select{|user| user.status.waiting_approval? } || []
   	end
 
   	def update

app/controllers/admin/admin_controller.rb

@@ -1,3 +1,21 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  before_filter :force_approved_account
+  before_filter :redirect_suspended_account
+
+  def force_approved_account
+  	# We will redirect to the approval page if a user is signed in, is not an admin and is marked as waiting for approval
+  	redirect = user_signed_in? && !current_user.is_admin? && current_user.status.waiting_approval?
+
+  	redirect_to approval_path if redirect
+  end
+
+  def redirect_suspended_account
+  	# We will redirect to suspended if a user is singed in and its marked as suspended 
+  	redirect = user_signed_in? && current_user.status.suspended?
+  	
+  	redirect_to suspended_path if redirect
+  end
+
 end

app/controllers/application_controller.rb

@@ -0,0 +1,17 @@
+class PagesController < ApplicationController
+  
+  before_filter :authenticate_user!, :except => :about
+
+  skip_filter :force_approved_account, :only => :approval
+  skip_filter :redirect_suspended_account, :only => :suspended
+
+  def approval
+  end
+
+  def suspended
+  end
+
+  def about
+  end
+
+end

app/controllers/pages_controller.rb

@@ -0,0 +1,2 @@
+module PagesHelper
+end

app/helpers/pages_helper.rb

@@ -37,7 +37,7 @@ def validate_public_site
   end
 
   def self.default_values
-  	return {:max_rooms => 99, :public_site => false }
+  	return {:max_rooms => 99, :public_site => true }
   end
 
   # Helper methods to be used while we don't need to deal with multi-tenancy

app/models/setting.rb

@@ -12,6 +12,7 @@
 	<% end %>
 
 	<div class="waiting-for-approval-users">
+		<div>Users waiting for approval</div>
 		<% if @waiting_for_approval_users.any? %>
 			<table cellspacing="0" cellpadding="0" border="0">
 				<thead>
@@ -25,7 +26,7 @@
 					</tr>
 				</thead>
 				<tbody>
-					<% @all_users.each do |user| %>
+					<% @waiting_for_approval_users.each do |user| %>
 						<tr class="<%= cycle('odd', 'even')%>" data-user-id="<%= user.id%>">
 							<td>
 								<%= user.username %>
@@ -55,6 +56,7 @@
 	</div>
 
 	<div class="approved-users">
+		<div>All users</div>
 		<% if @all_users.any? %>
 			<table cellspacing="0" cellpadding="0" border="0">
 				<thead>

app/views/admin/admin/index.html.erb

@@ -0,0 +1,3 @@
+<div>
+	You admin has to approve your account before you start using the Kandan app.
+</div>

app/views/main/about.html.erb app/views/pages/about.html.erb

@@ -0,0 +1,4 @@
+<div class="suspended">
+	Sorry buddy, the admin of this site has suspended your account.
+</div>
+<%= image_tag "emoticons/sad-meme.png", :alt => "sorry"%>

app/views/pages/approval.html.erb

@@ -1,5 +1,9 @@
 Kandan::Application.routes.draw do
 
+  get "pages/approval"
+
+  get "pages/suspended"
+
   root :to => "main#index"
   devise_for :users
 
@@ -12,7 +16,6 @@
 
   get "/active_users" => "apis#active_users"
 
-  get "/about" =>"main#about"
   get "/users/edit" =>"main#users_edit"
 
   namespace :admin do
@@ -21,6 +24,11 @@
     put "/update_users", :to => "admin#update_users", :as => "update_users"
   end
 
+  # Pages Controller
+  get "/approval", :to => "pages#approval"
+  get "/suspended", :to => "pages#suspended"
+  get "/about", :to =>"pages#about"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.