Rescue from AccessError with pretty and informative error page

Add pagination to teams page

app/assets/stylesheets/layout/_header.scss

@@ -12,7 +12,6 @@ header .banner {
     position: relative;
 
     img {
-      width: em(430);
       height: em(200);
       position: absolute;
       top: em(20);

app/assets/stylesheets/pages/_teams.scss

@@ -3,6 +3,8 @@
 */
 
 #teams {
+  @include span-columns(12);
+  
   table {
     table-layout: auto;
   }

app/controllers/application_controller.rb

@@ -1,4 +1,6 @@
 class ApplicationController < ActionController::Base
+  include Exceptions
+
   helper :all
   helper_method :cuser, :strip, :return_here
 
@@ -8,10 +10,6 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   respond_to :html, :js
 
-  include Exceptions
-
-  # Global methods
-
   def cuser
     @cuser ||= User.find(session[:user]) if session[:user]
   end
@@ -37,20 +35,19 @@ class ApplicationController < ActionController::Base
   end
 
   def redirect_to_home
-    redirect_to :controller => "articles", :action => "news_index"
+    redirect_to controller: "articles", action: "news_index"
   end
 
-  def rescue_action(exception)
+  rescue_from AccessError do |exception|
-    case exception
+    render 'errors/403', status: 403, layout: 'errors'
-    when AccessError
+  end
-      render :text => t(:access_denied), :layout => true
+
-    when Error
+  rescue_from Error do |exception|
-      render :text => exception.message, :layout => true
+    render text: exception.message, layout: true
-    when ActiveRecord::StaleObjectError
+  end
-      render :text => t(:application_stale)
+
-    else
+  rescue_from ActiveRecord::StaleObjectError do |exception|
-      super exception
+    render text: t(:application_stale)
-    end
   end
 
   private

app/controllers/teams_controller.rb

@@ -2,7 +2,7 @@ class TeamsController < ApplicationController
   before_filter :get_team, only: [:show, :edit, :update, :destroy, :recover]
 
   def index
-    @teams = Team.search(params[:search]).paginate(per_page: 40, page: params[:page]).with_teamers_num(0).ordered
+    @teams = Team.with_teamers_num(0).search(params[:search]).paginate(per_page: 80, page: params[:page]).ordered
   end
 
   def show

app/views/contests/current.html.erb

@@ -1,4 +1,4 @@
-<h1>Current Contests</h1>
+<h1 class="title">Current Contests</h1>
 
 <% @contests.each do |contest| %>
   <h3><%= link_to contest.name, contest %></h3>

app/views/teams/index.html.erb

@@ -14,6 +14,10 @@
   </div>
 <% end %>
 
+<%= will_paginate @teams %>
+
 <div id="teams">
   <%= render partial: 'list', locals: { teams: @teams } %>
 </div>
+
+<%= will_paginate @teams %>

app/views/users/index.html.erb

@@ -13,6 +13,8 @@
   </div>
 <% end %>
 
+<%= will_paginate @users %>
+
 <table id="users" class="striped">
   <tr>
     <th class="country"></th>

config/deploy/staging.rb

@@ -1,4 +1,4 @@
-set :branch, 'develop'
+set :branch, 'feature-redesign'
 set :deploy_to, '/var/www/virtual/ensl.org/staging/rails'
 
 set :rails_env, 'staging'