From d20d43eb2b0781a4d6172e8ac46e3fbf42a86069 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Mon, 19 Dec 2011 19:30:14 +0400
Subject: [PATCH 01/40] [refs #54] Base logic and templates for issues and
 comments to them

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 +
 app/controllers/comments_controller.rb        | 50 ++++++++++++++++
 app/controllers/issues_controller.rb          | 58 +++++++++++++++++++
 app/helpers/comments_helper.rb                |  2 +
 app/helpers/issues_helper.rb                  |  2 +
 app/models/comment.rb                         |  5 ++
 app/models/issue.rb                           | 24 ++++++++
 app/models/project.rb                         |  1 +
 app/views/comments/_form.html.haml            | 10 ++++
 app/views/comments/edit.html.haml             | 10 ++++
 app/views/issues/_form.html.haml              | 25 ++++++++
 app/views/issues/_list.html.haml              | 15 +++++
 app/views/issues/edit.html.haml               | 12 ++++
 app/views/issues/index.html.haml              | 14 +++++
 app/views/issues/new.html.haml                | 11 ++++
 app/views/issues/show.html.haml               | 53 +++++++++++++++++
 app/views/projects/show.html.haml             |  1 +
 config/routes.rb                              |  3 +
 db/migrate/20111216134039_create_issues.rb    | 20 +++++++
 db/migrate/20111216140849_create_comments.rb  | 16 +++++
 ...111219073859_add_has_issues_to_projects.rb |  9 +++
 db/schema.rb                                  | 25 +++++++-
 spec/controllers/comments_controller_spec.rb  |  5 ++
 spec/controllers/issues_controller_spec.rb    |  5 ++
 spec/factories/comments.rb                    |  6 ++
 spec/factories/issues.rb                      |  6 ++
 spec/helpers/comments_helper_spec.rb          | 15 +++++
 spec/helpers/issues_helper_spec.rb            | 15 +++++
 spec/models/comment_spec.rb                   |  5 ++
 spec/models/issue_spec.rb                     |  5 ++
 31 files changed, 430 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/comments_controller.rb
 create mode 100644 app/controllers/issues_controller.rb
 create mode 100644 app/helpers/comments_helper.rb
 create mode 100644 app/helpers/issues_helper.rb
 create mode 100644 app/models/comment.rb
 create mode 100644 app/models/issue.rb
 create mode 100644 app/views/comments/_form.html.haml
 create mode 100644 app/views/comments/edit.html.haml
 create mode 100644 app/views/issues/_form.html.haml
 create mode 100644 app/views/issues/_list.html.haml
 create mode 100644 app/views/issues/edit.html.haml
 create mode 100644 app/views/issues/index.html.haml
 create mode 100644 app/views/issues/new.html.haml
 create mode 100644 app/views/issues/show.html.haml
 create mode 100644 db/migrate/20111216134039_create_issues.rb
 create mode 100644 db/migrate/20111216140849_create_comments.rb
 create mode 100644 db/migrate/20111219073859_add_has_issues_to_projects.rb
 create mode 100644 spec/controllers/comments_controller_spec.rb
 create mode 100644 spec/controllers/issues_controller_spec.rb
 create mode 100644 spec/factories/comments.rb
 create mode 100644 spec/factories/issues.rb
 create mode 100644 spec/helpers/comments_helper_spec.rb
 create mode 100644 spec/helpers/issues_helper_spec.rb
 create mode 100644 spec/models/comment_spec.rb
 create mode 100644 spec/models/issue_spec.rb

diff --git a/Gemfile b/Gemfile
index bd75f3d66..8712951b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ gem 'paperclip', "~> 2.3"
 gem "will_paginate", "~> 3.0.2"
 gem 'meta-tags', '~> 1.2.4', :require => 'meta_tags'
 gem "russian"
+gem "friendly_id", "~> 4.0.0.beta14"
 
 # gem 'ghoul_grack', '~> 0.0.1'
 gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http'
diff --git a/Gemfile.lock b/Gemfile.lock
index 33a001a38..3bf319e35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,6 +77,7 @@ GEM
     factory_girl_rails (1.4.0)
       factory_girl (~> 2.3.0)
       railties (>= 3.0.0)
+    friendly_id (4.0.0.beta8)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -219,6 +220,7 @@ DEPENDENCIES
   delayed_job
   devise (~> 1.5.2)
   factory_girl_rails (~> 1.4.0)
+  friendly_id (~> 4.0.0.beta14)
   grack!
   grit
   haml-rails (~> 0.3.4)
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
new file mode 100644
index 000000000..50b0be70f
--- /dev/null
+++ b/app/controllers/comments_controller.rb
@@ -0,0 +1,50 @@
+class CommentsController < ApplicationController
+  before_filter :authenticate_user!
+
+  def index
+    @commentable = find_commentable
+    @comments = @commentable.comments
+  end
+
+  def create
+    @commentable = find_commentable
+    @comment = @commentable.comments.build(params[:comment])
+    if @comment.save
+      flash[:notice] = I18n.t("flash.comment.saved")
+      redirect_to :id => nil
+    else
+      flash[:error] = I18n.t("flash.comment.saved_error")
+      render :action => 'new'
+    end
+  end
+
+  def update
+    @comment = Comment.find(params[:id])
+    if @comment.update_attributes(params[:comment])
+      flash[:notice] = I18n.t("flash.comment.saved")
+      redirect_to :id => nil
+    else
+      flash[:error] = I18n.t("flash.comment.saved_error")
+      render :action => 'new'
+    end
+  end
+
+  def destroy
+    @comment = Comment.find(params[:id])
+    @comment.destroy
+
+    flash[:notice] = t("flash.comment.destroyed")
+    redirect_to root_path
+  end
+
+  private
+
+  def find_commentable
+    params.each do |name, value|
+      if name =~ /(.+)_id$/
+        return $1.classify.constantize.find(value)
+      end
+    end
+    nil
+  end
+end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
new file mode 100644
index 000000000..014d86dc4
--- /dev/null
+++ b/app/controllers/issues_controller.rb
@@ -0,0 +1,58 @@
+class IssuesController < ApplicationController
+  before_filter :authenticate_user!
+  before_filter :find_project
+  before_filter :find_issue, :only => [:show, :edit, :update, :destroy]
+
+  load_and_authorize_resource
+  autocomplete :user, :uname
+
+  def index
+    @issues = @project.issues.paginate :per_page => 10, :page => params[:page]
+  end
+
+  def create
+    @user_id = params[:user_id]
+    @user_uname = params[:user_uname]
+
+    @issue = Issue.new(params[:issue])
+    @issue.user_id = @user_id
+    @issue.project_id = @project.id
+    if @issue.save!
+      flash[:notice] = I18n.t("flash.issue.saved")
+      redirect_to project_issues_path(@project)
+    else
+      flash[:error] = I18n.t("flash.issue.saved_error")
+      render :action => :new
+    end
+  end
+
+  def update
+    @user_id = params[:user_id]
+    @user_uname = params[:user_uname]
+
+    if @issue.update_attributes( params[:issue].merge({:user_id => @user_id}) )
+      flash[:notice] = I18n.t("flash.issue.saved")
+      redirect_to @issue
+    else
+      flash[:error] = I18n.t("flash.issue.saved_error")
+      render :action => :new
+    end
+  end
+
+  def destroy
+    @issue.destroy
+
+    flash[:notice] = t("flash.issue.destroyed")
+    redirect_to root_path
+  end
+
+  private
+
+  def find_project
+    @project = Project.find(params[:project_id])
+  end
+
+  def find_issue
+    @issue = Issue.find(params[:id])
+  end
+end
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
new file mode 100644
index 000000000..0ec9ca5f2
--- /dev/null
+++ b/app/helpers/comments_helper.rb
@@ -0,0 +1,2 @@
+module CommentsHelper
+end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
new file mode 100644
index 000000000..bfb9d25e5
--- /dev/null
+++ b/app/helpers/issues_helper.rb
@@ -0,0 +1,2 @@
+module IssuesHelper
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
new file mode 100644
index 000000000..2d523d32f
--- /dev/null
+++ b/app/models/comment.rb
@@ -0,0 +1,5 @@
+class Comment < ActiveRecord::Base
+  belongs_to :commentable
+
+  validates :body, :commentable_id, :commentable_type, :presence => true
+end
diff --git a/app/models/issue.rb b/app/models/issue.rb
new file mode 100644
index 000000000..f1825ab27
--- /dev/null
+++ b/app/models/issue.rb
@@ -0,0 +1,24 @@
+class Issue < ActiveRecord::Base
+  STATUSES = ['open', 'close']
+
+  extend FriendlyId
+  friendly_id :serial_id
+
+  belongs_to :project
+  belongs_to :user
+
+  has_many :comments, :as => :commentable
+
+  validates :title, :body, :project_id, :user_id, :presence => true
+
+  attr_readonly :serial_id
+
+  after_create :set_serial_id
+
+  protected
+
+  def set_serial_id
+    serial_id = project.issues.count + 1
+    save
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index f0e66c885..56e861308 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -4,6 +4,7 @@ class Project < ActiveRecord::Base
   belongs_to :category, :counter_cache => true
   belongs_to :owner, :polymorphic => true
 
+  has_many :issues, :dependent => :destroy
   has_many :build_lists, :dependent => :destroy
   has_many :auto_build_lists, :dependent => :destroy
 
diff --git a/app/views/comments/_form.html.haml b/app/views/comments/_form.html.haml
new file mode 100644
index 000000000..65d4e0704
--- /dev/null
+++ b/app/views/comments/_form.html.haml
@@ -0,0 +1,10 @@
+.group
+  = f.label :body, :class => :label
+  = f.text_area :body, :class => 'text_field', :cols => 80
+
+.group.navform.wat-cf
+  %button.button{:type => "submit"}
+    = image_tag("web-app-theme/icons/tick.png", :alt => t("layout.save"))
+    = t("layout.save")
+  %span.text_button_padding= t("layout.or")
+  = link_to t("layout.cancel"), project_issue_comment_path(@issue.project, @issue), :class => "text_button_padding link_button"
diff --git a/app/views/comments/edit.html.haml b/app/views/comments/edit.html.haml
new file mode 100644
index 000000000..516ddd476
--- /dev/null
+++ b/app/views/comments/edit.html.haml
@@ -0,0 +1,10 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first= link_to t("layout.issues.list"), project_issue_path(@project, @issue)
+  .content
+    %h2.title
+      = t("layout.issues.edit_header")
+    .inner
+      = form_for @comment, :url => project_issue_comment_path(@project, @issue, @comment), :html => { :class => :form } do |f|
+        = render :partial => "form", :locals => {:f => f}
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
new file mode 100644
index 000000000..bb1bc72ed
--- /dev/null
+++ b/app/views/issues/_form.html.haml
@@ -0,0 +1,25 @@
+= javascript_include_tag "autocomplete-rails.js"
+
+.group
+  = f.label :title, :class => :label
+  = f.text_field :title, :class => 'text_field'
+
+.group
+  = f.label :body, :class => :label
+  = f.text_area :body, :class => 'text_field', :cols => 80
+
+.group
+  = f.label :status, :class => :label
+  = f.select :status, Issue::STATUSES, :class => 'text_field'
+
+.group
+  = label_tag "", t("layout.issues.user_id"), :class => :label
+  = autocomplete_field_tag 'user_id', @user_uname, autocomplete_user_uname_platforms_path, :id_element => '#user_id_field'
+  = hidden_field_tag 'user_id', @user_id, :id => 'user_id_field'
+  
+.group.navform.wat-cf
+  %button.button{:type => "submit"}
+    = image_tag("web-app-theme/icons/tick.png", :alt => t("layout.save"))
+    = t("layout.save")
+  %span.text_button_padding= t("layout.or")
+  = link_to t("layout.cancel"), project_path(@project), :class => "text_button_padding link_button"
diff --git a/app/views/issues/_list.html.haml b/app/views/issues/_list.html.haml
new file mode 100644
index 000000000..e0a9757ee
--- /dev/null
+++ b/app/views/issues/_list.html.haml
@@ -0,0 +1,15 @@
+%table.table
+  %tr
+    %th.first= t("activerecord.attributes.issue.title")
+    %th.first= t("activerecord.attributes.issue.status")
+    %th.last &nbsp;
+  - @project.issues.each do |issue|
+    %tr{:class => cycle("odd", "even")}
+      %td
+        = link_to issue.title, project_issue_path(@project, issue)
+      %td
+        = issue.status
+      %td.last
+        = link_to t("layout.show"), project_issue_path(@project, issue)
+        |
+        = link_to t("layout.delete"), project_issue_path(@project, issue), :method => :delete, :confirm => t("layout.issues.confirm_delete")  if can? :destroy, issue
diff --git a/app/views/issues/edit.html.haml b/app/views/issues/edit.html.haml
new file mode 100644
index 000000000..99a3533b0
--- /dev/null
+++ b/app/views/issues/edit.html.haml
@@ -0,0 +1,12 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first= link_to t("layout.issues.list"), project_issues_path(@project)
+      %li= link_to t("layout.issues.new"), new_project_issue_path(@project)
+      %li.active= link_to t("layout.issues.edit"), edit_project_issue_path(@project)
+  .content
+    %h2.title
+      = t("layout.issues.edit_header")
+    .inner
+      = form_for @issue, :url => project_issue_path(@issue), :html => { :class => :form } do |f|
+        = render :partial => "form", :locals => {:f => f}
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
new file mode 100644
index 000000000..9b8661458
--- /dev/null
+++ b/app/views/issues/index.html.haml
@@ -0,0 +1,14 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first.active= link_to t("layout.issues.list"), project_issues_path(@project)
+      %li= link_to t("layout.issues.new"), new_project_issue_path(@project) if can? :create, Issue
+  .content
+    %h2.title
+      = t("layout.issues.list_header")
+    .inner
+      = render :partial => 'shared/search_form'
+      = render :partial => 'issues/list', :object => @issues
+      .actions-bar.wat-cf
+        .actions
+          = will_paginate @issues, :param_name => :issue_page
diff --git a/app/views/issues/new.html.haml b/app/views/issues/new.html.haml
new file mode 100644
index 000000000..cb94f0ac4
--- /dev/null
+++ b/app/views/issues/new.html.haml
@@ -0,0 +1,11 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first= link_to "#{t("layout.issues.list")}", project_issues_path(@project)
+      %li.active= link_to "#{t("layout.issues.new")}", new_project_issue_path(@project)
+  .content
+    %h2.title
+      = t("layout.issues.new_header")
+    .inner
+      = form_for :issue, :url => project_issues_path(@project), :html => { :class => :form } do |f|
+        = render :partial => "form", :locals => {:f => f}
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
new file mode 100644
index 000000000..5092edc54
--- /dev/null
+++ b/app/views/issues/show.html.haml
@@ -0,0 +1,53 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first= link_to t("layout.issues.list"), project_issues_path(@project)
+      %li= link_to t("layout.issues.edit"), edit_project_issue_path(@project, @issue) if can? :edit, @issue
+  .content
+    .inner
+      %p
+        %b
+          = t("activerecord.attributes.issue.title")
+          \:
+        = @issue.title
+      %p
+        %b
+          = t("activerecord.attributes.issue.body")
+          \:
+        = @issue.body
+      %p
+        %b
+          = t('layout.issues.status')
+          \:
+        = @issue.status
+
+%a{ :name => "comments" }
+.block
+  .secondary-navigation
+    %ul.wat-cf
+  .content
+    %h2.title
+      = t("layout.issues.comments_header")
+    .inner
+      %table.table
+        %tr
+          %th.first= t("activerecord.attributes.user.uname")
+          %th.first= t("activerecord.attributes.comment.body")
+          %th.last &nbsp;
+        - @issue.comments.each do |comment|
+          %tr{:class => cycle("odd", "even")}
+            %td
+              = comment.user.uname
+            %td
+              = comment.body
+            %td.last
+              = link_to t("layout.edit"), edit_project_issue_comment_path(@project, @issue, comment) if can? :update, comment
+              = link_to image_tag("web-app-theme/icons/cross.png", :alt => t("layout.delete")) + " " + t("layout.delete"), project_issue_comment_path(@project, @issue, comment), :method => "delete", :class => "button", :confirm => t("layout.comment.confirm_delete") if can? :delete, comment
+
+.block
+  .content
+    %h2.title
+      = t("layout.comments.new_header")
+    .inner
+      = form_for :comment, :url => project_issue_comments_path(@project, @issue), :html => { :class => :form } do |f|
+        = render :partial => "comments/form", :locals => {:f => f}
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 3930d97a2..7bbc69176 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -6,6 +6,7 @@
       %li.active= link_to t("layout.projects.show"), project_path(@project)
       %li= link_to t("layout.git.repositories.source"), project_repo_path(@project)
       %li= link_to t("layout.projects.build"), build_project_path(@project)
+      %li= link_to t("layout.projects.issues"), project_issues_path(@project)
 
   .content
     .inner
diff --git a/config/routes.rb b/config/routes.rb
index 5d22a7cfe..721c6f254 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -68,6 +68,9 @@ Rosa::Application.routes.draw do
   end
 
   resources :projects do
+    resources :issues do
+      resources :comments, :only => [:edit, :create, :update, :destroy]
+    end
     resource :repo, :controller => "git/repositories", :only => [:show]
     resources :build_lists, :only => [:index, :show] do
       collection do
diff --git a/db/migrate/20111216134039_create_issues.rb b/db/migrate/20111216134039_create_issues.rb
new file mode 100644
index 000000000..8d6a47315
--- /dev/null
+++ b/db/migrate/20111216134039_create_issues.rb
@@ -0,0 +1,20 @@
+class CreateIssues < ActiveRecord::Migration
+  def self.up
+    create_table :issues do |t|
+      t.integer :serial_id
+      t.integer :project_id
+      t.integer :user_id
+      t.string :title
+      t.text :body
+      t.string :status
+
+      t.timestamps
+    end
+
+    add_index :issues, [:project_id, :serial_id], :unique => true
+  end
+
+  def self.down
+    drop_table :issues
+  end
+end
diff --git a/db/migrate/20111216140849_create_comments.rb b/db/migrate/20111216140849_create_comments.rb
new file mode 100644
index 000000000..d05b53eb7
--- /dev/null
+++ b/db/migrate/20111216140849_create_comments.rb
@@ -0,0 +1,16 @@
+class CreateComments < ActiveRecord::Migration
+  def self.up
+    create_table :comments do |t|
+      t.integer :commentable_id
+      t.string :commentable_type
+      t.integer :user_id
+      t.text :body
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :comments
+  end
+end
diff --git a/db/migrate/20111219073859_add_has_issues_to_projects.rb b/db/migrate/20111219073859_add_has_issues_to_projects.rb
new file mode 100644
index 000000000..f0ea1e42c
--- /dev/null
+++ b/db/migrate/20111219073859_add_has_issues_to_projects.rb
@@ -0,0 +1,9 @@
+class AddHasIssuesToProjects < ActiveRecord::Migration
+  def self.up
+    add_column :projects, :has_issues, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :projects, :has_issues
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 17c70bd11..5acde5031 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111130181101) do
+ActiveRecord::Schema.define(:version => 20111219073859) do
 
   create_table "arches", :force => true do |t|
     t.string   "name",       :null => false
@@ -83,6 +83,15 @@ ActiveRecord::Schema.define(:version => 20111130181101) do
     t.datetime "updated_at"
   end
 
+  create_table "comments", :force => true do |t|
+    t.integer  "commentable_id"
+    t.string   "commentable_type"
+    t.integer  "user_id"
+    t.text     "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "containers", :force => true do |t|
     t.string   "name",       :null => false
     t.integer  "project_id", :null => false
@@ -140,6 +149,19 @@ ActiveRecord::Schema.define(:version => 20111130181101) do
     t.string   "uname"
   end
 
+  create_table "issues", :force => true do |t|
+    t.integer  "serial_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.string   "title"
+    t.text     "body"
+    t.string   "status"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "issues", ["project_id", "serial_id"], :name => "index_issues_on_project_id_and_serial_id", :unique => true
+
   create_table "platforms", :force => true do |t|
     t.string   "description"
     t.string   "name"
@@ -211,6 +233,7 @@ ActiveRecord::Schema.define(:version => 20111130181101) do
     t.integer  "category_id"
     t.text     "description"
     t.string   "ancestry"
+    t.boolean  "has_issues",  :default => true
   end
 
   add_index "projects", ["category_id"], :name => "index_projects_on_category_id"
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
new file mode 100644
index 000000000..562bf1aff
--- /dev/null
+++ b/spec/controllers/comments_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe CommentsController do
+
+end
diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb
new file mode 100644
index 000000000..c27154bda
--- /dev/null
+++ b/spec/controllers/issues_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe IssuesController do
+
+end
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
new file mode 100644
index 000000000..f9df3b695
--- /dev/null
+++ b/spec/factories/comments.rb
@@ -0,0 +1,6 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :comment do
+    end
+end
\ No newline at end of file
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
new file mode 100644
index 000000000..5e4c566b7
--- /dev/null
+++ b/spec/factories/issues.rb
@@ -0,0 +1,6 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :issue do
+    end
+end
\ No newline at end of file
diff --git a/spec/helpers/comments_helper_spec.rb b/spec/helpers/comments_helper_spec.rb
new file mode 100644
index 000000000..cc93aa9b6
--- /dev/null
+++ b/spec/helpers/comments_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CommentsHelper. For example:
+#
+# describe CommentsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe CommentsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
new file mode 100644
index 000000000..2e20f1cf1
--- /dev/null
+++ b/spec/helpers/issues_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the IssuesHelper. For example:
+#
+# describe IssuesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe IssuesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
new file mode 100644
index 000000000..505e33d36
--- /dev/null
+++ b/spec/models/comment_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Comment do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
new file mode 100644
index 000000000..881318921
--- /dev/null
+++ b/spec/models/issue_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Issue do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 446cdac8e61d540d0d772398f62df51ea5a40e2d Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Tue, 20 Dec 2011 14:20:00 +0400
Subject: [PATCH 02/40] [refs #54] Add new locales. Fix routes. Fix issues and
 comments update

---
 app/controllers/comments_controller.rb | 20 +++++++++----
 app/models/comment.rb                  |  5 ++--
 app/views/issues/show.html.haml        |  6 ++--
 config/locales/ru.yml                  | 39 ++++++++++++++++++++++++--
 4 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 50b0be70f..0964f2f36 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,28 +1,34 @@
 class CommentsController < ApplicationController
   before_filter :authenticate_user!
+  before_filter :set_commentable, :only => [:index, :edit, :create]
 
   def index
-    @commentable = find_commentable
     @comments = @commentable.comments
   end
 
   def create
-    @commentable = find_commentable
     @comment = @commentable.comments.build(params[:comment])
+    @comment.user = current_user
     if @comment.save
       flash[:notice] = I18n.t("flash.comment.saved")
-      redirect_to :id => nil
+      redirect_to :back
     else
       flash[:error] = I18n.t("flash.comment.saved_error")
       render :action => 'new'
     end
   end
 
+  def edit
+    @comment = Comment.find(params[:id])
+    @issue = @commentable
+    @project = @issue.project
+  end
+
   def update
     @comment = Comment.find(params[:id])
     if @comment.update_attributes(params[:comment])
       flash[:notice] = I18n.t("flash.comment.saved")
-      redirect_to :id => nil
+      redirect_to :back
     else
       flash[:error] = I18n.t("flash.comment.saved_error")
       render :action => 'new'
@@ -34,7 +40,7 @@ class CommentsController < ApplicationController
     @comment.destroy
 
     flash[:notice] = t("flash.comment.destroyed")
-    redirect_to root_path
+    redirect_to :back
   end
 
   private
@@ -47,4 +53,8 @@ class CommentsController < ApplicationController
     end
     nil
   end
+
+  def set_commentable
+    @commentable = find_commentable
+  end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 2d523d32f..4c15a8b66 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,6 @@
 class Comment < ActiveRecord::Base
-  belongs_to :commentable
+  belongs_to :commentable, :polymorphic => true
+  belongs_to :user
 
-  validates :body, :commentable_id, :commentable_type, :presence => true
+  validates :body, :user_id, :commentable_id, :commentable_type, :presence => true
 end
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 5092edc54..a68e58fea 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -17,7 +17,7 @@
         = @issue.body
       %p
         %b
-          = t('layout.issues.status')
+          = t('activerecord.attributes.issue.status')
           \:
         = @issue.status
 
@@ -42,12 +42,12 @@
               = comment.body
             %td.last
               = link_to t("layout.edit"), edit_project_issue_comment_path(@project, @issue, comment) if can? :update, comment
-              = link_to image_tag("web-app-theme/icons/cross.png", :alt => t("layout.delete")) + " " + t("layout.delete"), project_issue_comment_path(@project, @issue, comment), :method => "delete", :class => "button", :confirm => t("layout.comment.confirm_delete") if can? :delete, comment
+              = link_to image_tag("web-app-theme/icons/cross.png", :alt => t("layout.delete")) + " " + t("layout.delete"), project_issue_comment_path(@project, @issue, comment), :method => "delete", :class => "button", :confirm => t("layout.comments.confirm_delete") if can? :delete, comment
 
 .block
   .content
     %h2.title
       = t("layout.comments.new_header")
     .inner
-      = form_for :comment, :url => project_issue_comments_path(@project, @issue), :html => { :class => :form } do |f|
+      = form_for :comment, :url => project_issue_comments_path(@project, @issue), :method => :post, :html => { :class => :form } do |f|
         = render :partial => "comments/form", :locals => {:f => f}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6f343a6e4..7cfca7ad7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -83,6 +83,7 @@ ru:
       confirm_regenerate: Вы уверены, что хотите перегенерировать эту пару логин/пароль?
       regenerate_btn: Перегенерировать
       warning_message: Примечание - При получении новых данных старые становятся недействительными
+
     categories:
       list: Список
       new: Создать
@@ -93,6 +94,19 @@ ru:
       edit_header: Редактировать категорию
       confirm_delete: Вы уверены, что хотите удалить эту категорию?
 
+    issues:
+      list: Список
+      edit: Редактировать
+      comments_header: Комментарии
+      new: Новая задача
+      list_header: Список
+      confirm_delete: Вы уверены, что хотите удалить эту задачу?
+      new_header: Новая задача
+
+    comments:
+      confirm_delete: Вы уверены, что хотите удалить комментарий?
+      new_header: Новый комментарий
+
     platforms:
       admin_id: Владелец
       build_all: Собрать все
@@ -214,6 +228,7 @@ ru:
       collaborators: Коллабораторы
       groups: Группы
       edit_collaborators: Изменить список участников
+      issues: Задачи
 
     collaborators:
       back_to_proj: Вернуться к проекту
@@ -332,7 +347,7 @@ ru:
 
     downloads:
       statistics_refreshed: Статистика обновлена
-    
+
     collaborators:
       successfully_changed: Список коллабораторов успешно изменен
       error_in_changing: Ошибка изменения списка коллабораторов
@@ -353,12 +368,19 @@ ru:
       failed: Не удалось автоматизировать сборку!
       cancel: Автоматическая сборка проекта отменена!
       cancel_failed: Не удалось отменить автоматическую сборку проекта!
-    
+
     category:
       saved: Категория успешно сохранена
       save_error: Не удалось сохранить категорию
       destroyed: Категория успешно удалена
 
+    comment:
+      saved: Комментарий успешно сохранен
+      destroyed: Комментарий удален
+
+    issue:
+      saved: Задача успешно сохранена
+
     project:
       saved: Проект успешно сохранен
       save_error: Не удалось сохранить проект
@@ -455,7 +477,18 @@ ru:
         pl: Платформа
         arch_id: Архитектура
         arch: Архитектура
-      
+
+      comment:
+        body: Содержание
+        user: Автор
+
+      issue:
+        title: Заголовок
+        body: Содержание
+        user: Назначено
+        project: Проект
+        status: Статус
+
       private_user:
         login: Логин
         password: Пароль

From 375c98366f9215803d0e855fe5562dafcf48dcf6 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Tue, 20 Dec 2011 20:57:34 +0400
Subject: [PATCH 03/40] [ref #54] Add has_issue settings to projec edit. Fix
 routes and friendly_id bug. Fix some moments

---
 Gemfile                              | 1 -
 app/controllers/issues_controller.rb | 6 +++++-
 app/models/issue.rb                  | 9 +++------
 app/views/comments/_form.html.haml   | 2 +-
 app/views/issues/_list.html.haml     | 4 ++--
 app/views/projects/_form.html.haml   | 3 +++
 config/locales/ru.yml                | 1 +
 config/routes.rb                     | 3 ++-
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8712951b3..bd75f3d66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,6 @@ gem 'paperclip', "~> 2.3"
 gem "will_paginate", "~> 3.0.2"
 gem 'meta-tags', '~> 1.2.4', :require => 'meta_tags'
 gem "russian"
-gem "friendly_id", "~> 4.0.0.beta14"
 
 # gem 'ghoul_grack', '~> 0.0.1'
 gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http'
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 014d86dc4..fa83ead1f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,11 +1,15 @@
 class IssuesController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_project
-  before_filter :find_issue, :only => [:show, :edit, :update, :destroy]
+  before_filter :find_issue, :only => [:edit, :update, :destroy]
 
   load_and_authorize_resource
   autocomplete :user, :uname
 
+  def show
+    @issue = @project.issues.where(:serial_id => params[:serial_id])[0]
+  end
+
   def index
     @issues = @project.issues.paginate :per_page => 10, :page => params[:page]
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f1825ab27..0e971f55f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,9 +1,6 @@
 class Issue < ActiveRecord::Base
   STATUSES = ['open', 'close']
 
-  extend FriendlyId
-  friendly_id :serial_id
-
   belongs_to :project
   belongs_to :user
 
@@ -11,14 +8,14 @@ class Issue < ActiveRecord::Base
 
   validates :title, :body, :project_id, :user_id, :presence => true
 
-  attr_readonly :serial_id
+  #attr_readonly :serial_id
 
   after_create :set_serial_id
 
   protected
 
   def set_serial_id
-    serial_id = project.issues.count + 1
-    save
+    self.serial_id = self.project.issues.count
+    self.save!
   end
 end
diff --git a/app/views/comments/_form.html.haml b/app/views/comments/_form.html.haml
index 65d4e0704..ccca4cc1d 100644
--- a/app/views/comments/_form.html.haml
+++ b/app/views/comments/_form.html.haml
@@ -7,4 +7,4 @@
     = image_tag("web-app-theme/icons/tick.png", :alt => t("layout.save"))
     = t("layout.save")
   %span.text_button_padding= t("layout.or")
-  = link_to t("layout.cancel"), project_issue_comment_path(@issue.project, @issue), :class => "text_button_padding link_button"
+  = link_to t("layout.cancel"), show_issue_path(@issue.project, @issue.serial_id), :class => "text_button_padding link_button"
diff --git a/app/views/issues/_list.html.haml b/app/views/issues/_list.html.haml
index e0a9757ee..9e27261bb 100644
--- a/app/views/issues/_list.html.haml
+++ b/app/views/issues/_list.html.haml
@@ -6,10 +6,10 @@
   - @project.issues.each do |issue|
     %tr{:class => cycle("odd", "even")}
       %td
-        = link_to issue.title, project_issue_path(@project, issue)
+        = link_to issue.title, show_issue_path(@project, issue.serial_id)
       %td
         = issue.status
       %td.last
-        = link_to t("layout.show"), project_issue_path(@project, issue)
+        = link_to t("layout.show"), show_issue_path(@project, issue.serial_id)
         |
         = link_to t("layout.delete"), project_issue_path(@project, issue), :method => :delete, :confirm => t("layout.issues.confirm_delete")  if can? :destroy, issue
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index 832d033bb..d0cc3e7bf 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -10,6 +10,9 @@
 .group
   = f.label :description, t("activerecord.attributes.project.description"), :class => :label
   = f.text_area :description, :class => 'text_field', :cols => 80
+.group
+  = f.label :has_issues, t("activerecord.attributes.project.has_issues"), :class => :label
+  = f.check_box :has_issues
 
 .group.navform.wat-cf
   %button.button{:type => "submit"}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7cfca7ad7..cf6d82a55 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -569,6 +569,7 @@ ru:
         repository: Репозиторий
         created_at: Создан
         updated_at: Обновлен
+        has_issues: Включить трэкер
 
       rpm:
         name: Название
diff --git a/config/routes.rb b/config/routes.rb
index 721c6f254..b3fc4bc05 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,8 +67,9 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
+  match "projects/:project_id/issues/:serial_id" => 'issues#show', :as => :show_issue, :via => :get
   resources :projects do
-    resources :issues do
+    resources :issues, :except => [:show] do
       resources :comments, :only => [:edit, :create, :update, :destroy]
     end
     resource :repo, :controller => "git/repositories", :only => [:show]

From d901426b7938ffb5c29a74e30f563c92d415b848 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 21 Dec 2011 16:01:50 +0200
Subject: [PATCH 04/40] Move project build functinality to build_lists
 controller. Refactor downloads url - create model based methods for url
 genertion. Cleanup code. Add includeed_repos functionality. Display
 included_repos on build_list page. Refs #65

---
 app/controllers/application_controller.rb     |  2 +-
 app/controllers/build_lists_controller.rb     | 51 ++++++++++---
 app/controllers/platforms_controller.rb       |  2 +-
 app/controllers/projects_controller.rb        | 74 +------------------
 app/models/ability.rb                         | 13 ++--
 app/models/build_list.rb                      |  9 +--
 app/models/platform.rb                        | 30 +++++++-
 app/models/project.rb                         |  4 +
 .../build_lists/_include_repos.html.haml      |  3 +
 .../new.html.haml}                            | 40 +++++-----
 app/views/build_lists/show.html.haml          |  5 ++
 app/views/git/shared/_navigation.html.haml    |  2 +-
 app/views/projects/show.html.haml             |  2 +-
 config/locales/ru.yml                         |  4 +-
 config/routes.rb                              |  4 +-
 ...152347_add_include_repos_to_build_lists.rb |  9 +++
 db/schema.rb                                  |  3 +-
 lib/build_server.rb                           | 11 ++-
 public/javascripts/application.js             | 57 ++++++--------
 19 files changed, 163 insertions(+), 162 deletions(-)
 create mode 100644 app/views/build_lists/_include_repos.html.haml
 rename app/views/{projects/build.html.haml => build_lists/new.html.haml} (52%)
 create mode 100644 db/migrate/20111220152347_add_include_repos_to_build_lists.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 081802f1c..4a64259cd 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   layout :layout_by_resource
 
   before_filter lambda { EventLog.current_controller = self },
-                :only => [:create, :destroy, :open_id, :auto_build, :process_build, :cancel, :publish, :change_visibility] # :update
+                :only => [:create, :destroy, :open_id, :auto_build, :cancel, :publish, :change_visibility] # :update
   after_filter lambda { EventLog.current_controller = nil }
 
   helper_method :get_owner
diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index 91e6d345b..175023c22 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -3,11 +3,13 @@ class BuildListsController < ApplicationController
 
   before_filter :authenticate_user!, :except => CALLBACK_ACTIONS
   before_filter :authenticate_build_service!, :only => CALLBACK_ACTIONS
-  before_filter :find_project, :only => [:index, :filter, :show, :publish]
+  before_filter :find_project, :only => [:index, :filter, :show, :publish, :new, :create]
   before_filter :find_arches, :only => [:index, :filter, :all]
   before_filter :find_project_versions, :only => [:index, :filter]
   before_filter :find_build_list_by_bs, :only => [:status_build, :pre_build, :post_build]
 
+  # load_and_authorize_resource :project, :except => CALLBACK_ACTIONS
+  # load_and_authorize_resource :build_list, :through => :project, :shallow => true, :except => CALLBACK_ACTIONS
   load_and_authorize_resource :except => CALLBACK_ACTIONS
 
 	def all
@@ -29,15 +31,6 @@ class BuildListsController < ApplicationController
     render :action => 'index'
 	end
 	
-	def cancel
-		build_list = BuildList.find(params[:id])
-		if build_list.cancel_build_list
-			redirect_to :back, :notice => t('layout.build_lists.cancel_successed')
-		else
-			redirect_to :back, :notice => t('layout.build_lists.cancel_failed')
-		end
-	end
-
 	def index
 		@build_lists = @project.build_lists.recent.paginate :page => params[:page]
 		@filter = BuildList::Filter.new(@project)
@@ -57,6 +50,35 @@ class BuildListsController < ApplicationController
 		@item_groups = @build_list.items.group_by_level
 	end
 	
+	def new
+	  @build_list = BuildList.new
+  end
+
+  def create
+    notices, errors = [], []
+    Arch.where(:id => params[:archs]).each do |arch|
+      Platform.main.where(:id => params[:bpls]).each do |bpl|
+        @build_list = @project.build_lists.build(params[:build_list])
+        @build_list.bpl = bpl; @build_list.arch = arch
+        flash_options = {:project_version => @build_list.project_version, :arch => arch.name, :bpl => bpl.name, :pl => @build_list.pl}
+        if @build_list.save
+          notices << t("flash.build_list.saved", flash_options)
+        else
+          errors << t("flash.build_list.save_error", flash_options)
+        end
+      end
+    end
+    errors << t("flash.build_list.no_arch_or_platform_selected") if errors.blank? and notices.blank?
+    if errors.present?
+      @build_list ||= BuildList.new
+      flash[:error] = errors.join('<br>').html_safe
+      render :action => :new
+    else
+      flash[:notice] = notices.join('<br>').html_safe
+      redirect_to @project
+    end
+  end
+  
 	def publish
 		@build_list = @project.build_lists.find(params[:id])
 		@build_list.publish
@@ -64,6 +86,15 @@ class BuildListsController < ApplicationController
 		redirect_to project_build_lists_path(@project)
 	end
 
+	def cancel
+		build_list = BuildList.find(params[:id])
+		if build_list.cancel_build_list
+			redirect_to :back, :notice => t('layout.build_lists.cancel_successed')
+		else
+			redirect_to :back, :notice => t('layout.build_lists.cancel_failed')
+		end
+	end
+
 	def status_build
 		@item = @build_list.items.find_by_name!(params[:package_name])
 		@item.status = params[:status]
diff --git a/app/controllers/platforms_controller.rb b/app/controllers/platforms_controller.rb
index f096ff050..3d34da351 100644
--- a/app/controllers/platforms_controller.rb
+++ b/app/controllers/platforms_controller.rb
@@ -30,7 +30,7 @@ class PlatformsController < ApplicationController
                           {:name => p.name,
                            :architectures => ['i586', 'x86_64'],
                            :repositories => p.repositories.map(&:name),
-                           :url => "http://#{request.host_with_port}/downloads/#{p.name}/repository/"}
+                           :url => p.public_downloads_url(request.host_with_port)}
                         end
         }
       end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 4ec20ac45..a870d584c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,14 +4,12 @@ class ProjectsController < ApplicationController
   belongs_to :user, :group, :polymorphic => true, :optional => true
 
   before_filter :authenticate_user!, :except => :auto_build
-  before_filter :find_project, :only => [:show, :edit, :update, :destroy, :fork, :build, :process_build]
+  before_filter :find_project, :only => [:show, :edit, :update, :destroy, :fork]
   before_filter :get_paths, :only => [:new, :create, :edit, :update]
 
   load_and_authorize_resource
 
   def index
-#    puts parent.inspect
-#    puts parent.is_a? User
     @projects = if parent? and !parent.nil?
                   parent.projects
                 else
@@ -95,52 +93,6 @@ class ProjectsController < ApplicationController
     render :nothing => true
   end
 
-  def build
-    @arches = Arch.recent
-    @bpls = Platform.main
-    @pls = @project.repositories.collect { |rep| ["#{rep.platform.name}/#{rep.name}", rep.platform.id] }
-    @project_versions = @project.versions
-  end
-
-  def process_build
-    @arch_ids = params[:build][:arches].select{|_,v| v == "1"}.collect{|x| x[0].to_i }
-    @arches = Arch.where(:id => @arch_ids)
-
-    @project_version = params[:build][:project_version]
-
-    bpls_ids = params[:build][:bpl].blank? ? [] : params[:build][:bpl].select{|_,v| v == "1"}.collect{|x| x[0].to_i }
-    bpls = Platform.where(:id => bpls_ids)
-    
-    pl = Platform.find params[:build][:pl]
-    update_type = params[:build][:update_type]
-    build_requires = params[:build][:build_requires]
-
-    @project_versions = @project.versions
-
-    if !check_arches || !check_project_versions
-      @arches = Arch.recent
-      @bpls = Platform.main
-      @pls = @project.repositories.collect { |rep| ["#{rep.platform.name}/#{rep.name}", rep.platform.id] }
-       
-      render :action => "build"
-    else
-      flash[:notice], flash[:error] = "", ""
-      @arches.each do |arch|
-        bpls.each do |bpl|
-          build_list = @project.build_lists.new(:arch => arch, :project_version => @project_version, :pl => pl, :bpl => bpl, :update_type =>  update_type, :build_requires => build_requires)
-        
-          if build_list.save
-            flash[:notice] += t("flash.build_list.saved", :project_version => @project_version, :arch => arch.name, :bpl => bpl.name, :pl => pl)
-          else
-            flash[:error] += t("flash.build_list.save_error", :project_version => @project_version, :arch => arch.name, :bpl => bpl.name, :pl => pl)
-          end
-        end
-      end
-
-      redirect_to project_path(@project)
-    end
-  end
-
   protected
 
     def get_paths
@@ -161,28 +113,4 @@ class ProjectsController < ApplicationController
     def find_project
       @project = Project.find params[:id]
     end
-
-    def check_arches
-      if @arch_ids.blank?
-        flash[:error] = t("flash.build_list.no_arch_selected")
-        false
-      elsif @arch_ids.length != @arches.length
-        flash[:error] = t("flash.build_list.no_arch_found")
-        false
-      else
-        true
-      end
-    end
-
-    def check_project_versions
-      if @project_version.blank?
-        flash[:error] = t("flash.build_list.no_project_version_selected")
-        false
-      elsif !@project_versions.flatten.include?(@project_version)
-        flash[:error] = t("flash.build_list.no_project_version_found", :project_version => @project_version)
-        false
-      else
-        true
-      end
-    end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index fd6118a6b..1741cb881 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -51,14 +51,14 @@ class Ability
         can [:read, :create], PrivateUser, :platform => {:owner_type => 'User', :owner_id => user.id}
 
         # If rule has multiple conditions CanCan joins them by 'AND' sql operator
-        can [:read, :update, :process_build, :build, :destroy], Project, :owner_type => 'User', :owner_id => user.id
+        can [:read, :update, :destroy], Project, :owner_type => 'User', :owner_id => user.id
         #can :read, Project, :relations => {:role => 'reader'}
         can :read, Project, projects_in_relations_with(:role => 'reader', :object_type => 'User', :object_id => user.id) do |project|
           #The can? and cannot? call cannot be used with a raw sql 'can' definition.
           project.relations.exists?(:role => 'reader', :object_type => 'User', :object_id => user.id)
         end
-        #can [:update, :process_build, :build], Project, :relations => {:role => 'writer'}
-        can [:read, :update, :process_build, :build], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)  do |project|
+        #can [:update], Project, :relations => {:role => 'writer'}
+        can [:read, :update], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)  do |project|
           project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)
         end
 
@@ -112,13 +112,13 @@ class Ability
           project.relations.exists? :object_id => user.group_ids, :object_type => 'Group', :role => 'admin'
         end
 
-        can [:read, :update, :process_build, :build, :destroy], Project, :owner_type => 'Group', :owner_id => user.group_ids
+        can [:read, :update, :destroy], Project, :owner_type => 'Group', :owner_id => user.group_ids
         #can :read, Project, :relations => {:role => 'reader', :object_type => 'Group', :object_id => user.group_ids}
         can :read, Project, projects_in_relations_with(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids) do |project|
           project.relations.exists?(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids)
         end
-        #can [:update, :process_build, :build], Project, :relations => {:role => 'writer', :object_type => 'Group', :object_id => user.group_ids}
-        can [:read, :update, :process_build, :build], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids) do |project|
+        #can [:update], Project, :relations => {:role => 'writer', :object_type => 'Group', :object_id => user.group_ids}
+        can [:read, :update], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids) do |project|
           project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids)
         end
         
@@ -135,6 +135,7 @@ class Ability
         end
 
         can(:fork, Project) {|p| can? :read, p}
+        can(:create, BuildList) {|bl| can? :update, bl.project}
 
         # Things that can not do simple user
         cannot :create, [Platform, User]
diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index 1cab5a9f8..27be7ac92 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -5,9 +5,7 @@ class BuildList < ActiveRecord::Base
   belongs_to :bpl, :class_name => 'Platform'
   has_many :items, :class_name => "BuildList::Item", :dependent => :destroy
 
-  validates :project_id, :presence => true
-  validates :project_version, :presence => true
-  #validates_inclusion_of :update_type, :in => UPDATE_TYPES#, :message => "extension %s is not included in the list"
+  validates :project_id, :project_version, :arch, :include_repos, :presence => true
   UPDATE_TYPES = %w[security bugfix enhancement recommended newpackage]
   validates :update_type, :inclusion => UPDATE_TYPES
   validate lambda {  
@@ -82,6 +80,7 @@ class BuildList < ActiveRecord::Base
   scope :scoped_to_project_name, lambda {|project_name| joins(:project).where('projects.name LIKE ?', "%#{project_name}%")}
 
   serialize :additional_repos
+  serialize :include_repos
   
   before_create :set_default_status
   after_create :place_build
@@ -139,8 +138,8 @@ class BuildList < ActiveRecord::Base
     end
 
     def place_build
-      #XML-RPC params: project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web
-      self.status = BuildServer.add_build_list project.name, project_version, pl.name, arch.name, (pl_id == bpl_id ? '' : bpl.name), update_type, build_requires, id
+      #XML-RPC params: project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web, include_repos
+      self.status = BuildServer.add_build_list project.name, project_version, pl.name, arch.name, (pl_id == bpl_id ? '' : bpl.name), update_type, build_requires, id, include_repos
       self.status = BUILD_PENDING if self.status == 0
       save
     end
diff --git a/app/models/platform.rb b/app/models/platform.rb
index 311c8545d..1ab3f10e6 100644
--- a/app/models/platform.rb
+++ b/app/models/platform.rb
@@ -43,14 +43,17 @@ class Platform < ActiveRecord::Base
       urpmi_commands[pl.name] = []
       local_pair = pl.id != self.id ? blank_pair : pair
       head = hidden? ? "http://#{local_pair[:login]}@#{local_pair[:pass]}:#{host}/private/" : "http://#{host}/downloads/"
-      if pl.distrib_type == APP_CONFIG['distr_types'].first
+      # prefix = prefix_url hidden?, :host => host, :login => local_pair[:login], :password => local_pair[:pass]
+      if pl.distrib_type == APP_CONFIG['distr_types'].first # mdv
         Arch.all.each do |arch|
           tail = "/#{arch.name}/main/release"
           urpmi_commands[pl.name] << "urpmi.addmedia #{name} #{head}#{name}/repository/#{pl.name}#{tail}"
+          # urpmi_commands[pl.name] << "urpmi.addmedia #{name} #{prefix}/#{name}/repository#{pl.downloads_url '', arch.name, 'main', 'release'}"
         end
       else
         tail = ''
         urpmi_commands[pl.name] << "urpmi.addmedia #{name} #{head}#{name}/repository/#{pl.name}#{tail}"
+        # urpmi_commands[pl.name] << "urpmi.addmedia #{name} #{prefix}/#{name}/repository#{pl.downloads_url ''}"
       end
     end
 
@@ -65,6 +68,27 @@ class Platform < ActiveRecord::Base
     Rails.root.join("public", "downloads", name)
   end
 
+  def prefix_url(pub, options = {})
+    options[:host] ||= EventLog.current_controller.request.host_with_port rescue ::Rosa::Application.config.action_mailer.default_url_options[:host]
+    pub ? "http://#{options[:host]}/downloads" : "http://#{options[:login]}:#{options[:password]}@#{options[:host]}/private"
+  end
+
+  def public_downloads_url(host = nil, arch = nil, repo = nil, suffix = nil)
+    downloads_url prefix_url(true, :host => host), arch, repo, suffix
+  end
+
+  def private_downloads_url(login, password, host = nil, arch = nil, repo = nil, suffix = nil)
+    downloads_url prefix_url(false, :host => host, :login => login, :password => password), arch, repo, suffix
+  end
+
+  def downloads_url(prefix, arch = nil, repo = nil, suffix = nil)
+    "#{prefix}/#{name}/repository/".tap do |url|
+      url << "#{arch}/" if arch.present?
+      url << "#{repo}/" if repo.present?
+      url << "#{suffix}/" if suffix.present?
+    end
+  end
+
   def hidden?
     visibility == 'hidden'
   end
@@ -115,9 +139,7 @@ class Platform < ActiveRecord::Base
     system("sudo mkdir -p #{mount_path}")
     system("sudo mount --bind #{path} #{mount_path}")
     Arch.all.each do |arch|
-      host = EventLog.current_controller.request.host_with_port rescue ::Rosa::Application.config.action_mailer.default_url_options[:host]
-      url = "http://#{host}/downloads/#{name}/repository/"
-      str = "country=Russian Federation,city=Moscow,latitude=52.18,longitude=48.88,bw=1GB,version=2011,arch=#{arch.name},type=distrib,url=#{url}\n"
+      str = "country=Russian Federation,city=Moscow,latitude=52.18,longitude=48.88,bw=1GB,version=2011,arch=#{arch.name},type=distrib,url=#{public_downloads_url}\n"
       File.open(File.join(mount_path, "#{name}.#{arch.name}.list"), 'w') {|f| f.write(str) }
     end
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index f0e66c885..0e5330202 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -128,6 +128,10 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def platforms
+    @platforms ||= repositories.map(&:platform).uniq
+  end
+
   protected
 
     def build_path(dir)
diff --git a/app/views/build_lists/_include_repos.html.haml b/app/views/build_lists/_include_repos.html.haml
new file mode 100644
index 000000000..55902b2f9
--- /dev/null
+++ b/app/views/build_lists/_include_repos.html.haml
@@ -0,0 +1,3 @@
+- platform.repositories.each do |repo|
+  = check_box_tag "build_list[include_repos][]", repo.id, repo.name == 'main' || @project.repositories.map(&:id).include?(repo.id), :id => "include_repos_#{repo.id}" # (params[:build_list]||[]).fetch(:include_repos, []).include?(repo.id.to_s)
+  = label_tag "include_repos_#{repo.id}", repo.name
\ No newline at end of file
diff --git a/app/views/projects/build.html.haml b/app/views/build_lists/new.html.haml
similarity index 52%
rename from app/views/projects/build.html.haml
rename to app/views/build_lists/new.html.haml
index 531334fae..1d53612ca 100644
--- a/app/views/projects/build.html.haml
+++ b/app/views/build_lists/new.html.haml
@@ -5,46 +5,50 @@
       %li= link_to t("layout.projects.new"), new_project_path
       %li= link_to t("layout.projects.show"), project_path(@project)
       %li=# link_to "git-repo", project_repo_path(@platform, @repository, @project)
-      %li.active= link_to t("layout.projects.build"), build_project_path(@project)
+      %li.active= link_to t("layout.projects.build"), new_project_build_list_path(@project)
 
   .content
     %h2.title= t("layout.projects.new_build", :project_name => @project.name)
 
     .inner
-      = form_for :build, :url => process_build_project_path(@project), :html => { :class => :form, :method => :post } do |f|
+      = form_for [@project, @build_list], :html => { :class => :form, :method => :post } do |f|
         .columns.wat-cf
           .column.left
             .group
               = f.label :project_version, t("activerecord.attributes.build_list.project_version"), :class => :label
-              = f.select :project_version, @project_versions
+              = f.select :project_version, @project.versions
               
             .group.pl_ids_container
               = f.label :bpl, t("activerecord.attributes.build_list.bpl"), :class => :label
-              - @bpls.each do |bpl|
-                = f.check_box "bpl[#{bpl.id}]", :bpl_id => bpl.id, :class => 'build_bpl_ids'
-                = bpl.name
+              - Platform.main.each do |bpl|
+                = check_box_tag "bpls[]", bpl.id, (params[:bpls]||[]).include?(bpl.id.to_s), :class => 'build_bpl_ids', :id => "bpls_#{bpl.id}"
+                = label_tag "bpls_#{bpl.id}", bpl.name
                 %br
-                
+
             .group
               = f.label :update_type, t("activerecord.attributes.build_list.update_type"), :class => :label
-              = f.select :update_type, BuildList::UPDATE_TYPES.collect { |ut| [ut, ut] }
-              
+              = f.select :update_type, BuildList::UPDATE_TYPES
+
             .group
               = f.check_box :build_requires
-              = t("activerecord.attributes.build_list.build_requires")
+              = f.label :build_requires, t("activerecord.attributes.build_list.build_requires")
 
 
           .column.right
             .group
               = f.label :arches, t("activerecord.attributes.build_list.arch"), :class => :label
-              - @arches.each do |arch|
-                = f.check_box "arches[#{arch.id}]"
-                = arch.name
+              - Arch.recent.each do |arch|
+                = check_box_tag "archs[]", arch.id, (params[:archs]||[]).include?(arch.id.to_s), :id => "archs_#{arch.id}"
+                = label_tag "archs_#{arch.id}", arch.name
                 %br
-                
+
             .group
-              = f.label :pl, t("activerecord.attributes.build_list.pl"), :class => :label
-              = f.select :pl, @pls
+              = f.label :pl_id, t("activerecord.attributes.build_list.pl"), :class => :label
+              = f.select :pl_id, @project.repositories.collect{|r| ["#{r.platform.name}/#{r.name}", r.platform.id]}
+
+            .group
+              = f.label :include_repos, t("activerecord.attributes.build_list.include_repos"), :class => :label
+              #include_repos
 
         .group.navform.wat-cf
           %button.button{:type => "submit"}
@@ -53,4 +57,6 @@
           %span.text_button_padding= t("layout.or")
           = link_to t("layout.cancel"), root_path, :class => "text_button_padding link_button"          
 
--# content_for :sidebar, render(:partial => 'sidebar')
+.preloaded_include_repos{:style => 'display: none'}
+  - @project.platforms.each do |p|
+    %div{:class => "include_repos_#{p.id}"}= render 'include_repos', :platform => p
diff --git a/app/views/build_lists/show.html.haml b/app/views/build_lists/show.html.haml
index 6d53030e6..6ed12c9e9 100644
--- a/app/views/build_lists/show.html.haml
+++ b/app/views/build_lists/show.html.haml
@@ -34,6 +34,11 @@
           = t("activerecord.attributes.build_list.pl")
           \:
         = @build_list.pl.name
+      %p
+        %b
+          = t("activerecord.attributes.build_list.include_repos")
+          \:
+        = (@build_list.include_repos||[]).map{|r| Repository.find(r).name}.join(', ')
       %p
         %b
           = t("activerecord.attributes.build_list.update_type")
diff --git a/app/views/git/shared/_navigation.html.haml b/app/views/git/shared/_navigation.html.haml
index cb135dea6..e09fcb051 100644
--- a/app/views/git/shared/_navigation.html.haml
+++ b/app/views/git/shared/_navigation.html.haml
@@ -4,7 +4,7 @@
     %li= link_to t("layout.projects.new"), new_project_path
     %li= link_to t("layout.projects.show"), project_path(@project)
     %li.active= link_to t("layout.git.repositories.source"), project_repo_path(@project)
-    %li= link_to t("layout.projects.build"), build_project_path(@project)
+    %li= link_to t("layout.projects.build"), new_project_build_list_path(@project)
 
   %ul#git_submenu.sub-wat-cf.wat-cf
     %li= link_to t("layout.git.repositories.commits"), commits_path(@project, :treeish => @treeish)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 3930d97a2..8d8e03902 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -5,7 +5,7 @@
       %li= link_to t("layout.projects.new"), new_project_path
       %li.active= link_to t("layout.projects.show"), project_path(@project)
       %li= link_to t("layout.git.repositories.source"), project_repo_path(@project)
-      %li= link_to t("layout.projects.build"), build_project_path(@project)
+      %li= link_to t("layout.projects.build"), new_project_build_list_path(@project)
 
   .content
     .inner
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6f343a6e4..4b414a876 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -412,8 +412,7 @@ ru:
       save_error: Не удалось сохранить билд лист для версии '%{project_version}', платформы '%{bpl}' и архитектуры '%{arch}'
       no_project_version_selected: Выберите какую-нибудь версию
       no_project_version_found: Выбранная версия '%{project_version}' не найдена
-      no_arch_selected: Выберите хотя бы одну ахритектуру
-      no_arch_found: Выбранные ахритектуры не найдены
+      no_arch_or_platform_selected: Выберите хотя бы одну ахритектуру и платформу
       wrong_platform: Для основного репозитория (main) может быть выбран только его же основная платформа!
       can_not_published: Опубликовать сборку можно только со статусом "Собран"
 
@@ -590,6 +589,7 @@ ru:
         is_circle: Циклическая сборка
         notified_at: Информация получена
         additional_repos: Дополнительные репозитории
+        include_repos: Подключаемые репозитории
         updated_at: Обновлен
         created_at: Создан
         pl: Репозиторий для сохранения пакетов
diff --git a/config/routes.rb b/config/routes.rb
index 5d22a7cfe..dafd4ad78 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -69,7 +69,7 @@ Rosa::Application.routes.draw do
 
   resources :projects do
     resource :repo, :controller => "git/repositories", :only => [:show]
-    resources :build_lists, :only => [:index, :show] do
+    resources :build_lists, :only => [:index, :show, :new, :create] do
       collection do
         get :recent
         post :filter
@@ -93,8 +93,6 @@ Rosa::Application.routes.draw do
 #    end
 
     member do
-      get :build
-      post :process_build
       post :fork
     end
     collection do
diff --git a/db/migrate/20111220152347_add_include_repos_to_build_lists.rb b/db/migrate/20111220152347_add_include_repos_to_build_lists.rb
new file mode 100644
index 000000000..cb0b8d7b0
--- /dev/null
+++ b/db/migrate/20111220152347_add_include_repos_to_build_lists.rb
@@ -0,0 +1,9 @@
+class AddIncludeReposToBuildLists < ActiveRecord::Migration
+  def self.up
+    add_column :build_lists, :include_repos, :text
+  end
+
+  def self.down
+    remove_column :build_lists, :include_repos
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 17c70bd11..1a7fdc5fd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111130181101) do
+ActiveRecord::Schema.define(:version => 20111220152347) do
 
   create_table "arches", :force => true do |t|
     t.string   "name",       :null => false
@@ -69,6 +69,7 @@ ActiveRecord::Schema.define(:version => 20111130181101) do
     t.string   "update_type"
     t.integer  "bpl_id"
     t.integer  "pl_id"
+    t.text     "include_repos"
   end
 
   add_index "build_lists", ["arch_id"], :name => "index_build_lists_on_arch_id"
diff --git a/lib/build_server.rb b/lib/build_server.rb
index 6ce8f87bb..cc655323b 100644
--- a/lib/build_server.rb
+++ b/lib/build_server.rb
@@ -72,8 +72,15 @@ class BuildServer
     self.client.call('add_to_repo', name, repo_name)
   end
 
-  def self.add_build_list project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web
-    self.client.call('add_build_list', project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web)
+  def self.add_build_list project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web, include_repos
+    include_repos_json = {}.tap do |h|
+      include_repos.each do |r|
+        repo = Repository.find r
+        h[repo.name] = repo.platform.public_downloads_url(nil, arch, repo.name)
+      end
+    end.to_json
+    # raise include_repos_json.inspect
+    self.client.call('add_build_list', project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web, include_repos_json)
   end
   
   def self.delete_build_list idlist
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 78895567c..394922672 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,42 +1,29 @@
-function check_by_ids(ids) {
-    for(var i = 0; i < ids.length; i++){
-        $('#'+ids[i]).attr('checked', true);
-    }
-    return false;
-}
-
-function uncheck_by_ids(ids) {
-    for(var i = 0; i < ids.length; i++){
-        $('#'+ids[i]).attr('checked', false);
-    }
-    return false;
-}
-
 $(document).ready(function() {
-	$('.pl_ids_container input[type="hidden"]').remove();
-	
-	$('select#build_pl').change(function() {
-	  var is_pl_main = false;
-	  var granted_bpl_id = '';
-	  var pl_id = $('select#build_pl').val();
+	$('select#build_list_pl_id').change(function() {
+	  var platform_id = $(this).val();
 
-	  $('input.build_bpl_ids').each(function(i,el) {
-	    var bpl_id = $(el).attr('bpl_id');
-	    if (pl_id == bpl_id) {
-	      is_pl_main = true;
-	      //granted_bpl_id = $(el).attr('bpl_id');
-	    }
-	  });
+    $('#include_repos').html($('.preloaded_include_repos .include_repos_' + platform_id).html());
 
-	  if (is_pl_main) {
-	    $('input.build_bpl_ids').attr('disabled', 'disabled');
-	    $('input.build_bpl_ids[bpl_id="'+pl_id+'"]').removeAttr('disabled');      
-	  } else {
-	    $('input.build_bpl_ids').removeAttr('disabled');
-	  }
+    // var is_pl_main = false;
+    // var granted_bpl_id = '';
+    // var pl_id = $('select#build_pl').val();
+    // 
+    // $('input.build_bpl_ids').each(function(i,el) {
+    //   var bpl_id = $(el).attr('bpl_id');
+    //   if (pl_id == bpl_id) {
+    //     is_pl_main = true;
+    //     //granted_bpl_id = $(el).attr('bpl_id');
+    //   }
+    // });
+    // 
+    // if (is_pl_main) {
+    //   $('input.build_bpl_ids').attr('disabled', 'disabled');
+    //   $('input.build_bpl_ids[bpl_id="'+pl_id+'"]').removeAttr('disabled');      
+    // } else {
+    //   $('input.build_bpl_ids').removeAttr('disabled');
+    // }
 	});
-
-	$('select#build_pl').trigger('change'); 
+	$('select#build_list_pl_id').trigger('change');
 
 	$('input.user_role_chbx').click(function() {
 		var current = $(this);

From 3ab55d34b8d0ce241872bec81766c213ded77e26 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Wed, 21 Dec 2011 18:48:16 +0400
Subject: [PATCH 05/40] [refs #54] Add CanCan rules for issues and comments.
 Fix serial_id routes and some actions

---
 Gemfile.lock                           |  2 -
 app/controllers/comments_controller.rb | 29 +++++++++-----
 app/controllers/issues_controller.rb   | 21 +++++++----
 app/models/ability.rb                  | 52 +++++++++++++++++++++++---
 app/models/issue.rb                    |  2 +-
 app/views/issues/edit.html.haml        |  3 +-
 app/views/issues/index.html.haml       |  2 +-
 app/views/issues/show.html.haml        |  2 +-
 config/routes.rb                       |  3 +-
 9 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3bf319e35..33a001a38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,7 +77,6 @@ GEM
     factory_girl_rails (1.4.0)
       factory_girl (~> 2.3.0)
       railties (>= 3.0.0)
-    friendly_id (4.0.0.beta8)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -220,7 +219,6 @@ DEPENDENCIES
   delayed_job
   devise (~> 1.5.2)
   factory_girl_rails (~> 1.4.0)
-  friendly_id (~> 4.0.0.beta14)
   grack!
   grit
   haml-rails (~> 0.3.4)
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 0964f2f36..e50844862 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,6 +1,11 @@
 class CommentsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :set_commentable, :only => [:index, :edit, :create]
+  before_filter :find_project, :only => [:index]
+  before_filter :find_comment, :only => [:show, :edit, :update, :destroy]
+
+  authorize_resource :only => [:show, :edit, :update, :destroy]
+  authorize_resource :project, :only => [:index]
 
   def index
     @comments = @commentable.comments
@@ -19,13 +24,11 @@ class CommentsController < ApplicationController
   end
 
   def edit
-    @comment = Comment.find(params[:id])
     @issue = @commentable
     @project = @issue.project
   end
 
   def update
-    @comment = Comment.find(params[:id])
     if @comment.update_attributes(params[:comment])
       flash[:notice] = I18n.t("flash.comment.saved")
       redirect_to :back
@@ -36,7 +39,6 @@ class CommentsController < ApplicationController
   end
 
   def destroy
-    @comment = Comment.find(params[:id])
     @comment.destroy
 
     flash[:notice] = t("flash.comment.destroyed")
@@ -46,15 +48,24 @@ class CommentsController < ApplicationController
   private
 
   def find_commentable
-    params.each do |name, value|
-      if name =~ /(.+)_id$/
-        return $1.classify.constantize.find(value)
-      end
-    end
-    nil
+    #params.each do |name, value|
+    #  if name =~ /(.+)_id$/
+    #    return $1.classify.constantize.find(value)
+    #  end
+    #end
+    #nil
+    return Issue.find(params[:issue_id])
   end
 
   def set_commentable
     @commentable = find_commentable
   end
+
+  def find_comment
+    @comment = Comment.find(params[:id])
+  end
+
+  def find_project
+    @project = @comment.commentable.project
+  end
 end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fa83ead1f..140a5c15c 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,13 +1,15 @@
 class IssuesController < ApplicationController
   before_filter :authenticate_user!
-  before_filter :find_project
-  before_filter :find_issue, :only => [:edit, :update, :destroy]
+  before_filter :find_project, :except => [:destroy]
+  before_filter :find_issue_by_serial_id, :only => [:show, :edit]
 
-  load_and_authorize_resource
+  load_and_authorize_resource :except => [:show, :edit, :index]
+  authorize_resource :only => [:show, :edit]
+  #authorize_resource :through => :project, :only => [:index], :shallow => true
+  authorize_resource :project, :only => [:index]
   autocomplete :user, :uname
 
   def show
-    @issue = @project.issues.where(:serial_id => params[:serial_id])[0]
   end
 
   def index
@@ -30,13 +32,18 @@ class IssuesController < ApplicationController
     end
   end
 
+  def edit
+    @user_id = @issue.user_id
+    @user_uname = @issue.user.uname
+  end
+
   def update
     @user_id = params[:user_id]
     @user_uname = params[:user_uname]
 
     if @issue.update_attributes( params[:issue].merge({:user_id => @user_id}) )
       flash[:notice] = I18n.t("flash.issue.saved")
-      redirect_to @issue
+      redirect_to show_issue_path(@project, @issue.serial_id)
     else
       flash[:error] = I18n.t("flash.issue.saved_error")
       render :action => :new
@@ -56,7 +63,7 @@ class IssuesController < ApplicationController
     @project = Project.find(params[:project_id])
   end
 
-  def find_issue
-    @issue = Issue.find(params[:id])
+  def find_issue_by_serial_id
+    @issue = @project.issues.where(:serial_id => params[:serial_id])[0]
   end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index fd6118a6b..f3e67d84b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -3,7 +3,7 @@ class Ability
 
   def initialize(user)
     user ||= User.new # guest user (not logged in)
-    
+
     if user.admin?
       can :manage, :all
     else
@@ -73,7 +73,7 @@ class Ability
         can [:read, :update], Group, groups_in_relations_with(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id) do |group|
           group.objects.exists?(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)
         end
-        
+
         can :manage, Platform, :owner_type => 'User', :owner_id => user.id
         can :manage, Platform, platforms_in_relations_with(:role => 'admin', :object_type => 'User', :object_id => user.id) do |platform|
           platform.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
@@ -95,10 +95,39 @@ class Ability
         can [:new, :create], Repository do |repository|
           repository.platform.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
         end
-        
+
+        can [:show, :index], Issue do |issue|
+          issue.status == 'open'
+        end
+        #can [:show, :index], Issue, with_project_id_in_relations_with(:object_type => 'User', :object_id => user.id) do |issue|
+        can [:show, :index], Issue do |issue|
+          issue.project.relations.exists?(:object_type => 'User', :object_id => user.id)
+        end
+        can [:create, :new], Issue do |issue|
+          issue.project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)
+        end
+        can [:edit, :update], Issue do |issue|
+          issue.user_id == user.id || (user.id == issue.project.owner_id && issue.project.owner_type == 'User') ||
+          issue.project.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
+        end
+        can [:create, :new], Comment do |comment|
+          comment.commentable.project.relations.exists?(:object_type => 'User', :object_id => user.id)
+        end
+        can [:edit, :update], Comment do |comment|
+          comment.user_id == user.id || (user.id == comment.commentable.project.owner_id && comment.commentable.project.owner_type == 'User') ||
+          comment.commentable.project.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
+        end
+        #
+        cannot [:index, :edit, :update, :create, :new, :show], Issue do |issue|
+          !issue.project.has_issues
+        end
+        cannot [:edit, :update, :create, :new, :destroy], Comment do |comment|
+          !comment.commentable.project.has_issues
+        end
+
         #can :read, Repository
         # TODO: Add personal repos rules
-        
+
         # Same rights for groups:
         can [:read, :create], PrivateUser, :platform => {:owner_type => 'Group', :owner_id => user.group_ids}
         can :publish, BuildList do |build_list|
@@ -121,7 +150,7 @@ class Ability
         can [:read, :update, :process_build, :build], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids) do |project|
           project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids)
         end
-        
+
         can :manage, Platform, :owner_type => 'Group', :owner_id => user.group_ids
         #can :read, Platform, :groups => {:id => user.group_ids}
         can :read, Platform, platforms_in_relations_with(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids) do |platform|
@@ -140,11 +169,12 @@ class Ability
         cannot :create, [Platform, User]
       end
     end
-    
+
     # Shared cannot rights for all users (guests, registered, admin)
     cannot :destroy, Platform, :platform_type => 'personal'
     cannot :destroy, Repository, :platform => {:platform_type => 'personal'}
     cannot :fork, Project, :owner_id => user.id, :owner_type => user.class.to_s
+    cannot :destroy, Issue
   end
 
   # Sub query for platforms, projects relations
@@ -161,6 +191,16 @@ class Ability
     end
   end
 
+  def with_project_id_in_relations_with(opts = {})
+    query = "issues.project_id IN (SELECT target_id FROM relations WHERE relations.target_type = 'issues'"
+    opts.each do |key, value|
+      query = query + " AND relations.#{ key } #{ value.class == Array ? 'IN (?)' : '= ?' } "
+    end
+    query = query + ")"
+
+    return opts.values.unshift query
+  end
+
   ## Sub query for project relations
   #def projects_in_relations_with(opts={})
   #  ["projects.id IN (SELECT target_id FROM relations WHERE relations.object_id #{ opts[:object_id].class == Array ? 'IN (?)' : '= ?' } AND relations.object_type = '#{ opts[:object_type] }' AND relations.target_type = 'Platform') AND relations.role", opts[:object_id]]
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 0e971f55f..ad6f57468 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,5 +1,5 @@
 class Issue < ActiveRecord::Base
-  STATUSES = ['open', 'close']
+  STATUSES = ['open', 'closed']
 
   belongs_to :project
   belongs_to :user
diff --git a/app/views/issues/edit.html.haml b/app/views/issues/edit.html.haml
index 99a3533b0..aa09ab66f 100644
--- a/app/views/issues/edit.html.haml
+++ b/app/views/issues/edit.html.haml
@@ -3,10 +3,9 @@
     %ul.wat-cf
       %li.first= link_to t("layout.issues.list"), project_issues_path(@project)
       %li= link_to t("layout.issues.new"), new_project_issue_path(@project)
-      %li.active= link_to t("layout.issues.edit"), edit_project_issue_path(@project)
   .content
     %h2.title
       = t("layout.issues.edit_header")
     .inner
-      = form_for @issue, :url => project_issue_path(@issue), :html => { :class => :form } do |f|
+      = form_for @issue, :url => project_issue_path(@project, @issue), :html => { :class => :form } do |f|
         = render :partial => "form", :locals => {:f => f}
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 9b8661458..aa3323b70 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -2,7 +2,7 @@
   .secondary-navigation
     %ul.wat-cf
       %li.first.active= link_to t("layout.issues.list"), project_issues_path(@project)
-      %li= link_to t("layout.issues.new"), new_project_issue_path(@project) if can? :create, Issue
+      %li= link_to t("layout.issues.new"), new_project_issue_path(@project) if can? :new, Issue.new(:project_id => @project.id)
   .content
     %h2.title
       = t("layout.issues.list_header")
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index a68e58fea..51c080e4a 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -2,7 +2,7 @@
   .secondary-navigation
     %ul.wat-cf
       %li.first= link_to t("layout.issues.list"), project_issues_path(@project)
-      %li= link_to t("layout.issues.edit"), edit_project_issue_path(@project, @issue) if can? :edit, @issue
+      %li= link_to t("layout.issues.edit"), edit_project_issue_path(@project, @issue.serial_id) if can? :edit, @issue
   .content
     .inner
       %p
diff --git a/config/routes.rb b/config/routes.rb
index b3fc4bc05..120556a0b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,7 +67,8 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
-  match "projects/:project_id/issues/:serial_id" => 'issues#show', :as => :show_issue, :via => :get
+  match "projects/:project_id/issues/:serial_id" => 'issues#show', :serial_id => /\d+/, :as => :show_issue, :via => :get
+  match "projects/:project_id/issues/:serial_id/edit" => 'issues#edit', :serial_id => /\d+/, :as => :edit_issue, :via => :get
   resources :projects do
     resources :issues, :except => [:show] do
       resources :comments, :only => [:edit, :create, :update, :destroy]

From 7f58a5260279ae5165edbc2b74feda51e98c828c Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 21 Dec 2011 19:51:55 +0200
Subject: [PATCH 06/40] Autocheck current save platform and disable unavailable
 base platforms on JS level. Refs #65

---
 app/views/build_lists/new.html.haml |  2 +-
 public/javascripts/application.js   | 32 +++++++++++++----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/views/build_lists/new.html.haml b/app/views/build_lists/new.html.haml
index 1d53612ca..88aa55c5d 100644
--- a/app/views/build_lists/new.html.haml
+++ b/app/views/build_lists/new.html.haml
@@ -18,7 +18,7 @@
               = f.label :project_version, t("activerecord.attributes.build_list.project_version"), :class => :label
               = f.select :project_version, @project.versions
               
-            .group.pl_ids_container
+            .group.base_platforms
               = f.label :bpl, t("activerecord.attributes.build_list.bpl"), :class => :label
               - Platform.main.each do |bpl|
                 = check_box_tag "bpls[]", bpl.id, (params[:bpls]||[]).include?(bpl.id.to_s), :class => 'build_bpl_ids', :id => "bpls_#{bpl.id}"
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 394922672..b2617a1c7 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,27 +1,23 @@
 $(document).ready(function() {
 	$('select#build_list_pl_id').change(function() {
 	  var platform_id = $(this).val();
+	  var base_platforms = $('.base_platforms input[type=checkbox]');
 
     $('#include_repos').html($('.preloaded_include_repos .include_repos_' + platform_id).html());
 
-    // var is_pl_main = false;
-    // var granted_bpl_id = '';
-    // var pl_id = $('select#build_pl').val();
-    // 
-    // $('input.build_bpl_ids').each(function(i,el) {
-    //   var bpl_id = $(el).attr('bpl_id');
-    //   if (pl_id == bpl_id) {
-    //     is_pl_main = true;
-    //     //granted_bpl_id = $(el).attr('bpl_id');
-    //   }
-    // });
-    // 
-    // if (is_pl_main) {
-    //   $('input.build_bpl_ids').attr('disabled', 'disabled');
-    //   $('input.build_bpl_ids[bpl_id="'+pl_id+'"]').removeAttr('disabled');      
-    // } else {
-    //   $('input.build_bpl_ids').removeAttr('disabled');
-    // }
+    base_platforms.each(function(){
+      if ($.inArray(platform_id, base_platforms.map(function(){ return $(this).val() }).get()) >= 0) {
+        if ($(this).val() == platform_id) {
+          $(this).attr('checked', 'checked');
+          $(this).removeAttr('disabled');
+        } else {
+          $(this).removeAttr('checked');
+          $(this).attr('disabled', 'disabled');
+        }
+      } else {
+        $(this).removeAttr('disabled');
+      }
+    });
 	});
 	$('select#build_list_pl_id').trigger('change');
 

From a61d211862f4ba4d7ff8d8fe157f16427be826e6 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 21 Dec 2011 20:59:19 +0200
Subject: [PATCH 07/40] Fix bugs. Change included_repos format. Refs #65

---
 app/views/build_lists/_build_lists.html.haml | 6 +++---
 app/views/build_lists/index.html.haml        | 6 +++---
 app/views/build_lists/show.html.haml         | 2 +-
 config/locales/event_log.ru.yml              | 2 +-
 lib/build_server.rb                          | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/build_lists/_build_lists.html.haml b/app/views/build_lists/_build_lists.html.haml
index d3a5ae44c..8cc07e778 100644
--- a/app/views/build_lists/_build_lists.html.haml
+++ b/app/views/build_lists/_build_lists.html.haml
@@ -7,7 +7,7 @@
     %th= t("activerecord.attributes.build_list.arch")
     %th= t("activerecord.attributes.build_list.user")
     %th= t("activerecord.attributes.build_list.is_circle")
-    - if controller.action_name = 'all'
+    - unless @project
       %th= t("layout.build_lists.cancel_button_header")
     %th.last= t("activerecord.attributes.build_list.notified_at")
 
@@ -18,9 +18,9 @@
       %td= link_to build_list.project_version, "#"
       %td= link_to build_list.project.name, project_path(build_list.project)
       %td= build_list.arch.name
-      %td= build_list.user.fullname
+      %td= build_list.user.try(:fullname)
       %td= t("layout.#{build_list.is_circle?}_")
-      - if controller.action_name = 'all'
+      - unless @project
         %td= link_to t("layout.build_lists.cancel_button"), build_list_cancel_path(build_list) if build_list.can_cancel?
       %td.last= build_list.notified_at
 
diff --git a/app/views/build_lists/index.html.haml b/app/views/build_lists/index.html.haml
index 9fe414890..32dab8efb 100644
--- a/app/views/build_lists/index.html.haml
+++ b/app/views/build_lists/index.html.haml
@@ -1,12 +1,12 @@
 .block
-  - if controller.action_name != 'all'
+  - if @project
     .secondary-navigation
       %ul.wat-cf
         %li.first= link_to t("layout.build_lists.current"), project_path(@project) + "#build_lists"
         %li.active= link_to t("layout.build_lists.all"), project_build_lists_path(@project)
 
   .content
-    - if controller.action_name == 'all'
+    - unless @project
       .inner
         %h2= t('layout.build_lists.build_server_status.header')
         .field
@@ -25,4 +25,4 @@
     .inner
       = render :partial => "build_lists/build_lists", :object => @build_lists
 
-- content_for :sidebar, render(:partial => 'sidebar') if controller.action_name != 'all'
\ No newline at end of file
+- content_for :sidebar, render(:partial => 'sidebar') if @project
\ No newline at end of file
diff --git a/app/views/build_lists/show.html.haml b/app/views/build_lists/show.html.haml
index bc5342f1e..e8c6f6f20 100644
--- a/app/views/build_lists/show.html.haml
+++ b/app/views/build_lists/show.html.haml
@@ -73,7 +73,7 @@
         %b
           = t("activerecord.attributes.build_list.user")
           \:
-        = @build_list.user.fullname
+        = @build_list.user.try(:fullname)
       %p
         %b
           = t("activerecord.attributes.build_list.notified_at")
diff --git a/config/locales/event_log.ru.yml b/config/locales/event_log.ru.yml
index c1aed3a86..c6e627043 100644
--- a/config/locales/event_log.ru.yml
+++ b/config/locales/event_log.ru.yml
@@ -23,8 +23,8 @@ ru:
         open_id: 'вход через OpenID'
       projects_controller:
         auto_build: 'отправлен на автоматическую сборку'
-        process_build: 'отправлен на сборку'
       build_lists_controller:
+        create: 'отправлен на сборку'
         cancel: 'сборка отменена'
         publish: 'сборка опубликована'
       auto_build_lists_controller:
diff --git a/lib/build_server.rb b/lib/build_server.rb
index cc655323b..b82c13387 100644
--- a/lib/build_server.rb
+++ b/lib/build_server.rb
@@ -73,14 +73,14 @@ class BuildServer
   end
 
   def self.add_build_list project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web, include_repos
-    include_repos_json = {}.tap do |h|
+    include_repos_hash = {}.tap do |h|
       include_repos.each do |r|
         repo = Repository.find r
         h[repo.name] = repo.platform.public_downloads_url(nil, arch, repo.name)
       end
-    end.to_json
-    # raise include_repos_json.inspect
-    self.client.call('add_build_list', project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web, include_repos_json)
+    end
+    # raise include_repos_hash.inspect
+    self.client.call('add_build_list', project_name, project_version, plname, arch, bplname, update_type, build_requires, id_web, include_repos_hash)
   end
   
   def self.delete_build_list idlist

From 8c2b83760066a5ec490507fa484321e4b2536bc9 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 21 Dec 2011 21:17:55 +0200
Subject: [PATCH 08/40] Fix build_list user assign. Refs #65

---
 app/controllers/build_lists_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index c02d1aaf0..86fa8d81e 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -46,7 +46,7 @@ class BuildListsController < ApplicationController
     Arch.where(:id => params[:archs]).each do |arch|
       Platform.main.where(:id => params[:bpls]).each do |bpl|
         @build_list = @project.build_lists.build(params[:build_list])
-        @build_list.bpl = bpl; @build_list.arch = arch
+        @build_list.bpl = bpl; @build_list.arch = arch; @build_list.user = current_user
         flash_options = {:project_version => @build_list.project_version, :arch => arch.name, :bpl => bpl.name, :pl => @build_list.pl}
         if @build_list.save
           notices << t("flash.build_list.saved", flash_options)

From 2c67843c3471f9f7bfb71ce1bf4b1a754985f691 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 21 Dec 2011 23:42:06 +0200
Subject: [PATCH 09/40] Refactor and cleanup build_lists controller and routes.
 Rename methods. Allow deffis in platform and repository name. Add missing
 relation and migration to force work user assign in build_lists. Fix and
 simplify links. Abstract sidebar. Refs #65

---
 app/controllers/build_lists_controller.rb     | 80 ++++++++-----------
 app/models/ability.rb                         |  4 +-
 app/models/build_list.rb                      |  6 +-
 app/models/platform.rb                        |  2 +-
 app/models/repository.rb                      |  2 +-
 app/models/user.rb                            |  1 +
 app/views/build_lists/_build_lists.html.haml  |  4 +-
 app/views/build_lists/_filter.html.haml       |  6 +-
 app/views/build_lists/_sidebar.html.haml      |  4 +-
 app/views/build_lists/index.html.haml         |  2 +-
 app/views/build_lists/show.html.haml          | 12 +--
 config/locales/ru.yml                         |  8 +-
 config/routes.rb                              | 33 +++-----
 ...111221194422_add_user_id_to_build_lists.rb |  9 +++
 db/schema.rb                                  |  3 +-
 15 files changed, 80 insertions(+), 96 deletions(-)
 create mode 100644 db/migrate/20111221194422_add_user_id_to_build_lists.rb

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index 86fa8d81e..4f7479aa4 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -1,24 +1,22 @@
 class BuildListsController < ApplicationController
   CALLBACK_ACTIONS = [:status_build, :pre_build, :post_build, :circle_build, :new_bbdt]
+  NESTED_ACTIONS = [:index, :new, :create]
 
   before_filter :authenticate_user!, :except => CALLBACK_ACTIONS
   before_filter :authenticate_build_service!, :only => CALLBACK_ACTIONS
-  before_filter :find_project, :only => [:filter, :show, :publish, :new, :create]
-  before_filter :find_arches, :only => [:index]
+  before_filter :find_project, :only => NESTED_ACTIONS
+  before_filter :find_build_list, :only => [:show, :publish, :cancel]
   before_filter :find_build_list_by_bs, :only => [:status_build, :pre_build, :post_build]
 
-  load_and_authorize_resource :project, :only => :index
-  load_and_authorize_resource :through => :project, :only => :index, :shallow => true
-  load_and_authorize_resource :except => CALLBACK_ACTIONS.concat([:index])
+  load_and_authorize_resource :project, :only => NESTED_ACTIONS
+  load_and_authorize_resource :through => :project, :only => NESTED_ACTIONS, :shallow => true
+  load_and_authorize_resource :except => CALLBACK_ACTIONS.concat(NESTED_ACTIONS)
 
 	def index
     filter_params = params[:filter] || {}
-    if params[:project_id]
-      find_project
-      find_project_versions
+    if @project
       @action_url = project_build_lists_path(@project)
     else
-      @project = nil
       @action_url = build_lists_path
     end
 
@@ -32,11 +30,6 @@ class BuildListsController < ApplicationController
     end
 	end
 
-	def show
-		@build_list = @project.build_lists.find(params[:id])
-		@item_groups = @build_list.items.group_by_level
-	end
-	
 	def new
 	  @build_list = BuildList.new
   end
@@ -65,20 +58,24 @@ class BuildListsController < ApplicationController
       redirect_to @project
     end
   end
-  
+
+	def show
+		@item_groups = @build_list.items.group_by_level
+	end
+
 	def publish
-		@build_list = @project.build_lists.find(params[:id])
-		@build_list.publish
-		
-		redirect_to project_build_lists_path(@project)
+		if @build_list.publish
+			redirect_to :back, :notice => t('layout.build_lists.publish_success')
+		else
+			redirect_to :back, :notice => t('layout.build_lists.publish_fail')
+		end
 	end
 
 	def cancel
-		build_list = BuildList.find(params[:id])
-		if build_list.cancel_build_list
-			redirect_to :back, :notice => t('layout.build_lists.cancel_successed')
+		if @build_list.cancel
+			redirect_to :back, :notice => t('layout.build_lists.cancel_success')
 		else
-			redirect_to :back, :notice => t('layout.build_lists.cancel_failed')
+			redirect_to :back, :notice => t('layout.build_lists.cancel_fail')
 		end
 	end
 
@@ -86,10 +83,9 @@ class BuildListsController < ApplicationController
 		@item = @build_list.items.find_by_name!(params[:package_name])
 		@item.status = params[:status]
 		@item.save
-		
+
 		@build_list.container_path = params[:container_path]
 		@build_list.notified_at = Time.current
-
 		@build_list.save
 
 		render :nothing => true, :status => 200
@@ -98,7 +94,6 @@ class BuildListsController < ApplicationController
 	def pre_build
 		@build_list.status = BuildServer::BUILD_STARTED
 		@build_list.notified_at = Time.current
-
 		@build_list.save
 
 		render :nothing => true, :status => 200
@@ -108,7 +103,6 @@ class BuildListsController < ApplicationController
 		@build_list.status = params[:status]
 		@build_list.container_path = params[:container_path]
 		@build_list.notified_at = Time.current
-
 		@build_list.save
 
 		render :nothing => true, :status => 200
@@ -118,7 +112,6 @@ class BuildListsController < ApplicationController
 		@build_list.is_circle = true
 		@build_list.container_path = params[:container_path]
 		@build_list.notified_at = Time.current
-
 		@build_list.save
 
 		render :nothing => true, :status => 200
@@ -139,27 +132,22 @@ class BuildListsController < ApplicationController
 	end
 
 	protected
-	
-		def find_project
-			@project = Project.find params[:project_id]
-		end
 
-		def find_arches
-			@arches = Arch.recent
-		end
+	def find_project
+		@project = Project.find_by_id params[:project_id]
+	end
 
-		def find_project_versions
-			@git_repository = @project.git_repository
-			@project_versions = @project.versions
-		end
+  def find_build_list
+    @build_list = BuildList.find(params[:id])
+  end
 
-		def find_build_list_by_bs
-			@build_list = BuildList.find_by_bs_id!(params[:id])
-		end
+	def find_build_list_by_bs
+		@build_list = BuildList.find_by_bs_id!(params[:id])
+	end
 
-    def authenticate_build_service!
-      if request.remote_ip != APP_CONFIG['build_server_ip']
-        render :nothing => true, :status => 403
-      end
+  def authenticate_build_service!
+    if request.remote_ip != APP_CONFIG['build_server_ip']
+      render :nothing => true, :status => 403
     end
+  end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 09cd275a1..cbfbef43b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -43,7 +43,7 @@ class Ability
         can :create, Project
         can :create, Group
         can :publish, BuildList do |build_list|
-          build_list.can_published? && build_list.project.relations.exists?(:object_type => 'User', :object_id => user.id)
+          build_list.can_publish? && build_list.project.relations.exists?(:object_type => 'User', :object_id => user.id)
         end
         can [:index, :read], BuildList, ["build_lists.project_id IN (SELECT id FROM projects WHERE visibility = ?)", 'open'] do |build_list|
           build_list.project.public?
@@ -106,7 +106,7 @@ class Ability
         # Same rights for groups:
         can [:read, :create], PrivateUser, :platform => {:owner_type => 'Group', :owner_id => user.group_ids}
         can :publish, BuildList do |build_list|
-          build_list.can_published? && build_list.project.relations.exists?(:object_type => 'Group', :object_id => user.group_ids)
+          build_list.can_publish? && build_list.project.relations.exists?(:object_type => 'Group', :object_id => user.group_ids)
         end
         can [:index, :read], BuildList, build_lists_in_relations_with(:object_type => 'Group', :object_id => user.group_ids) do |build_list|
           build_list.project.relations.exists?(:object_type => 'Group', :object_id => user.group_ids)
diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index c30504da2..1c1562863 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -105,18 +105,18 @@ class BuildList < ActiveRecord::Base
   end
   
   def publish
-    return false unless can_published?
+    return false unless can_publish?
     
     BuildServer.publish_container bs_id
     self.update_attribute(:status, BUILD_PUBLISHED)
     #self.destroy # self.delete
   end
   
-  def can_published?
+  def can_publish?
     self.status == BuildServer::SUCCESS
   end
 
-  def cancel_build_list
+  def cancel
     has_canceled = BuildServer.delete_build_list bs_id
     update_attribute(:status, BUILD_CANCELED) if has_canceled == 0
     
diff --git a/app/models/platform.rb b/app/models/platform.rb
index 1ab3f10e6..e0768062a 100644
--- a/app/models/platform.rb
+++ b/app/models/platform.rb
@@ -14,7 +14,7 @@ class Platform < ActiveRecord::Base
   has_many :groups,  :through => :objects, :source => :object, :source_type => 'Group'
 
   validates :description, :presence => true, :uniqueness => true
-  validates :name, :uniqueness => true, :presence => true, :format => { :with => /^[a-zA-Z0-9_]+$/ }
+  validates :name, :uniqueness => true, :presence => true, :format => { :with => /^[a-zA-Z0-9_\-]+$/ }
   validates :distrib_type, :presence => true, :inclusion => {:in => APP_CONFIG['distr_types']}
 
   before_create :xml_rpc_create, :unless => lambda {Thread.current[:skip]}
diff --git a/app/models/repository.rb b/app/models/repository.rb
index c6acb4599..13c4e2a02 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -11,7 +11,7 @@ class Repository < ActiveRecord::Base
   has_many :groups,  :through => :objects, :source => :object, :source_type => 'Group'
 
   validates :description, :uniqueness => {:scope => :platform_id}, :presence => true
-  validates :name, :uniqueness => {:scope => :platform_id}, :presence => true, :format => { :with => /^[a-z0-9_]+$/ }
+  validates :name, :uniqueness => {:scope => :platform_id}, :presence => true, :format => { :with => /^[a-z0-9_\-]+$/ }
   # validates :platform_id, :presence => true # if you uncomment this platform clone will not work
 
   scope :recent, order("name ASC")
diff --git a/app/models/user.rb b/app/models/user.rb
index bbaf191c9..07e59a71f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,6 +5,7 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :validatable #, :trackable, :confirmable, :lockable
 
   has_many :authentications, :dependent => :destroy
+  has_many :build_lists, :dependent => :destroy
 
   has_many :relations, :as => :object, :dependent => :destroy
   has_many :targets, :as => :object, :class_name => 'Relation'
diff --git a/app/views/build_lists/_build_lists.html.haml b/app/views/build_lists/_build_lists.html.haml
index 8cc07e778..8bd7ab667 100644
--- a/app/views/build_lists/_build_lists.html.haml
+++ b/app/views/build_lists/_build_lists.html.haml
@@ -13,7 +13,7 @@
 
   - build_lists.each do |build_list|
     %tr{:class => cycle("odd", "even")}
-      %td= link_to (build_list.bs_id.present? ? build_list.bs_id : t("layout.build_lists.bs_id_not_set")), project_build_list_path(build_list.project, build_list)
+      %td= link_to (build_list.bs_id.present? ? build_list.bs_id : t("layout.build_lists.bs_id_not_set")), build_list
       %td= build_list.human_status
       %td= link_to build_list.project_version, "#"
       %td= link_to build_list.project.name, project_path(build_list.project)
@@ -21,7 +21,7 @@
       %td= build_list.user.try(:fullname)
       %td= t("layout.#{build_list.is_circle?}_")
       - unless @project
-        %td= link_to t("layout.build_lists.cancel_button"), build_list_cancel_path(build_list) if build_list.can_cancel?
+        %td= link_to t("layout.build_lists.cancel_button"), cancel_build_list_path(build_list), :method => "put", :confirm => t("layout.confirm") if build_list.can_cancel?
       %td.last= build_list.notified_at
 
 = will_paginate build_lists
diff --git a/app/views/build_lists/_filter.html.haml b/app/views/build_lists/_filter.html.haml
index 49e5df245..9a184f655 100644
--- a/app/views/build_lists/_filter.html.haml
+++ b/app/views/build_lists/_filter.html.haml
@@ -8,12 +8,12 @@
         = f.select :status, BuildList::STATUSES.collect{|status| [BuildList.human_status(status), status]}, :include_blank => true, :selected => @filter.status
       .group
         = f.label :arch_id, t("activerecord.attributes.build_list.arch"), :class => :label
-        = f.select :arch_id, @arches.collect{|arch| [arch.name, arch.id]}, :include_blank => true, :selected => @filter.arch_id
+        = f.select :arch_id, Arch.recent.collect{|arch| [arch.name, arch.id]}, :include_blank => true, :selected => @filter.arch_id
     .column.right
-      - if @project_versions
+      - if @project
         .group
           = f.label :project_version, t("activerecord.attributes.build_list.project_version"), :class => :label
-          = f.select :project_version, @project_versions, :include_blank => true, :selected => @filter.project_version
+          = f.select :project_version, @project.versions, :include_blank => true, :selected => @filter.project_version
       .group
         = f.label :is_circle, t("activerecord.attributes.build_list.is_circle"), :class => :label
         = f.select :is_circle, [[t("layout.yes_"), 1], [t("layout.no_"), 0]], :include_blank => true, :selected => @filter.is_circle.present? ? (@filter.is_circle ? "1" : "0") : nil
diff --git a/app/views/build_lists/_sidebar.html.haml b/app/views/build_lists/_sidebar.html.haml
index 2b81fc62c..55d964a20 100644
--- a/app/views/build_lists/_sidebar.html.haml
+++ b/app/views/build_lists/_sidebar.html.haml
@@ -1,10 +1,10 @@
 .block.notice
   %h3= t("layout.repositories.current_repository_header")
   .content
-    - @project.repositories.each do |repository|
+    - project.repositories.each do |repository|
       %p= link_to "#{repository.name} (#{repository.platform.name})", platform_repository_path(repository.platform, repository)
 
 .block.notice
   %h3= t("layout.projects.current_project_header")
   .content
-    %p= link_to @project.name, project_path(@project)
\ No newline at end of file
+    %p= link_to project.name, project
\ No newline at end of file
diff --git a/app/views/build_lists/index.html.haml b/app/views/build_lists/index.html.haml
index 32dab8efb..97e5375f9 100644
--- a/app/views/build_lists/index.html.haml
+++ b/app/views/build_lists/index.html.haml
@@ -25,4 +25,4 @@
     .inner
       = render :partial => "build_lists/build_lists", :object => @build_lists
 
-- content_for :sidebar, render(:partial => 'sidebar') if @project
\ No newline at end of file
+- content_for :sidebar, render('sidebar', :project => @project) if @project
diff --git a/app/views/build_lists/show.html.haml b/app/views/build_lists/show.html.haml
index e8c6f6f20..eafd98ddd 100644
--- a/app/views/build_lists/show.html.haml
+++ b/app/views/build_lists/show.html.haml
@@ -1,9 +1,9 @@
 .block
   .secondary-navigation
     %ul.wat-cf
-      %li.first= link_to t("layout.build_lists.current"), project_path(@project) + "#build_lists"
-      %li= link_to t("layout.build_lists.all"), project_build_lists_path(@project)
-      %li.active= link_to t("layout.build_lists.show"), project_build_list_path(@project, @build_list)
+      %li.first= link_to t("layout.build_lists.current"), project_path(@build_list.project) + "#build_lists"
+      %li= link_to t("layout.build_lists.all"), project_build_lists_path(@build_list.project)
+      %li.active= link_to t("layout.build_lists.show"), @build_list
 
   .content
     .inner
@@ -85,9 +85,9 @@
           \:
         = t("layout.#{@build_list.is_circle?}_")
 
-      - if  @build_list.can_published?  
+      - if @build_list.can_publish?  
         .wat-cf
-          = link_to image_tag("web-app-theme/icons/tick.png", :alt => t("layout.publish")) + " " + t("layout.publish"), publish_project_build_list_path(@project, @build_list), :method => "post", :class => "button", :confirm => t("layout.build_lists.confirm_publish")
+          = link_to image_tag("web-app-theme/icons/tick.png", :alt => t("layout.publish")) + " " + t("layout.publish"), publish_build_list_path(@build_list), :method => "put", :class => "button", :confirm => t("layout.confirm")
 
 .block
   .content
@@ -111,4 +111,4 @@
               %td= item.version
               %td.last= item.human_status
 
-- content_for :sidebar, render(:partial => 'sidebar')
+- content_for :sidebar, render('sidebar', :project => @build_list.project)
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c4d84ac11..2f0cb3bf4 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -280,7 +280,6 @@ ru:
     build_lists:
       filter_header: Фильтр
       current: Текущие
-      all: Все
       created_at_start: "Время постановки на сборку с:"
       created_at_end: "Время постановки на сборку по:"
       notified_at_start: "Время последнего обновления от BS с:"
@@ -291,11 +290,12 @@ ru:
       items_header: Элементы сборки
       no_items_data: Данных нет
       show: Просмотр
-      confirm_publish: Вы уверены, что хотите опубликовать контейнер?
       cancel_button_header: Действие
       cancel_button: Отмена
-      cancel_successed: 'Сборка отменена.'
-      cancel_failed: 'При отмене сборки произошла ошибка!'
+      cancel_success: 'Сборка отменена.'
+      cancel_fail: 'При отмене сборки произошла ошибка!'
+      publish_success: 'Сборка опубликована.'
+      publish_fail: 'При публикации сборки произошла ошибка!'
       
       build_server_status:
         header: Статус сборочного сервера
diff --git a/config/routes.rb b/config/routes.rb
index 7abc1ffe4..a5918b82f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,23 +24,16 @@ Rosa::Application.routes.draw do
 
   match '/private/:platform_name/*file_path' => 'privates#show'
 
-#  match 'build_lists/' => 'build_lists#index', :as => :all_build_lists
-#  match 'build_lists/:id/cancel/' => 'build_lists#cancel', :as => :build_list_cancel
-#  match 'build_lists/status_build', :to => "build_lists#status_build"
-#  match 'build_lists/post_build', :to => "build_lists#post_build"
-#  match 'build_lists/pre_build', :to => "build_lists#pre_build"
-#  match 'build_lists/circle_build', :to => "build_lists#circle_build"
-#  match 'build_lists/new_bbdt', :to => "build_lists#new_bbdt"
+  match 'build_lists/status_build', :to => "build_lists#status_build"
+  match 'build_lists/post_build', :to => "build_lists#post_build"
+  match 'build_lists/pre_build', :to => "build_lists#pre_build"
+  match 'build_lists/circle_build', :to => "build_lists#circle_build"
+  match 'build_lists/new_bbdt', :to => "build_lists#new_bbdt"
 
-
-  resources :build_lists, :only => [:index, :cancel, :status_build, :post_build, :pre_build, :circle_build, :new_bbdt] do
+  resources :build_lists, :only => [:index, :show] do
     member do
-      get :cancel
-      get :status_build
-      get :post_build
-      get :pre_build
-      get :circle_build
-      get :new_bbdt
+      put :cancel
+      put :publish
     end
   end
 
@@ -86,15 +79,7 @@ Rosa::Application.routes.draw do
 
   resources :projects do
     resource :repo, :controller => "git/repositories", :only => [:show]
-    resources :build_lists, :only => [:index, :show, :new, :create] do
-      collection do
-        get :recent
-        post :filter
-      end
-      member do
-        post :publish
-      end
-    end
+    resources :build_lists, :only => [:index, :new, :create]
 
     resources :collaborators, :only => [:index, :edit, :update, :add] do
       collection do
diff --git a/db/migrate/20111221194422_add_user_id_to_build_lists.rb b/db/migrate/20111221194422_add_user_id_to_build_lists.rb
new file mode 100644
index 000000000..1a52d0264
--- /dev/null
+++ b/db/migrate/20111221194422_add_user_id_to_build_lists.rb
@@ -0,0 +1,9 @@
+class AddUserIdToBuildLists < ActiveRecord::Migration
+  def self.up
+    add_column :build_lists, :user_id, :integer
+  end
+
+  def self.down
+    remove_column :build_lists, :user_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1a7fdc5fd..914d12701 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111220152347) do
+ActiveRecord::Schema.define(:version => 20111221194422) do
 
   create_table "arches", :force => true do |t|
     t.string   "name",       :null => false
@@ -70,6 +70,7 @@ ActiveRecord::Schema.define(:version => 20111220152347) do
     t.integer  "bpl_id"
     t.integer  "pl_id"
     t.text     "include_repos"
+    t.integer  "user_id"
   end
 
   add_index "build_lists", ["arch_id"], :name => "index_build_lists_on_arch_id"

From 2ac4391edfca488065f97baa057b47f247f00b00 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Thu, 22 Dec 2011 01:31:05 +0200
Subject: [PATCH 10/40] Redo build_list publish to check returned status. Refs
 #77

---
 app/models/build_list.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index 1c1562863..94522d13d 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -103,13 +103,12 @@ class BuildList < ActiveRecord::Base
       end
     end
   end
-  
+
   def publish
-    return false unless can_publish?
-    
-    BuildServer.publish_container bs_id
-    self.update_attribute(:status, BUILD_PUBLISHED)
-    #self.destroy # self.delete
+    has_published = BuildServer.publish_container bs_id
+    update_attribute(:status, BUILD_PUBLISHED) if has_published == 0
+
+    return has_published == 0
   end
   
   def can_publish?
@@ -119,7 +118,7 @@ class BuildList < ActiveRecord::Base
   def cancel
     has_canceled = BuildServer.delete_build_list bs_id
     update_attribute(:status, BUILD_CANCELED) if has_canceled == 0
-    
+
     return has_canceled == 0
   end
 

From a82f59f35a23a51d39e1d2b24964cf5ad96b95b8 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Thu, 22 Dec 2011 02:53:55 +0200
Subject: [PATCH 11/40] Add route, action and statuses for publish_build. Apply
 status assign and check. Localize statuses. Convert tabs to spaces. Refs #80

---
 app/controllers/build_lists_controller.rb | 152 ++++++++++++----------
 app/models/build_list.rb                  |  12 +-
 config/locales/ru.yml                     |   4 +-
 config/routes.rb                          |   1 +
 4 files changed, 93 insertions(+), 76 deletions(-)

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index 4f7479aa4..cfb84498c 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -1,18 +1,18 @@
 class BuildListsController < ApplicationController
-  CALLBACK_ACTIONS = [:status_build, :pre_build, :post_build, :circle_build, :new_bbdt]
+  CALLBACK_ACTIONS = [:publish_build, :status_build, :pre_build, :post_build, :circle_build, :new_bbdt]
   NESTED_ACTIONS = [:index, :new, :create]
 
   before_filter :authenticate_user!, :except => CALLBACK_ACTIONS
   before_filter :authenticate_build_service!, :only => CALLBACK_ACTIONS
   before_filter :find_project, :only => NESTED_ACTIONS
   before_filter :find_build_list, :only => [:show, :publish, :cancel]
-  before_filter :find_build_list_by_bs, :only => [:status_build, :pre_build, :post_build]
+  before_filter :find_build_list_by_bs, :only => [:publish_build, :status_build, :pre_build, :post_build]
 
   load_and_authorize_resource :project, :only => NESTED_ACTIONS
   load_and_authorize_resource :through => :project, :only => NESTED_ACTIONS, :shallow => true
   load_and_authorize_resource :except => CALLBACK_ACTIONS.concat(NESTED_ACTIONS)
 
-	def index
+  def index
     filter_params = params[:filter] || {}
     if @project
       @action_url = project_build_lists_path(@project)
@@ -21,17 +21,17 @@ class BuildListsController < ApplicationController
     end
 
     @filter = BuildList::Filter.new(@project, filter_params)
-		@build_lists = @filter.find.accessible_by(current_ability).recent.paginate :page => params[:page]
+    @build_lists = @filter.find.accessible_by(current_ability).recent.paginate :page => params[:page]
 
     @build_server_status = begin
       BuildServer.get_status
     rescue Exception # Timeout::Error
       {}
     end
-	end
+  end
 
-	def new
-	  @build_list = BuildList.new
+  def new
+    @build_list = BuildList.new
   end
 
   def create
@@ -59,91 +59,99 @@ class BuildListsController < ApplicationController
     end
   end
 
-	def show
-		@item_groups = @build_list.items.group_by_level
-	end
+  def show
+    @item_groups = @build_list.items.group_by_level
+  end
 
-	def publish
-		if @build_list.publish
-			redirect_to :back, :notice => t('layout.build_lists.publish_success')
-		else
-			redirect_to :back, :notice => t('layout.build_lists.publish_fail')
-		end
-	end
+  def publish
+    if @build_list.publish
+      redirect_to :back, :notice => t('layout.build_lists.publish_success')
+    else
+      redirect_to :back, :notice => t('layout.build_lists.publish_fail')
+    end
+  end
 
-	def cancel
-		if @build_list.cancel
-			redirect_to :back, :notice => t('layout.build_lists.cancel_success')
-		else
-			redirect_to :back, :notice => t('layout.build_lists.cancel_fail')
-		end
-	end
+  def cancel
+    if @build_list.cancel
+      redirect_to :back, :notice => t('layout.build_lists.cancel_success')
+    else
+      redirect_to :back, :notice => t('layout.build_lists.cancel_fail')
+    end
+  end
 
-	def status_build
-		@item = @build_list.items.find_by_name!(params[:package_name])
-		@item.status = params[:status]
-		@item.save
+  def publish_build
+    @build_list.status = (params[:status].to_i == 0 ? BuildList::BUILD_PUBLISHED : BuildList::FAILED_PUBLISH)
+    @build_list.notified_at = Time.current
+    @build_list.save
 
-		@build_list.container_path = params[:container_path]
-		@build_list.notified_at = Time.current
-		@build_list.save
+    render :nothing => true, :status => 200
+  end
 
-		render :nothing => true, :status => 200
-	end
+  def status_build
+    @item = @build_list.items.find_by_name!(params[:package_name])
+    @item.status = params[:status]
+    @item.save
 
-	def pre_build
-		@build_list.status = BuildServer::BUILD_STARTED
-		@build_list.notified_at = Time.current
-		@build_list.save
+    @build_list.container_path = params[:container_path]
+    @build_list.notified_at = Time.current
+    @build_list.save
 
-		render :nothing => true, :status => 200
-	end
+    render :nothing => true, :status => 200
+  end
 
-	def post_build
-		@build_list.status = params[:status]
-		@build_list.container_path = params[:container_path]
-		@build_list.notified_at = Time.current
-		@build_list.save
+  def pre_build
+    @build_list.status = BuildServer::BUILD_STARTED
+    @build_list.notified_at = Time.current
+    @build_list.save
 
-		render :nothing => true, :status => 200
-	end
+    render :nothing => true, :status => 200
+  end
 
-	def circle_build
-		@build_list.is_circle = true
-		@build_list.container_path = params[:container_path]
-		@build_list.notified_at = Time.current
-		@build_list.save
+  def post_build
+    @build_list.status = params[:status]
+    @build_list.container_path = params[:container_path]
+    @build_list.notified_at = Time.current
+    @build_list.save
 
-		render :nothing => true, :status => 200
-	end
+    render :nothing => true, :status => 200
+  end
 
-	def new_bbdt
-		@build_list = BuildList.find_by_id!(params[:web_id])
-		@build_list.name = params[:name]
-		@build_list.additional_repos = ActiveSupport::JSON.decode(params[:additional_repos])
-		@build_list.set_items(ActiveSupport::JSON.decode(params[:items]))
-		@build_list.notified_at = Time.current
-		@build_list.is_circle = (params[:is_circular] != "0")
-		@build_list.bs_id = params[:id]
-		params[:arch]
-		@build_list.save
+  def circle_build
+    @build_list.is_circle = true
+    @build_list.container_path = params[:container_path]
+    @build_list.notified_at = Time.current
+    @build_list.save
 
-		render :nothing => true, :status => 200
-	end
+    render :nothing => true, :status => 200
+  end
 
-	protected
+  def new_bbdt
+    @build_list = BuildList.find_by_id!(params[:web_id])
+    @build_list.name = params[:name]
+    @build_list.additional_repos = ActiveSupport::JSON.decode(params[:additional_repos])
+    @build_list.set_items(ActiveSupport::JSON.decode(params[:items]))
+    @build_list.notified_at = Time.current
+    @build_list.is_circle = (params[:is_circular] != "0")
+    @build_list.bs_id = params[:id]
+    params[:arch]
+    @build_list.save
 
-	def find_project
-		@project = Project.find_by_id params[:project_id]
-	end
+    render :nothing => true, :status => 200
+  end
+
+  protected
+
+  def find_project
+    @project = Project.find_by_id params[:project_id]
+  end
 
   def find_build_list
     @build_list = BuildList.find(params[:id])
   end
 
-	def find_build_list_by_bs
-		@build_list = BuildList.find_by_bs_id!(params[:id])
-	end
+  def find_build_list_by_bs
+    @build_list = BuildList.find_by_bs_id!(params[:id])
+  end
 
   def authenticate_build_service!
     if request.remote_ip != APP_CONFIG['build_server_ip']
diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index 94522d13d..58f6e0da5 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -21,11 +21,15 @@ class BuildList < ActiveRecord::Base
   WAITING_FOR_RESPONSE = 4000
   BUILD_PENDING = 2000
   BUILD_PUBLISHED = 6000
+  BUILD_PUBLISH = 7000
+  FAILED_PUBLISH = 8000
 
   STATUSES = [  WAITING_FOR_RESPONSE,
                 BUILD_CANCELED,
                 BUILD_PENDING,
                 BUILD_PUBLISHED,
+                BUILD_PUBLISH,
+                FAILED_PUBLISH,
                 BuildServer::SUCCESS,
                 BuildServer::BUILD_STARTED,
                 BuildServer::BUILD_ERROR,
@@ -40,6 +44,8 @@ class BuildList < ActiveRecord::Base
                      BUILD_CANCELED => :build_canceled,
                      BUILD_PENDING => :build_pending,
                      BUILD_PUBLISHED => :build_published,
+                     BUILD_PUBLISH => :build_publish,
+                     FAILED_PUBLISH => :failed_publish,
                      BuildServer::BUILD_ERROR => :build_error,
                      BuildServer::BUILD_STARTED => :build_started,
                      BuildServer::SUCCESS => :success,
@@ -106,13 +112,13 @@ class BuildList < ActiveRecord::Base
 
   def publish
     has_published = BuildServer.publish_container bs_id
-    update_attribute(:status, BUILD_PUBLISHED) if has_published == 0
+    update_attribute(:status, BUILD_PUBLISH) if has_published == 0
 
     return has_published == 0
   end
   
   def can_publish?
-    self.status == BuildServer::SUCCESS
+    status == BuildServer::SUCCESS or status == FAILED_PUBLISH
   end
 
   def cancel
@@ -124,7 +130,7 @@ class BuildList < ActiveRecord::Base
 
   #TODO: Share this checking on product owner.
   def can_cancel?
-    self.status == BUILD_PENDING && bs_id
+    status == BUILD_PENDING && bs_id
   end
 
   def event_log_message
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2f0cb3bf4..6e3a6838f 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -294,7 +294,7 @@ ru:
       cancel_button: Отмена
       cancel_success: 'Сборка отменена.'
       cancel_fail: 'При отмене сборки произошла ошибка!'
-      publish_success: 'Сборка опубликована.'
+      publish_success: 'Сборка поставлена в очередь на публикацию.'
       publish_fail: 'При публикации сборки произошла ошибка!'
       
       build_server_status:
@@ -314,6 +314,8 @@ ru:
       statuses:
         build_error: ошибка сборки
         build_published: опубликован
+        build_publish: публикуется
+        failed_publish: ошибка публикации
         dependencies_fail: зависимости не найдены
         waiting_for_response: ожидает ответа
         build_pending: ожидает сборку
diff --git a/config/routes.rb b/config/routes.rb
index a5918b82f..2877c44b9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,6 +24,7 @@ Rosa::Application.routes.draw do
 
   match '/private/:platform_name/*file_path' => 'privates#show'
 
+  match 'build_lists/publish_build', :to => "build_lists#publish_build"
   match 'build_lists/status_build', :to => "build_lists#status_build"
   match 'build_lists/post_build', :to => "build_lists#post_build"
   match 'build_lists/pre_build', :to => "build_lists#pre_build"

From 96d458875e398351b80f43cf2c3efaddbe075937 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Thu, 22 Dec 2011 04:08:11 +0200
Subject: [PATCH 12/40] Remove publish validator. Add can_cancel/can_publish
 checking to cancel/publish methods. Refs #80

---
 app/models/build_list.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index 58f6e0da5..d28e0d293 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -12,9 +12,6 @@ class BuildList < ActiveRecord::Base
   validate lambda {  
     errors.add(:bpl, I18n.t('flash.build_list.wrong_platform')) if pl.platform_type == 'main' && pl_id != bpl_id
   }
-  validate lambda {
-    errors.add(:bpl, I18n.t('flash.build_list.can_not_published')) if status == BUILD_PUBLISHED && status_was != BuildServer::SUCCESS    
-  }
 
   # The kernel does not send these statuses directly
   BUILD_CANCELED = 5000
@@ -111,20 +108,20 @@ class BuildList < ActiveRecord::Base
   end
 
   def publish
+    return false unless can_publish?
     has_published = BuildServer.publish_container bs_id
     update_attribute(:status, BUILD_PUBLISH) if has_published == 0
-
     return has_published == 0
   end
-  
+
   def can_publish?
     status == BuildServer::SUCCESS or status == FAILED_PUBLISH
   end
 
   def cancel
+    return false unless can_cancel?
     has_canceled = BuildServer.delete_build_list bs_id
     update_attribute(:status, BUILD_CANCELED) if has_canceled == 0
-
     return has_canceled == 0
   end
 

From e2144e0fdb43b37c5262d88a66cd15b5c52b53ae Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Thu, 22 Dec 2011 11:41:37 +0400
Subject: [PATCH 13/40] [refs #54] Fix issue ability and comment redirect after
 update

---
 app/controllers/comments_controller.rb |  3 ++-
 app/controllers/issues_controller.rb   | 15 ++++++++-------
 app/models/ability.rb                  | 12 ++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e50844862..d6775451d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -31,7 +31,8 @@ class CommentsController < ApplicationController
   def update
     if @comment.update_attributes(params[:comment])
       flash[:notice] = I18n.t("flash.comment.saved")
-      redirect_to :back
+      #redirect_to :back
+      redirect_to show_issue_path(@comment.commentable.project, @comment.commentable.serial_id)
     else
       flash[:error] = I18n.t("flash.comment.saved_error")
       render :action => 'new'
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 140a5c15c..ea0cc3c55 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,17 +1,13 @@
 class IssuesController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_project, :except => [:destroy]
-  before_filter :find_issue_by_serial_id, :only => [:show, :edit]
+  before_filter :find_and_authorize_by_serial_id, :only => [:show, :edit]
+  before_filter :set_issue_stub, :only => [:new, :create]
 
   load_and_authorize_resource :except => [:show, :edit, :index]
-  authorize_resource :only => [:show, :edit]
-  #authorize_resource :through => :project, :only => [:index], :shallow => true
   authorize_resource :project, :only => [:index]
   autocomplete :user, :uname
 
-  def show
-  end
-
   def index
     @issues = @project.issues.paginate :per_page => 10, :page => params[:page]
   end
@@ -63,7 +59,12 @@ class IssuesController < ApplicationController
     @project = Project.find(params[:project_id])
   end
 
-  def find_issue_by_serial_id
+  def find_and_authorize_by_serial_id
     @issue = @project.issues.where(:serial_id => params[:serial_id])[0]
+    authorize! params[:action].to_sym, @issue
+  end
+
+  def set_issue_stub
+    @issue = Issue.new(:project => @project)
   end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index f3e67d84b..6af166beb 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -96,11 +96,13 @@ class Ability
           repository.platform.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
         end
 
-        can [:show, :index], Issue do |issue|
+        can [:read, :index], Issue do |issue|
+          puts "SHIT\n"*10
           issue.status == 'open'
         end
-        #can [:show, :index], Issue, with_project_id_in_relations_with(:object_type => 'User', :object_id => user.id) do |issue|
-        can [:show, :index], Issue do |issue|
+        #can [:read], Issue, :status => 'open'
+        #can [:show], Issue, with_project_id_in_relations_with(:object_type => 'User', :object_id => user.id)
+        can [:read, :index], Issue do |issue|
           issue.project.relations.exists?(:object_type => 'User', :object_id => user.id)
         end
         can [:create, :new], Issue do |issue|
@@ -118,7 +120,9 @@ class Ability
           comment.commentable.project.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
         end
         #
-        cannot [:index, :edit, :update, :create, :new, :show], Issue do |issue|
+        cannot [:index, :edit, :update, :create, :new, :read], Issue do |issue|
+          puts "FUCK\n"*10
+          puts !issue.project.has_issues
           !issue.project.has_issues
         end
         cannot [:edit, :update, :create, :new, :destroy], Comment do |comment|

From 8c3291d237c45f44d589da9cd5dffa03772ff9ea Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Fri, 23 Dec 2011 04:14:28 +0200
Subject: [PATCH 14/40] Fix and redo specs after great build_lists refactoring
 and improvement. Fix minor bugs. Code cleanup. Refs #65

---
 app/controllers/build_lists_controller.rb     |  2 +-
 app/views/build_lists/new.html.haml           |  4 +-
 .../build_lists_controller_spec.rb            | 57 +++++++++++++++++--
 spec/controllers/projects_controller_spec.rb  | 11 ----
 spec/factories/build_list_factory.rb          | 10 ++--
 spec/factories/platform_factory.rb            |  4 ++
 spec/models/cancan_spec.rb                    | 27 ++++++++-
 .../shared_examples/projects_controller.rb    | 10 ----
 8 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index cfb84498c..cbd847933 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -36,7 +36,7 @@ class BuildListsController < ApplicationController
 
   def create
     notices, errors = [], []
-    Arch.where(:id => params[:archs]).each do |arch|
+    Arch.where(:id => params[:arches]).each do |arch|
       Platform.main.where(:id => params[:bpls]).each do |bpl|
         @build_list = @project.build_lists.build(params[:build_list])
         @build_list.bpl = bpl; @build_list.arch = arch; @build_list.user = current_user
diff --git a/app/views/build_lists/new.html.haml b/app/views/build_lists/new.html.haml
index 88aa55c5d..622191b78 100644
--- a/app/views/build_lists/new.html.haml
+++ b/app/views/build_lists/new.html.haml
@@ -38,8 +38,8 @@
             .group
               = f.label :arches, t("activerecord.attributes.build_list.arch"), :class => :label
               - Arch.recent.each do |arch|
-                = check_box_tag "archs[]", arch.id, (params[:archs]||[]).include?(arch.id.to_s), :id => "archs_#{arch.id}"
-                = label_tag "archs_#{arch.id}", arch.name
+                = check_box_tag "arches[]", arch.id, (params[:arches]||[]).include?(arch.id.to_s), :id => "arches_#{arch.id}"
+                = label_tag "arches_#{arch.id}", arch.name
                 %br
 
             .group
diff --git a/spec/controllers/build_lists_controller_spec.rb b/spec/controllers/build_lists_controller_spec.rb
index 27b6b8174..d6d2172a7 100644
--- a/spec/controllers/build_lists_controller_spec.rb
+++ b/spec/controllers/build_lists_controller_spec.rb
@@ -25,8 +25,49 @@ describe BuildListsController do
       response.should redirect_to(forbidden_url)
     end
   end
+  
+  shared_examples_for 'create build list' do
+    it 'should be able to perform new action' do
+      get :new, :project_id => @project.id
+      response.should render_template(:new)
+    end
+
+    it 'should be able to perform create action' do
+      post :create, {:project_id => @project.id}.merge(@create_params)
+      response.should redirect_to(@project)
+    end
+  end
+
+  shared_examples_for 'not create build list' do
+    it 'should not be able to perform new action' do
+      get :new, :project_id => @project.id
+      response.should redirect_to(forbidden_url)
+    end
+
+    it 'should not be able to perform create action' do
+      post :create, {:project_id => @project.id}.merge(@create_params)
+      response.should redirect_to(forbidden_url)
+    end
+  end
 
   context 'crud' do
+    before(:each) do
+      stub_rsync_methods
+
+      platform = Factory(:platform_with_repos)
+      @create_params = {
+        :build_list => { 
+          :project_version => 'v1.0',
+          :pl_id => platform.id,
+          :update_type => 'security',
+          :include_repos => [platform.repositories.first.id]
+        },
+        :arches => [Factory(:arch).id],
+        :bpls => [platform.id]
+      }
+      any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+    end
+
     context 'for guest' do
       it 'should not be able to perform index action' do
         get :index
@@ -36,7 +77,6 @@ describe BuildListsController do
 
     context 'for user' do
       before(:each) do
-        stub_rsync_methods
         @build_list = Factory(:build_list_core)
         @project = @build_list.project
         @owner_user = @project.owner
@@ -47,7 +87,6 @@ describe BuildListsController do
         @user = Factory(:user)
         set_session_for(@user)
         @show_params = {:project_id => @project.id, :id => @build_list.id}
-
       end
   
       context 'for all build lists' do
@@ -76,15 +115,18 @@ describe BuildListsController do
 
       context 'for open project' do
         it_should_behave_like 'show build list'
+        it_should_behave_like 'not create build list'
 
         context 'if user is project owner' do
           before(:each) {set_session_for(@owner_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'create build list'
         end
 
         context 'if user is project member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'not create build list'
         end
       end
 
@@ -95,23 +137,24 @@ describe BuildListsController do
         end
 
         it_should_behave_like 'not show build list'
+        it_should_behave_like 'not create build list'
 
         context 'if user is project owner' do
           before(:each) {set_session_for(@owner_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'create build list'
         end
 
         context 'if user is project member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'not create build list'
         end
       end
-
     end
 
     context 'for group' do
       before(:each) do
-        stub_rsync_methods
         @owner_group = Factory(:group)
         @owner_user = Factory(:user)
         @owner_group.objects.create :role => 'reader', :object_id => @owner_user.id, :object_type => 'User'
@@ -158,15 +201,18 @@ describe BuildListsController do
 
       context 'for open project' do
         it_should_behave_like 'show build list'
+        it_should_behave_like 'not create build list'
 
         context 'if user is group owner' do
           before(:each) {set_session_for(@owner_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'create build list'
         end
 
         context 'if user is group member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'not create build list'
         end
       end
 
@@ -177,15 +223,18 @@ describe BuildListsController do
         end
 
         it_should_behave_like 'not show build list'
+        it_should_behave_like 'not create build list'
 
         context 'if user is group owner' do
           before(:each) {set_session_for(@owner_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'create build list'
         end
 
         context 'if user is group member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
+          it_should_behave_like 'not create build list'
         end
       end
 
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index ebf0ab6ac..c17c09954 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -8,17 +8,6 @@ describe ProjectsController do
     @another_user = Factory(:user)
     @create_params = {:project => {:name => 'pro'}}
     @update_params = {:project => {:name => 'pro2'}}
-
-    platform = Factory(:platform)
-    @process_build_params = {:build => {
-      :arches => {Factory(:arch).id => '1'}, 
-      :project_version => 'v1.0',
-      :bpl => {platform.id => '1'},
-      :pl => platform.id,
-      :update_type => 'security'
-    }}
-
-    any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
 	end
 
 	context 'for guest' do
diff --git a/spec/factories/build_list_factory.rb b/spec/factories/build_list_factory.rb
index a4e1aa39a..10c4fc3b5 100644
--- a/spec/factories/build_list_factory.rb
+++ b/spec/factories/build_list_factory.rb
@@ -1,11 +1,13 @@
 Factory.define(:build_list) do |p|
-  p.association :project, :factory => :project
-  p.association :pl, :factory => :platform
-  p.association :arch, :factory => :arch
-  p.bpl { |bl| bl.pl }
+  p.association :user
+  p.association :project
+  p.association :pl, :factory => :platform_with_repos
+  p.association :arch
+  p.bpl {|bl| bl.pl}
   p.project_version "1.0"
   p.build_requires true
   p.update_type 'security'
+  p.include_repos {|bl| bl.pl.repositories.map(&:id)}
 end
 
 Factory.define(:build_list_core, :parent => :build_list) do |p|
diff --git a/spec/factories/platform_factory.rb b/spec/factories/platform_factory.rb
index 9fab7a443..1c1f3307a 100644
--- a/spec/factories/platform_factory.rb
+++ b/spec/factories/platform_factory.rb
@@ -5,3 +5,7 @@ Factory.define(:platform) do |p|
   p.distrib_type APP_CONFIG['distr_types'].first
   p.association :owner, :factory => :user
 end
+
+Factory.define(:platform_with_repos, :parent => :platform) do |p|
+  p.repositories {|r| [r.association(:repository)]}
+end
\ No newline at end of file
diff --git a/spec/models/cancan_spec.rb b/spec/models/cancan_spec.rb
index 97362bb66..8875ef1f5 100644
--- a/spec/models/cancan_spec.rb
+++ b/spec/models/cancan_spec.rb
@@ -139,11 +139,18 @@ describe CanCan do
           @project.relations.create!(:object_id => @user.id, :object_type => 'User', :role => 'writer')
         end
 
-        [:read, :update, :process_build, :build].each do |action|
+        [:read, :update].each do |action|
           it "should be able to #{ action } project" do
             @ability.should be_able_to(action, @project)
           end
         end
+
+        [:new, :create].each do |action|
+          it "should be able to #{action} build_list" do
+            @build_list = Factory(:build_list, :project => @project)
+            @ability.should be_able_to(action, @build_list)
+          end
+        end
       end
 
       context 'with admin rights' do
@@ -151,12 +158,19 @@ describe CanCan do
           @project.relations.create!(:object_id => @user.id, :object_type => 'User', :role => 'admin')
         end
 
-        [:read, :update, :process_build, :build].each do |action|
+        [:read, :update].each do |action|
           it "should be able to #{ action } project" do
             @ability.should be_able_to(action, @project)
           end
         end
 
+        [:new, :create].each do |action|
+          it "should be able to #{action} build_list" do
+            @build_list = Factory(:build_list, :project => @project)
+            @ability.should be_able_to(action, @build_list)
+          end
+        end
+
         it "should be able to manage collaborators of project" do
           @ability.should be_able_to(:manage_collaborators, @project)
         end
@@ -167,11 +181,18 @@ describe CanCan do
           @project.update_attribute(:owner, @user)
         end
 
-        [:read, :update, :process_build, :build, :destroy].each do |action|
+        [:read, :update, :destroy].each do |action|
           it "should be able to #{ action } project" do
             @ability.should be_able_to(action, @project)
           end
         end
+
+        [:new, :create].each do |action|
+          it "should be able to #{action} build_list" do
+            @build_list = Factory(:build_list, :project => @project)
+            @ability.should be_able_to(action, @build_list)
+          end
+        end
       end
 
     end
diff --git a/spec/support/shared_examples/projects_controller.rb b/spec/support/shared_examples/projects_controller.rb
index 7aa4baa01..37cd28b28 100644
--- a/spec/support/shared_examples/projects_controller.rb
+++ b/spec/support/shared_examples/projects_controller.rb
@@ -12,16 +12,6 @@ shared_examples_for 'projects user with writer rights' do
     put :update, {:id => @project.id}.merge(@update_params)
     response.should redirect_to(project_path(@project))
   end
-
-  it 'should be able to perform build action' do
-    get :build, :id => @project.id
-    response.should render_template(:build)
-  end
-
-  it 'should be able to perform process_build action' do
-    post :process_build, {:id => @project.id}.merge(@process_build_params)
-    response.should redirect_to(project_path(@project))
-  end
 end
 
 shared_examples_for 'user with rights to view projects' do

From 894bc0c077d0395e594aeddcdf785653bbc2b0ba Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Fri, 23 Dec 2011 14:56:46 +0400
Subject: [PATCH 15/40] [refs #54] Add issues tests. Fix some CanCan rights.
 Make some fixes to logic

---
 app/controllers/comments_controller.rb     |   2 +-
 app/controllers/issues_controller.rb       |   4 +-
 app/models/ability.rb                      |   5 +-
 db/schema.rb                               |  11 +-
 spec/controllers/issues_controller_spec.rb | 191 ++++++++++++++++++++-
 spec/factories/issues.rb                   |  12 +-
 spec/models/cancan_spec.rb                 |  32 +++-
 7 files changed, 234 insertions(+), 23 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d6775451d..93baf3b77 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -2,7 +2,7 @@ class CommentsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :set_commentable, :only => [:index, :edit, :create]
   before_filter :find_project, :only => [:index]
-  before_filter :find_comment, :only => [:show, :edit, :update, :destroy]
+  before_filter :find_comment, :only => [:edit, :update, :destroy]
 
   authorize_resource :only => [:show, :edit, :update, :destroy]
   authorize_resource :project, :only => [:index]
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ea0cc3c55..85cd9f291 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -34,8 +34,8 @@ class IssuesController < ApplicationController
   end
 
   def update
-    @user_id = params[:user_id]
-    @user_uname = params[:user_uname]
+    @user_id = params[:user_id].blank? ? @issue.user_id : params[:user_id]
+    @user_uname = params[:user_uname].blank? ? @issue.user.uname : params[:user_uname]
 
     if @issue.update_attributes( params[:issue].merge({:user_id => @user_id}) )
       flash[:notice] = I18n.t("flash.issue.saved")
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 6af166beb..ca4b2ffc7 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -97,7 +97,6 @@ class Ability
         end
 
         can [:read, :index], Issue do |issue|
-          puts "SHIT\n"*10
           issue.status == 'open'
         end
         #can [:read], Issue, :status => 'open'
@@ -120,9 +119,7 @@ class Ability
           comment.commentable.project.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
         end
         #
-        cannot [:index, :edit, :update, :create, :new, :read], Issue do |issue|
-          puts "FUCK\n"*10
-          puts !issue.project.has_issues
+        cannot [:index, :edit, :update, :create, :new, :read, :show], Issue do |issue|
           !issue.project.has_issues
         end
         cannot [:edit, :update, :create, :new, :destroy], Comment do |comment|
diff --git a/db/schema.rb b/db/schema.rb
index 5acde5031..794ab6874 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -243,6 +243,7 @@ ActiveRecord::Schema.define(:version => 20111219073859) do
     t.string   "object_type"
     t.integer  "target_id"
     t.string   "target_type"
+    t.integer  "role_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "role"
@@ -271,16 +272,16 @@ ActiveRecord::Schema.define(:version => 20111219073859) do
 
   create_table "users", :force => true do |t|
     t.string   "name"
-    t.string   "email",                               :default => "", :null => false
-    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
-    t.string   "password_salt",                       :default => "", :null => false
+    t.string   "email",                                 :default => "", :null => false
+    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
     t.string   "reset_password_token"
-    t.string   "remember_token"
+    t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "ssh_key"
     t.string   "uname"
+    t.text     "ssh_key"
+    t.integer  "role_id"
     t.string   "role"
   end
 
diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb
index c27154bda..2d9ba9a46 100644
--- a/spec/controllers/issues_controller_spec.rb
+++ b/spec/controllers/issues_controller_spec.rb
@@ -1,5 +1,194 @@
 require 'spec_helper'
 
-describe IssuesController do
+shared_examples_for 'issue user with project reader rights' do
+  #it_should_behave_like 'user with rights to view issues'
+  it 'should be able to perform index action' do
+    get :index, :project_id => @project.id
+    response.should render_template(:index)
+  end
 
+  it 'should be able to perform show action' do
+    get :show, :project_id => @project.id, :serial_id => @issue.serial_id
+    response.should render_template(:show)
+  end
+end
+
+shared_examples_for 'issue user with project writer rights' do
+  it 'should be able to perform create action' do
+    post :create, @create_params
+    response.should redirect_to(project_issues_path(@project))
+  end
+
+  it 'should create issue object into db' do
+    lambda{ post :create, @create_params }.should change{ Issue.count }.by(1)
+  end
+end
+
+shared_examples_for 'user with issue update rights' do
+  it 'should be able to perform update action' do
+    put :update, {:id => @issue.id}.merge(@update_params)
+    response.should redirect_to(show_issue_path(@project, @issue.serial_id))
+  end
+
+  it 'should update issue title' do
+    put :update, {:id => @issue.id}.merge(@update_params)
+    @issue.reload.title.should == 'issue2'
+  end
+end
+
+shared_examples_for 'user without issue update rights' do
+  it 'should not be able to perform update action' do
+    put :update, {:id => @issue.id}.merge(@update_params)
+    response.should redirect_to(forbidden_path)
+  end
+
+  it 'should not update issue title' do
+    put :update, {:id => @issue.id}.merge(@update_params)
+    @issue.reload.title.should_not == 'issue2'
+  end
+end
+
+shared_examples_for 'user without issue destroy rights' do
+  it 'should not be able to perform destroy action' do
+    delete :destroy, :id => @issue.id, :project_id => @project.id
+    response.should redirect_to(forbidden_path)
+  end
+
+  it 'should not reduce issues count' do
+    lambda{ delete :destroy, :id => @issue.id, :project_id => @project.id }.should change{ Issue.count }.by(0)
+  end
+end
+
+shared_examples_for 'project with issues turned off' do
+  pending 'should not be able to perform index action' do
+    get :index, :project_id => @project_with_turned_off_issues.id
+    #response.should redirect_to(forbidden_path)
+    response.should render_template(:index)
+  end
+
+  it 'should not be able to perform show action' do
+    get :show, :project_id => @project_with_turned_off_issues.id, :serial_id => @turned_of_issue.serial_id
+    response.should redirect_to(forbidden_path)
+  end
+end
+
+describe IssuesController do
+  before(:each) do
+    stub_rsync_methods
+
+    @project = Factory(:project)
+    @issue_user = Factory(:user)
+    @create_params = {:project => {:name => 'pro'}}
+    @update_params = {:project => {:name => 'pro2'}}
+
+    any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+
+    @issue = Factory(:issue, :project_id => @project.id, :user_id => @issue_user.id)
+    @create_params = {
+      :project_id => @project.id,
+      :issue => {
+        :title => "issue1",
+        :body => "issue body",
+        :project_id => @project.id
+      },
+      :user_id => @issue_user.id,
+      :user_uname => @issue_user.uname
+    }
+    @update_params = {
+      :project_id => @project.id,
+      :issue => {
+        :title => "issue2"
+      }
+    }
+
+    @project_with_turned_off_issues = Factory(:project, :has_issues => false)
+    @turned_of_issue = Factory(:issue, :project_id => @project_with_turned_off_issues.id, :user_id => @issue_user.id)
+  end
+
+  context 'for global admin user' do
+    before(:each) do
+      @admin = Factory(:admin)
+      set_session_for(@admin)
+    end
+
+    it_should_behave_like 'user without issue destroy rights'
+  end
+
+  context 'for project admin user' do
+    before(:each) do
+      #@admin = Factory(:admin)
+      #set_session_for(@admin)
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+    end
+
+    it_should_behave_like 'issue user with project reader rights'
+    it_should_behave_like 'issue user with project writer rights'
+    it_should_behave_like 'user with issue update rights'
+    it_should_behave_like 'user without issue destroy rights'
+    it_should_behave_like 'project with issues turned off'
+  end
+
+  context 'for project owner user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.update_attribute(:owner, @user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+    end
+
+    it_should_behave_like 'issue user with project reader rights'
+    it_should_behave_like 'issue user with project writer rights'
+    it_should_behave_like 'user with issue update rights'
+    it_should_behave_like 'user without issue destroy rights'
+    it_should_behave_like 'project with issues turned off'
+  end
+
+  context 'for project reader user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'reader')
+    end
+
+    it_should_behave_like 'issue user with project reader rights'
+    it_should_behave_like 'user without issue update rights'
+    it_should_behave_like 'user without issue destroy rights'
+    it_should_behave_like 'project with issues turned off'
+
+    it 'should not be able to perform create action' do
+      post :create, @create_params
+      response.should redirect_to(forbidden_path)
+    end
+
+    it 'should not create issue object into db' do
+      lambda{ post :create, @create_params }.should change{ Issue.count }.by(0)
+    end
+  end
+
+  context 'for project writer user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'writer')
+    end
+
+    it_should_behave_like 'issue user with project reader rights'
+    it_should_behave_like 'issue user with project writer rights'
+    it_should_behave_like 'user without issue update rights'
+    it_should_behave_like 'user without issue destroy rights'
+    it_should_behave_like 'project with issues turned off'
+  end
+
+  context 'for issue assign user' do
+    before(:each) do
+      set_session_for(@issue_user)
+      #@project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'writer')
+    end
+
+    it_should_behave_like 'user with issue update rights'
+    it_should_behave_like 'user without issue destroy rights'
+    it_should_behave_like 'project with issues turned off'
+  end
 end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 5e4c566b7..8b8017dbc 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,6 +1,6 @@
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :issue do
-    end
-end
\ No newline at end of file
+Factory.define(:issue) do |p|
+  p.title { Factory.next(:string) }
+  p.body { Factory.next(:string) }
+  p.association :user, :factory => :user
+  p.status "open"
+end
diff --git a/spec/models/cancan_spec.rb b/spec/models/cancan_spec.rb
index 97362bb66..cae0291ca 100644
--- a/spec/models/cancan_spec.rb
+++ b/spec/models/cancan_spec.rb
@@ -118,6 +118,7 @@ describe CanCan do
     context 'as project collaborator' do
       before(:each) do
         @project = Factory(:project)
+        @issue = Factory(:issue, :project_id => @project.id)
       end
 
       context 'with read rights' do
@@ -128,13 +129,17 @@ describe CanCan do
         it 'should be able to read project' do
           @ability.should be_able_to(:read, @project)
         end
-        
-        it 'should be able to read project' do
+
+        it 'should be able to read open platform' do
           @ability.should be_able_to(:read, open_platform)
         end
+
+        it 'should be able to read issue' do
+          @ability.should be_able_to(:read, @issue)
+        end
       end
-      
-      context 'with write rights' do
+
+      context 'with writer rights' do
         before(:each) do
           @project.relations.create!(:object_id => @user.id, :object_type => 'User', :role => 'writer')
         end
@@ -144,6 +149,12 @@ describe CanCan do
             @ability.should be_able_to(action, @project)
           end
         end
+
+        [:read, :create, :new].each do |action|
+          it "should be able to #{ action } project" do
+            @ability.should be_able_to(action, @project)
+          end
+        end
       end
 
       context 'with admin rights' do
@@ -160,11 +171,18 @@ describe CanCan do
         it "should be able to manage collaborators of project" do
           @ability.should be_able_to(:manage_collaborators, @project)
         end
+
+        [:read, :create, :new, :update, :edit].each do |action|
+          it "should be able to #{ action } issue" do
+            @ability.should be_able_to(action, @issue)
+          end
+        end
       end
 
       context 'with owner rights' do
         before(:each) do
           @project.update_attribute(:owner, @user)
+          @issue.project.reload
         end
 
         [:read, :update, :process_build, :build, :destroy].each do |action|
@@ -172,6 +190,12 @@ describe CanCan do
             @ability.should be_able_to(action, @project)
           end
         end
+
+        [:read, :update, :edit].each do |action|
+          it "should be able to #{ action } issue" do
+            @ability.should be_able_to(action, @issue)
+          end
+        end
       end
 
     end

From bf2f3d1bc7bc0db5039a86cd4ca48c81b5758111 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Fri, 23 Dec 2011 18:34:32 +0400
Subject: [PATCH 16/40] [refs #54] Add issue statuses filters

---
 app/controllers/issues_controller.rb | 10 +++++++++-
 app/views/issues/_list.html.haml     |  2 +-
 app/views/issues/index.html.haml     | 10 +++++++++-
 config/locales/ru.yml                |  4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 85cd9f291..a6a4cb734 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -9,7 +9,15 @@ class IssuesController < ApplicationController
   autocomplete :user, :uname
 
   def index
-    @issues = @project.issues.paginate :per_page => 10, :page => params[:page]
+    @issues = Issue.scoped
+    @issues = @project.issues
+    case params[:status]
+    when 'open'
+      @issues = @issues.where(:status => 'open')
+    when 'closed'
+      @issues = @issues.where(:status => 'closed')
+    end
+    @issues = @issues.paginate :per_page => 10, :page => params[:page]
   end
 
   def create
diff --git a/app/views/issues/_list.html.haml b/app/views/issues/_list.html.haml
index 9e27261bb..dfb083664 100644
--- a/app/views/issues/_list.html.haml
+++ b/app/views/issues/_list.html.haml
@@ -3,7 +3,7 @@
     %th.first= t("activerecord.attributes.issue.title")
     %th.first= t("activerecord.attributes.issue.status")
     %th.last &nbsp;
-  - @project.issues.each do |issue|
+  - @issues.each do |issue|
     %tr{:class => cycle("odd", "even")}
       %td
         = link_to issue.title, show_issue_path(@project, issue.serial_id)
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index aa3323b70..ea6a25a13 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -3,12 +3,20 @@
     %ul.wat-cf
       %li.first.active= link_to t("layout.issues.list"), project_issues_path(@project)
       %li= link_to t("layout.issues.new"), new_project_issue_path(@project) if can? :new, Issue.new(:project_id => @project.id)
+  .secondary-navigation
+    %ul.wat-cf
+      %li{:class => "first " + (params[:status].blank? ? "active" : "")}
+        = link_to t("layout.issues.statuses.any"), project_issues_path(@project)
+      %li{:class => "first " + (params[:status] == 'open' ? "active" : "")}
+        = link_to t("layout.issues.statuses.open"), project_issues_path(@project, :status => 'open')
+      %li{:class => "first " + (params[:status] == 'closed' ? "active" : "")}
+        = link_to t("layout.issues.statuses.closed"), project_issues_path(@project, :status => 'closed')
   .content
     %h2.title
       = t("layout.issues.list_header")
     .inner
       = render :partial => 'shared/search_form'
-      = render :partial => 'issues/list', :object => @issues
+      = render :partial => 'issues/list'
       .actions-bar.wat-cf
         .actions
           = will_paginate @issues, :param_name => :issue_page
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index cf6d82a55..506eac2f8 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -102,6 +102,10 @@ ru:
       list_header: Список
       confirm_delete: Вы уверены, что хотите удалить эту задачу?
       new_header: Новая задача
+      statuses:
+        open: Открытые
+        closed: Закрытые
+        any: Все
 
     comments:
       confirm_delete: Вы уверены, что хотите удалить комментарий?

From 7d8d77a38633c7a209b67442c985d8d270a9a691 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Fri, 23 Dec 2011 21:06:47 +0400
Subject: [PATCH 17/40] [issue #79] Added validation to ProjectToRepository

---
 app/models/project_to_repository.rb       | 10 ++++++++++
 spec/models/project_to_repository_spec.rb | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/models/project_to_repository.rb b/app/models/project_to_repository.rb
index 68148f89c..a5a623123 100644
--- a/app/models/project_to_repository.rb
+++ b/app/models/project_to_repository.rb
@@ -7,4 +7,14 @@ class ProjectToRepository < ActiveRecord::Base
   after_create lambda { project.xml_rpc_create(repository) }, :unless => lambda {Thread.current[:skip]}
   after_destroy lambda { project.xml_rpc_destroy(repository) }
   # after_rollback lambda { project.xml_rpc_destroy(repository) rescue true if new_record? }
+
+  validate :one_project_in_platform_repositories
+
+  protected
+
+  def one_project_in_platform_repositories
+    c = Platform.scoped.select('projects.*').joins(:repositories => :projects).where(
+      :projects => {:name => project.name}, :id => repository.platform_id).count
+    errors.add(:project, 'should be one in platform') if c > 0
+  end
 end
diff --git a/spec/models/project_to_repository_spec.rb b/spec/models/project_to_repository_spec.rb
index f908dee57..7a67a65e5 100644
--- a/spec/models/project_to_repository_spec.rb
+++ b/spec/models/project_to_repository_spec.rb
@@ -1,5 +1,21 @@
 require 'spec_helper'
 
 describe ProjectToRepository do
-  pending "add some examples to (or delete) #{__FILE__}"
+ # pending "add some examples to (or delete) #{__FILE__}"
+  before(:each) do
+    stub_rsync_methods
+    @platform = Factory(:platform)
+    @first_repo = Factory(:repository, :platform_id => @platform.id)
+    @second_repo = Factory(:repository, :platform_id => @platform.id)
+    @project = Factory(:project)
+    @first_repo.projects << @project
+    @first_repo.save
+  end
+
+  it 'should not add the same project in different repositories of same platform' do
+#    puts Platform.scoped.select('projects.*').joins(:repositories => :projects).where(:id => @platform.id)inspect
+    
+    p2r = @second_repo.project_to_repositories.build :project_id => @project.id
+    p2r.should_not be_valid
+  end
 end

From 3b300f2ca4c36df39023ee87cd1e53ad6b265400 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Fri, 23 Dec 2011 21:17:02 +0400
Subject: [PATCH 18/40] [issue #79] Removed comments

---
 spec/models/project_to_repository_spec.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/models/project_to_repository_spec.rb b/spec/models/project_to_repository_spec.rb
index 7a67a65e5..c27de0b5f 100644
--- a/spec/models/project_to_repository_spec.rb
+++ b/spec/models/project_to_repository_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe ProjectToRepository do
- # pending "add some examples to (or delete) #{__FILE__}"
   before(:each) do
     stub_rsync_methods
     @platform = Factory(:platform)
@@ -13,8 +12,6 @@ describe ProjectToRepository do
   end
 
   it 'should not add the same project in different repositories of same platform' do
-#    puts Platform.scoped.select('projects.*').joins(:repositories => :projects).where(:id => @platform.id)inspect
-    
     p2r = @second_repo.project_to_repositories.build :project_id => @project.id
     p2r.should_not be_valid
   end

From 0e5b39985e1293659b4c4742c83e7a6c6e8f93df Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Fri, 23 Dec 2011 20:47:13 +0200
Subject: [PATCH 19/40] Clarify tests. Write autostart docs. Refs #65, #53

---
 doc/README_FOR_APP                              | 16 ++++++++++++++--
 spec/controllers/build_lists_controller_spec.rb |  8 ++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
index fbcff3042..bbed67ad7 100644
--- a/doc/README_FOR_APP
+++ b/doc/README_FOR_APP
@@ -1,8 +1,20 @@
 === Basic bootstrap
+
 * rake db:drop db:setup
+
 ==
 
 === Setup autostart
-Add to /etc/rc.d/rc.local following /srv/rosa_build/current/bin/autostart.sh
-==
 
+Add to /etc/rc.d/rc.local
+
+  /srv/rosa_build/current/bin/autostart.sh
+
+Add to /etc/rc.d/rc.sysinit
+
+  # force run rc.local
+  if [ -f /etc/rc.local ]; then
+  . /etc/rc.local
+  fi
+
+==
diff --git a/spec/controllers/build_lists_controller_spec.rb b/spec/controllers/build_lists_controller_spec.rb
index d6d2172a7..c05d24e50 100644
--- a/spec/controllers/build_lists_controller_spec.rb
+++ b/spec/controllers/build_lists_controller_spec.rb
@@ -123,7 +123,7 @@ describe BuildListsController do
           it_should_behave_like 'create build list'
         end
 
-        context 'if user is project member' do
+        context 'if user is project read member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
           it_should_behave_like 'not create build list'
@@ -145,7 +145,7 @@ describe BuildListsController do
           it_should_behave_like 'create build list'
         end
 
-        context 'if user is project member' do
+        context 'if user is project read member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
           it_should_behave_like 'not create build list'
@@ -209,7 +209,7 @@ describe BuildListsController do
           it_should_behave_like 'create build list'
         end
 
-        context 'if user is group member' do
+        context 'if user is group read member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
           it_should_behave_like 'not create build list'
@@ -231,7 +231,7 @@ describe BuildListsController do
           it_should_behave_like 'create build list'
         end
 
-        context 'if user is group member' do
+        context 'if user is group read member' do
           before(:each) {set_session_for(@member_user)}
           it_should_behave_like 'show build list'
           it_should_behave_like 'not create build list'

From ce6746f7a9317fed56cec1979e3adb95bf3fd5a4 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Mon, 26 Dec 2011 19:48:57 +0400
Subject: [PATCH 20/40] [refs #54] Add subscribes and notifications

---
 app/controllers/subscribes_controller.rb      | 31 +++++++++++++++
 app/helpers/subscribes_helper.rb              |  2 +
 app/mailers/user_mailer.rb                    | 26 ++++++++++++-
 app/models/comment.rb                         | 16 ++++++++
 app/models/issue.rb                           | 39 +++++++++++++++++++
 app/models/relation.rb                        |  1 +
 app/models/subscribe.rb                       |  4 ++
 app/views/issues/show.html.haml               |  8 ++++
 .../issue_assign_notification.haml            |  7 ++++
 .../user_mailer/new_comment_notification.haml |  7 ++++
 .../user_mailer/new_issue_notification.haml   |  7 ++++
 config/locales/ru.yml                         |  9 +++++
 config/routes.rb                              |  3 ++
 .../20111226141947_create_subscribes.rb       | 14 +++++++
 db/schema.rb                                  | 21 ++++++----
 .../controllers/subscribes_controller_spec.rb |  5 +++
 spec/factories/subscribes.rb                  |  6 +++
 spec/helpers/subscribes_helper_spec.rb        | 15 +++++++
 spec/models/subscribe_spec.rb                 |  5 +++
 19 files changed, 218 insertions(+), 8 deletions(-)
 create mode 100644 app/controllers/subscribes_controller.rb
 create mode 100644 app/helpers/subscribes_helper.rb
 create mode 100644 app/models/subscribe.rb
 create mode 100644 app/views/user_mailer/issue_assign_notification.haml
 create mode 100644 app/views/user_mailer/new_comment_notification.haml
 create mode 100644 app/views/user_mailer/new_issue_notification.haml
 create mode 100644 db/migrate/20111226141947_create_subscribes.rb
 create mode 100644 spec/controllers/subscribes_controller_spec.rb
 create mode 100644 spec/factories/subscribes.rb
 create mode 100644 spec/helpers/subscribes_helper_spec.rb
 create mode 100644 spec/models/subscribe_spec.rb

diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb
new file mode 100644
index 000000000..4bb51be46
--- /dev/null
+++ b/app/controllers/subscribes_controller.rb
@@ -0,0 +1,31 @@
+class SubscribesController < ApplicationController
+  def create
+    @subscribe = @subscribeable.subscribes.build(:user_id => current_user.id)
+    if @subscribe.save
+      flash[:notice] = I18n.t("flash.subscribe.saved")
+      redirect_to :back
+    else
+      flash[:error] = I18n.t("flash.subscribe.saved_error")
+      redirect_to :back
+    end
+  end
+
+  def destroy
+    @subscribe = Subscribe.find(params[:id])
+    @subscribe.destroy
+
+    flash[:notice] = t("flash.subscribe.destroyed")
+    redirect_to :back
+  end
+
+  private
+
+  def find_subscribeable
+    params.each do |name, value|
+      if name =~ /(.+)_id$/
+        return $1.classify.constantize.find(value)
+      end
+    end
+    nil
+  end
+end
diff --git a/app/helpers/subscribes_helper.rb b/app/helpers/subscribes_helper.rb
new file mode 100644
index 000000000..dc1b490ec
--- /dev/null
+++ b/app/helpers/subscribes_helper.rb
@@ -0,0 +1,2 @@
+module SubscribesHelper
+end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 3137b0dff..2c43482e1 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -5,7 +5,31 @@ class UserMailer < ActionMailer::Base
 
   def new_user_notification(user)
     @user = user
-    mail(:to => user.email, :subject => "Регистрация на проекте «#{APP_CONFIG['project_name']}»") do |format|
+    mail(:to => user.email, :subject => I18n.t("notifications.subjects.new_user_notification", :project_name => APP_CONFIG['project_name'])) do |format|
+      format.html
+    end
+  end
+
+  def new_comment_notification(comment, user)
+    @user = user
+    @comment = comment
+    mail(:to => user.email, :subject => I18n.t("notifications.subjects.new_comment_notification")) do |format|
+      format.html
+    end
+  end
+
+  def new_issue_notification(issue, user)
+    @user = user
+    @issue = issue
+    mail(:to => user.email, :subject => I18n.t("notifications.subjects.new_issue_notification")) do |format|
+      format.html
+    end
+  end
+
+  def issue_assign_notification(issue, user)
+    @user = user
+    @issue = issue
+    mail(:to => user.email, :subject => I18n.t("notifications.subjects.issue_assign_notification")) do |format|
       format.html
     end
   end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 4c15a8b66..36e14c412 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -3,4 +3,20 @@ class Comment < ActiveRecord::Base
   belongs_to :user
 
   validates :body, :user_id, :commentable_id, :commentable_type, :presence => true
+
+  after_create :deliver_new_comment_notification
+
+  protected
+
+  def deliver_new_comment_notification
+    #UserMailer.new_comment_notification(self, self.commentable.user).deliver
+    #UserMailer.new_comment_notification(self, self.commentable.project.owner).deliver
+    recipients = self.commentable.project.relations.by_role('admin').where(:object_type => 'User').map { |rel| rel.read_attribute(:object_id) }
+    recipients = recipients | [self.commentable.user_id]
+    recipients = recipients | [self.commentable.project.owner_id] if self.commentable.project.owner_type == 'User'
+    recipients.each do |recipient_id|
+      recipient = User.find(recipient_id)
+      UserMailer.new_comment_notification(self, recipient).deliver
+    end
+  end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index ad6f57468..586175b89 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -5,12 +5,17 @@ class Issue < ActiveRecord::Base
   belongs_to :user
 
   has_many :comments, :as => :commentable
+  has_many :subscribes, :as => :subscribeable
 
   validates :title, :body, :project_id, :user_id, :presence => true
 
   #attr_readonly :serial_id
 
   after_create :set_serial_id
+  after_create :subscribe_users
+  after_create :deliver_new_issue_notification
+  after_create :deliver_issue_assign_notification
+  after_update :deliver_issue_assign_notification
 
   protected
 
@@ -18,4 +23,38 @@ class Issue < ActiveRecord::Base
     self.serial_id = self.project.issues.count
     self.save!
   end
+
+  def deliver_new_issue_notification
+    #UserMailer.new_issue_notification(self, self.project.owner).deliver
+    #self.project.relations.by_role('admin').each do |rel|
+    #  admin = User.find(rel.object_id)
+    #  UserMailer.new_issue_notification(self, admin).deliver
+    #end
+
+    recipients = collect_recipient_ids
+    recipients.each do |recipient_id|
+      recipient = User.find(recipient_id)
+      UserMailer.new_issue_notification(self, recipient).deliver
+    end
+  end
+
+  def deliver_issue_assign_notification
+    UserMailer.issue_assign_notification(self, self.user).deliver if self.user_id_was != self.user_id
+  end
+
+  def subscribe_users
+    recipients = collect_recipient_ids
+    recipients.each do |recipient_id|
+      ss = self.subscribes.build(:user_id => recipient_id)
+      ss.save!
+    end
+  end
+
+  def collect_recipient_ids
+    recipients = self.project.relations.by_role('admin').where(:object_type => 'User').map { |rel| rel.read_attribute(:object_id) }
+    recipients = recipients | [self.user_id]
+    recipients = recipients | [self.project.owner_id] if self.project.owner_type == 'User'
+    recipients
+  end
+
 end
diff --git a/app/models/relation.rb b/app/models/relation.rb
index 822687dca..a08ddf6a9 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -10,6 +10,7 @@ class Relation < ActiveRecord::Base
 
   scope :by_object, lambda {|obj| {:conditions => ['object_id = ? AND object_type = ?', obj.id, obj.class.to_s]}}
   scope :by_target, lambda {|tar| {:conditions => ['target_id = ? AND target_type = ?', tar.id, tar.class.to_s]}}
+  scope :by_role, lambda {|role| {:conditions => ['role = ?', role]}}
 
   def self.create_with_role(object, target, role)
     r = new
diff --git a/app/models/subscribe.rb b/app/models/subscribe.rb
new file mode 100644
index 000000000..0c3a52698
--- /dev/null
+++ b/app/models/subscribe.rb
@@ -0,0 +1,4 @@
+class Subscribe < ActiveRecord::Base
+  belongs_to :subscribeable, :polymorphic => true
+  belongs_to :user
+end
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 51c080e4a..69c2be747 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -20,6 +20,14 @@
           = t('activerecord.attributes.issue.status')
           \:
         = @issue.status
+      %p
+        %b
+          = t('layout.issues.subscribe')
+          \:
+        - if @issue.subscribes.exists? :user_id => current_user.id
+          = link_to t('layout.issues.unsubscribe_btn'), unsubscribe_issue(@issue), :method => :post
+        - else
+          = link_to t('layout.issues.subscribe_btn'), subscribe_issue(@issue), :method => :delete
 
 %a{ :name => "comments" }
 .block
diff --git a/app/views/user_mailer/issue_assign_notification.haml b/app/views/user_mailer/issue_assign_notification.haml
new file mode 100644
index 000000000..72e99e7df
--- /dev/null
+++ b/app/views/user_mailer/issue_assign_notification.haml
@@ -0,0 +1,7 @@
+%p== Здравствуйте, #{@user.name}.
+
+
+%p Вам была назначена задача #{ link_to @issue.title, show_issue_path(@issue.project, @issue.serial_id) }
+
+
+%p== Команда поддержки «ROSA Build System»
diff --git a/app/views/user_mailer/new_comment_notification.haml b/app/views/user_mailer/new_comment_notification.haml
new file mode 100644
index 000000000..0e57ff415
--- /dev/null
+++ b/app/views/user_mailer/new_comment_notification.haml
@@ -0,0 +1,7 @@
+%p== Здравствуйте, #{@user.name}.
+
+
+%p К задаче #{ link_to @comment.commentable.title, show_issue_path(@comment.commentable.project, @comment.commentable.serial_id) } был добавлен новый комментарий.
+
+
+%p== Команда поддержки «ROSA Build System»
diff --git a/app/views/user_mailer/new_issue_notification.haml b/app/views/user_mailer/new_issue_notification.haml
new file mode 100644
index 000000000..e98f32f45
--- /dev/null
+++ b/app/views/user_mailer/new_issue_notification.haml
@@ -0,0 +1,7 @@
+%p== Здравствуйте, #{@user.name}.
+
+
+%p К проекту #{ link_to @issue.project.name, project_path(@issue.project) } была добавлена задача #{ link_to @issue.title, show_issue_path(@issue.project, @issue.serial_id) }
+
+
+%p== Команда поддержки «ROSA Build System»
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 97eea839c..563ffdea7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -106,6 +106,9 @@ ru:
         open: Открытые
         closed: Закрытые
         any: Все
+      subscribe: Подписка на уведомления
+      subscribe_btn: Подписаться
+      unsubscribe_btn: Отписаться
 
     comments:
       confirm_delete: Вы уверены, что хотите удалить комментарий?
@@ -653,3 +656,9 @@ ru:
         distro: Дистрибутив
         platform: Архитектура
         counter: Закачки
+  notifications:
+    subjects:
+      new_comment_notification: Новый комментарий к Вашей задаче
+      new_issue_notification: Новая задача добавлена к проекту
+      new_user_notification: Регистрация на проекте «%{ project_name }»
+      issue_assign_notification: Вам назначили задачу
diff --git a/config/routes.rb b/config/routes.rb
index 4a0227e63..e71991c55 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,6 +78,9 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
+  match "issues/:issue_id/subscribe" => 'subscribes#create', :as => :subscribe_issue, :via => :post
+  match "issues/:issue_id/unsubscribe" => 'subscribes#destroy', :as => :unsubscribe_issue, :via => :delete
+
   match "projects/:project_id/issues/:serial_id" => 'issues#show', :serial_id => /\d+/, :as => :show_issue, :via => :get
   match "projects/:project_id/issues/:serial_id/edit" => 'issues#edit', :serial_id => /\d+/, :as => :edit_issue, :via => :get
   resources :projects do
diff --git a/db/migrate/20111226141947_create_subscribes.rb b/db/migrate/20111226141947_create_subscribes.rb
new file mode 100644
index 000000000..631e09f09
--- /dev/null
+++ b/db/migrate/20111226141947_create_subscribes.rb
@@ -0,0 +1,14 @@
+class CreateSubscribes < ActiveRecord::Migration
+  def self.up
+    create_table :subscribes do |t|
+      t.integer :subscribeable_id
+      t.string :subscribeable_type
+      t.integer :user_id
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :subscribes
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 55f94564c..1aece65f1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111221194422) do
+ActiveRecord::Schema.define(:version => 20111226141947) do
 
   create_table "arches", :force => true do |t|
     t.string   "name",       :null => false
@@ -245,7 +245,6 @@ ActiveRecord::Schema.define(:version => 20111221194422) do
     t.string   "object_type"
     t.integer  "target_id"
     t.string   "target_type"
-    t.integer  "role_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "role"
@@ -272,18 +271,26 @@ ActiveRecord::Schema.define(:version => 20111221194422) do
   add_index "rpms", ["project_id", "arch_id"], :name => "index_rpms_on_project_id_and_arch_id"
   add_index "rpms", ["project_id"], :name => "index_rpms_on_project_id"
 
+  create_table "subscribes", :force => true do |t|
+    t.integer  "subscribeable_id"
+    t.string   "subscribeable_type"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "users", :force => true do |t|
     t.string   "name"
-    t.string   "email",                                 :default => "", :null => false
-    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.string   "email",                               :default => "", :null => false
+    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
+    t.string   "password_salt",                       :default => "", :null => false
     t.string   "reset_password_token"
-    t.datetime "reset_password_sent_at"
+    t.string   "remember_token"
     t.datetime "remember_created_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "uname"
     t.text     "ssh_key"
-    t.integer  "role_id"
+    t.string   "uname"
     t.string   "role"
   end
 
diff --git a/spec/controllers/subscribes_controller_spec.rb b/spec/controllers/subscribes_controller_spec.rb
new file mode 100644
index 000000000..e1c466cb3
--- /dev/null
+++ b/spec/controllers/subscribes_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe SubscribesController do
+
+end
diff --git a/spec/factories/subscribes.rb b/spec/factories/subscribes.rb
new file mode 100644
index 000000000..f0644816f
--- /dev/null
+++ b/spec/factories/subscribes.rb
@@ -0,0 +1,6 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :subscribe do
+    end
+end
\ No newline at end of file
diff --git a/spec/helpers/subscribes_helper_spec.rb b/spec/helpers/subscribes_helper_spec.rb
new file mode 100644
index 000000000..c72869cf9
--- /dev/null
+++ b/spec/helpers/subscribes_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the SubscribesHelper. For example:
+#
+# describe SubscribesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe SubscribesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/subscribe_spec.rb b/spec/models/subscribe_spec.rb
new file mode 100644
index 000000000..0df4fbb42
--- /dev/null
+++ b/spec/models/subscribe_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Subscribe do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 8face9208ed4c4dcc8b87fe8dc501f3e7da2ac93 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Tue, 27 Dec 2011 16:35:31 +0400
Subject: [PATCH 21/40] [refs #54] Add fixes and locales to subscribes

---
 app/controllers/subscribes_controller.rb | 16 +++++++++++-----
 app/views/issues/show.html.haml          |  4 ++--
 config/locales/ru.yml                    |  4 ++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb
index 4bb51be46..98efb5ccb 100644
--- a/app/controllers/subscribes_controller.rb
+++ b/app/controllers/subscribes_controller.rb
@@ -1,4 +1,8 @@
 class SubscribesController < ApplicationController
+  before_filter :authenticate_user!
+  before_filter :set_instances
+  before_filter :set_subscribeable
+
   def create
     @subscribe = @subscribeable.subscribes.build(:user_id => current_user.id)
     if @subscribe.save
@@ -11,8 +15,7 @@ class SubscribesController < ApplicationController
   end
 
   def destroy
-    @subscribe = Subscribe.find(params[:id])
-    @subscribe.destroy
+    @subscribeable.subscribes.where(:user_id => current_user.id)[0].destroy
 
     flash[:notice] = t("flash.subscribe.destroyed")
     redirect_to :back
@@ -20,12 +23,15 @@ class SubscribesController < ApplicationController
 
   private
 
-  def find_subscribeable
+  def set_instances
     params.each do |name, value|
       if name =~ /(.+)_id$/
-        return $1.classify.constantize.find(value)
+        instance_variable_set "@"+$1, $1.classify.constantize.find(value)
       end
     end
-    nil
+  end
+
+  def set_subscribeable
+    @subscribeable = @issue if @issue
   end
 end
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 69c2be747..943ea1a0a 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -25,9 +25,9 @@
           = t('layout.issues.subscribe')
           \:
         - if @issue.subscribes.exists? :user_id => current_user.id
-          = link_to t('layout.issues.unsubscribe_btn'), unsubscribe_issue(@issue), :method => :post
+          = link_to t('layout.issues.unsubscribe_btn'), unsubscribe_issue_path(@issue), :method => :delete
         - else
-          = link_to t('layout.issues.subscribe_btn'), subscribe_issue(@issue), :method => :delete
+          = link_to t('layout.issues.subscribe_btn'), subscribe_issue_path(@issue), :method => :post§
 
 %a{ :name => "comments" }
 .block
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 563ffdea7..20dd0c45d 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -352,6 +352,10 @@ ru:
         project_version_not_found: версия не найден
 
   flash:
+    subscribe:
+      saved: Вы подписаны на оповещения для этой задачи
+      destroyed: Подписка на оповещения для этой задачи убрана
+
     exception_message: У Вас нет доступа к этой странице!
 
     downloads:

From d3ba83135ee10393b26ed816bac0d3dd271e3cf1 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Tue, 27 Dec 2011 17:18:25 +0400
Subject: [PATCH 22/40] [refs #54] Add some locales and interface fixes for
 issues

---
 app/views/comments/_form.html.haml | 2 +-
 app/views/issues/_form.html.haml   | 9 +++++----
 app/views/issues/_list.html.haml   | 3 +++
 config/locales/ru.yml              | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/views/comments/_form.html.haml b/app/views/comments/_form.html.haml
index ccca4cc1d..2b046013d 100644
--- a/app/views/comments/_form.html.haml
+++ b/app/views/comments/_form.html.haml
@@ -1,5 +1,5 @@
 .group
-  = f.label :body, :class => :label
+  = f.label :body, t("activerecord.attributes.comment.body"), :class => :label
   = f.text_area :body, :class => 'text_field', :cols => 80
 
 .group.navform.wat-cf
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index bb1bc72ed..985ff7913 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -8,12 +8,13 @@
   = f.label :body, :class => :label
   = f.text_area :body, :class => 'text_field', :cols => 80
 
-.group
-  = f.label :status, :class => :label
-  = f.select :status, Issue::STATUSES, :class => 'text_field'
+- unless @issue.new_record?
+  .group
+    = f.label :status, :class => :label
+    = f.select :status, Issue::STATUSES, :class => 'text_field'
 
 .group
-  = label_tag "", t("layout.issues.user_id"), :class => :label
+  = label_tag "", t("activerecord.attributes.issue.user_id"), :class => :label
   = autocomplete_field_tag 'user_id', @user_uname, autocomplete_user_uname_platforms_path, :id_element => '#user_id_field'
   = hidden_field_tag 'user_id', @user_id, :id => 'user_id_field'
   
diff --git a/app/views/issues/_list.html.haml b/app/views/issues/_list.html.haml
index dfb083664..41ec58acc 100644
--- a/app/views/issues/_list.html.haml
+++ b/app/views/issues/_list.html.haml
@@ -1,12 +1,15 @@
 %table.table
   %tr
     %th.first= t("activerecord.attributes.issue.title")
+    %th.first= t("activerecord.attributes.issue.user")
     %th.first= t("activerecord.attributes.issue.status")
     %th.last &nbsp;
   - @issues.each do |issue|
     %tr{:class => cycle("odd", "even")}
       %td
         = link_to issue.title, show_issue_path(@project, issue.serial_id)
+      %td
+        = link_to issue.user.uname, user_path(issue.user)
       %td
         = issue.status
       %td.last
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 20dd0c45d..242514ab5 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -101,6 +101,7 @@ ru:
       new: Новая задача
       list_header: Список
       confirm_delete: Вы уверены, что хотите удалить эту задачу?
+      edit_header: Редактирование задачи
       new_header: Новая задача
       statuses:
         open: Открытые
@@ -497,7 +498,8 @@ ru:
       issue:
         title: Заголовок
         body: Содержание
-        user: Назначено
+        user: Назначена
+        user_id: Назначена
         project: Проект
         status: Статус
 

From b48ffecc2807346b99c120b295dbfa16c9d18934 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Tue, 27 Dec 2011 17:52:48 +0400
Subject: [PATCH 23/40] [refs #54] Add new styles to comments list to issue
 page

---
 app/views/issues/show.html.haml          | 21 ++++++++-------------
 app/views/layouts/_stylesheets.html.haml |  2 +-
 public/stylesheets/patches.css           |  4 ++++
 3 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 public/stylesheets/patches.css

diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 943ea1a0a..8b52735a2 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -30,25 +30,20 @@
           = link_to t('layout.issues.subscribe_btn'), subscribe_issue_path(@issue), :method => :post§
 
 %a{ :name => "comments" }
-.block
-  .secondary-navigation
-    %ul.wat-cf
+.block#block-lists
   .content
     %h2.title
       = t("layout.issues.comments_header")
     .inner
-      %table.table
-        %tr
-          %th.first= t("activerecord.attributes.user.uname")
-          %th.first= t("activerecord.attributes.comment.body")
-          %th.last &nbsp;
+      %ul.list
         - @issue.comments.each do |comment|
-          %tr{:class => cycle("odd", "even")}
-            %td
-              = comment.user.uname
-            %td
+          %li
+            .left
+              = link_to comment.user.uname, user_path(comment.user.uname)
+            .item
               = comment.body
-            %td.last
+              %br
+              %br
               = link_to t("layout.edit"), edit_project_issue_comment_path(@project, @issue, comment) if can? :update, comment
               = link_to image_tag("web-app-theme/icons/cross.png", :alt => t("layout.delete")) + " " + t("layout.delete"), project_issue_comment_path(@project, @issue, comment), :method => "delete", :class => "button", :confirm => t("layout.comments.confirm_delete") if can? :delete, comment
 
diff --git a/app/views/layouts/_stylesheets.html.haml b/app/views/layouts/_stylesheets.html.haml
index b2e58f3b8..e8c95cca9 100644
--- a/app/views/layouts/_stylesheets.html.haml
+++ b/app/views/layouts/_stylesheets.html.haml
@@ -1,6 +1,6 @@
 -#= include_stylesheets :application
 
 = stylesheet_link_tag "web-app-theme/base.css", "web-app-theme/themes/default/style.css", "web-app-theme/override.css", "git/style.css"
-= stylesheet_link_tag "jquery-ui-1.8.16.custom.css"
+= stylesheet_link_tag "jquery-ui-1.8.16.custom.css", "patches.css"
 
 = yield :stylesheets
diff --git a/public/stylesheets/patches.css b/public/stylesheets/patches.css
new file mode 100644
index 000000000..d6a3f9473
--- /dev/null
+++ b/public/stylesheets/patches.css
@@ -0,0 +1,4 @@
+ul.list li .item {
+  margin-left: 180px;
+}
+

From ecbfed930054d232008fee4317f7f551f0d77686 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Tue, 27 Dec 2011 21:49:08 +0400
Subject: [PATCH 24/40] [refs #54] Fix user_id validation into issues

---
 app/controllers/issues_controller.rb | 2 +-
 app/models/issue.rb                  | 8 ++++++--
 app/views/issues/_list.html.haml     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a6a4cb734..031ca5ff4 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -27,7 +27,7 @@ class IssuesController < ApplicationController
     @issue = Issue.new(params[:issue])
     @issue.user_id = @user_id
     @issue.project_id = @project.id
-    if @issue.save!
+    if @issue.save
       flash[:notice] = I18n.t("flash.issue.saved")
       redirect_to project_issues_path(@project)
     else
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 586175b89..78b41a8b0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -7,7 +7,7 @@ class Issue < ActiveRecord::Base
   has_many :comments, :as => :commentable
   has_many :subscribes, :as => :subscribeable
 
-  validates :title, :body, :project_id, :user_id, :presence => true
+  validates :title, :body, :project_id, :presence => true
 
   #attr_readonly :serial_id
 
@@ -17,6 +17,10 @@ class Issue < ActiveRecord::Base
   after_create :deliver_issue_assign_notification
   after_update :deliver_issue_assign_notification
 
+  def assign_uname
+    user.uname if user
+  end
+
   protected
 
   def set_serial_id
@@ -52,7 +56,7 @@ class Issue < ActiveRecord::Base
 
   def collect_recipient_ids
     recipients = self.project.relations.by_role('admin').where(:object_type => 'User').map { |rel| rel.read_attribute(:object_id) }
-    recipients = recipients | [self.user_id]
+    recipients = recipients | [self.user_id] if self.user_id
     recipients = recipients | [self.project.owner_id] if self.project.owner_type == 'User'
     recipients
   end
diff --git a/app/views/issues/_list.html.haml b/app/views/issues/_list.html.haml
index 41ec58acc..7415a221e 100644
--- a/app/views/issues/_list.html.haml
+++ b/app/views/issues/_list.html.haml
@@ -9,7 +9,7 @@
       %td
         = link_to issue.title, show_issue_path(@project, issue.serial_id)
       %td
-        = link_to issue.user.uname, user_path(issue.user)
+        = link_to issue.user.uname, user_path(issue.user) if issue.user
       %td
         = issue.status
       %td.last

From 5e3addd5d2dbbdc91470170d685c442205019af7 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 28 Dec 2011 04:57:42 +0200
Subject: [PATCH 25/40] Great refactor for cancan abilities. Remove product
 relations. Fix git abilities. Fix and refactor specs. Refs #85. Refactor
 issues controller to avoid serial_id problem. Fix links and routes. Fix minor
 bugs and translations. Fix specs. Refs #54

---
 app/controllers/build_lists_controller.rb     |   2 +-
 app/controllers/comments_controller.rb        |   6 +-
 app/controllers/issues_controller.rb          |  32 +-
 app/controllers/platforms_controller.rb       |   4 +-
 app/models/ability.rb                         | 273 ++++++------------
 app/models/issue.rb                           |   4 +
 app/models/product.rb                         |  25 +-
 app/views/comments/_form.html.haml            |   2 +-
 app/views/issues/_list.html.haml              |   4 +-
 app/views/issues/show.html.haml               |   2 +-
 config/locales/ru.yml                         |   9 +-
 config/routes.rb                              |   4 +-
 lib/grack/base.rb                             |   2 +-
 .../build_lists_controller_spec.rb            |  10 +-
 spec/controllers/issues_controller_spec.rb    |  18 +-
 spec/controllers/products_controller_spec.rb  |   3 +-
 spec/controllers/projects_controller_spec.rb  |   5 +-
 spec/models/cancan_spec.rb                    |  43 +--
 .../shared_examples/projects_controller.rb    |   2 +-
 19 files changed, 176 insertions(+), 274 deletions(-)

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index cbd847933..44b1773f1 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -9,7 +9,7 @@ class BuildListsController < ApplicationController
   before_filter :find_build_list_by_bs, :only => [:publish_build, :status_build, :pre_build, :post_build]
 
   load_and_authorize_resource :project, :only => NESTED_ACTIONS
-  load_and_authorize_resource :through => :project, :only => NESTED_ACTIONS, :shallow => true
+  load_and_authorize_resource :build_list, :through => :project, :only => NESTED_ACTIONS, :shallow => true
   load_and_authorize_resource :except => CALLBACK_ACTIONS.concat(NESTED_ACTIONS)
 
   def index
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 93baf3b77..e20aa3af1 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -18,7 +18,7 @@ class CommentsController < ApplicationController
       flash[:notice] = I18n.t("flash.comment.saved")
       redirect_to :back
     else
-      flash[:error] = I18n.t("flash.comment.saved_error")
+      flash[:error] = I18n.t("flash.comment.save_error")
       render :action => 'new'
     end
   end
@@ -32,9 +32,9 @@ class CommentsController < ApplicationController
     if @comment.update_attributes(params[:comment])
       flash[:notice] = I18n.t("flash.comment.saved")
       #redirect_to :back
-      redirect_to show_issue_path(@comment.commentable.project, @comment.commentable.serial_id)
+      redirect_to [@comment.commentable.project, @comment.commentable]
     else
-      flash[:error] = I18n.t("flash.comment.saved_error")
+      flash[:error] = I18n.t("flash.comment.save_error")
       render :action => 'new'
     end
   end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a6a4cb734..3f1a6f4ec 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,15 +1,14 @@
 class IssuesController < ApplicationController
   before_filter :authenticate_user!
-  before_filter :find_project, :except => [:destroy]
-  before_filter :find_and_authorize_by_serial_id, :only => [:show, :edit]
-  before_filter :set_issue_stub, :only => [:new, :create]
+  before_filter :find_project
+  before_filter :find_issue_by_serial_id, :only => [:show, :edit, :update, :destroy]
+
+  load_and_authorize_resource :project
+  load_and_authorize_resource :issue, :through => :project, :find_by => :serial_id
 
-  load_and_authorize_resource :except => [:show, :edit, :index]
-  authorize_resource :project, :only => [:index]
   autocomplete :user, :uname
 
   def index
-    @issues = Issue.scoped
     @issues = @project.issues
     case params[:status]
     when 'open'
@@ -20,6 +19,10 @@ class IssuesController < ApplicationController
     @issues = @issues.paginate :per_page => 10, :page => params[:page]
   end
 
+  def new
+    @issue = Issue.new(:project => @project)
+  end
+
   def create
     @user_id = params[:user_id]
     @user_uname = params[:user_uname]
@@ -27,11 +30,11 @@ class IssuesController < ApplicationController
     @issue = Issue.new(params[:issue])
     @issue.user_id = @user_id
     @issue.project_id = @project.id
-    if @issue.save!
+    if @issue.save
       flash[:notice] = I18n.t("flash.issue.saved")
       redirect_to project_issues_path(@project)
     else
-      flash[:error] = I18n.t("flash.issue.saved_error")
+      flash[:error] = I18n.t("flash.issue.save_error")
       render :action => :new
     end
   end
@@ -47,9 +50,9 @@ class IssuesController < ApplicationController
 
     if @issue.update_attributes( params[:issue].merge({:user_id => @user_id}) )
       flash[:notice] = I18n.t("flash.issue.saved")
-      redirect_to show_issue_path(@project, @issue.serial_id)
+      redirect_to [@project, @issue]
     else
-      flash[:error] = I18n.t("flash.issue.saved_error")
+      flash[:error] = I18n.t("flash.issue.save_error")
       render :action => :new
     end
   end
@@ -67,12 +70,7 @@ class IssuesController < ApplicationController
     @project = Project.find(params[:project_id])
   end
 
-  def find_and_authorize_by_serial_id
-    @issue = @project.issues.where(:serial_id => params[:serial_id])[0]
-    authorize! params[:action].to_sym, @issue
-  end
-
-  def set_issue_stub
-    @issue = Issue.new(:project => @project)
+  def find_issue_by_serial_id
+    @issue = @project.issues.find_by_serial_id!(params[:id])
   end
 end
diff --git a/app/controllers/platforms_controller.rb b/app/controllers/platforms_controller.rb
index 3aed37c95..3ce47f9a7 100644
--- a/app/controllers/platforms_controller.rb
+++ b/app/controllers/platforms_controller.rb
@@ -64,7 +64,7 @@ class PlatformsController < ApplicationController
       flash[:notice] = I18n.t("flash.platform.saved")
       redirect_to @platform
     else
-      flash[:error] = I18n.t("flash.platform.saved_error")
+      flash[:error] = I18n.t("flash.platform.save_error")
       render :action => :new
     end
   end
@@ -81,7 +81,7 @@ class PlatformsController < ApplicationController
       flash[:notice] = I18n.t("flash.platform.saved")
       redirect_to @platform
     else
-      flash[:error] = I18n.t("flash.platform.saved_error")
+      flash[:error] = I18n.t("flash.platform.save_error")
       render :action => :new
     end
   end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index dfd6f105d..9a601f37e 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,178 +1,95 @@
+# If rules goes one by one CanCan joins them by 'OR' sql operator
+# If rule has multiple conditions CanCan joins them by 'AND' sql operator
+# WARNING:      
+# - put cannot rules _after_ can rules and not before!
+# - beware inner joins. Use sub queries against them! 
+
 class Ability
   include CanCan::Ability
 
   def initialize(user)
     user ||= User.new # guest user (not logged in)
+    @user = user
 
     if user.admin?
       can :manage, :all
     else
-      #WARNING:
-      # - put cannot rules _after_ can rules and not before!
-      # - beware inner joins. Use sub queries against them! 
       # Shared rights between guests and registered users
       can :forbidden, Platform
 
-      can :read, [Repository, Platform], :visibility => 'open'
       # TODO remove because auth callbacks skipped
       can :auto_build, Project
-      can [:status_build, :pre_build, :post_build, :circle_build, :new_bbdt], BuildList
+      can [:publish_build, :status_build, :pre_build, :post_build, :circle_build, :new_bbdt], BuildList
 
-      # Guest rights
-      if user.guest?
+      if user.guest? # Guest rights
         can :create, User
-      # Registered user rights
-      else
-        can [:read, :platforms], Category
+      else # Registered user rights
+        can [:show, :autocomplete_user_uname], User
+
+        can [:read, :create], Group
+        can [:update, :manage_members], Group do |group|
+          group.objects.exists?(:object_type => 'User', :object_id => user.id, :role => 'admin') # or group.owner_id = user.id
+        end
+        can :destroy, Group, :owner_id => user.id
+
+        can :create, Project
+        can :read, Project, :visibility => 'open'
+        can :read, Project, :owner_type => 'User', :owner_id => user.id
+        can :read, Project, :owner_type => 'Group', :owner_id => user.group_ids
+        can(:read, Project, read_relations_for('projects')) {|project| local_reader? project}
+        can(:write, Project) {|project| local_writer? project} # for grack
+        can([:update, :manage_collaborators], Project) {|project| local_admin? project}
+        can(:fork, Project) {|project| can? :read, project}
+        can(:destroy, Project) {|project| owner? project}
 
         can :create, AutoBuildList
         can [:index, :destroy], AutoBuildList, :project_id => user.own_project_ids
-        # If rules goes one by one CanCan joins them by 'OR' sql operator
-        can :read, Project, :visibility => 'open'
-        can :read, Group
-        can :read, User
-        cannot :index, User
-        can :manage_collaborators, Project do |project|
-          project.relations.exists? :object_id => user.id, :object_type => 'User', :role => 'admin'
-        end
-        can :manage_members, Group do |group|
-          group.objects.exists? :object_id => user.id, :object_type => 'User', :role => 'admin'
-        end
 
-        # Put here model names which objects can user create
-        can :create, Project
-        can :create, Group
-        can :publish, BuildList do |build_list|
-          build_list.can_publish? && build_list.project.relations.exists?(:object_type => 'User', :object_id => user.id)
-        end
-        can [:index, :read], BuildList, ["build_lists.project_id IN (SELECT id FROM projects WHERE visibility = ?)", 'open'] do |build_list|
-          build_list.project.public?
-        end
-        can [:index, :read], BuildList, build_lists_in_relations_with(:object_type => 'User', :object_id => user.id) do |build_list|
-          build_list.project.relations.exists?(:object_type => 'User', :object_id => user.id)
-        end
+        can :read, BuildList, :project => {:visibility => 'open'}
+        can :read, BuildList, :project => {:owner_type => 'User', :owner_id => user.id}
+        can :read, BuildList, :project => {:owner_type => 'Group', :owner_id => user.group_ids}
+        can(:read, BuildList, read_relations_for('build_lists', 'projects')) {|build_list| can? :read, build_list.project}
+        can(:create, BuildList) {|build_list| can? :write, build_list.project}
+        can(:publish, BuildList) {|build_list| build_list.can_publish? && can?(:write, build_list.project)}
+
+        can :read, Platform, :visibility => 'open'
+        can :read, Platform, :owner_type => 'User', :owner_id => user.id
+        can :read, Platform, :owner_type => 'Group', :owner_id => user.group_ids
+        can(:read, Platform, read_relations_for('platforms')) {|platform| local_reader? platform}
+        can(:update, Platform) {|platform| local_admin? platform}
+        can([:freeze, :unfreeze, :destroy], Platform) {|platform| owner? platform}
+        can :autocomplete_user_uname, Platform
+
+        # TODO delegate to platform?
+        can :read, Repository, :visibility => 'open'
+        can :read, Repository, :owner_type => 'User', :owner_id => user.id
+        can :read, Repository, :owner_type => 'Group', :owner_id => user.group_ids
+        can(:read, Repository, read_relations_for('repositories')) {|repository| local_reader? repository}
+        can(:create, Repository) {|repository| local_admin? repository.platform}
+        can([:update, :add_project, :remove_project], Repository) {|repository| local_admin? repository}
+        can([:change_visibility, :settings, :destroy], Repository) {|repository| owner? repository}
+
+        can :read, Product, :platform => {:owner_type => 'User', :owner_id => user.id}
+        can :read, Product, :platform => {:owner_type => 'Group', :owner_id => user.group_ids}
+        can(:manage, Product, read_relations_for('products', 'platforms')) {|product| local_admin? product.platform}
+
+        can [:read, :platforms], Category
 
         can [:read, :create], PrivateUser, :platform => {:owner_type => 'User', :owner_id => user.id}
-
-        # If rule has multiple conditions CanCan joins them by 'AND' sql operator
-        can [:read, :update, :destroy], Project, :owner_type => 'User', :owner_id => user.id
-        #can :read, Project, :relations => {:role => 'reader'}
-        can :read, Project, projects_in_relations_with(:role => 'reader', :object_type => 'User', :object_id => user.id) do |project|
-          #The can? and cannot? call cannot be used with a raw sql 'can' definition.
-          project.relations.exists?(:role => 'reader', :object_type => 'User', :object_id => user.id)
-        end
-        #can [:update], Project, :relations => {:role => 'writer'}
-        can [:read, :update], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)  do |project|
-          project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)
-        end
-
-        can [:read, :update, :destroy], Product, products_in_relations_with(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)  do |product|
-          product.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-        # Small CanCan hack by Product.new(:platform_id => ...)
-        can [:new, :create], Product do |product|
-          product.platform.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-
-        can [:read, :update], Group, groups_in_relations_with(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id) do |group|
-          group.objects.exists?(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)
-        end
-
-        can :manage, Platform, :owner_type => 'User', :owner_id => user.id
-        can :manage, Platform, platforms_in_relations_with(:role => 'admin', :object_type => 'User', :object_id => user.id) do |platform|
-          platform.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-        #can :read, Platform, :members => {:id => user.id}
-        can :read, Platform, platforms_in_relations_with(:role => 'reader', :object_type => 'User', :object_id => user.id) do |platform|
-          platform.relations.exists?(:role => 'reader', :object_type => 'User', :object_id => user.id)
-        end
-
-        can [:manage, :add_project, :remove_project, :change_visibility, :settings], Repository, :owner_type => 'User', :owner_id => user.id
-        can :manage, Repository, repositories_in_relations_with(:role => 'admin', :object_type => 'User', :object_id => user.id) do |repository|
-          repository.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-        #can :read, Repository, :members => {:id => user.id}
-        can :read, Repository, repositories_in_relations_with(:role => 'reader', :object_type => 'User', :object_id => user.id) do |repository|
-          repository.relations.exists?(:role => 'reader', :object_type => 'User', :object_id => user.id)
-        end
-        # Small CanCan hack by Repository.new(:platform_id => ...)
-        can [:new, :create], Repository do |repository|
-          repository.platform.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-
-        can [:read, :index], Issue do |issue|
-          issue.status == 'open'
-        end
-        #can [:read], Issue, :status => 'open'
-        #can [:show], Issue, with_project_id_in_relations_with(:object_type => 'User', :object_id => user.id)
-        can [:read, :index], Issue do |issue|
-          issue.project.relations.exists?(:object_type => 'User', :object_id => user.id)
-        end
-        can [:create, :new], Issue do |issue|
-          issue.project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'User', :object_id => user.id)
-        end
-        can [:edit, :update], Issue do |issue|
-          issue.user_id == user.id || (user.id == issue.project.owner_id && issue.project.owner_type == 'User') ||
-          issue.project.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-        can [:create, :new], Comment do |comment|
-          comment.commentable.project.relations.exists?(:object_type => 'User', :object_id => user.id)
-        end
-        can [:edit, :update], Comment do |comment|
-          comment.user_id == user.id || (user.id == comment.commentable.project.owner_id && comment.commentable.project.owner_type == 'User') ||
-          comment.commentable.project.relations.exists?(:role => 'admin', :object_type => 'User', :object_id => user.id)
-        end
-        #
-        cannot [:index, :edit, :update, :create, :new, :read, :show], Issue do |issue|
-          !issue.project.has_issues
-        end
-        cannot [:edit, :update, :create, :new, :destroy], Comment do |comment|
-          !comment.commentable.project.has_issues
-        end
-
-        #can :read, Repository
-        # TODO: Add personal repos rules
-
-        # Same rights for groups:
         can [:read, :create], PrivateUser, :platform => {:owner_type => 'Group', :owner_id => user.group_ids}
-        can :publish, BuildList do |build_list|
-          build_list.can_publish? && build_list.project.relations.exists?(:object_type => 'Group', :object_id => user.group_ids)
-        end
-        can [:index, :read], BuildList, build_lists_in_relations_with(:object_type => 'Group', :object_id => user.group_ids) do |build_list|
-          build_list.project.relations.exists?(:object_type => 'Group', :object_id => user.group_ids)
-        end
 
-        can :manage_collaborators, Project, projects_in_relations_with(:role => 'admin', :object_type => 'Group', :object_id => user.group_ids) do |project|
-          project.relations.exists? :object_id => user.group_ids, :object_type => 'Group', :role => 'admin'
-        end
+        # can :read, Issue, :status => 'open'
+        can :read, Issue, :project => {:visibility => 'open'}
+        can :read, Issue, :project => {:owner_type => 'User', :owner_id => user.id}
+        can :read, Issue, :project => {:owner_type => 'Group', :owner_id => user.group_ids}
+        can(:read, Issue, read_relations_for('issues', 'projects')) {|issue| can? :read, issue.project rescue nil}
+        can(:create, Issue) {|issue| can? :write, issue.project}
+        can([:update, :destroy], Issue) {|issue| issue.user_id == user.id or local_admin?(issue.project)}
+        cannot :manage, Issue, :project => {:has_issues => false} # switch off issues
 
-        can [:read, :update, :destroy], Project, :owner_type => 'Group', :owner_id => user.group_ids
-        #can :read, Project, :relations => {:role => 'reader', :object_type => 'Group', :object_id => user.group_ids}
-        can :read, Project, projects_in_relations_with(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids) do |project|
-          project.relations.exists?(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids)
-        end
-        #can [:update], Project, :relations => {:role => 'writer', :object_type => 'Group', :object_id => user.group_ids}
-        can [:read, :update], Project, projects_in_relations_with(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids) do |project|
-          project.relations.exists?(:role => ['writer', 'admin'], :object_type => 'Group', :object_id => user.group_ids)
-        end
-
-        can :manage, Platform, :owner_type => 'Group', :owner_id => user.group_ids
-        #can :read, Platform, :groups => {:id => user.group_ids}
-        can :read, Platform, platforms_in_relations_with(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids) do |platform|
-          platform.relations.exists?(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids)
-        end
-
-        can [:manage, :add_project, :remove_project], Repository, :owner_type => 'Group', :owner_id => user.group_ids
-        #can :read, Platform, :groups => {:id => user.group_ids}
-        can :read, Repository, repositories_in_relations_with(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids) do |repository|
-          repository.relations.exists?(:role => 'reader', :object_type => 'Group', :object_id => user.group_ids)
-        end
-
-        can(:fork, Project) {|p| can? :read, p}
-        can(:create, BuildList) {|bl| can? :update, bl.project}
-
-        # Things that can not do simple user
-        cannot :create, [Platform, User]
+        can(:create, Comment) {|comment| can? :read, comment.commentable.project}
+        can(:update, Comment) {|comment| can? :update, comment.user_id == user.id or local_admin?(comment.commentable.project)}
+        cannot :manage, Comment, :commentable => {:project => {:has_issues => false}} # switch off issues
       end
     end
 
@@ -183,42 +100,34 @@ class Ability
     cannot :destroy, Issue
   end
 
-  # Sub query for platforms, projects relations
-  # TODO: Replace table names list by method_missing way
-  %w[platforms projects products repositories groups].each do |table_name|
-    define_method table_name + "_in_relations_with" do |opts|
-      query = "#{ table_name }.id IN (SELECT target_id FROM relations WHERE relations.target_type = '#{ table_name.singularize.camelize }'"
-      opts.each do |key, value|
-        query = query + " AND relations.#{ key } #{ value.class == Array ? 'IN (?)' : '= ?' } "
-      end
-      query = query + ")"
-
-      return opts.values.unshift query
-    end
+  # TODO group_ids ??
+  def read_relations_for(table, parent = nil)
+    key = parent ? "#{parent.singularize}_id" : 'id'
+    parent ||= table
+    ["#{table}.#{key} IN (
+      SELECT target_id FROM relations WHERE relations.target_type = ? AND
+      (relations.object_type = 'User' AND relations.object_id = ? OR
+       relations.object_type = 'Group' AND relations.object_id IN (?)))", parent.classify, @user, @user.group_ids]
   end
 
-  def with_project_id_in_relations_with(opts = {})
-    query = "issues.project_id IN (SELECT target_id FROM relations WHERE relations.target_type = 'issues'"
-    opts.each do |key, value|
-      query = query + " AND relations.#{ key } #{ value.class == Array ? 'IN (?)' : '= ?' } "
-    end
-    query = query + ")"
-
-    return opts.values.unshift query
+  def relation_exists_for(object, roles)
+    object.relations.exists?(:object_id => @user.id, :object_type => 'User', :role => roles) or
+    object.relations.exists?(:object_id => @user.group_ids, :object_type => 'Group', :role => roles)
   end
 
-  def build_lists_in_relations_with(opts)
-    query = "build_lists.project_id IN (SELECT target_id FROM relations WHERE relations.target_type = 'Project'"
-    opts.each do |key, value|
-      query = query + " AND relations.#{ key } #{ value.class == Array ? 'IN (?)' : '= ?' } "
-    end
-    query = query + ")"
-
-    return opts.values.unshift query
+  def local_reader?(object)
+    relation_exists_for(object, %w{reader writer admin}) or owner?(object)
   end
 
-  ## Sub query for project relations
-  #def projects_in_relations_with(opts={})
-  #  ["projects.id IN (SELECT target_id FROM relations WHERE relations.object_id #{ opts[:object_id].class == Array ? 'IN (?)' : '= ?' } AND relations.object_type = '#{ opts[:object_type] }' AND relations.target_type = 'Platform') AND relations.role", opts[:object_id]]
-  #end
+  def local_writer?(object)
+    relation_exists_for(object, %w{writer admin}) or owner?(object)
+  end
+
+  def local_admin?(object)
+    relation_exists_for(object, 'admin') or owner?(object)
+  end
+
+  def owner?(object)
+    object.owner == @user or @user.own_groups.include?(object.owner)
+  end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index ad6f57468..f320f3309 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -12,6 +12,10 @@ class Issue < ActiveRecord::Base
 
   after_create :set_serial_id
 
+  def to_param
+    serial_id.to_s
+  end
+
   protected
 
   def set_serial_id
diff --git a/app/models/product.rb b/app/models/product.rb
index 637fdee90..36337f4f9 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -3,11 +3,9 @@ class Product < ActiveRecord::Base
 
   belongs_to :platform
   has_many :product_build_lists, :dependent => :destroy
-  has_many :relations, :as => :target, :dependent => :destroy
 
   after_validation :merge_tar_errors
   before_save :destroy_tar?
-  after_create :add_admin_relations
 
   has_attached_file :tar
 
@@ -69,21 +67,12 @@ class Product < ActiveRecord::Base
 
   protected
 
-    def destroy_tar?
-      self.tar.clear if @delete_tar == "1"
-    end
-
-    def merge_tar_errors
-      errors[:tar] += errors[:tar_content_type]
-      errors[:tar_content_type] = []
-    end
-
-    def add_admin_relations
-      platform.relations.where(:role => 'admin').each do |rel|
-        r = relations.build(:role => 'admin', :object_type => rel.object_type)
-        r.object_id = rel.object_id
-        r.save
-      end
-    end
+  def destroy_tar?
+    self.tar.clear if @delete_tar == "1"
+  end
 
+  def merge_tar_errors
+    errors[:tar] += errors[:tar_content_type]
+    errors[:tar_content_type] = []
+  end
 end
diff --git a/app/views/comments/_form.html.haml b/app/views/comments/_form.html.haml
index ccca4cc1d..eb5acaf4d 100644
--- a/app/views/comments/_form.html.haml
+++ b/app/views/comments/_form.html.haml
@@ -7,4 +7,4 @@
     = image_tag("web-app-theme/icons/tick.png", :alt => t("layout.save"))
     = t("layout.save")
   %span.text_button_padding= t("layout.or")
-  = link_to t("layout.cancel"), show_issue_path(@issue.project, @issue.serial_id), :class => "text_button_padding link_button"
+  = link_to t("layout.cancel"), [@issue.project, @issue], :class => "text_button_padding link_button"
diff --git a/app/views/issues/_list.html.haml b/app/views/issues/_list.html.haml
index dfb083664..98d5d5448 100644
--- a/app/views/issues/_list.html.haml
+++ b/app/views/issues/_list.html.haml
@@ -6,10 +6,10 @@
   - @issues.each do |issue|
     %tr{:class => cycle("odd", "even")}
       %td
-        = link_to issue.title, show_issue_path(@project, issue.serial_id)
+        = link_to issue.title, [@project, issue]
       %td
         = issue.status
       %td.last
-        = link_to t("layout.show"), show_issue_path(@project, issue.serial_id)
+        = link_to t("layout.show"), [@project, issue]
         |
         = link_to t("layout.delete"), project_issue_path(@project, issue), :method => :delete, :confirm => t("layout.issues.confirm_delete")  if can? :destroy, issue
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 51c080e4a..a68e58fea 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -2,7 +2,7 @@
   .secondary-navigation
     %ul.wat-cf
       %li.first= link_to t("layout.issues.list"), project_issues_path(@project)
-      %li= link_to t("layout.issues.edit"), edit_project_issue_path(@project, @issue.serial_id) if can? :edit, @issue
+      %li= link_to t("layout.issues.edit"), edit_project_issue_path(@project, @issue) if can? :edit, @issue
   .content
     .inner
       %p
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 97eea839c..892d6ff7c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -382,10 +382,13 @@ ru:
 
     comment:
       saved: Комментарий успешно сохранен
+      save_error: Ошибка сохранения комментария
       destroyed: Комментарий удален
 
     issue:
       saved: Задача успешно сохранена
+      save_error: Не удалось сохранить задачу
+      destroyed: Задача успешно удалена
 
     project:
       saved: Проект успешно сохранен
@@ -406,10 +409,6 @@ ru:
       destroyed: Группа успешно удалена
       user_uname_exists: Пользователь с таким именем уже зарегестрирован
 
-    role:
-      saved: Роль успешно сохранена
-      save_error: Ошибка сохранения роли
-
     repository:
       saved: Репозиторий успешно добавлен
       save_error: Не удалось добавить репозиторий
@@ -427,7 +426,7 @@ ru:
 
     platform:
       saved: Платформа успешно добавлена
-      saved_error: Не удалось создать платформу
+      save_error: Не удалось создать платформу
       freezed: Платформа успешно заморожена
       freeze_error: Не удалось заморозить платформу, попробуйте еще раз
       unfreezed: Платформа успешно разморожена
diff --git a/config/routes.rb b/config/routes.rb
index 4a0227e63..dcea79076 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,10 +78,8 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
-  match "projects/:project_id/issues/:serial_id" => 'issues#show', :serial_id => /\d+/, :as => :show_issue, :via => :get
-  match "projects/:project_id/issues/:serial_id/edit" => 'issues#edit', :serial_id => /\d+/, :as => :edit_issue, :via => :get
   resources :projects do
-    resources :issues, :except => [:show] do
+    resources :issues do
       resources :comments, :only => [:edit, :create, :update, :destroy]
     end
     resource :repo, :controller => "git/repositories", :only => [:show]
diff --git a/lib/grack/base.rb b/lib/grack/base.rb
index 1d77f2af4..e2ee2a121 100644
--- a/lib/grack/base.rb
+++ b/lib/grack/base.rb
@@ -28,7 +28,7 @@ module Grack
     end
 
     def action
-      write? ? :update : :read
+      write? ? :write : :read
     end
 
     def project
diff --git a/spec/controllers/build_lists_controller_spec.rb b/spec/controllers/build_lists_controller_spec.rb
index c05d24e50..bfedd23a2 100644
--- a/spec/controllers/build_lists_controller_spec.rb
+++ b/spec/controllers/build_lists_controller_spec.rb
@@ -94,9 +94,8 @@ describe BuildListsController do
           @build_list1 = Factory(:build_list_core)
           @build_list2 = Factory(:build_list_core, :project => Factory(:project, :visibility => 'hidden'))
           @build_list3 = Factory(:build_list_core, :project => Factory(:project, :owner => @user, :visibility => 'hidden'))
-            b = Factory(:build_list_core, :project => Factory(:project, :visibility => 'hidden'))
-            b.project.relations.create :role => 'reader', :object_id => @user.id, :object_type => 'User'
-          @build_list4 = b
+          @build_list4 = Factory(:build_list_core, :project => Factory(:project, :visibility => 'hidden'))
+          @build_list4.project.relations.create :role => 'reader', :object_id => @user.id, :object_type => 'User'
         end
 
         it 'should be able to perform index action' do
@@ -180,9 +179,8 @@ describe BuildListsController do
           @build_list1 = Factory(:build_list_core)
           @build_list2 = Factory(:build_list_core, :project => Factory(:project, :visibility => 'hidden'))
           @build_list3 = Factory(:build_list_core, :project => Factory(:project, :owner => @group, :visibility => 'hidden'))
-            b = Factory(:build_list_core, :project => Factory(:project, :visibility => 'hidden'))
-            b.project.relations.create :role => 'reader', :object_id => @group.id, :object_type => 'Group'
-          @build_list4 = b
+          @build_list4 = Factory(:build_list_core, :project => Factory(:project, :visibility => 'hidden'))
+          @build_list4.project.relations.create :role => 'reader', :object_id => @group.id, :object_type => 'Group'
         end
 
         it 'should be able to perform index action' do
diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb
index 2d9ba9a46..37aad58cf 100644
--- a/spec/controllers/issues_controller_spec.rb
+++ b/spec/controllers/issues_controller_spec.rb
@@ -8,7 +8,7 @@ shared_examples_for 'issue user with project reader rights' do
   end
 
   it 'should be able to perform show action' do
-    get :show, :project_id => @project.id, :serial_id => @issue.serial_id
+    get :show, :project_id => @project.id, :id => @issue.serial_id
     response.should render_template(:show)
   end
 end
@@ -26,36 +26,36 @@ end
 
 shared_examples_for 'user with issue update rights' do
   it 'should be able to perform update action' do
-    put :update, {:id => @issue.id}.merge(@update_params)
-    response.should redirect_to(show_issue_path(@project, @issue.serial_id))
+    put :update, {:id => @issue.serial_id}.merge(@update_params)
+    response.should redirect_to([@project, @issue])
   end
 
   it 'should update issue title' do
-    put :update, {:id => @issue.id}.merge(@update_params)
+    put :update, {:id => @issue.serial_id}.merge(@update_params)
     @issue.reload.title.should == 'issue2'
   end
 end
 
 shared_examples_for 'user without issue update rights' do
   it 'should not be able to perform update action' do
-    put :update, {:id => @issue.id}.merge(@update_params)
+    put :update, {:id => @issue.serial_id}.merge(@update_params)
     response.should redirect_to(forbidden_path)
   end
 
   it 'should not update issue title' do
-    put :update, {:id => @issue.id}.merge(@update_params)
+    put :update, {:id => @issue.serial_id}.merge(@update_params)
     @issue.reload.title.should_not == 'issue2'
   end
 end
 
 shared_examples_for 'user without issue destroy rights' do
   it 'should not be able to perform destroy action' do
-    delete :destroy, :id => @issue.id, :project_id => @project.id
+    delete :destroy, :id => @issue.serial_id, :project_id => @project.id
     response.should redirect_to(forbidden_path)
   end
 
   it 'should not reduce issues count' do
-    lambda{ delete :destroy, :id => @issue.id, :project_id => @project.id }.should change{ Issue.count }.by(0)
+    lambda{ delete :destroy, :id => @issue.serial_id, :project_id => @project.id }.should change{ Issue.count }.by(0)
   end
 end
 
@@ -67,7 +67,7 @@ shared_examples_for 'project with issues turned off' do
   end
 
   it 'should not be able to perform show action' do
-    get :show, :project_id => @project_with_turned_off_issues.id, :serial_id => @turned_of_issue.serial_id
+    get :show, :project_id => @project_with_turned_off_issues.id, :id => @turned_of_issue.serial_id
     response.should redirect_to(forbidden_path)
   end
 end
diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb
index 7b6e4f4f6..826568374 100644
--- a/spec/controllers/products_controller_spec.rb
+++ b/spec/controllers/products_controller_spec.rb
@@ -61,8 +61,7 @@ describe ProductsController do
   	before(:each) do
   		@user = Factory(:user)
   		set_session_for(@user)
-      r = @product.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
-      r = @platform.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+      @platform.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
 		end
 
     it 'should be able to perform create action' do
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index c17c09954..29e6aff09 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -28,7 +28,7 @@ describe ProjectsController do
   		set_session_for(@admin)
 		end
 
-    it_should_behave_like 'projects user with writer rights'
+    it_should_behave_like 'projects user with admin rights'
     it_should_behave_like 'projects user with reader rights'
 
     it 'should be able to perform create action' do
@@ -49,7 +49,7 @@ describe ProjectsController do
   		@project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
 		end
 
-    it_should_behave_like 'projects user with writer rights'
+    it_should_behave_like 'projects user with admin rights'
     it_should_behave_like 'user with rights to view projects'
 
     it 'should be able to perform destroy action' do
@@ -90,7 +90,6 @@ describe ProjectsController do
   		@project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'writer')
 		end
 
-    it_should_behave_like 'projects user with writer rights'
     it_should_behave_like 'projects user with reader rights'
   end
 
diff --git a/spec/models/cancan_spec.rb b/spec/models/cancan_spec.rb
index 927a38447..e245c19ff 100644
--- a/spec/models/cancan_spec.rb
+++ b/spec/models/cancan_spec.rb
@@ -50,19 +50,19 @@ describe CanCan do
 			guest_create
 		end
 
-		it 'should be able to read open platform' do
-			@ability.should be_able_to(:read, open_platform)
-		end
+    it 'should not be able to read open platform' do
+    	@ability.should_not be_able_to(:read, open_platform)
+    end
 
-		it 'should not be able to read hidden platform' do
-			@ability.should_not be_able_to(:read, hidden_platform)
-		end
+    it 'should not be able to read hidden platform' do
+    	@ability.should_not be_able_to(:read, hidden_platform)
+    end
 
-		it 'should be able to auto build projects' do
-			@ability.should be_able_to(:auto_build, Project)
-		end
+    it 'should be able to auto build projects' do
+    	@ability.should be_able_to(:auto_build, Project)
+    end
 
-		[:status_build, :pre_build, :post_build, :circle_build, :new_bbdt].each do |action|
+		[:publish_build, :status_build, :pre_build, :post_build, :circle_build, :new_bbdt].each do |action|
 			it "should be able to #{ action } build list" do
 				@ability.should be_able_to(action, BuildList)
 			end
@@ -78,11 +78,13 @@ describe CanCan do
       user_create
     end
 
-    [Platform, User, Repository].each do |model_name|
-      it "should not be able to create #{ model_name.to_s }" do
+    [Platform, Repository].each do |model_name|
+      it "should not be able to read #{model_name}" do
         @ability.should be_able_to(:read, model_name)
       end
     end
+    
+    it { @ability.should be_able_to(:show, User) }
 
     it "shoud be able to read another user object" do
       admin_create
@@ -225,8 +227,10 @@ describe CanCan do
           @platform.update_attribute(:owner, @user)
         end
 
-        it 'should be able to manage platform' do
-          @ability.should be_able_to(:manage, @platform)
+        [:read, :update, :destroy, :freeze, :unfreeze].each do |action|
+          it "should be able to #{action} platform" do
+            @ability.should be_able_to(action, @platform)
+          end
         end
       end
 
@@ -251,11 +255,16 @@ describe CanCan do
           @repository.update_attribute(:owner, @user)
         end
 
-        [:manage, :add_project, :remove_project, :change_visibility, :settings].each do |action|
-          it "should be able to #{ action } repository" do
+        [:read, :update, :destroy, :add_project, :remove_project, :change_visibility, :settings].each do |action|
+          it "should be able to #{action} repository" do
             @ability.should be_able_to(action, @repository)
           end
         end
+
+        it do
+          @repository.platform.update_attribute(:owner, @user)
+          @ability.should be_able_to(:create, @repository)
+        end
       end
 
       context 'with read rights' do
@@ -272,7 +281,7 @@ describe CanCan do
     context 'build list relations' do
       before(:each) do
         @project = Factory(:project)
-        @project.relations.create!(:object_id => @user.id, :object_type => 'User', :role => 'reader')
+        @project.relations.create!(:object_id => @user.id, :object_type => 'User', :role => 'writer')
         @build_list = Factory(:build_list, :project => @project)
       end
 
diff --git a/spec/support/shared_examples/projects_controller.rb b/spec/support/shared_examples/projects_controller.rb
index 37cd28b28..0dff8f8d2 100644
--- a/spec/support/shared_examples/projects_controller.rb
+++ b/spec/support/shared_examples/projects_controller.rb
@@ -7,7 +7,7 @@ shared_examples_for 'projects user with reader rights' do
   end
 end
 
-shared_examples_for 'projects user with writer rights' do
+shared_examples_for 'projects user with admin rights' do
   it 'should be able to perform update action' do
     put :update, {:id => @project.id}.merge(@update_params)
     response.should redirect_to(project_path(@project))

From 1c263c6e0a4978655e6f956adf7d8a18022e66d5 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Wed, 28 Dec 2011 14:47:54 +0400
Subject: [PATCH 26/40] [refs #54] Notification DJ support. Routes fixes.

---
 app/controllers/subscribes_controller.rb             | 2 ++
 app/models/issue.rb                                  | 5 +++--
 app/views/issues/show.html.haml                      | 4 ++--
 app/views/user_mailer/issue_assign_notification.haml | 2 +-
 app/views/user_mailer/new_comment_notification.haml  | 2 +-
 app/views/user_mailer/new_issue_notification.haml    | 2 +-
 config/routes.rb                                     | 4 ++--
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb
index 98efb5ccb..d075950f0 100644
--- a/app/controllers/subscribes_controller.rb
+++ b/app/controllers/subscribes_controller.rb
@@ -23,6 +23,7 @@ class SubscribesController < ApplicationController
 
   private
 
+  # Sets instances for parent resources (@issue, etc.)
   def set_instances
     params.each do |name, value|
       if name =~ /(.+)_id$/
@@ -31,6 +32,7 @@ class SubscribesController < ApplicationController
     end
   end
 
+  # Sets current parent resource by setted instance
   def set_subscribeable
     @subscribeable = @issue if @issue
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 48e9092d5..34401d4be 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -42,12 +42,13 @@ class Issue < ActiveRecord::Base
     recipients = collect_recipient_ids
     recipients.each do |recipient_id|
       recipient = User.find(recipient_id)
-      UserMailer.new_issue_notification(self, recipient).deliver
+      UserMailer.delay.new_issue_notification(self, recipient)#.deliver
     end
   end
 
   def deliver_issue_assign_notification
-    UserMailer.issue_assign_notification(self, self.user).deliver if self.user_id_was != self.user_id
+    #UserMailer.delay.issue_assign_notification(self, self.user).deliver if self.user_id_was != self.user_id
+    UserMailer.delay.issue_assign_notification(self, self.user) if self.user_id_was != self.user_id
   end
 
   def subscribe_users
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 847afd8b9..202d891f4 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -25,9 +25,9 @@
           = t('layout.issues.subscribe')
           \:
         - if @issue.subscribes.exists? :user_id => current_user.id
-          = link_to t('layout.issues.unsubscribe_btn'), unsubscribe_issue_path(@issue), :method => :delete
+          = link_to t('layout.issues.unsubscribe_btn'), unsubscribe_issue_path(@issue.id), :method => :delete
         - else
-          = link_to t('layout.issues.subscribe_btn'), subscribe_issue_path(@issue), :method => :post§
+          = link_to t('layout.issues.subscribe_btn'), subscribe_issue_path(@issue.id), :method => :post§
 
 %a{ :name => "comments" }
 .block#block-lists
diff --git a/app/views/user_mailer/issue_assign_notification.haml b/app/views/user_mailer/issue_assign_notification.haml
index 72e99e7df..a6615d3eb 100644
--- a/app/views/user_mailer/issue_assign_notification.haml
+++ b/app/views/user_mailer/issue_assign_notification.haml
@@ -1,7 +1,7 @@
 %p== Здравствуйте, #{@user.name}.
 
 
-%p Вам была назначена задача #{ link_to @issue.title, show_issue_path(@issue.project, @issue.serial_id) }
+%p Вам была назначена задача #{ link_to @issue.title, [@issue.project, @issue] }
 
 
 %p== Команда поддержки «ROSA Build System»
diff --git a/app/views/user_mailer/new_comment_notification.haml b/app/views/user_mailer/new_comment_notification.haml
index 0e57ff415..88692f64e 100644
--- a/app/views/user_mailer/new_comment_notification.haml
+++ b/app/views/user_mailer/new_comment_notification.haml
@@ -1,7 +1,7 @@
 %p== Здравствуйте, #{@user.name}.
 
 
-%p К задаче #{ link_to @comment.commentable.title, show_issue_path(@comment.commentable.project, @comment.commentable.serial_id) } был добавлен новый комментарий.
+%p К задаче #{ link_to @comment.commentable.title, [@comment.commentable.project, @comment.commentable] } был добавлен новый комментарий.
 
 
 %p== Команда поддержки «ROSA Build System»
diff --git a/app/views/user_mailer/new_issue_notification.haml b/app/views/user_mailer/new_issue_notification.haml
index e98f32f45..3a2604cfb 100644
--- a/app/views/user_mailer/new_issue_notification.haml
+++ b/app/views/user_mailer/new_issue_notification.haml
@@ -1,7 +1,7 @@
 %p== Здравствуйте, #{@user.name}.
 
 
-%p К проекту #{ link_to @issue.project.name, project_path(@issue.project) } была добавлена задача #{ link_to @issue.title, show_issue_path(@issue.project, @issue.serial_id) }
+%p К проекту #{ link_to @issue.project.name, project_path(@issue.project) } была добавлена задача #{ link_to @issue.title, [@issue.project, @issue] }
 
 
 %p== Команда поддержки «ROSA Build System»
diff --git a/config/routes.rb b/config/routes.rb
index d076405a2..db44731a0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,8 +78,8 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
-  #match "issues/:issue_id/subscribe" => 'subscribes#create', :as => :subscribe_issue, :via => :post
-  #match "issues/:issue_id/unsubscribe" => 'subscribes#destroy', :as => :unsubscribe_issue, :via => :delete
+  match "issues/:issue_id/subscribe" => 'subscribes#create', :as => :subscribe_issue, :via => :post
+  match "issues/:issue_id/unsubscribe" => 'subscribes#destroy', :as => :unsubscribe_issue, :via => :delete
 
   #match "projects/:project_id/issues/:serial_id" => 'issues#show', :serial_id => /\d+/, :as => :show_issue, :via => :get
   #match "projects/:project_id/issues/:serial_id/edit" => 'issues#edit', :serial_id => /\d+/, :as => :edit_issue, :via => :get

From fa8656d1f53d5d96048fc5c6ede82784356ca7e0 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Wed, 28 Dec 2011 17:54:45 +0400
Subject: [PATCH 27/40] [refs #54] Refactor subscires routes and authorize

---
 app/controllers/subscribes_controller.rb | 36 ++++++++++++++----------
 app/models/ability.rb                    |  8 ++++++
 app/views/issues/show.html.haml          |  4 +--
 config/routes.rb                         |  5 ++--
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb
index d075950f0..e08d48db9 100644
--- a/app/controllers/subscribes_controller.rb
+++ b/app/controllers/subscribes_controller.rb
@@ -1,10 +1,15 @@
 class SubscribesController < ApplicationController
   before_filter :authenticate_user!
-  before_filter :set_instances
-  before_filter :set_subscribeable
+  #before_filter :set_instances
+  #before_filter :set_subscribeable
+
+  load_and_authorize_resource :project
+  load_and_authorize_resource :issue, :through => :project, :find_by => :serial_id
+  load_and_authorize_resource :subscribe, :through => :issue, :find_by => :user_id
 
   def create
-    @subscribe = @subscribeable.subscribes.build(:user_id => current_user.id)
+    #@subscribe = @subscribeable.subscribes.build(:user_id => current_user.id)
+    @subscribe = @issue.subscribes.build(:user_id => current_user.id)
     if @subscribe.save
       flash[:notice] = I18n.t("flash.subscribe.saved")
       redirect_to :back
@@ -15,25 +20,26 @@ class SubscribesController < ApplicationController
   end
 
   def destroy
-    @subscribeable.subscribes.where(:user_id => current_user.id)[0].destroy
+    #@subscribeable.subscribes.where(:user_id => current_user.id)[0].destroy
+    @subscribe.destroy
 
     flash[:notice] = t("flash.subscribe.destroyed")
     redirect_to :back
   end
 
-  private
+  #private
 
   # Sets instances for parent resources (@issue, etc.)
-  def set_instances
-    params.each do |name, value|
-      if name =~ /(.+)_id$/
-        instance_variable_set "@"+$1, $1.classify.constantize.find(value)
-      end
-    end
-  end
+  #def set_instances
+  #  params.each do |name, value|
+  #    if name =~ /(.+)_id$/
+  #      instance_variable_set "@"+$1, $1.classify.constantize.find(value)
+  #    end
+  #  end
+  #end
 
   # Sets current parent resource by setted instance
-  def set_subscribeable
-    @subscribeable = @issue if @issue
-  end
+  #def set_subscribeable
+  #  @subscribeable = @issue if @issue
+  #end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 9a601f37e..ebff5da1b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -90,6 +90,14 @@ class Ability
         can(:create, Comment) {|comment| can? :read, comment.commentable.project}
         can(:update, Comment) {|comment| can? :update, comment.user_id == user.id or local_admin?(comment.commentable.project)}
         cannot :manage, Comment, :commentable => {:project => {:has_issues => false}} # switch off issues
+
+        can :create, Subscribe do |subscribe|
+          !subscribe.subscribeable.subscribes.exists?(:user_id => user.id)
+        end
+        can :destroy, Subscribe do |subscribe|
+          subscribe.subscribeable.subscribes.exists?(:user_id => user.id) && user.id == subscribe.user_id
+        end
+        #can [:create, :delete], Subscribe
       end
     end
 
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 202d891f4..3c0bf000f 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -25,9 +25,9 @@
           = t('layout.issues.subscribe')
           \:
         - if @issue.subscribes.exists? :user_id => current_user.id
-          = link_to t('layout.issues.unsubscribe_btn'), unsubscribe_issue_path(@issue.id), :method => :delete
+          = link_to t('layout.issues.unsubscribe_btn'), project_issue_subscribe_path(@project, @issue, current_user.id), :method => :delete
         - else
-          = link_to t('layout.issues.subscribe_btn'), subscribe_issue_path(@issue.id), :method => :post§
+          = link_to t('layout.issues.subscribe_btn'), project_issue_subscribes_path(@project, @issue), :method => :post§
 
 %a{ :name => "comments" }
 .block#block-lists
diff --git a/config/routes.rb b/config/routes.rb
index db44731a0..c6b729fd7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,8 +78,8 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
-  match "issues/:issue_id/subscribe" => 'subscribes#create', :as => :subscribe_issue, :via => :post
-  match "issues/:issue_id/unsubscribe" => 'subscribes#destroy', :as => :unsubscribe_issue, :via => :delete
+  #match "issues/:issue_id/subscribe" => 'subscribes#create', :as => :subscribe_issue, :via => :post
+  #match "issues/:issue_id/unsubscribe" => 'subscribes#destroy', :as => :unsubscribe_issue, :via => :delete
 
   #match "projects/:project_id/issues/:serial_id" => 'issues#show', :serial_id => /\d+/, :as => :show_issue, :via => :get
   #match "projects/:project_id/issues/:serial_id/edit" => 'issues#edit', :serial_id => /\d+/, :as => :edit_issue, :via => :get
@@ -87,6 +87,7 @@ Rosa::Application.routes.draw do
   resources :projects do
     resources :issues do
       resources :comments, :only => [:edit, :create, :update, :destroy]
+      resources :subscribes, :only => [:create, :destroy]
     end
     resource :repo, :controller => "git/repositories", :only => [:show]
     resources :build_lists, :only => [:index, :new, :create]

From 49ec1ebe984f6b1fbbc017abb5c76ef7d556e544 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Wed, 28 Dec 2011 18:24:24 +0400
Subject: [PATCH 28/40] [refs #54] Remove unused comments

---
 app/controllers/subscribes_controller.rb | 20 --------------------
 app/views/issues/show.html.haml          |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb
index e08d48db9..e9ff43abf 100644
--- a/app/controllers/subscribes_controller.rb
+++ b/app/controllers/subscribes_controller.rb
@@ -1,14 +1,11 @@
 class SubscribesController < ApplicationController
   before_filter :authenticate_user!
-  #before_filter :set_instances
-  #before_filter :set_subscribeable
 
   load_and_authorize_resource :project
   load_and_authorize_resource :issue, :through => :project, :find_by => :serial_id
   load_and_authorize_resource :subscribe, :through => :issue, :find_by => :user_id
 
   def create
-    #@subscribe = @subscribeable.subscribes.build(:user_id => current_user.id)
     @subscribe = @issue.subscribes.build(:user_id => current_user.id)
     if @subscribe.save
       flash[:notice] = I18n.t("flash.subscribe.saved")
@@ -20,26 +17,9 @@ class SubscribesController < ApplicationController
   end
 
   def destroy
-    #@subscribeable.subscribes.where(:user_id => current_user.id)[0].destroy
     @subscribe.destroy
 
     flash[:notice] = t("flash.subscribe.destroyed")
     redirect_to :back
   end
-
-  #private
-
-  # Sets instances for parent resources (@issue, etc.)
-  #def set_instances
-  #  params.each do |name, value|
-  #    if name =~ /(.+)_id$/
-  #      instance_variable_set "@"+$1, $1.classify.constantize.find(value)
-  #    end
-  #  end
-  #end
-
-  # Sets current parent resource by setted instance
-  #def set_subscribeable
-  #  @subscribeable = @issue if @issue
-  #end
 end
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 3c0bf000f..073de4c2a 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -27,7 +27,7 @@
         - if @issue.subscribes.exists? :user_id => current_user.id
           = link_to t('layout.issues.unsubscribe_btn'), project_issue_subscribe_path(@project, @issue, current_user.id), :method => :delete
         - else
-          = link_to t('layout.issues.subscribe_btn'), project_issue_subscribes_path(@project, @issue), :method => :post§
+          = link_to t('layout.issues.subscribe_btn'), project_issue_subscribes_path(@project, @issue), :method => :post
 
 %a{ :name => "comments" }
 .block#block-lists

From acb970686cf5593a60a021b35e4de241b2f17d33 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Thu, 29 Dec 2011 04:37:34 +0200
Subject: [PATCH 29/40] Apply auto_publish for build_lists. Apply publish
 build_list error status. Remove circle build info. Display auto_publish info.
 Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72

---
 app/controllers/build_lists_controller.rb     |  9 +-
 app/models/build_list.rb                      |  2 +-
 app/views/build_lists/_build_lists.html.haml  |  2 -
 app/views/build_lists/new.html.haml           |  4 +
 app/views/build_lists/show.html.haml          |  5 +
 config/locales/ru.yml                         |  1 +
 ...8182425_add_auto_publish_to_build_lists.rb |  9 ++
 db/schema.rb                                  |  3 +-
 .../build_lists_controller_spec.rb            | 99 ++++++++++++++++++-
 9 files changed, 123 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/20111228182425_add_auto_publish_to_build_lists.rb

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index 44b1773f1..143ddc880 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -6,7 +6,7 @@ class BuildListsController < ApplicationController
   before_filter :authenticate_build_service!, :only => CALLBACK_ACTIONS
   before_filter :find_project, :only => NESTED_ACTIONS
   before_filter :find_build_list, :only => [:show, :publish, :cancel]
-  before_filter :find_build_list_by_bs, :only => [:publish_build, :status_build, :pre_build, :post_build]
+  before_filter :find_build_list_by_bs, :only => [:publish_build, :status_build, :pre_build, :post_build, :circle_build]
 
   load_and_authorize_resource :project, :only => NESTED_ACTIONS
   load_and_authorize_resource :build_list, :through => :project, :only => NESTED_ACTIONS, :shallow => true
@@ -113,6 +113,8 @@ class BuildListsController < ApplicationController
     @build_list.notified_at = Time.current
     @build_list.save
 
+    @build_list.publish if @build_list.auto_publish # && @build_list.can_publish?
+
     render :nothing => true, :status => 200
   end
 
@@ -130,10 +132,9 @@ class BuildListsController < ApplicationController
     @build_list.name = params[:name]
     @build_list.additional_repos = ActiveSupport::JSON.decode(params[:additional_repos])
     @build_list.set_items(ActiveSupport::JSON.decode(params[:items]))
-    @build_list.notified_at = Time.current
-    @build_list.is_circle = (params[:is_circular] != "0")
+    @build_list.is_circle = (params[:is_circular].to_i != 0)
     @build_list.bs_id = params[:id]
-    params[:arch]
+    @build_list.notified_at = Time.current
     @build_list.save
 
     render :nothing => true, :status => 200
diff --git a/app/models/build_list.rb b/app/models/build_list.rb
index d28e0d293..91534a5a5 100644
--- a/app/models/build_list.rb
+++ b/app/models/build_list.rb
@@ -110,7 +110,7 @@ class BuildList < ActiveRecord::Base
   def publish
     return false unless can_publish?
     has_published = BuildServer.publish_container bs_id
-    update_attribute(:status, BUILD_PUBLISH) if has_published == 0
+    update_attribute(:status, has_published == 0 ? BUILD_PUBLISH : FAILED_PUBLISH)
     return has_published == 0
   end
 
diff --git a/app/views/build_lists/_build_lists.html.haml b/app/views/build_lists/_build_lists.html.haml
index 8bd7ab667..a51c428f3 100644
--- a/app/views/build_lists/_build_lists.html.haml
+++ b/app/views/build_lists/_build_lists.html.haml
@@ -6,7 +6,6 @@
     %th= t("activerecord.attributes.build_list.project")
     %th= t("activerecord.attributes.build_list.arch")
     %th= t("activerecord.attributes.build_list.user")
-    %th= t("activerecord.attributes.build_list.is_circle")
     - unless @project
       %th= t("layout.build_lists.cancel_button_header")
     %th.last= t("activerecord.attributes.build_list.notified_at")
@@ -19,7 +18,6 @@
       %td= link_to build_list.project.name, project_path(build_list.project)
       %td= build_list.arch.name
       %td= build_list.user.try(:fullname)
-      %td= t("layout.#{build_list.is_circle?}_")
       - unless @project
         %td= link_to t("layout.build_lists.cancel_button"), cancel_build_list_path(build_list), :method => "put", :confirm => t("layout.confirm") if build_list.can_cancel?
       %td.last= build_list.notified_at
diff --git a/app/views/build_lists/new.html.haml b/app/views/build_lists/new.html.haml
index 622191b78..76187ddb5 100644
--- a/app/views/build_lists/new.html.haml
+++ b/app/views/build_lists/new.html.haml
@@ -50,6 +50,10 @@
               = f.label :include_repos, t("activerecord.attributes.build_list.include_repos"), :class => :label
               #include_repos
 
+            .group
+              = f.check_box :auto_publish
+              = f.label :auto_publish, t("activerecord.attributes.build_list.auto_publish")
+
         .group.navform.wat-cf
           %button.button{:type => "submit"}
             = image_tag("web-app-theme/icons/tick.png", :alt => t("layout.projects.build_button"))
diff --git a/app/views/build_lists/show.html.haml b/app/views/build_lists/show.html.haml
index eafd98ddd..9c7e779c5 100644
--- a/app/views/build_lists/show.html.haml
+++ b/app/views/build_lists/show.html.haml
@@ -49,6 +49,11 @@
           = t("activerecord.attributes.build_list.build_requires")
           \:
         = @build_list.build_requires
+      %p
+        %b
+          = t("activerecord.attributes.build_list.auto_publish")
+          \:
+        = @build_list.auto_publish
       %p
         %b
           = t("activerecord.attributes.build_list.status")
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 892d6ff7c..dbc4294dc 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -637,6 +637,7 @@ ru:
         bpl_id: Платформа
         update_type: Критичность обновления
         build_requires: Пересборка с зависимостями
+        auto_publish: Автоматическая публикация
         project_version: Версия
         user: Пользователь
 
diff --git a/db/migrate/20111228182425_add_auto_publish_to_build_lists.rb b/db/migrate/20111228182425_add_auto_publish_to_build_lists.rb
new file mode 100644
index 000000000..a9cb7d3bd
--- /dev/null
+++ b/db/migrate/20111228182425_add_auto_publish_to_build_lists.rb
@@ -0,0 +1,9 @@
+class AddAutoPublishToBuildLists < ActiveRecord::Migration
+  def self.up
+    add_column :build_lists, :auto_publish, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :build_lists, :auto_publish
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2a5a51d73..4fad3e5fa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111221194422) do
+ActiveRecord::Schema.define(:version => 20111228182425) do
 
   create_table "arches", :force => true do |t|
     t.string   "name",       :null => false
@@ -71,6 +71,7 @@ ActiveRecord::Schema.define(:version => 20111221194422) do
     t.integer  "pl_id"
     t.text     "include_repos"
     t.integer  "user_id"
+    t.boolean  "auto_publish",     :default => true
   end
 
   add_index "build_lists", ["arch_id"], :name => "index_build_lists_on_arch_id"
diff --git a/spec/controllers/build_lists_controller_spec.rb b/spec/controllers/build_lists_controller_spec.rb
index bfedd23a2..a3e088c63 100644
--- a/spec/controllers/build_lists_controller_spec.rb
+++ b/spec/controllers/build_lists_controller_spec.rb
@@ -50,10 +50,10 @@ describe BuildListsController do
     end
   end
 
+  before { stub_rsync_methods }
+
   context 'crud' do
     before(:each) do
-      stub_rsync_methods
-
       platform = Factory(:platform_with_repos)
       @create_params = {
         :build_list => { 
@@ -257,7 +257,6 @@ describe BuildListsController do
   context 'filter' do
     
     before(:each) do 
-      stub_rsync_methods
       set_session_for Factory(:admin)
 
       @build_list1 = Factory(:build_list_core)
@@ -297,5 +296,99 @@ describe BuildListsController do
   end
 
   context 'callbacks' do
+    let(:build_list) { Factory(:build_list_core) }
+
+    describe 'publish_build' do
+      def do_get(status)
+        get :publish_build, :id => build_list.bs_id, :status => status
+        build_list.reload
+      end
+
+      it { do_get(BuildServer::SUCCESS); response.should be_ok }
+      it { lambda{ do_get(BuildServer::SUCCESS) }.should change(build_list, :status).to(BuildList::BUILD_PUBLISHED) }
+      it { lambda{ do_get(BuildServer::ERROR) }.should change(build_list, :status).to(BuildList::FAILED_PUBLISH) }
+      it { lambda{ do_get(BuildServer::ERROR) }.should change(build_list, :notified_at) }
+    end
+
+    describe 'status_build' do
+      before { @item = build_list.items.create(:name => build_list.project.name, :version => build_list.project_version, :level => 0) }
+
+      def do_get
+        get :status_build, :id => build_list.bs_id, :package_name => build_list.project.name, :status => BuildServer::SUCCESS, :container_path => '/path/to'
+        build_list.reload
+        @item.reload
+      end
+
+      it { do_get; response.should be_ok }
+      it { lambda{ do_get }.should change(@item, :status) }
+      it { lambda{ do_get }.should change(build_list, :container_path) }
+      it { lambda{ do_get }.should change(build_list, :notified_at) }
+    end
+
+    describe 'pre_build' do
+      def do_get
+        get :pre_build, :id => build_list.bs_id
+        build_list.reload
+      end
+
+      it { do_get; response.should be_ok }
+      it { lambda{ do_get }.should change(build_list, :status).to(BuildServer::BUILD_STARTED) }
+      it { lambda{ do_get }.should change(build_list, :notified_at) }
+    end
+
+    describe 'post_build' do
+      def do_get(status)
+        get :post_build, :id => build_list.bs_id, :status => status, :container_path => '/path/to'
+        build_list.reload
+      end
+
+      it { do_get(BuildServer::SUCCESS); response.should be_ok }
+      it { lambda{ do_get(BuildServer::SUCCESS) }.should change(build_list, :container_path) }
+      it { lambda{ do_get(BuildServer::SUCCESS) }.should change(build_list, :notified_at) }
+
+      context 'with auto_publish' do
+        it { lambda{ do_get(BuildServer::SUCCESS) }.should change(build_list, :status).to(BuildList::BUILD_PUBLISH) }
+        it { lambda{ do_get(BuildServer::ERROR) }.should change(build_list, :status).to(BuildServer::ERROR) }
+      end
+
+      context 'without auto_publish' do
+        before { build_list.update_attribute(:auto_publish, false) }
+
+        it { lambda{ do_get(BuildServer::SUCCESS) }.should change(build_list, :status).to(BuildServer::SUCCESS) }
+        it { lambda{ do_get(BuildServer::ERROR) }.should change(build_list, :status).to(BuildServer::ERROR) }
+      end
+    end
+
+    describe 'circle_build' do
+      def do_get
+        get :circle_build, :id => build_list.bs_id, :container_path => '/path/to'
+        build_list.reload
+      end
+
+      it { do_get; response.should be_ok }
+      it { lambda{ do_get }.should change(build_list, :is_circle).to(true) }
+      it { lambda{ do_get }.should change(build_list, :container_path) }
+      it { lambda{ do_get }.should change(build_list, :notified_at) }
+    end
+
+    describe 'new_bbdt' do
+      before { @items = build_list.items }
+
+      def do_get
+        get :new_bbdt, :id => 123, :web_id => build_list.id, :name => build_list.project.name, :is_circular => 1,
+            :additional_repos => ActiveSupport::JSON.encode([{:name => 'build_repos'}, {:name => 'main'}]),
+            :items => ActiveSupport::JSON.encode(0 => [{:name => build_list.project.name, :version => build_list.project_version}])
+        build_list.reload
+        @items.reload
+      end
+
+      it { do_get; response.should be_ok }
+      it { lambda{ do_get }.should change(build_list, :name).to(build_list.project.name) }
+      it { lambda{ do_get }.should change(build_list, :additional_repos) }
+      it { lambda{ do_get }.should change(@items, :first) }
+      it { lambda{ do_get }.should change(build_list, :is_circle).to(true) }
+      it { lambda{ do_get }.should change(build_list, :bs_id).to(123) }
+      it { lambda{ do_get }.should change(build_list, :notified_at) }
+    end
   end
 end

From 635e2b7977bc3e28fa68661c6ad0119dd3ad1f88 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Thu, 29 Dec 2011 15:16:54 +0400
Subject: [PATCH 30/40] [refs #54] Add comments specs and factory. Remove
 unused code. Add one delay and fix some links.

---
 app/models/ability.rb                        |  17 +--
 app/models/comment.rb                        |   4 +-
 app/models/issue.rb                          |   7 -
 app/views/issues/show.html.haml              |   6 +-
 db/schema.rb                                 |  11 +-
 spec/controllers/comments_controller_spec.rb | 145 ++++++++++++++++++-
 spec/controllers/issues_controller_spec.rb   |   2 -
 spec/factories/comments.rb                   |  11 +-
 spec/factories/issues.rb                     |   1 +
 9 files changed, 168 insertions(+), 36 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index ebff5da1b..a0bd61c8d 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -88,16 +88,8 @@ class Ability
         cannot :manage, Issue, :project => {:has_issues => false} # switch off issues
 
         can(:create, Comment) {|comment| can? :read, comment.commentable.project}
-        can(:update, Comment) {|comment| can? :update, comment.user_id == user.id or local_admin?(comment.commentable.project)}
+        can(:update, Comment) {|comment| comment.user_id == user.id or local_admin?(comment.commentable.project)}
         cannot :manage, Comment, :commentable => {:project => {:has_issues => false}} # switch off issues
-
-        can :create, Subscribe do |subscribe|
-          !subscribe.subscribeable.subscribes.exists?(:user_id => user.id)
-        end
-        can :destroy, Subscribe do |subscribe|
-          subscribe.subscribeable.subscribes.exists?(:user_id => user.id) && user.id == subscribe.user_id
-        end
-        #can [:create, :delete], Subscribe
       end
     end
 
@@ -106,6 +98,13 @@ class Ability
     cannot :destroy, Repository, :platform => {:platform_type => 'personal'}
     cannot :fork, Project, :owner_id => user.id, :owner_type => user.class.to_s
     cannot :destroy, Issue
+
+    can :create, Subscribe do |subscribe|
+      !subscribe.subscribeable.subscribes.exists?(:user_id => user.id)
+    end
+    can :destroy, Subscribe do |subscribe|
+      subscribe.subscribeable.subscribes.exists?(:user_id => user.id) && user.id == subscribe.user_id
+    end
   end
 
   # TODO group_ids ??
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 36e14c412..439fd0733 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -9,14 +9,12 @@ class Comment < ActiveRecord::Base
   protected
 
   def deliver_new_comment_notification
-    #UserMailer.new_comment_notification(self, self.commentable.user).deliver
-    #UserMailer.new_comment_notification(self, self.commentable.project.owner).deliver
     recipients = self.commentable.project.relations.by_role('admin').where(:object_type => 'User').map { |rel| rel.read_attribute(:object_id) }
     recipients = recipients | [self.commentable.user_id]
     recipients = recipients | [self.commentable.project.owner_id] if self.commentable.project.owner_type == 'User'
     recipients.each do |recipient_id|
       recipient = User.find(recipient_id)
-      UserMailer.new_comment_notification(self, recipient).deliver
+      UserMailer.delay.new_comment_notification(self, recipient)
     end
   end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 34401d4be..9ae96f439 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -33,12 +33,6 @@ class Issue < ActiveRecord::Base
   end
 
   def deliver_new_issue_notification
-    #UserMailer.new_issue_notification(self, self.project.owner).deliver
-    #self.project.relations.by_role('admin').each do |rel|
-    #  admin = User.find(rel.object_id)
-    #  UserMailer.new_issue_notification(self, admin).deliver
-    #end
-
     recipients = collect_recipient_ids
     recipients.each do |recipient_id|
       recipient = User.find(recipient_id)
@@ -47,7 +41,6 @@ class Issue < ActiveRecord::Base
   end
 
   def deliver_issue_assign_notification
-    #UserMailer.delay.issue_assign_notification(self, self.user).deliver if self.user_id_was != self.user_id
     UserMailer.delay.issue_assign_notification(self, self.user) if self.user_id_was != self.user_id
   end
 
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 073de4c2a..49b229b5c 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -30,7 +30,7 @@
           = link_to t('layout.issues.subscribe_btn'), project_issue_subscribes_path(@project, @issue), :method => :post
 
 %a{ :name => "comments" }
-.block#block-lists
+.block#block-list
   .content
     %h2.title
       = t("layout.issues.comments_header")
@@ -44,8 +44,8 @@
               = comment.body
               %br
               %br
-              = link_to t("layout.edit"), edit_project_issue_comment_path(@project, @issue, comment) if can? :update, comment
-              = link_to image_tag("web-app-theme/icons/cross.png", :alt => t("layout.delete")) + " " + t("layout.delete"), project_issue_comment_path(@project, @issue, comment), :method => "delete", :class => "button", :confirm => t("layout.comments.confirm_delete") if can? :delete, comment
+              = link_to t("layout.edit"), edit_project_issue_comment_path(@project, @issue.id, comment) if can? :update, comment
+              = link_to image_tag("web-app-theme/icons/cross.png", :alt => t("layout.delete")) + " " + t("layout.delete"), project_issue_comment_path(@project, @issue.id, comment), :method => "delete", :class => "button", :confirm => t("layout.comments.confirm_delete") if can? :delete, comment
 
 .block
   .content
diff --git a/db/schema.rb b/db/schema.rb
index 1aece65f1..37cc1d3a6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -245,6 +245,7 @@ ActiveRecord::Schema.define(:version => 20111226141947) do
     t.string   "object_type"
     t.integer  "target_id"
     t.string   "target_type"
+    t.integer  "role_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "role"
@@ -281,16 +282,16 @@ ActiveRecord::Schema.define(:version => 20111226141947) do
 
   create_table "users", :force => true do |t|
     t.string   "name"
-    t.string   "email",                               :default => "", :null => false
-    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
-    t.string   "password_salt",                       :default => "", :null => false
+    t.string   "email",                                 :default => "", :null => false
+    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
     t.string   "reset_password_token"
-    t.string   "remember_token"
+    t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "ssh_key"
     t.string   "uname"
+    t.text     "ssh_key"
+    t.integer  "role_id"
     t.string   "role"
   end
 
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 562bf1aff..8e9af23eb 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -1,5 +1,148 @@
 require 'spec_helper'
 
-describe CommentsController do
+shared_examples_for 'user with create comment rights' do
+  it 'should be able to perform create action' do
+    post :create, @create_params
+    response.should redirect_to(project_issue_path(@project, @issue))
+  end
 
+  it 'should create issue object into db' do
+    lambda{ post :create, @create_params }.should change{ Comment.count }.by(1)
+  end
+end
+
+shared_examples_for 'user with update own comment rights' do
+  it 'should be able to perform update action' do
+    put :update, {:id => @own_comment.id}.merge(@update_params)
+    response.should redirect_to([@project, @issue])
+  end
+
+  it 'should update issue title' do
+    put :update, {:id => @own_comment.id}.merge(@update_params)
+    @own_comment.reload.body.should == 'updated'
+  end
+end
+
+shared_examples_for 'user with update stranger comment rights' do
+  it 'should be able to perform update action' do
+    put :update, {:id => @comment.id}.merge(@update_params)
+    response.should redirect_to([@project, @issue])
+  end
+
+  it 'should update issue title' do
+    put :update, {:id => @comment.id}.merge(@update_params)
+    @comment.reload.body.should == 'updated'
+  end
+end
+
+shared_examples_for 'user without update stranger comment rights' do
+  it 'should not be able to perform update action' do
+    put :update, {:id => @comment.id}.merge(@update_params)
+    response.should redirect_to(forbidden_path)
+  end
+
+  it 'should not update issue title' do
+    put :update, {:id => @comment.id}.merge(@update_params)
+    @comment.reload.body.should_not == 'updated'
+  end
+end
+
+shared_examples_for 'user without destroy comment rights' do
+  it 'should not be able to perform destroy action' do
+    delete :destroy, :id => @comment.id, :issue_id => @issue.id, :project_id => @project.id
+    response.should redirect_to(forbidden_path)
+  end
+
+  it 'should not reduce comments count' do
+    lambda{ delete :destroy, :id => @comment.id, :issue_id => @issue.id, :project_id => @project.id }.should change{ Issue.count }.by(0)
+  end
+end
+
+#shared_examples_for 'user with destroy rights' do
+#  it 'should be able to perform destroy action' do
+#    delete :destroy, :id => @comment.id, :issue_id => @issue.id, :project_id => @project.id
+#    response.should redirect_to([@project, @issue])
+#  end
+#
+#  it 'should reduce comments count' do
+#    lambda{ delete :destroy, :id => @comment.id, :issue_id => @issue.id, :project_id => @project.id }.should change{ Comment.count }.by(-1)
+#  end
+#end
+
+describe CommentsController do
+  before(:each) do
+    stub_rsync_methods
+
+    @project = Factory(:project)
+    @issue = Factory(:issue, :project_id => @project.id)
+    @comment = Factory(:comment, :commentable => @issue)
+
+    @create_params = {:comment => {:body => 'I am a comment!'}, :project_id => @project.id, :issue_id => @issue.id}
+    @update_params = {:comment => {:body => 'updated'}, :project_id => @project.id, :issue_id => @issue.id}
+
+    any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+
+    @request.env['HTTP_REFERER'] = project_issue_path(@project, @issue)
+  end
+
+  context 'for project admin user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+
+      @own_comment = Factory(:comment, :commentable => @issue, :user => @user)
+    end
+
+    it_should_behave_like 'user with create comment rights'
+    it_should_behave_like 'user with update stranger comment rights'
+    it_should_behave_like 'user with update own comment rights'
+    it_should_behave_like 'user without destroy comment rights'
+  end
+
+  context 'for project owner user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.update_attribute(:owner, @user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+
+      @own_comment = Factory(:comment, :commentable => @issue, :user => @user)
+    end
+
+   it_should_behave_like 'user with create comment rights'
+   it_should_behave_like 'user with update stranger comment rights'
+   it_should_behave_like 'user with update own comment rights'
+   it_should_behave_like 'user without destroy comment rights'
+  end
+
+  context 'for project reader user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'reader')
+
+      @own_comment = Factory(:comment, :commentable => @issue, :user => @user)
+    end
+
+   it_should_behave_like 'user with create comment rights'
+   it_should_behave_like 'user without update stranger comment rights'
+   it_should_behave_like 'user with update own comment rights'
+   it_should_behave_like 'user without destroy comment rights'
+  end
+
+  context 'for project writer user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'writer')
+
+      @own_comment = Factory(:comment, :commentable => @issue, :user => @user)
+    end
+
+   it_should_behave_like 'user with create comment rights'
+   it_should_behave_like 'user without update stranger comment rights'
+   it_should_behave_like 'user with update own comment rights'
+   it_should_behave_like 'user without destroy comment rights'
+  end
 end
diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb
index 37aad58cf..63003491e 100644
--- a/spec/controllers/issues_controller_spec.rb
+++ b/spec/controllers/issues_controller_spec.rb
@@ -78,8 +78,6 @@ describe IssuesController do
 
     @project = Factory(:project)
     @issue_user = Factory(:user)
-    @create_params = {:project => {:name => 'pro'}}
-    @update_params = {:project => {:name => 'pro2'}}
 
     any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
 
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
index f9df3b695..f036eee06 100644
--- a/spec/factories/comments.rb
+++ b/spec/factories/comments.rb
@@ -1,6 +1,5 @@
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :comment do
-    end
-end
\ No newline at end of file
+Factory.define(:comment) do |p|
+  p.body { Factory.next(:string) }
+  p.association :user, :factory => :user
+  p.association :commentable, :factory => :issue
+end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 8b8017dbc..79d2ca96a 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,6 +1,7 @@
 Factory.define(:issue) do |p|
   p.title { Factory.next(:string) }
   p.body { Factory.next(:string) }
+  p.association :project, :factory => :project
   p.association :user, :factory => :user
   p.status "open"
 end

From 402133aff6d7df5c249c21be93a06893ad32d5b0 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Thu, 29 Dec 2011 21:03:53 +0400
Subject: [PATCH 31/40] [refs #54] Add some subscribe specs and factory

---
 spec/controllers/comments_controller_spec.rb  |  4 +-
 .../controllers/subscribes_controller_spec.rb | 64 +++++++++++++++++++
 spec/factories/subscribes.rb                  | 10 ++-
 3 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 8e9af23eb..c93ac57f0 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -6,7 +6,7 @@ shared_examples_for 'user with create comment rights' do
     response.should redirect_to(project_issue_path(@project, @issue))
   end
 
-  it 'should create issue object into db' do
+  it 'should create subscribe object into db' do
     lambda{ post :create, @create_params }.should change{ Comment.count }.by(1)
   end
 end
@@ -17,7 +17,7 @@ shared_examples_for 'user with update own comment rights' do
     response.should redirect_to([@project, @issue])
   end
 
-  it 'should update issue title' do
+  it 'should update subscribe body' do
     put :update, {:id => @own_comment.id}.merge(@update_params)
     @own_comment.reload.body.should == 'updated'
   end
diff --git a/spec/controllers/subscribes_controller_spec.rb b/spec/controllers/subscribes_controller_spec.rb
index e1c466cb3..7358127ee 100644
--- a/spec/controllers/subscribes_controller_spec.rb
+++ b/spec/controllers/subscribes_controller_spec.rb
@@ -1,5 +1,69 @@
 require 'spec_helper'
 
+shared_examples_for 'user with create subscribe rights' do
+  it 'should be able to perform create action' do
+    post :create, @create_params
+    response.should redirect_to(project_issue_path(@project, @issue))
+  end
+
+  it 'should create subscribe object into db' do
+    lambda{ post :create, @create_params }.should change{ Subscribe.count }.by(1)
+  end
+end
+
+shared_examples_for 'user without destroy subscribe rights' do
+  it 'should not be able to perform destroy action' do
+    delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id
+    response.should redirect_to(forbidden_path)
+  end
+
+  it 'should not reduce subscribes count' do
+    lambda{ delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id }.should change{ Subscribe.count }.by(0)
+  end
+end
+
 describe SubscribesController do
+  before(:each) do
+    stub_rsync_methods
+
+    @project = Factory(:project)
+    @issue = Factory(:issue, :project_id => @project.id)
+    @subscribe = Factory(:subscribe, :subscribeable => @issue, :user => @user)
+
+    any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+
+    @request.env['HTTP_REFERER'] = project_issue_path(@project, @issue)
+  end
+
+  context 'for global admin user' do
+    before(:each) do
+      @user = Factory(:admin)
+      set_session_for(@user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+    end
+
+    it 'should be able to perform create action' do
+      post :create, :project_id => @project.id, :issue_id => @issue.id
+      response.should redirect_to(project_issue_path(@project, @issue))
+    end
+
+    it 'should create issue object into db' do
+      lambda{ post :create, :project_id => @project.id, :issue_id => @issue.id }.should change{ Subscribe.count }.by(1)
+    end
+
+    it 'should be able to perform destroy action' do
+      delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id
+      response.should redirect_to(forbidden_path)
+    end
+
+    it 'should reduce subscribes count' do
+      lambda{ delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id }.should change{ Issue.count }.by(-1)
+    end
+
+    #it_should_behave_like 'user with create subscribe rights'
+    #it_should_behave_like 'user with update stranger subscribe rights'
+    #it_should_behave_like 'user with update own subscribe rights'
+    #it_should_behave_like 'user without destroy subscribe rights'
+  end
 
 end
diff --git a/spec/factories/subscribes.rb b/spec/factories/subscribes.rb
index f0644816f..55a75a8ee 100644
--- a/spec/factories/subscribes.rb
+++ b/spec/factories/subscribes.rb
@@ -1,6 +1,4 @@
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :subscribe do
-    end
-end
\ No newline at end of file
+Factory.define(:subscribe) do |p|
+  p.association :subscribeable, :factory => :issue
+  p.association :user, :factory => :user
+end

From 782b311983a81e0fa48853029d4d4af13ffb5561 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Thu, 29 Dec 2011 22:16:39 +0400
Subject: [PATCH 32/40] [issue #76] Changed project list in repositories.

---
 app/views/repositories/_proj_list.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/_proj_list.html.haml b/app/views/repositories/_proj_list.html.haml
index cb3745999..087de3c70 100644
--- a/app/views/repositories/_proj_list.html.haml
+++ b/app/views/repositories/_proj_list.html.haml
@@ -5,7 +5,7 @@
   - @projects.each do |project|
     %tr{:class => cycle("odd", "even")}
       %td
-        = link_to project.owner.name + '/' + project.name, project_path(project)
+        = link_to project.owner.uname + '/' + project.name, project_path(project)
       %td.last
         #{link_to t("layout.show"), project_path(project)} | #{link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id)}
 

From 3f72082e0ec4511423f8beacdf551a0db2da7ea0 Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Fri, 30 Dec 2011 18:21:08 +0400
Subject: [PATCH 33/40] [refs #54] Add comments, subscribes models specs.
 Finish subscribes controller specs. Some ability.rb fixes

---
 app/models/ability.rb                         |   2 +
 .../controllers/subscribes_controller_spec.rb |  86 +++++++++---
 spec/models/comment_spec.rb                   | 122 +++++++++++++++++-
 spec/models/subscribe_spec.rb                 |  74 ++++++++++-
 4 files changed, 262 insertions(+), 22 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index a0bd61c8d..1b7509a2b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -13,6 +13,8 @@ class Ability
 
     if user.admin?
       can :manage, :all
+      cannot :destroy, Subscribe
+      cannot :create, Subscribe
     else
       # Shared rights between guests and registered users
       can :forbidden, Platform
diff --git a/spec/controllers/subscribes_controller_spec.rb b/spec/controllers/subscribes_controller_spec.rb
index 7358127ee..378af911d 100644
--- a/spec/controllers/subscribes_controller_spec.rb
+++ b/spec/controllers/subscribes_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-shared_examples_for 'user with create subscribe rights' do
+shared_examples_for 'can subscribe' do
   it 'should be able to perform create action' do
     post :create, @create_params
     response.should redirect_to(project_issue_path(@project, @issue))
@@ -11,14 +11,42 @@ shared_examples_for 'user with create subscribe rights' do
   end
 end
 
-shared_examples_for 'user without destroy subscribe rights' do
+shared_examples_for 'can not subscribe' do
+  it 'should not be able to perform create action' do
+    post :create, @create_params
+    response.should redirect_to(forbidden_path)
+  end
+
+  it 'should not create subscribe object into db' do
+    lambda{ post :create, @create_params }.should change{ Subscribe.count }.by(0)
+  end
+end
+
+shared_examples_for 'can unsubscribe' do
+  it 'should be able to perform destroy action' do
+    #set_objects_to_destroy
+    delete :destroy, @destroy_params
+
+    response.should redirect_to([@project, @issue])
+  end
+
+  it 'should reduce subscribes count' do
+    #set_objects_to_destroy
+    lambda{ delete :destroy, @destroy_params }.should change{ Subscribe.count }.by(-1)
+  end
+end
+
+shared_examples_for 'can not unsubscribe' do
   it 'should not be able to perform destroy action' do
-    delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id
+    #set_objects_to_destroy
+    delete :destroy, @destroy_params
+
     response.should redirect_to(forbidden_path)
   end
 
   it 'should not reduce subscribes count' do
-    lambda{ delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id }.should change{ Subscribe.count }.by(0)
+    #set_objects_to_destroy
+    lambda{ delete :destroy, @destroy_params }.should change{ Subscribe.count }.by(0)
   end
 end
 
@@ -28,7 +56,9 @@ describe SubscribesController do
 
     @project = Factory(:project)
     @issue = Factory(:issue, :project_id => @project.id)
-    @subscribe = Factory(:subscribe, :subscribeable => @issue, :user => @user)
+
+    @create_params = {:issue_id => @issue.serial_id, :project_id => @project.id}
+    @destroy_params = {:issue_id => @issue.serial_id, :project_id => @project.id}
 
     any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
 
@@ -40,30 +70,46 @@ describe SubscribesController do
       @user = Factory(:admin)
       set_session_for(@user)
       @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+      @destroy_params = @destroy_params.merge({:id => @user.id})
     end
 
-    it 'should be able to perform create action' do
-      post :create, :project_id => @project.id, :issue_id => @issue.id
-      response.should redirect_to(project_issue_path(@project, @issue))
+    context 'subscribed' do
+      before(:each) do
+        ss = @issue.subscribes.build(:user => @user)
+        ss.save!
+      end
+
+      it_should_behave_like 'can unsubscribe'
+      it_should_behave_like 'can not subscribe'
     end
 
-    it 'should create issue object into db' do
-      lambda{ post :create, :project_id => @project.id, :issue_id => @issue.id }.should change{ Subscribe.count }.by(1)
+    context 'not subscribed' do
+      it_should_behave_like 'can subscribe'
+      #it_should_behave_like 'can not unsubscribe'
+    end
+  end
+
+  context 'for simple user' do
+    before(:each) do
+      @user = Factory(:user)
+      set_session_for(@user)
+      @destroy_params = @destroy_params.merge({:id => @user.id})
     end
 
-    it 'should be able to perform destroy action' do
-      delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id
-      response.should redirect_to(forbidden_path)
+    context 'subscribed' do
+      before(:each) do
+        ss = @issue.subscribes.build(:user => @user)
+        ss.save!
+      end
+
+      it_should_behave_like 'can unsubscribe'
+      it_should_behave_like 'can not subscribe'
     end
 
-    it 'should reduce subscribes count' do
-      lambda{ delete :destroy, :id => @subscribe.id, :issue_id => @issue.id, :project_id => @project.id }.should change{ Issue.count }.by(-1)
+    context 'not subscribed' do
+      it_should_behave_like 'can subscribe'
+      #it_should_behave_like 'can not unsubscribe'
     end
-
-    #it_should_behave_like 'user with create subscribe rights'
-    #it_should_behave_like 'user with update stranger subscribe rights'
-    #it_should_behave_like 'user with update own subscribe rights'
-    #it_should_behave_like 'user without destroy subscribe rights'
   end
 
 end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 505e33d36..0b969c134 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -1,5 +1,125 @@
 require 'spec_helper'
+require "cancan/matchers"
+
+def set_testable_data
+  @ability = Ability.new(@user)
+
+  @project = Factory(:project)
+  @issue = Factory(:issue, :project_id => @project.id)
+
+  @comment = Factory(:comment, :commentable => @issue, :user => @user)
+  @stranger_comment = Factory(:comment, :commentable => @issue, :user => @stranger)
+
+  any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+end
 
 describe Comment do
-  pending "add some examples to (or delete) #{__FILE__}"
+  context 'for global admin user' do
+    before(:each) do
+      @user = Factory(:admin)
+      @stranger = Factory(:user)
+
+      set_testable_data
+    end
+
+    it 'should create comment' do
+      @ability.should be_able_to(:create, Comment.new(:commentable => @issue, :user => @user))
+    end
+
+    it 'should update comment' do
+      @ability.should be_able_to(:update, @comment)
+    end
+
+    it 'should update stranger comment' do
+      @ability.should be_able_to(:update, @stranger_comment)
+    end
+
+    it 'should destroy own comment' do
+        @ability.should be_able_to(:destroy, @comment)
+    end
+
+    it 'should destroy stranger comment' do
+      @ability.should be_able_to(:destroy, @stranger_comment)
+    end
+  end
+
+  context 'for project admin user' do
+    before(:each) do
+      @user = Factory(:user)
+      @stranger = Factory(:user)
+
+      set_testable_data
+
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+    end
+
+    it 'should create comment' do
+      @ability.should be_able_to(:create, Comment.new(:commentable => @issue, :user => @user))
+    end
+
+    it 'should update comment' do
+      @ability.should be_able_to(:update, @comment)
+    end
+
+    it 'should update stranger comment' do
+      @ability.should be_able_to(:update, @stranger_comment)
+    end
+
+    it 'should not destroy comment' do
+      @ability.should_not be_able_to(:destroy, @comment)
+    end
+  end
+
+  context 'for project owner user' do
+    before(:each) do
+      @user = Factory(:user)
+      @stranger = Factory(:user)
+
+      set_testable_data
+
+      @project.update_attribute(:owner, @user)
+      @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+    end
+
+    it 'should create comment' do
+      @ability.should be_able_to(:create, Comment.new(:commentable => @issue, :user => @user))
+    end
+
+    it 'should update comment' do
+      @ability.should be_able_to(:update, @comment)
+    end
+
+    it 'should update stranger comment' do
+      @ability.should be_able_to(:update, @stranger_comment)
+    end
+
+    it 'should not destroy comment' do
+      @ability.should_not be_able_to(:destroy, @comment)
+    end
+  end
+
+  context 'for simple user' do
+    before(:each) do
+      @user = Factory(:user)
+      @stranger = Factory(:user)
+
+      set_testable_data
+    end
+
+    it 'should create comment' do
+      @ability.should be_able_to(:create, Comment.new(:commentable => @issue, :user => @user))
+    end
+
+    it 'should update comment' do
+      @ability.should be_able_to(:update, @comment)
+    end
+
+    it 'should not update stranger comment' do
+      @ability.should_not be_able_to(:update, @stranger_comment)
+    end
+
+    it 'should not destroy comment' do
+      @ability.should_not be_able_to(:destroy, @comment)
+    end
+  end
 end
diff --git a/spec/models/subscribe_spec.rb b/spec/models/subscribe_spec.rb
index 0df4fbb42..7d496da07 100644
--- a/spec/models/subscribe_spec.rb
+++ b/spec/models/subscribe_spec.rb
@@ -1,5 +1,77 @@
 require 'spec_helper'
+require "cancan/matchers"
+
+def set_testable_data
+  @ability = Ability.new(@user)
+
+  @project = Factory(:project)
+  @issue = Factory(:issue, :project_id => @project.id)
+
+  any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+end
 
 describe Subscribe do
-  pending "add some examples to (or delete) #{__FILE__}"
+  context 'for global admin user' do
+    before(:each) do
+      @user = Factory(:admin)
+      @stranger = Factory(:user)
+
+      set_testable_data
+    end
+
+    it 'should create subscribe' do
+      @ability.should be_able_to(:create, Subscribe.new(:subscribeable => @issue, :user => @user))
+    end
+
+    context 'destroy' do
+      before(:each) do
+        @subscribe = Factory(:subscribe, :subscribeable => @issue, :user => @user)
+        @stranger_subscribe = Factory(:subscribe, :subscribeable => @issue, :user => @stranger)
+      end
+
+      context 'own subscribe' do
+        it 'should destroy subscribe' do
+          @ability.should be_able_to(:destroy, @subscribe)
+        end
+      end
+
+      context 'stranger subscribe' do
+        it 'should not destroy subscribe' do
+          @ability.should_not be_able_to(:destroy, @stranger_subscribe)
+        end
+      end
+    end
+  end
+
+  context 'for simple user' do
+    before(:each) do
+      @user = Factory(:user)
+      @stranger = Factory(:user)
+
+      set_testable_data
+    end
+
+    it 'should create subscribe' do
+      @ability.should be_able_to(:create, Subscribe.new(:subscribeable => @issue, :user => @user))
+    end
+
+    context 'destroy' do
+      before(:each) do
+        @subscribe = Factory(:subscribe, :subscribeable => @issue, :user => @user)
+        @stranger_subscribe = Factory(:subscribe, :subscribeable => @issue, :user => @stranger)
+      end
+
+      context 'own subscribe' do
+        it 'should destroy subscribe' do
+          @ability.should be_able_to(:destroy, @subscribe)
+        end
+      end
+
+      context 'stranger subscribe' do
+        it 'should not destroy subscribe' do
+          @ability.should_not be_able_to(:destroy, @stranger_subscribe)
+        end
+      end
+    end
+  end
 end

From a44530980ed8344ad4925346b163ac4f274d69ce Mon Sep 17 00:00:00 2001
From: "konstantin.grabar" <santaux@gmail.com>
Date: Fri, 30 Dec 2011 18:44:47 +0400
Subject: [PATCH 34/40] [refs #54] Remove some unnessacary comments

---
 config/routes.rb                               |  6 ------
 spec/controllers/issues_controller_spec.rb     |  5 -----
 spec/controllers/subscribes_controller_spec.rb |  6 ------
 spec/helpers/comments_helper_spec.rb           | 15 ---------------
 spec/helpers/issues_helper_spec.rb             | 15 ---------------
 spec/helpers/subscribes_helper_spec.rb         | 15 ---------------
 6 files changed, 62 deletions(-)
 delete mode 100644 spec/helpers/comments_helper_spec.rb
 delete mode 100644 spec/helpers/issues_helper_spec.rb
 delete mode 100644 spec/helpers/subscribes_helper_spec.rb

diff --git a/config/routes.rb b/config/routes.rb
index c6b729fd7..7f3449cde 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,12 +78,6 @@ Rosa::Application.routes.draw do
     resources :categories, :only => [:index, :show]
   end
 
-  #match "issues/:issue_id/subscribe" => 'subscribes#create', :as => :subscribe_issue, :via => :post
-  #match "issues/:issue_id/unsubscribe" => 'subscribes#destroy', :as => :unsubscribe_issue, :via => :delete
-
-  #match "projects/:project_id/issues/:serial_id" => 'issues#show', :serial_id => /\d+/, :as => :show_issue, :via => :get
-  #match "projects/:project_id/issues/:serial_id/edit" => 'issues#edit', :serial_id => /\d+/, :as => :edit_issue, :via => :get
-
   resources :projects do
     resources :issues do
       resources :comments, :only => [:edit, :create, :update, :destroy]
diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb
index 63003491e..829957dee 100644
--- a/spec/controllers/issues_controller_spec.rb
+++ b/spec/controllers/issues_controller_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 shared_examples_for 'issue user with project reader rights' do
-  #it_should_behave_like 'user with rights to view issues'
   it 'should be able to perform index action' do
     get :index, :project_id => @project.id
     response.should render_template(:index)
@@ -62,7 +61,6 @@ end
 shared_examples_for 'project with issues turned off' do
   pending 'should not be able to perform index action' do
     get :index, :project_id => @project_with_turned_off_issues.id
-    #response.should redirect_to(forbidden_path)
     response.should render_template(:index)
   end
 
@@ -114,8 +112,6 @@ describe IssuesController do
 
   context 'for project admin user' do
     before(:each) do
-      #@admin = Factory(:admin)
-      #set_session_for(@admin)
       @user = Factory(:user)
       set_session_for(@user)
       @project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
@@ -182,7 +178,6 @@ describe IssuesController do
   context 'for issue assign user' do
     before(:each) do
       set_session_for(@issue_user)
-      #@project.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'writer')
     end
 
     it_should_behave_like 'user with issue update rights'
diff --git a/spec/controllers/subscribes_controller_spec.rb b/spec/controllers/subscribes_controller_spec.rb
index 378af911d..6db7e2c24 100644
--- a/spec/controllers/subscribes_controller_spec.rb
+++ b/spec/controllers/subscribes_controller_spec.rb
@@ -24,28 +24,24 @@ end
 
 shared_examples_for 'can unsubscribe' do
   it 'should be able to perform destroy action' do
-    #set_objects_to_destroy
     delete :destroy, @destroy_params
 
     response.should redirect_to([@project, @issue])
   end
 
   it 'should reduce subscribes count' do
-    #set_objects_to_destroy
     lambda{ delete :destroy, @destroy_params }.should change{ Subscribe.count }.by(-1)
   end
 end
 
 shared_examples_for 'can not unsubscribe' do
   it 'should not be able to perform destroy action' do
-    #set_objects_to_destroy
     delete :destroy, @destroy_params
 
     response.should redirect_to(forbidden_path)
   end
 
   it 'should not reduce subscribes count' do
-    #set_objects_to_destroy
     lambda{ delete :destroy, @destroy_params }.should change{ Subscribe.count }.by(0)
   end
 end
@@ -85,7 +81,6 @@ describe SubscribesController do
 
     context 'not subscribed' do
       it_should_behave_like 'can subscribe'
-      #it_should_behave_like 'can not unsubscribe'
     end
   end
 
@@ -108,7 +103,6 @@ describe SubscribesController do
 
     context 'not subscribed' do
       it_should_behave_like 'can subscribe'
-      #it_should_behave_like 'can not unsubscribe'
     end
   end
 
diff --git a/spec/helpers/comments_helper_spec.rb b/spec/helpers/comments_helper_spec.rb
deleted file mode 100644
index cc93aa9b6..000000000
--- a/spec/helpers/comments_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the CommentsHelper. For example:
-#
-# describe CommentsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe CommentsHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
deleted file mode 100644
index 2e20f1cf1..000000000
--- a/spec/helpers/issues_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the IssuesHelper. For example:
-#
-# describe IssuesHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe IssuesHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/helpers/subscribes_helper_spec.rb b/spec/helpers/subscribes_helper_spec.rb
deleted file mode 100644
index c72869cf9..000000000
--- a/spec/helpers/subscribes_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the SubscribesHelper. For example:
-#
-# describe SubscribesHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe SubscribesHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

From 7c50b2c3f583b12a24935f5167cd6218c1b2f0b5 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Sat, 31 Dec 2011 02:42:58 +0400
Subject: [PATCH 35/40] [issue #76] Added jQuery DataTable. But it doesn't work
 yet

---
 app/controllers/repositories_controller.rb    |  27 +++-
 app/views/repositories/_proj_ajax.js.erb      |  12 ++
 app/views/repositories/_proj_list.html.haml   |  12 +-
 .../repositories/projects_list.html.haml      |   2 +-
 config/routes.rb                              |   1 +
 public/javascripts/jquery.dataTables.min.js   | 151 ++++++++++++++++++
 vendor/plugins/rails_datatables/MIT-LICENSE   |  20 +++
 vendor/plugins/rails_datatables/README.md     | 138 ++++++++++++++++
 vendor/plugins/rails_datatables/Rakefile      |  23 +++
 vendor/plugins/rails_datatables/init.rb       |   1 +
 vendor/plugins/rails_datatables/install.rb    |   1 +
 .../rails_datatables/lib/rails_datatables.rb  |  81 ++++++++++
 .../test/rails_datatables_test.rb             |   8 +
 .../rails_datatables/test/test_helper.rb      |   3 +
 vendor/plugins/rails_datatables/uninstall.rb  |   1 +
 15 files changed, 472 insertions(+), 9 deletions(-)
 create mode 100644 app/views/repositories/_proj_ajax.js.erb
 create mode 100644 public/javascripts/jquery.dataTables.min.js
 create mode 100644 vendor/plugins/rails_datatables/MIT-LICENSE
 create mode 100644 vendor/plugins/rails_datatables/README.md
 create mode 100644 vendor/plugins/rails_datatables/Rakefile
 create mode 100644 vendor/plugins/rails_datatables/init.rb
 create mode 100644 vendor/plugins/rails_datatables/install.rb
 create mode 100644 vendor/plugins/rails_datatables/lib/rails_datatables.rb
 create mode 100644 vendor/plugins/rails_datatables/test/rails_datatables_test.rb
 create mode 100644 vendor/plugins/rails_datatables/test/test_helper.rb
 create mode 100644 vendor/plugins/rails_datatables/uninstall.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 8bbca916e..bb6dbdbe5 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -63,15 +63,32 @@ class RepositoriesController < ApplicationController
       end
       redirect_to repository_path(@repository)
     else
-      if @repository.platform.platform_type == 'main'
-        @projects = Project.addable_to_repository(@repository.id).by_visibilities(['open']).paginate(:page => params[:project_page])
-      else
-        @projects = Project.addable_to_repository(@repository.id).paginate(:page => params[:project_page])
-      end
+#      if @repository.platform.platform_type == 'main'
+#        @projects = Project.addable_to_repository(@repository.id).by_visibilities(['open']).paginate(:page => params[:project_page])
+#      else
+#        @projects = Project.addable_to_repository(@repository.id).paginate(:page => params[:project_page])
+#      end
       render 'projects_list'
     end
   end
 
+  def projects_list
+    colName = ['owner.uname', 'projects.name']
+    sort_col = params[:iSortCol_0] || 0
+    sort_dir = params[:sSortDir_0]=="asc" ? 'asc' : 'desc'
+    order = "#{colName[sort_col.to_i]} #{sort_dir}"
+
+    @projects = Project.addable_to_repository(@repository.id)
+    @projects = @projects.by_visibilities(['open']) if @repository.platform.platform_type == 'main'
+
+    @total_projects = @projects.count
+    @projects = @projects.where(['projects.name LIKE ?', "#{params[:sSearch]}%"]) if params[:sSearch] and !params[:sSearch].empty?
+    @total_project = @projects.count
+    @projects = @projects.order(order)#.includes(:owner) #WTF????
+
+    render :partial => 'proj_ajax', :layout => false
+  end
+
   def remove_project
     @project = Project.find(params[:project_id])
     ProjectToRepository.where(:project_id => @project.id, :repository_id => @repository.id).destroy_all
diff --git a/app/views/repositories/_proj_ajax.js.erb b/app/views/repositories/_proj_ajax.js.erb
new file mode 100644
index 000000000..b70fc996f
--- /dev/null
+++ b/app/views/repositories/_proj_ajax.js.erb
@@ -0,0 +1,12 @@
+{"sEcho": <%= params[:sEcho] || -1 %>,
+ "iTotalRecords": <%= @total_projects %>,
+ "iTotalDisplayRecords": <%= @total_project %>,
+ "aaData":[
+<% @projects.each do |project| %>
+  ['<%= link_to(project.owner.uname, project.owner) %>',
+   '<%= link_to(project.name, project) %>',
+   '<%= link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id) %>'
+  ],
+<% end %>
+]}
+
diff --git a/app/views/repositories/_proj_list.html.haml b/app/views/repositories/_proj_list.html.haml
index 087de3c70..67bdd09f1 100644
--- a/app/views/repositories/_proj_list.html.haml
+++ b/app/views/repositories/_proj_list.html.haml
@@ -1,11 +1,17 @@
-%table.table
+- columns = [{:type => 'html', :sortable => false, :searchable => false}, {:type => 'html'}, {:type => nil}]
+= raw datatable(columns, {:sort_by => "[1, 'asc']", :ajax_source => "#{url_for :controller => :repositories, :action => :projects_list, :id => @repository.id}" })
+
+%table.table.datatable
   %tr
-    %th.first= t("activerecord.attributes.project.name")
+    %th.first= t("activerecord.attributes.user.uname")
+    %th= t("activerecord.attributes.project.name")
     %th.last &nbsp;
-  - @projects.each do |project|
+  -# @projects.each do |project|
     %tr{:class => cycle("odd", "even")}
       %td
         = link_to project.owner.uname + '/' + project.name, project_path(project)
       %td.last
         #{link_to t("layout.show"), project_path(project)} | #{link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id)}
 
+= content_for :javascripts do
+  = javascript_include_tag 'jquery.dataTables.min.js'
diff --git a/app/views/repositories/projects_list.html.haml b/app/views/repositories/projects_list.html.haml
index de40de54c..56f66de84 100644
--- a/app/views/repositories/projects_list.html.haml
+++ b/app/views/repositories/projects_list.html.haml
@@ -41,7 +41,7 @@
     .inner
       = render :partial => 'shared/search_form'
       = render :partial => 'proj_list', :object => @projects
-      .actions-bar.wat-cf
+      -#.actions-bar.wat-cf
         .actions
           = will_paginate @projects, :param_name => :project_page
 
diff --git a/config/routes.rb b/config/routes.rb
index dcea79076..ca9648c86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -110,6 +110,7 @@ Rosa::Application.routes.draw do
     member do
       get :add_project
       get :remove_project
+      get :projects_list
     end
   end
 
diff --git a/public/javascripts/jquery.dataTables.min.js b/public/javascripts/jquery.dataTables.min.js
new file mode 100644
index 000000000..4280c6d63
--- /dev/null
+++ b/public/javascripts/jquery.dataTables.min.js
@@ -0,0 +1,151 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.8.2
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2011 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, as supplied with this software.
+ * 
+ * This source file is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ */
+(function(i,za,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var n=i.fn.dataTableExt;n.sVersion="1.8.2";n.sErrMode="alert";n.iApiIndex=0;n.oApi={};n.afnFiltering=[];n.aoFeatures=[];n.ofnSearch={};n.afnSortData=[];n.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
+sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
+sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};n.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
+sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",
+sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last ui-corner-tr ui-corner-br",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",
+sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollWrapper:"dataTables_scroll",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};n.oPagination={two_button:{fnInit:function(g,l,s){var t,w,y;if(g.bJUI){t=p.createElement("a");w=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;w.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;
+t.appendChild(y)}else{t=p.createElement("div");w=p.createElement("div")}t.className=g.oClasses.sPagePrevDisabled;w.className=g.oClasses.sPageNextDisabled;t.title=g.oLanguage.oPaginate.sPrevious;w.title=g.oLanguage.oPaginate.sNext;l.appendChild(t);l.appendChild(w);i(t).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&s(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&s(g)});i(t).bind("selectstart.DT",function(){return false});i(w).bind("selectstart.DT",function(){return false});
+if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");t.setAttribute("id",g.sTableId+"_previous");w.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=g.aanFeatures.p,s=0,t=l.length;s<t;s++)if(l[s].childNodes.length!==0){l[s].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[s].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:
+g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,s){var t=p.createElement("span"),w=p.createElement("span"),y=p.createElement("span"),F=p.createElement("span"),x=p.createElement("span");t.innerHTML=g.oLanguage.oPaginate.sFirst;w.innerHTML=g.oLanguage.oPaginate.sPrevious;F.innerHTML=g.oLanguage.oPaginate.sNext;x.innerHTML=g.oLanguage.oPaginate.sLast;var v=g.oClasses;t.className=v.sPageButton+" "+v.sPageFirst;w.className=v.sPageButton+" "+v.sPagePrevious;F.className=
+v.sPageButton+" "+v.sPageNext;x.className=v.sPageButton+" "+v.sPageLast;l.appendChild(t);l.appendChild(w);l.appendChild(y);l.appendChild(F);l.appendChild(x);i(t).bind("click.DT",function(){g.oApi._fnPageChange(g,"first")&&s(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&s(g)});i(F).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&s(g)});i(x).bind("click.DT",function(){g.oApi._fnPageChange(g,"last")&&s(g)});i("span",l).bind("mousedown.DT",function(){return false}).bind("selectstart.DT",
+function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");t.setAttribute("id",g.sTableId+"_first");w.setAttribute("id",g.sTableId+"_previous");F.setAttribute("id",g.sTableId+"_next");x.setAttribute("id",g.sTableId+"_last")}},fnUpdate:function(g,l){if(g.aanFeatures.p){var s=n.oPagination.iFullNumbersShowPages,t=Math.floor(s/2),w=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,F=
+"",x,v=g.oClasses;if(w<s){t=1;x=w}else if(y<=t){t=1;x=s}else if(y>=w-t){t=w-s+1;x=w}else{t=y-Math.ceil(s/2)+1;x=t+s-1}for(s=t;s<=x;s++)F+=y!=s?'<span class="'+v.sPageButton+'">'+s+"</span>":'<span class="'+v.sPageButtonActive+'">'+s+"</span>";x=g.aanFeatures.p;var z,$=function(M){g._iDisplayStart=(this.innerHTML*1-1)*g._iDisplayLength;l(g);M.preventDefault()},X=function(){return false};s=0;for(t=x.length;s<t;s++)if(x[s].childNodes.length!==0){z=i("span:eq(2)",x[s]);z.html(F);i("span",z).bind("click.DT",
+$).bind("mousedown.DT",X).bind("selectstart.DT",X);z=x[s].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];i(z).removeClass(v.sPageButton+" "+v.sPageButtonActive+" "+v.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+v.sPageButtonStaticDisabled;z[1].className+=" "+v.sPageButtonStaticDisabled}else{z[0].className+=" "+v.sPageButton;z[1].className+=" "+v.sPageButton}if(w===0||y==w||g._iDisplayLength==-1){z[2].className+=" "+v.sPageButtonStaticDisabled;z[3].className+=" "+
+v.sPageButtonStaticDisabled}else{z[2].className+=" "+v.sPageButton;z[3].className+=" "+v.sPageButton}}}}}};n.oSort={"string-asc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<
+l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return l-
+g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};n.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,s=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var t=1;t<g.length;t++){l=g.charAt(t);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(s)return null;s=true}}return"numeric"},function(g){var l=Date.parse(g);
+if(l!==null&&!isNaN(l)||typeof g=="string"&&g.length===0)return"date";return null},function(g){if(typeof g=="string"&&g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];n.fnVersionCheck=function(g){var l=function(x,v){for(;x.length<v;)x+="0";return x},s=n.sVersion.split(".");g=g.split(".");for(var t="",w="",y=0,F=g.length;y<F;y++){t+=l(s[y],3);w+=l(g[y],3)}return parseInt(t,10)>=parseInt(w,10)};n._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal=
+function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance=
+this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",
+sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sInfoThousands:",",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",
+bRegex:false,bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripeClasses=[];this.asDestroyStripes=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType=
+"two_button";this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:function(f){i(d.oInstance).trigger("xhr",d);c(f)},dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};
+this.aoServerParams=[];this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=this.oLanguage.sInfoThousands+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.bDrawing=this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=n.oStdClasses;this.bSortCellsTop=this.bSorted=this.bFiltered=false;
+this.oInit=null;this.aoDestroyCallback=[]}function s(a){return function(){var b=[A(this[n.iApiIndex])].concat(Array.prototype.slice.call(arguments));return n.oApi[a].apply(this,b)}}function t(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){t(a)},200);else{Aa(a);X(a);M(a,a.aoHeader);a.nTFoot&&M(a,a.aoFooter);K(a,true);a.oFeatures.bAutoWidth&&ga(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=q(a.aoColumns[b].sWidth);
+if(a.oFeatures.bSort)R(a);else if(a.oFeatures.bFilter)N(a,a.oPreviousSearch);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide){c=[];ha(a,c);a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(f){var e=f;if(a.sAjaxDataProp!=="")e=aa(a.sAjaxDataProp)(f);for(b=0;b<e.length;b++)v(a,e[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)R(a);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}K(a,false);w(a,f)},a)}else if(!a.oFeatures.bServerSide){K(a,
+false);w(a)}}}function w(a,b){a._bInitComplete=true;if(typeof a.fnInitComplete=="function")typeof b!="undefined"?a.fnInitComplete.call(a.oInstance,a,b):a.fnInitComplete.call(a.oInstance,a)}function y(a,b,c){a.oLanguage=i.extend(true,a.oLanguage,b);typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&o(a.oLanguage,b,"sZeroRecords","sEmptyTable");typeof b.sLoadingRecords=="undefined"&&typeof b.sZeroRecords!="undefined"&&o(a.oLanguage,b,"sZeroRecords","sLoadingRecords");c&&t(a)}function F(a,
+b){var c=a.aoColumns.length;b={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:c,mDataProp:c,fnGetData:null,fnSetData:null,sSortDataType:"std",sDefaultContent:null,sContentPadding:"",nTh:b?b:p.createElement("th"),nTf:null};a.aoColumns.push(b);if(typeof a.aoPreSearchCols[c]==
+"undefined"||a.aoPreSearchCols[c]===null)a.aoPreSearchCols[c]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[c].bRegex=="undefined")a.aoPreSearchCols[c].bRegex=true;if(typeof a.aoPreSearchCols[c].bSmart=="undefined")a.aoPreSearchCols[c].bSmart=true}x(a,c,null)}function x(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}o(b,c,"bVisible");o(b,c,"bSearchable");o(b,c,"bSortable");o(b,c,"sTitle");o(b,
+c,"sName");o(b,c,"sWidth");o(b,c,"sWidth","sWidthOrig");o(b,c,"sClass");o(b,c,"fnRender");o(b,c,"bUseRendered");o(b,c,"iDataSort");o(b,c,"mDataProp");o(b,c,"asSorting");o(b,c,"sSortDataType");o(b,c,"sDefaultContent");o(b,c,"sContentPadding")}b.fnGetData=aa(b.mDataProp);b.fnSetData=Ba(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||
+i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function v(a,b){var c;
+c=i.isArray(b)?b.slice():i.extend(true,{},b);b=a.aoData.length;var d={nTr:null,_iId:a.iNextId++,_aData:c,_anHidden:[],_sRowStripe:""};a.aoData.push(d);for(var f,e=0,h=a.aoColumns.length;e<h;e++){c=a.aoColumns[e];typeof c.fnRender=="function"&&c.bUseRendered&&c.mDataProp!==null&&O(a,b,e,c.fnRender({iDataRow:b,iDataColumn:e,aData:d._aData,oSettings:a}));if(c._bAutoType&&c.sType!="string"){f=G(a,b,e,"type");if(f!==null&&f!==""){f=ia(f);if(c.sType===null)c.sType=f;else if(c.sType!=f&&c.sType!="html")c.sType=
+"string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||z(a,b);return b}function z(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=p.createElement("tr");typeof c._aData.DT_RowId!="undefined"&&c.nTr.setAttribute("id",c._aData.DT_RowId);typeof c._aData.DT_RowClass!="undefined"&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,e=a.aoColumns.length;f<e;f++){var h=a.aoColumns[f];d=p.createElement("td");d.innerHTML=typeof h.fnRender=="function"&&(!h.bUseRendered||h.mDataProp===null)?h.fnRender({iDataRow:b,
+iDataColumn:f,aData:c._aData,oSettings:a}):G(a,b,f,"display");if(h.sClass!==null)d.className=h.sClass;if(h.bVisible){c.nTr.appendChild(d);c._anHidden[f]=null}else c._anHidden[f]=d}}}function $(a){var b,c,d,f,e,h,j,k,m;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){k=a.aoData.length;a.aoData.push({nTr:j[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(k);h=j[b].childNodes;d=e=0;for(f=
+h.length;d<f;d++){m=h[d].nodeName.toUpperCase();if(m=="TD"||m=="TH"){O(a,k,e,i.trim(h[d].innerHTML));e++}}}}j=ba(a);h=[];b=0;for(c=j.length;b<c;b++){d=0;for(f=j[b].childNodes.length;d<f;d++){e=j[b].childNodes[d];m=e.nodeName.toUpperCase();if(m=="TD"||m=="TH")h.push(e)}}h.length!=j.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+j.length*a.aoColumns.length+" and got "+h.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");
+d=0;for(f=a.aoColumns.length;d<f;d++){if(a.aoColumns[d].sTitle===null)a.aoColumns[d].sTitle=a.aoColumns[d].nTh.innerHTML;j=a.aoColumns[d]._bAutoType;m=typeof a.aoColumns[d].fnRender=="function";e=a.aoColumns[d].sClass!==null;k=a.aoColumns[d].bVisible;var u,r;if(j||m||e||!k){b=0;for(c=a.aoData.length;b<c;b++){u=h[b*f+d];if(j&&a.aoColumns[d].sType!="string"){r=G(a,b,d,"type");if(r!==""){r=ia(r);if(a.aoColumns[d].sType===null)a.aoColumns[d].sType=r;else if(a.aoColumns[d].sType!=r&&a.aoColumns[d].sType!=
+"html")a.aoColumns[d].sType="string"}}if(m){r=a.aoColumns[d].fnRender({iDataRow:b,iDataColumn:d,aData:a.aoData[b]._aData,oSettings:a});u.innerHTML=r;a.aoColumns[d].bUseRendered&&O(a,b,d,r)}if(e)u.className+=" "+a.aoColumns[d].sClass;if(k)a.aoData[b]._anHidden[d]=null;else{a.aoData[b]._anHidden[d]=u;u.parentNode.removeChild(u)}}}}}function X(a){var b,c,d;a.nTHead.getElementsByTagName("tr");if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;
+a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var f=p.createElement("tr");b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);f.appendChild(c)}i(a.nTHead).html("")[0].appendChild(f);Y(a.aoHeader,a.nTHead)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;f=p.createElement("div");
+f.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(f);var e=p.createElement("span");e.className=a.oClasses.sSortIcon;f.appendChild(e);c.appendChild(f)}}d=function(){this.onselectstart=function(){return false};return false};if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable!==false){ja(a,a.aoColumns[b].nTh,b);i(a.aoColumns[b].nTh).bind("mousedown.DT",d)}else i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(a.nTFoot).children("tr").children("th").addClass(a.oClasses.sFooterTH);
+if(a.nTFoot!==null){c=S(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(typeof c[b]!="undefined")a.aoColumns[b].nTf=c[b]}}function M(a,b,c){var d,f,e,h=[],j=[],k=a.aoColumns.length;if(typeof c=="undefined")c=false;d=0;for(f=b.length;d<f;d++){h[d]=b[d].slice();h[d].nTr=b[d].nTr;for(e=k-1;e>=0;e--)!a.aoColumns[e].bVisible&&!c&&h[d].splice(e,1);j.push([])}d=0;for(f=h.length;d<f;d++){if(h[d].nTr){a=0;for(e=h[d].nTr.childNodes.length;a<e;a++)h[d].nTr.removeChild(h[d].nTr.childNodes[0])}e=0;
+for(b=h[d].length;e<b;e++){k=c=1;if(typeof j[d][e]=="undefined"){h[d].nTr.appendChild(h[d][e].cell);for(j[d][e]=1;typeof h[d+c]!="undefined"&&h[d][e].cell==h[d+c][e].cell;){j[d+c][e]=1;c++}for(;typeof h[d][e+k]!="undefined"&&h[d][e].cell==h[d][e+k].cell;){for(a=0;a<c;a++)j[d+a][e+k]=1;k++}h[d][e].cell.rowSpan=c;h[d][e].cell.colSpan=k}}}}function C(a){var b,c,d=[],f=0,e=false;b=a.asStripeClasses.length;c=a.aoOpenRows.length;if(!(a.fnPreDrawCallback!==null&&a.fnPreDrawCallback.call(a.oInstance,a)===
+false)){a.bDrawing=true;if(typeof a.iInitDisplayStart!="undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;E(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!Ca(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var h=a._iDisplayStart,j=a._iDisplayEnd;if(a.oFeatures.bServerSide){h=0;j=a.aoData.length}for(h=
+h;h<j;h++){var k=a.aoData[a.aiDisplay[h]];k.nTr===null&&z(a,a.aiDisplay[h]);var m=k.nTr;if(b!==0){var u=a.asStripeClasses[f%b];if(k._sRowStripe!=u){i(m).removeClass(k._sRowStripe).addClass(u);k._sRowStripe=u}}if(typeof a.fnRowCallback=="function"){m=a.fnRowCallback.call(a.oInstance,m,a.aoData[a.aiDisplay[h]]._aData,f,h);if(!m&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(m);f++;if(c!==0)for(k=0;k<c;k++)m==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");
+if(typeof a.asStripeClasses[0]!="undefined")d[0].className=a.asStripeClasses[0];e=a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)e=a.oLanguage.sLoadingRecords;else if(typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0)e=a.oLanguage.sEmptyTable;b=p.createElement("td");b.setAttribute("valign","top");b.colSpan=Z(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=e;d[f].appendChild(b)}typeof a.fnHeaderCallback==
+"function"&&a.fnHeaderCallback.call(a.oInstance,i(a.nTHead).children("tr")[0],ca(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback=="function"&&a.fnFooterCallback.call(a.oInstance,i(a.nTFoot).children("tr")[0],ca(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered){c=a.nTBody.childNodes;for(b=
+c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b])}b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}for(b=a.aoDrawCallback.length-1;b>=0;b--)a.aoDrawCallback[b].fn.call(a.oInstance,a);i(a.oInstance).trigger("draw",a);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){K(a,false);typeof a._bInitComplete=="undefined"&&w(a)}}}function da(a){if(a.oFeatures.bSort)R(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)N(a,
+a.oPreviousSearch);else{E(a);C(a)}}function Ca(a){if(a.bAjaxDataGet){a.iDraw++;K(a,true);var b=Da(a);ha(a,b);a.fnServerData.call(a.oInstance,a.sAjaxSource,b,function(c){Ea(a,c)},a);return false}else return true}function Da(a){var b=a.aoColumns.length,c=[],d,f;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:ka(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:
+-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d=="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){d=
+a.aaSortingFixed!==null?a.aaSortingFixed.length:0;var e=a.aaSorting.length;c.push({name:"iSortingCols",value:d+e});for(f=0;f<d;f++){c.push({name:"iSortCol_"+f,value:a.aaSortingFixed[f][0]});c.push({name:"sSortDir_"+f,value:a.aaSortingFixed[f][1]})}for(f=0;f<e;f++){c.push({name:"iSortCol_"+(f+d),value:a.aaSorting[f][0]});c.push({name:"sSortDir_"+(f+d),value:a.aaSorting[f][1]})}for(f=0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}return c}function ha(a,b){for(var c=0,d=a.aoServerParams.length;c<
+d;c++)a.aoServerParams[c].fn.call(a.oInstance,b)}function Ea(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))la(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=ka(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=Fa(a,b.sColumns);b=aa(a.sAjaxDataProp)(b);for(var f=0,e=b.length;f<e;f++)if(c){for(var h=[],j=0,k=a.aoColumns.length;j<k;j++)h.push(b[f][d[j]]);
+v(a,h)}else v(a,b[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;C(a);a.bAjaxDataGet=true;K(a,false)}function Aa(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,h,j,k,m,u,r=0;r<d.length;r++){e=0;h=d[r];if(h==
+"<"){j=p.createElement("div");k=d[r+1];if(k=="'"||k=='"'){m="";for(u=2;d[r+u]!=k;){m+=d[r+u];u++}if(m=="H")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(m=="F")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(m.indexOf(".")!=-1){k=m.split(".");j.setAttribute("id",k[0].substr(1,k[0].length-1));j.className=k[1]}else if(m.charAt(0)=="#")j.setAttribute("id",m.substr(1,m.length-1));else j.className=m;r+=u}c.appendChild(j);
+c=j}else if(h==">")c=c.parentNode;else if(h=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=Ga(a);e=1}else if(h=="f"&&a.oFeatures.bFilter){f=Ha(a);e=1}else if(h=="r"&&a.oFeatures.bProcessing){f=Ia(a);e=1}else if(h=="t"){f=Ja(a);e=1}else if(h=="i"&&a.oFeatures.bInfo){f=Ka(a);e=1}else if(h=="p"&&a.oFeatures.bPaginate){f=La(a);e=1}else if(n.aoFeatures.length!==0){j=n.aoFeatures;u=0;for(k=j.length;u<k;u++)if(h==j[u].cFeature){if(f=j[u].fnInit(a))e=1;break}}if(e==1&&f!==null){if(typeof a.aanFeatures[h]!=
+"object")a.aanFeatures[h]=[];a.aanFeatures[h].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function Ja(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),h=p.createElement("div"),j=a.nTable.cloneNode(false),k=a.nTable.cloneNode(false),m=a.nTable.getElementsByTagName("thead")[0],u=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],
+r=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?n.oJUIClasses:n.oStdClasses;c.appendChild(d);e.appendChild(h);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(j);j.appendChild(m);if(u!==null){b.appendChild(e);h.appendChild(k);k.appendChild(u)}b.className=r.sScrollWrapper;c.className=r.sScrollHead;d.className=r.sScrollHeadInner;f.className=r.sScrollBody;e.className=r.sScrollFoot;h.className=r.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";
+e.style.overflow="hidden";f.style.overflow="auto"}c.style.border="0";c.style.width="100%";e.style.border="0";d.style.width="150%";j.removeAttribute("id");j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(u!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=i(a.nTable).children("caption");h=0;for(k=d.length;h<k;h++)j.appendChild(d[h]);if(a.oScroll.sX!==""){c.style.width=q(a.oScroll.sX);f.style.width=q(a.oScroll.sX);if(u!==null)e.style.width=q(a.oScroll.sX);i(f).scroll(function(){c.scrollLeft=
+this.scrollLeft;if(u!==null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=q(a.oScroll.sY);a.aoDrawCallback.push({fn:Ma,sName:"scrolling"});a.oScroll.bInfinite&&i(f).scroll(function(){if(!a.bDrawing)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){ma(a,"next");E(a);C(a)}});a.nScrollHead=c;a.nScrollFoot=e;return b}function Ma(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],
+d=a.nTable.parentNode,f,e,h,j,k,m,u,r,H=[],L=a.nTFoot!==null?a.nScrollFoot.getElementsByTagName("div")[0]:null,T=a.nTFoot!==null?L.getElementsByTagName("table")[0]:null,B=i.browser.msie&&i.browser.version<=7;h=a.nTable.getElementsByTagName("thead");h.length>0&&a.nTable.removeChild(h[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}h=a.nTHead.cloneNode(true);a.nTable.insertBefore(h,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);
+a.nTable.insertBefore(k,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var U=S(a,h);f=0;for(e=U.length;f<e;f++){u=Na(a,f);U[f].style.width=a.aoColumns[u].sWidth}a.nTFoot!==null&&P(function(I){I.style.width=""},k.getElementsByTagName("tr"));f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(B&&(d.scrollHeight>d.offsetHeight||i(d).css("overflow-y")=="scroll"))a.nTable.style.width=q(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!==
+"")a.nTable.style.width=q(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=q(f-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=q(f)}else a.nTable.style.width=q(f);f=i(a.nTable).outerWidth();e=a.nTHead.getElementsByTagName("tr");h=h.getElementsByTagName("tr");P(function(I,na){m=I.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;r=i(I).width();na.style.width=
+q(r);H.push(r)},h,e);i(h).height(0);if(a.nTFoot!==null){j=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");P(function(I,na){m=I.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;r=i(I).width();na.style.width=q(r);H.push(r)},j,k);i(j).height(0)}P(function(I){I.innerHTML="";I.style.width=q(H.shift())},h);a.nTFoot!==null&&P(function(I){I.innerHTML="";I.style.width=q(H.shift())},j);if(i(a.nTable).outerWidth()<f){j=d.scrollHeight>d.offsetHeight||
+i(d).css("overflow-y")=="scroll"?f+a.oScroll.iBarWidth:f;if(B&&(d.scrollHeight>d.offsetHeight||i(d).css("overflow-y")=="scroll"))a.nTable.style.width=q(j-a.oScroll.iBarWidth);d.style.width=q(j);b.parentNode.style.width=q(j);if(a.nTFoot!==null)L.parentNode.style.width=q(j);if(a.oScroll.sX==="")J(a,1,"The table cannot fit into the current element which will cause column misalignment. The table has been drawn at its minimum possible width.");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. Increase the sScrollXInner value or remove it to allow automatic calculation")}else{d.style.width=
+q("100%");b.parentNode.style.width=q("100%");if(a.nTFoot!==null)L.parentNode.style.width=q("100%")}if(a.oScroll.sY==="")if(B)d.style.height=q(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=q(a.oScroll.sY);B=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=q(i(a.nTable).height()+B)}B=i(a.nTable).outerWidth();c.style.width=q(B);b.style.width=q(B+a.oScroll.iBarWidth);
+if(a.nTFoot!==null){L.style.width=q(a.nTable.offsetWidth+a.oScroll.iBarWidth);T.style.width=q(a.nTable.offsetWidth)}if(a.bSorted||a.bFiltered)d.scrollTop=0}function ea(a){if(a.oFeatures.bAutoWidth===false)return false;ga(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function Ha(a){var b=a.oLanguage.sSearch;b=b.indexOf("_INPUT_")!==-1?b.replace("_INPUT_",'<input type="text" />'):b===""?'<input type="text" />':b+' <input type="text" />';var c=p.createElement("div");
+c.className=a.oClasses.sFilter;c.innerHTML="<label>"+b+"</label>";a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&c.setAttribute("id",a.sTableId+"_filter");b=i("input",c);b.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));b.bind("keyup.DT",function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=i(this).parents("div.dataTables_filter")[0]&&i("input",d[f]).val(this.value);this.value!=a.oPreviousSearch.sSearch&&N(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});
+b.bind("keypress.DT",function(d){if(d.keyCode==13)return false});return c}function N(a,b,c){Oa(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)Pa(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,a.aoPreSearchCols[b].bSmart);n.afnFiltering.length!==0&&Qa(a);a.bFiltered=true;i(a.oInstance).trigger("filter",a);a._iDisplayStart=0;E(a);C(a);oa(a,0)}function Qa(a){for(var b=n.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,h=a.aiDisplay.length;e<h;e++){var j=a.aiDisplay[e-
+f];if(!b[c](a,fa(a,j,"filter"),j)){a.aiDisplay.splice(e-f,1);f++}}}function Pa(a,b,c,d,f){if(b!==""){var e=0;b=pa(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=qa(G(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,1);e++}}}}function Oa(a,b,c,d,f){var e=pa(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(n.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||
+a.oPreviousSearch.sSearch.length>b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);oa(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var h=0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-h,1);h++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function oa(a,b){if(!a.oFeatures.bServerSide){a.asDataSearch.splice(0,
+a.asDataSearch.length);b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=ra(a,fa(a,b[c],"filter"))}}function ra(a,b){var c="";if(typeof a.__nTmpFilter=="undefined")a.__nTmpFilter=p.createElement("div");for(var d=a.__nTmpFilter,f=0,e=a.aoColumns.length;f<e;f++)if(a.aoColumns[f].bSearchable)c+=qa(b[f],a.aoColumns[f].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;c=c.replace(/\n/g," ").replace(/\r/g,
+"")}return c}function pa(a,b,c){if(c){a=b?a.split(" "):sa(a).split(" ");a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:sa(a);return new RegExp(a,"i")}}function qa(a,b){if(typeof n.ofnSearch[b]=="function")return n.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g," ");else if(a===null)return"";return a}function R(a,b){var c,d,f,e,h=[],j=[],k=n.oSort;d=a.aoData;var m=a.aoColumns;if(!a.oFeatures.bServerSide&&
+(a.aaSorting.length!==0||a.aaSortingFixed!==null)){h=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<h.length;c++){var u=h[c][0];f=ta(a,u);e=a.aoColumns[u].sSortDataType;if(typeof n.afnSortData[e]!="undefined"){var r=n.afnSortData[e](a,u,f);f=0;for(e=d.length;f<e;f++)O(a,f,u,r[f])}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)j[a.aiDisplayMaster[c]]=c;var H=h.length;a.aiDisplayMaster.sort(function(L,T){var B,U;for(c=0;c<H;c++){B=m[h[c][0]].iDataSort;U=m[B].sType;
+B=k[(U?U:"string")+"-"+h[c][1]](G(a,L,B,"sort"),G(a,T,B,"sort"));if(B!==0)return B}return k["numeric-asc"](j[L],j[T])})}if((typeof b=="undefined"||b)&&!a.oFeatures.bDeferRender)V(a);a.bSorted=true;i(a.oInstance).trigger("sort",a);if(a.oFeatures.bFilter)N(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;E(a);C(a)}}function ja(a,b,c,d){i(b).bind("click.DT",function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var h,j;if(f.shiftKey){for(var k=false,m=0;m<
+a.aaSorting.length;m++)if(a.aaSorting[m][0]==c){k=true;h=a.aaSorting[m][0];j=a.aaSorting[m][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")a.aaSorting.splice(m,1);else{a.aaSorting[m][1]=a.aoColumns[h].asSorting[j];a.aaSorting[m][2]=j}break}k===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){h=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")j=0;a.aaSorting[0][1]=a.aoColumns[h].asSorting[j];
+a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}R(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function V(a){var b,c,d,f,e,h=a.aoColumns.length,j=a.oClasses;for(b=0;b<h;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):
+a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?j.sSortAsc:j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=i("span",a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);
+e=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=Q(a);if(a.oFeatures.bDeferRender)i(d).removeClass(e+"1 "+e+"2 "+e+"3");else if(d.length>=h)for(b=0;b<h;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"1",""))}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"2",""))}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/
+h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(" "+e+"3",""))}j=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/h;c<a;c++)d[h*c+k].className+=" "+e+j;j<3&&j++}}}function La(a){if(a.oScroll.bInfinite)return null;var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;n.oPagination[a.sPaginationType].fnInit(a,b,function(c){E(c);C(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){n.oPagination[c.sPaginationType].fnUpdate(c,
+function(d){E(d);C(d)})},sName:"pagination"});return b}function ma(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-
+1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=0;else J(a,0,"Unknown paging action: "+b);i(a.oInstance).trigger("page",a);return c!=a._iDisplayStart}function Ka(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Ra,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}function Ra(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a._iDisplayStart+
+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),e=a.fnFormatNumber(b),h=a.fnFormatNumber(c),j=a.fnFormatNumber(d),k=a.fnFormatNumber(f);if(a.oScroll.bInfinite)e=a.fnFormatNumber(1);e=a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()===0?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",j)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",
+e).replace("_END_",h).replace("_TOTAL_",k)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",e).replace("_END_",h).replace("_TOTAL_",k)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;if(a.oLanguage.fnInfoCallback!==null)e=a.oLanguage.fnInfoCallback(a,b,c,d,f,e);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(e)}}function Ga(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+(a.sTableId===""?"":'name="'+
+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]=="object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+"_length");
+f.className=a.oClasses.sLength;f.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+a._iDisplayLength+'"]',f).attr("selected",true);i("select",f).bind("change.DT",function(){var e=i(this).val(),h=a.aanFeatures.l;c=0;for(d=h.length;c<d;c++)h[c]!=this.parentNode&&i("select",h[c]).val(e);a._iDisplayLength=parseInt(e,10);E(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=
+0}if(a._iDisplayLength==-1)a._iDisplayStart=0;C(a)});return f}function Ia(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r=="undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function Na(a,b){for(var c=-1,d=0;d<
+a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function ta(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function W(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function Z(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===
+true&&b++;return b}function E(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Sa(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=q(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ga(a){var b=0,c,d=0,f=a.aoColumns.length,e,h=i("th",
+a.nTHead);for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Sa(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==null)a.aoColumns[e].sWidth=q(c);b++}}if(f==h.length&&b===0&&d==f&&a.oScroll.sX===""&&a.oScroll.sY==="")for(e=0;e<a.aoColumns.length;e++){c=i(h[e]).width();if(c!==null)a.aoColumns[e].sWidth=q(c)}else{b=a.nTable.cloneNode(false);e=a.nTHead.cloneNode(true);d=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(e);if(a.nTFoot!==
+null){b.appendChild(a.nTFoot.cloneNode(true));P(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);h=S(a,e);for(e=d=0;e<f;e++){var j=a.aoColumns[e];if(j.bVisible&&j.sWidthOrig!==null&&j.sWidthOrig!=="")h[e-d].style.width=q(j.sWidthOrig);else if(j.bVisible)h[e-d].style.width="";else d++}for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Ta(a,e);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[e].sContentPadding!==
+"")d.innerHTML+=a.aoColumns[e].sContentPadding;c.appendChild(d)}}f=a.nTable.parentNode;f.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!=="")b.style.width=q(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<f.offsetWidth)b.style.width=q(f.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=q(f.offsetWidth);b.style.visibility="hidden";Ua(a,b);f=i("tbody tr:eq(0)",b).children();if(f.length===0)f=S(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(e=d=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c+=
+a.aoColumns[e].sWidthOrig===null?i(f[d]).outerWidth():parseInt(a.aoColumns[e].sWidth.replace("px",""),10)+(i(f[d]).outerWidth()-i(f[d]).width());d++}b.style.width=q(c);a.nTable.style.width=q(c)}for(e=d=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c=i(f[d]).width();if(c!==null&&c>0)a.aoColumns[e].sWidth=q(c);d++}a.nTable.style.width=q(i(b).outerWidth());b.parentNode.removeChild(b)}}function Ua(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=q(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!==
+"")b.style.width=q(i(b).outerWidth())}function Ta(a,b){var c=Va(a,b);if(c<0)return null;if(a.aoData[c].nTr===null){var d=p.createElement("td");d.innerHTML=G(a,c,b,"");return d}return Q(a,c)[b]}function Va(a,b){for(var c=-1,d=-1,f=0;f<a.aoData.length;f++){var e=G(a,f,b,"display")+"";e=e.replace(/<.*?>/g,"");if(e.length>c){c=e.length;d=f}}return d}function q(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+
+"px"}function Za(a,b){if(a.length!=b.length)return 1;for(var c=0;c<a.length;c++)if(a[c]!=b[c])return 2;return 0}function ia(a){for(var b=n.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function A(a){for(var b=0;b<D.length;b++)if(D[b].nTable==a)return D[b];return null}function ca(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function ba(a){for(var b=[],c=0,d=a.aoData.length;c<d;c++)a.aoData[c].nTr!==null&&b.push(a.aoData[c].nTr);
+return b}function Q(a,b){var c=[],d,f,e,h,j;f=0;var k=a.aoData.length;if(typeof b!="undefined"){f=b;k=b+1}for(f=f;f<k;f++){j=a.aoData[f];if(j.nTr!==null){b=[];e=0;for(h=j.nTr.childNodes.length;e<h;e++){d=j.nTr.childNodes[e].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[e])}e=d=0;for(h=a.aoColumns.length;e<h;e++)if(a.aoColumns[e].bVisible)c.push(b[e-d]);else{c.push(j._anHidden[e]);d++}}}return c}function sa(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)",
+"g"),"\\$1")}function ua(a,b){for(var c=-1,d=0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function Fa(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function ka(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+
+a.sTableId+"'): "+c;if(b===0)if(n.sErrMode=="alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function la(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);E(a)}function va(a){if(!(!a.oFeatures.bStateSave||typeof a.bDestroying!="undefined")){var b,c,d,f="{";f+='"iCreate":'+(new Date).getTime()+",";f+='"iStart":'+(a.oScroll.bInfinite?0:a._iDisplayStart)+",";
+f+='"iEnd":'+(a.oScroll.bInfinite?a._iDisplayLength:a._iDisplayEnd)+",";f+='"iLength":'+a._iDisplayLength+",";f+='"sFilter":"'+encodeURIComponent(a.oPreviousSearch.sSearch)+'",';f+='"sFilterEsc":'+!a.oPreviousSearch.bRegex+",";f+='"aaSorting":[ ';for(b=0;b<a.aaSorting.length;b++)f+="["+a.aaSorting[b][0]+',"'+a.aaSorting[b][1]+'"],';f=f.substring(0,f.length-1);f+="],";f+='"aaSearchCols":[ ';for(b=0;b<a.aoPreSearchCols.length;b++)f+='["'+encodeURIComponent(a.aoPreSearchCols[b].sSearch)+'",'+!a.aoPreSearchCols[b].bRegex+
+"],";f=f.substring(0,f.length-1);f+="],";f+='"abVisCols":[ ';for(b=0;b<a.aoColumns.length;b++)f+=a.aoColumns[b].bVisible+",";f=f.substring(0,f.length-1);f+="]";b=0;for(c=a.aoStateSave.length;b<c;b++){d=a.aoStateSave[b].fn(a,f);if(d!=="")f=d}f+="}";Wa(a.sCookiePrefix+a.sInstance,f,a.iCookieDuration,a.sCookiePrefix,a.fnCookieCallback)}}function Xa(a,b){if(a.oFeatures.bStateSave){var c,d,f;d=wa(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=typeof i.parseJSON=="function"?i.parseJSON(d.replace(/'/g,
+'"')):eval("("+d+")")}catch(e){return}d=0;for(f=a.aoStateLoad.length;d<f;d++)if(!a.aoStateLoad[d].fn(a,c))return;a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=decodeURIComponent(c.sFilter);a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<
+c.aaSearchCols.length;d++)a.aoPreSearchCols[d]={sSearch:decodeURIComponent(c.aaSearchCols[d][0]),bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Wa(a,b,c,d,f){var e=new Date;e.setTime(e.getTime()+c*1E3);c=za.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var h;if(f!==null){h=typeof i.parseJSON=="function"?i.parseJSON(b):
+eval("("+b+")");b=f(a,h,e.toGMTString(),c.join("/")+"/")}else b=a+"="+encodeURIComponent(b)+"; expires="+e.toGMTString()+"; path="+c.join("/")+"/";f="";e=9999999999999;if((wa(a)!==null?p.cookie.length:b.length+p.cookie.length)+10>4096){a=p.cookie.split(";");for(var j=0,k=a.length;j<k;j++)if(a[j].indexOf(d)!=-1){var m=a[j].split("=");try{h=eval("("+decodeURIComponent(m[1])+")")}catch(u){continue}if(typeof h.iCreate!="undefined"&&h.iCreate<e){f=m[0];e=h.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+
+c.join("/")+"/"}p.cookie=b}function wa(a){var b=za.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function Y(a,b){b=i(b).children("tr");var c,d,f,e,h,j,k,m,u=function(L,T,B){for(;typeof L[T][B]!="undefined";)B++;return B};a.splice(0,a.length);d=0;for(j=b.length;d<
+j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){f=0;for(k=b[d].childNodes.length;f<k;f++){c=b[d].childNodes[f];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var r=c.getAttribute("colspan")*1,H=c.getAttribute("rowspan")*1;r=!r||r===0||r===1?1:r;H=!H||H===0||H===1?1:H;m=u(a,d,0);for(h=0;h<r;h++)for(e=0;e<H;e++){a[d+e][m+h]={cell:c,unique:r==1?true:false};a[d+e].nTr=b[d]}}}}}function S(a,b,c){var d=[];if(typeof c=="undefined"){c=a.aoHeader;if(typeof b!="undefined"){c=[];Y(c,b)}}b=0;
+for(var f=c.length;b<f;b++)for(var e=0,h=c[b].length;e<h;e++)if(c[b][e].unique&&(typeof d[e]=="undefined"||!a.bSortCellsTop))d[e]=c[b][e].cell;return d}function Ya(){var a=p.createElement("p"),b=a.style;b.width="100%";b.height="200px";b.padding="0px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.padding="0px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";
+a=a.offsetWidth;if(b==a)a=c.clientWidth;p.body.removeChild(c);return b-a}function P(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,h=b[d].childNodes.length;e<h;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function o(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}function fa(a,b,c){for(var d=[],f=0,e=a.aoColumns.length;f<e;f++)d.push(G(a,b,f,c));return d}function G(a,b,c,d){var f=a.aoColumns[c];
+if((c=f.fnGetData(a.aoData[b]._aData))===undefined){if(a.iDrawError!=a.iDraw&&f.sDefaultContent===null){J(a,0,"Requested unknown parameter '"+f.mDataProp+"' from the data source for row "+b);a.iDrawError=a.iDraw}return f.sDefaultContent}if(c===null&&f.sDefaultContent!==null)c=f.sDefaultContent;else if(typeof c=="function")return c();if(d=="display"&&c===null)return"";return c}function O(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function aa(a){if(a===null)return function(){return null};
+else if(typeof a=="function")return function(c){return a(c)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c){return c[b[0]][b[1]]}:b.length==3?function(c){return c[b[0]][b[1]][b[2]]}:function(c){for(var d=0,f=b.length;d<f;d++)c=c[b[d]];return c}}else return function(c){return c[a]}}function Ba(a){if(a===null)return function(){};else if(typeof a=="function")return function(c,d){return a(c,d)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");
+return b.length==2?function(c,d){c[b[0]][b[1]]=d}:b.length==3?function(c,d){c[b[0]][b[1]][b[2]]=d}:function(c,d){for(var f=0,e=b.length-1;f<e;f++)c=c[b[f]];c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}this.oApi={};this.fnDraw=function(a){var b=A(this[n.iApiIndex]);if(typeof a!="undefined"&&a===false){E(b);C(b)}else da(b)};this.fnFilter=function(a,b,c,d,f){var e=A(this[n.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=
+true;if(typeof b=="undefined"||b===null){N(e,{sSearch:a,bRegex:c,bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;N(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return A(this[n.iApiIndex])};this.fnVersionCheck=n.fnVersionCheck;this.fnSort=function(a){var b=A(this[n.iApiIndex]);b.aaSorting=a;R(b)};this.fnSortListener=function(a,
+b,c){ja(A(this[n.iApiIndex]),a,b,c)};this.fnAddData=function(a,b){if(a.length===0)return[];var c=[],d,f=A(this[n.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=v(f,a[e]);if(d==-1)return c;c.push(d)}else{d=v(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();if(typeof b=="undefined"||b)da(f);return c};this.fnDeleteRow=function(a,b,c){var d=A(this[n.iApiIndex]);a=typeof a=="object"?W(d,a):a;var f=d.aoData.splice(a,1),e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,
+1);ua(d.aiDisplayMaster,a);ua(d.aiDisplay,a);typeof b=="function"&&b.call(this,d,f);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){E(d);C(d)}return f};this.fnClearTable=function(a){var b=A(this[n.iApiIndex]);la(b);if(typeof a=="undefined"||a)C(b)};this.fnOpen=function(a,b,c){var d=A(this[n.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;
+e.colSpan=Z(d);if(typeof b.jquery!="undefined"||typeof b=="object")e.appendChild(b);else e.innerHTML=b;b=i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(f).insertAfter(a);d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=A(this[n.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a,b){var c=A(this[n.iApiIndex]);if(typeof a!=
+"undefined"){a=typeof a=="object"?W(c,a):a;if(typeof b!="undefined")return G(c,a,b,"");return typeof c.aoData[a]!="undefined"?c.aoData[a]._aData:null}return ca(c)};this.fnGetNodes=function(a){var b=A(this[n.iApiIndex]);if(typeof a!="undefined")return typeof b.aoData[a]!="undefined"?b.aoData[a].nTr:null;return ba(b)};this.fnGetPosition=function(a){var b=A(this[n.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return W(b,a);else if(c=="TD"||c=="TH"){c=W(b,a.parentNode);for(var d=Q(b,c),f=0;f<b.aoColumns.length;f++)if(d[f]==
+a)return[c,ta(b,f),f]}return null};this.fnUpdate=function(a,b,c,d,f){var e=A(this[n.iApiIndex]);b=typeof b=="object"?W(e,b):b;if(i.isArray(a)&&typeof a=="object"){e.aoData[b]._aData=a.slice();for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(G(e,b,c),b,c,false,false)}else if(a!==null&&typeof a=="object"){e.aoData[b]._aData=i.extend(true,{},a);for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(G(e,b,c),b,c,false,false)}else{a=a;O(e,b,c,a);if(e.aoColumns[c].fnRender!==null){a=e.aoColumns[c].fnRender({iDataRow:b,
+iDataColumn:c,aData:e.aoData[b]._aData,oSettings:e});e.aoColumns[c].bUseRendered&&O(e,b,c,a)}if(e.aoData[b].nTr!==null)Q(e,b)[c].innerHTML=a}c=i.inArray(b,e.aiDisplay);e.asDataSearch[c]=ra(e,fa(e,b,"filter"));if(typeof f=="undefined"||f)ea(e);if(typeof d=="undefined"||d)da(e);return 0};this.fnSetColumnVis=function(a,b,c){var d=A(this[n.iApiIndex]),f,e;e=d.aoColumns.length;var h,j;if(d.aoColumns[a].bVisible!=b){if(b){for(f=j=0;f<a;f++)d.aoColumns[f].bVisible&&j++;j=j>=Z(d);if(!j)for(f=a;f<e;f++)if(d.aoColumns[f].bVisible){h=
+f;break}f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null)j?d.aoData[f].nTr.appendChild(d.aoData[f]._anHidden[a]):d.aoData[f].nTr.insertBefore(d.aoData[f]._anHidden[a],Q(d,f)[h])}else{f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null){h=Q(d,f)[a];d.aoData[f]._anHidden[a]=h;h.parentNode.removeChild(h)}}d.aoColumns[a].bVisible=b;M(d,d.aoHeader);d.nTFoot&&M(d,d.aoFooter);f=0;for(e=d.aoOpenRows.length;f<e;f++)d.aoOpenRows[f].nTr.colSpan=Z(d);if(typeof c=="undefined"||c){ea(d);C(d)}va(d)}};
+this.fnPageChange=function(a,b){var c=A(this[n.iApiIndex]);ma(c,a);E(c);if(typeof b=="undefined"||b)C(c)};this.fnDestroy=function(){var a=A(this[n.iApiIndex]),b=a.nTableWrapper.parentNode,c=a.nTBody,d,f;a.bDestroying=true;d=0;for(f=a.aoDestroyCallback.length;d<f;d++)a.aoDestroyCallback[d].fn();d=0;for(f=a.aoColumns.length;d<f;d++)a.aoColumns[d].bVisible===false&&this.fnSetColumnVis(d,true);i(a.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+a.oClasses.sRowEmpty,a.nTable).parent().remove();
+if(a.nTable!=a.nTHead.parentNode){i(a.nTable).children("thead").remove();a.nTable.appendChild(a.nTHead)}if(a.nTFoot&&a.nTable!=a.nTFoot.parentNode){i(a.nTable).children("tfoot").remove();a.nTable.appendChild(a.nTFoot)}a.nTable.parentNode.removeChild(a.nTable);i(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];V(a);i(ba(a)).removeClass(a.asStripeClasses.join(" "));if(a.bJUI){i("th",a.nTHead).removeClass([n.oStdClasses.sSortable,n.oJUIClasses.sSortableAsc,n.oJUIClasses.sSortableDesc,n.oJUIClasses.sSortableNone].join(" "));
+i("th span."+n.oJUIClasses.sSortIcon,a.nTHead).remove();i("th",a.nTHead).each(function(){var e=i("div."+n.oJUIClasses.sSortJUIWrapper,this),h=e.contents();i(this).append(h);e.remove()})}else i("th",a.nTHead).removeClass([n.oStdClasses.sSortable,n.oStdClasses.sSortableAsc,n.oStdClasses.sSortableDesc,n.oStdClasses.sSortableNone].join(" "));a.nTableReinsertBefore?b.insertBefore(a.nTable,a.nTableReinsertBefore):b.appendChild(a.nTable);d=0;for(f=a.aoData.length;d<f;d++)a.aoData[d].nTr!==null&&c.appendChild(a.aoData[d].nTr);
+if(a.oFeatures.bAutoWidth===true)a.nTable.style.width=q(a.sDestroyWidth);i(c).children("tr:even").addClass(a.asDestroyStripes[0]);i(c).children("tr:odd").addClass(a.asDestroyStripes[1]);d=0;for(f=D.length;d<f;d++)D[d]==a&&D.splice(d,1);a=null};this.fnAdjustColumnSizing=function(a){var b=A(this[n.iApiIndex]);ea(b);if(typeof a=="undefined"||a)this.fnDraw(false);else if(b.oScroll.sX!==""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};for(var xa in n.oApi)if(xa)this[xa]=s(xa);this.oApi._fnExternApiFunc=
+s;this.oApi._fnInitialise=t;this.oApi._fnInitComplete=w;this.oApi._fnLanguageProcess=y;this.oApi._fnAddColumn=F;this.oApi._fnColumnOptions=x;this.oApi._fnAddData=v;this.oApi._fnCreateTr=z;this.oApi._fnGatherData=$;this.oApi._fnBuildHead=X;this.oApi._fnDrawHead=M;this.oApi._fnDraw=C;this.oApi._fnReDraw=da;this.oApi._fnAjaxUpdate=Ca;this.oApi._fnAjaxParameters=Da;this.oApi._fnAjaxUpdateDraw=Ea;this.oApi._fnServerParams=ha;this.oApi._fnAddOptionsHtml=Aa;this.oApi._fnFeatureHtmlTable=Ja;this.oApi._fnScrollDraw=
+Ma;this.oApi._fnAdjustColumnSizing=ea;this.oApi._fnFeatureHtmlFilter=Ha;this.oApi._fnFilterComplete=N;this.oApi._fnFilterCustom=Qa;this.oApi._fnFilterColumn=Pa;this.oApi._fnFilter=Oa;this.oApi._fnBuildSearchArray=oa;this.oApi._fnBuildSearchRow=ra;this.oApi._fnFilterCreateSearch=pa;this.oApi._fnDataToSearch=qa;this.oApi._fnSort=R;this.oApi._fnSortAttachListener=ja;this.oApi._fnSortingClasses=V;this.oApi._fnFeatureHtmlPaginate=La;this.oApi._fnPageChange=ma;this.oApi._fnFeatureHtmlInfo=Ka;this.oApi._fnUpdateInfo=
+Ra;this.oApi._fnFeatureHtmlLength=Ga;this.oApi._fnFeatureHtmlProcessing=Ia;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=Na;this.oApi._fnColumnIndexToVisible=ta;this.oApi._fnNodeToDataIndex=W;this.oApi._fnVisbleColumns=Z;this.oApi._fnCalculateEnd=E;this.oApi._fnConvertToWidth=Sa;this.oApi._fnCalculateColumnWidths=ga;this.oApi._fnScrollingWidthAdjust=Ua;this.oApi._fnGetWidestNode=Ta;this.oApi._fnGetMaxLenString=Va;this.oApi._fnStringToCss=q;this.oApi._fnArrayCmp=Za;this.oApi._fnDetectType=
+ia;this.oApi._fnSettingsFromNode=A;this.oApi._fnGetDataMaster=ca;this.oApi._fnGetTrNodes=ba;this.oApi._fnGetTdNodes=Q;this.oApi._fnEscapeRegex=sa;this.oApi._fnDeleteIndex=ua;this.oApi._fnReOrderIndex=Fa;this.oApi._fnColumnOrdering=ka;this.oApi._fnLog=J;this.oApi._fnClearTable=la;this.oApi._fnSaveState=va;this.oApi._fnLoadState=Xa;this.oApi._fnCreateCookie=Wa;this.oApi._fnReadCookie=wa;this.oApi._fnDetectHeader=Y;this.oApi._fnGetUniqueThs=S;this.oApi._fnScrollBarWidth=Ya;this.oApi._fnApplyToChildren=
+P;this.oApi._fnMap=o;this.oApi._fnGetRowData=fa;this.oApi._fnGetCellData=G;this.oApi._fnSetCellData=O;this.oApi._fnGetObjectDataFn=aa;this.oApi._fnSetObjectDataFn=Ba;var ya=this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=D.length;a<b;a++){if(D[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return D[a].oInstance;else if(typeof g.bDestroy!="undefined"&&g.bDestroy===true){D[a].oInstance.fnDestroy();break}else{J(D[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");
+return}if(D[a].sTableId!==""&&D[a].sTableId==this.getAttribute("id")){D.splice(a,1);break}}var e=new l;D.push(e);var h=false,j=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=n._oExternConfig.iNextUnique++;if(this.nodeName.toLowerCase()!="table")J(e,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{e.nTable=this;e.oInstance=ya.length==1?ya:i(this).dataTable();e.oApi=ya.oApi;e.sDestroyWidth=i(this).width();if(typeof g!=
+"undefined"&&g!==null){e.oInit=g;o(e.oFeatures,g,"bPaginate");o(e.oFeatures,g,"bLengthChange");o(e.oFeatures,g,"bFilter");o(e.oFeatures,g,"bSort");o(e.oFeatures,g,"bInfo");o(e.oFeatures,g,"bProcessing");o(e.oFeatures,g,"bAutoWidth");o(e.oFeatures,g,"bSortClasses");o(e.oFeatures,g,"bServerSide");o(e.oFeatures,g,"bDeferRender");o(e.oScroll,g,"sScrollX","sX");o(e.oScroll,g,"sScrollXInner","sXInner");o(e.oScroll,g,"sScrollY","sY");o(e.oScroll,g,"bScrollCollapse","bCollapse");o(e.oScroll,g,"bScrollInfinite",
+"bInfinite");o(e.oScroll,g,"iScrollLoadGap","iLoadGap");o(e.oScroll,g,"bScrollAutoCss","bAutoCss");o(e,g,"asStripClasses","asStripeClasses");o(e,g,"asStripeClasses");o(e,g,"fnPreDrawCallback");o(e,g,"fnRowCallback");o(e,g,"fnHeaderCallback");o(e,g,"fnFooterCallback");o(e,g,"fnCookieCallback");o(e,g,"fnInitComplete");o(e,g,"fnServerData");o(e,g,"fnFormatNumber");o(e,g,"aaSorting");o(e,g,"aaSortingFixed");o(e,g,"aLengthMenu");o(e,g,"sPaginationType");o(e,g,"sAjaxSource");o(e,g,"sAjaxDataProp");o(e,
+g,"iCookieDuration");o(e,g,"sCookiePrefix");o(e,g,"sDom");o(e,g,"bSortCellsTop");o(e,g,"oSearch","oPreviousSearch");o(e,g,"aoSearchCols","aoPreSearchCols");o(e,g,"iDisplayLength","_iDisplayLength");o(e,g,"bJQueryUI","bJUI");o(e.oLanguage,g,"fnInfoCallback");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});typeof g.fnServerParams=="function"&&e.aoServerParams.push({fn:g.fnServerParams,sName:"user"});typeof g.fnStateSaveCallback=="function"&&e.aoStateSave.push({fn:g.fnStateSaveCallback,
+sName:"user"});typeof g.fnStateLoadCallback=="function"&&e.aoStateLoad.push({fn:g.fnStateLoadCallback,sName:"user"});if(e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses)e.aoDrawCallback.push({fn:V,sName:"server_side_sort_classes"});else e.oFeatures.bDeferRender&&e.aoDrawCallback.push({fn:V,sName:"defer_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=n.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==""||e.oScroll.sY!==
+"")e.oScroll.iBarWidth=Ya();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Xa(e,g);e.aoDrawCallback.push({fn:va,sName:"state_save"})}if(typeof g.iDeferLoading!="undefined"){e.bDeferLoading=true;e._iRecordsTotal=g.iDeferLoading;e._iRecordsDisplay=g.iDeferLoading}if(typeof g.aaData!="undefined")j=true;if(typeof g!="undefined"&&
+typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!="undefined"&&g.oLanguage.sUrl!==""){e.oLanguage.sUrl=g.oLanguage.sUrl;i.getJSON(e.oLanguage.sUrl,null,function(u){y(e,u,true)});h=true}else y(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"&&typeof g.asStripeClasses=="undefined"){e.asStripeClasses.push(e.oClasses.sStripeOdd);e.asStripeClasses.push(e.oClasses.sStripeEven)}c=false;d=i(this).children("tbody").children("tr");
+a=0;for(b=e.asStripeClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripeClasses[a])){c=true;break}if(c){e.asDestroyStripes=["",""];if(i(d[0]).hasClass(e.oClasses.sStripeOdd))e.asDestroyStripes[0]+=e.oClasses.sStripeOdd+" ";if(i(d[0]).hasClass(e.oClasses.sStripeEven))e.asDestroyStripes[0]+=e.oClasses.sStripeEven;if(i(d[1]).hasClass(e.oClasses.sStripeOdd))e.asDestroyStripes[1]+=e.oClasses.sStripeOdd+" ";if(i(d[1]).hasClass(e.oClasses.sStripeEven))e.asDestroyStripes[1]+=e.oClasses.sStripeEven;
+d.removeClass(e.asStripeClasses.join(" "))}c=[];var k;a=this.getElementsByTagName("thead");if(a.length!==0){Y(e.aoHeader,a[0]);c=S(e)}if(typeof g.aoColumns=="undefined"){k=[];a=0;for(b=c.length;a<b;a++)k.push(null)}else k=g.aoColumns;a=0;for(b=k.length;a<b;a++){if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(k[a]===null)k[a]={};k[a].bVisible=g.saved_aoColumns[a].bVisible}F(e,c?c[a]:null)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){var m=
+g.aoColumnDefs[a].aTargets;i.isArray(m)||J(e,1,"aTargets must be an array of targets, not a "+typeof m);c=0;for(d=m.length;c<d;c++)if(typeof m[c]=="number"&&m[c]>=0){for(;e.aoColumns.length<=m[c];)F(e);x(e,m[c],g.aoColumnDefs[a])}else if(typeof m[c]=="number"&&m[c]<0)x(e,e.aoColumns.length+m[c],g.aoColumnDefs[a]);else if(typeof m[c]=="string"){b=0;for(f=e.aoColumns.length;b<f;b++)if(m[c]=="_all"||i(e.aoColumns[b].nTh).hasClass(m[c]))x(e,b,g.aoColumnDefs[a])}}if(typeof k!="undefined"){a=0;for(b=k.length;a<
+b;a++)x(e,a,k[a])}a=0;for(b=e.aaSorting.length;a<b;a++){if(e.aaSorting[a][0]>=e.aoColumns.length)e.aaSorting[a][0]=0;k=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=k.asSorting[0];c=0;for(d=k.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==k.asSorting[c]){e.aaSorting[a][2]=c;break}}V(e);a=i(this).children("thead");if(a.length===0){a=[p.createElement("thead")];this.appendChild(a[0])}e.nTHead=
+a[0];a=i(this).children("tbody");if(a.length===0){a=[p.createElement("tbody")];this.appendChild(a[0])}e.nTBody=a[0];a=i(this).children("tfoot");if(a.length>0){e.nTFoot=a[0];Y(e.aoFooter,e.nTFoot)}if(j)for(a=0;a<g.aaData.length;a++)v(e,g.aaData[a]);else $(e);e.aiDisplay=e.aiDisplayMaster.slice();e.bInitialised=true;h===false&&t(e)}})}})(jQuery,window,document);
diff --git a/vendor/plugins/rails_datatables/MIT-LICENSE b/vendor/plugins/rails_datatables/MIT-LICENSE
new file mode 100644
index 000000000..9376605b2
--- /dev/null
+++ b/vendor/plugins/rails_datatables/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2009 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/plugins/rails_datatables/README.md b/vendor/plugins/rails_datatables/README.md
new file mode 100644
index 000000000..cb40b3889
--- /dev/null
+++ b/vendor/plugins/rails_datatables/README.md
@@ -0,0 +1,138 @@
+## RailsDatatables
+
+A simpler, Rails-friendly interface to using the [DataTables](http://datatables.net) jQuery library.
+
+### Prerequisites
+Make sure you have jQuery.js and jQuery.dataTables.js in /public/javascripts/ and that they're included in your layout.
+
+### Setup
+
+Give table a class of 'datatable' so that the Javascript knows which table to alter. NOTE: If you want to use multiple tables on a single page, include the :table_dom_id in the options hash to specify the ID table to be altered.
+
+Add thead around the table header (These elements will associate to the columns array created below, allowing sorting).
+
+Add tbody around the table rows (These are the elements that will be sorted and paginated.)
+
+Activate using <%= datatable() %>, passing in the columns, how to filter them (sorting type), and any other settings (ajax source, search?, label for search, processing image)
+
+    <% columns = [{:type => 'html', :class => "first"}, {:type => 'html'}, {:type => 'html'}, {:type => nil, :class => "last"}] %>
+    <%= datatable(columns, {:sort_by => "[0, 'desc']", :processing => image_tag("spinner.gif") }) %>
+
+    <table id='users' class='datatable'>
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Account Level</th>
+          <th>Email</th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        <%- @users.each do |user| -%>
+          <tr id="<%= dom_id(user) %>">
+            <td><%= user.name %></td>
+            <td><%= user.account.account_level.name %></td>
+            <td><%= user.email %></td>
+            <td><%= link_to "Edit", edit_system_user_path(user) %></td>
+          </tr>
+        <%- end -%>
+      </tbody>
+    </table>
+
+### Options
+
+#### Table Options
+
+    :sort_by - array, default column number (0 - n-1) and sort order. e.g. "[2, 'desc']". Defaults to initial order.
+    :search - boolean, display the search field. Defaults to true.
+    :search_label - string, the label for the search field. Defaults to "Search".
+    :processing - string, the text or image to display while processing data. Defaults to "Processing".
+    :persist_state - boolean, remember the sorting and page of the tables for the user. Defaults to true.
+    :additional_data - hash, pass along additional data, such as filter values. Default is none.
+    :table_dom_id - string, the ID of the table to alter. If nothing is passed, it will look for a class of 'datatable'. Necessary if you want to have multiple DataTables on a single page.
+    :per_page - the number of rows to show per page (renamed from display_length)
+    :append - functions to all at the end of the dataTable() call. Useful for [Datatables plugins](http://www.datatables.net/plug-ins/api)
+    :no_records_message - Message to display if no records are found, whether on load or after searching
+    :auto_width - Automatically adjust the width of the columns. Defaults to true.
+    :row_callback - a function to run on each row in the table. Inserted in to "'fnRowCallback': function( nRow, aData, iDisplayIndex ) {  }". See [documentation for fnRowCallback](http://www.datatables.net/usage/callbacks) for more information.
+    
+#### Column Options
+
+    :class - string, the class to assign to the table cell. Default is none.
+    :type - string, the type of content in the column, for non-Ajax tables. 'html' will strip all HTML and sort on the inner value, as a string. Default is string.
+    :sortable - boolean, allow this column to be sorted on. Default is true.
+    :searchable - boolean, allow this column to be searched, for non-Ajax tables. Default is true.
+
+#### AJAX Options
+  
+  When you're working with large datasets it's not reasonable to load everything on page load. Use an :ajax_source to load just the records that are being displayed, do custom searching (DB, Solr, etc).
+
+    :ajax_source - string, for large datasets, use an ajax source to load each page on its own. For smaller datasets, just load the whole set and let datatable do the sorting
+
+Add a datatable method on your controller to return JSON  
+* Return the objects to be displayed  
+* Return the total number of objects  
+* Add a method to handle sorting - DataTables returns the column that is being sorted (0 - n), so you need to know which column is which and sort on it.
+    
+### AJAX Example
+    
+#### Datatable view example - datatable.html.erb
+
+    {"sEcho": <%= params[:sEcho] || -1 %>,
+     "iTotalRecords": <%= @total_objects %>,
+     "iTotalDisplayRecords": <%= @total_object %>,
+     "aaData":[
+    <% @objects.each do |object| %>
+      ['<%= link_to(object.user.name, user) %>',
+       '<%= object.description || "-" %>',
+       '<%= object.created_at %>'
+      ],
+    <% end %>
+    ]}
+
+####  Controller example - using will_paginate
+
+    def datatable
+      @objects = current_objects(params)
+      @total_objectss = total_objects(params)
+      render :layout => false
+    end
+
+    private
+    
+    def current_objects(params={})
+      current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
+      @current_objects = Object.paginate :page => current_page, 
+                                         :include => [:user], 
+                                         :order => "#{datatable_columns(params[:iSortCol_0])} #{params[:sSortDir_0] || "DESC"}", 
+                                         :conditions => conditions,
+                                         :per_page => params[:iDisplayLength]
+    end
+
+    def total_objects(params={})
+      @total_objects = Object.count :include => [:user], :conditions => conditions
+    end
+
+    def datatable_columns(column_id)
+      case column_id.to_i
+      when 1
+        return "objects.description"
+      when 2
+        return "objects.created_at"
+      else
+        return "users.name"
+      end
+    end
+
+    def conditions
+      conditions = []
+      conditions << "(objects.description ILIKE '%#{params[:sSearch]}%' OR users.name ILIKE '%#{params[:sSearch]}%')" if(params[:sSearch])
+      return conditions.join(" AND ")
+    end
+    
+### Note
+There is a more functionality offered by DataTables than this plugin currently provides. We add to it as we find need for other features. If there's a feature of DataTables that you'd like to see, fork this repo and add it so we can all benefit.
+
+### Credits
+
+Copyright (c) 2009 [Phronos](http://phronos.com), released under the MIT license
diff --git a/vendor/plugins/rails_datatables/Rakefile b/vendor/plugins/rails_datatables/Rakefile
new file mode 100644
index 000000000..6be4ee971
--- /dev/null
+++ b/vendor/plugins/rails_datatables/Rakefile
@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the rails_datatables plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the rails_datatables plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'RailsDatatables'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff --git a/vendor/plugins/rails_datatables/init.rb b/vendor/plugins/rails_datatables/init.rb
new file mode 100644
index 000000000..538f33510
--- /dev/null
+++ b/vendor/plugins/rails_datatables/init.rb
@@ -0,0 +1 @@
+ActionView::Base.send :include, RailsDatatables
\ No newline at end of file
diff --git a/vendor/plugins/rails_datatables/install.rb b/vendor/plugins/rails_datatables/install.rb
new file mode 100644
index 000000000..f7732d379
--- /dev/null
+++ b/vendor/plugins/rails_datatables/install.rb
@@ -0,0 +1 @@
+# Install hook code here
diff --git a/vendor/plugins/rails_datatables/lib/rails_datatables.rb b/vendor/plugins/rails_datatables/lib/rails_datatables.rb
new file mode 100644
index 000000000..68bc52d9b
--- /dev/null
+++ b/vendor/plugins/rails_datatables/lib/rails_datatables.rb
@@ -0,0 +1,81 @@
+module RailsDatatables
+  def datatable(columns, opts={})
+    sort_by = opts[:sort_by] || nil
+    additional_data = opts[:additional_data] || {}
+    search = opts[:search].present? ? opts[:search].to_s : "true"
+    search_label = opts[:search_label] || "Search"
+    processing = opts[:processing] || "Processing"
+    persist_state = opts[:persist_state].present? ? opts[:persist_state].to_s : "true"
+    table_dom_id = opts[:table_dom_id] ? "##{opts[:table_dom_id]}" : ".datatable"
+    per_page = opts[:per_page] || opts[:display_length]|| 25
+    no_records_message = opts[:no_records_message] || nil
+    auto_width = opts[:auto_width].present? ? opts[:auto_width].to_s : "true"
+    row_callback = opts[:row_callback] || nil
+
+    append = opts[:append] || nil
+
+    ajax_source = opts[:ajax_source] || nil
+    server_side = opts[:ajax_source].present?
+
+    additional_data_string = ""
+    additional_data.each_pair do |name,value|
+      additional_data_string = additional_data_string + ", " if !additional_data_string.blank? && value
+      additional_data_string = additional_data_string + "{'name': '#{name}', 'value':'#{value}'}" if value
+    end
+
+    %Q{
+    <script type="text/javascript">
+    $(function() {
+        $('#{table_dom_id}').dataTable({
+          "oLanguage": {
+            "sSearch": "#{search_label}",
+            #{"'sZeroRecords': '#{no_records_message}'," if no_records_message}
+            "sProcessing": '#{processing}'
+          },
+          "sPaginationType": "full_numbers",
+          "iDisplayLength": #{per_page},
+          "bProcessing": true,
+          "bServerSide": #{server_side},
+          "bLengthChange": false,
+          "bStateSave": #{persist_state},
+          "bFilter": #{search},
+          "bAutoWidth": #{auto_width},
+          #{"'aaSorting': [#{sort_by}]," if sort_by}
+          #{"'sAjaxSource': '#{ajax_source}'," if ajax_source}
+          "aoColumns": [
+      			#{formatted_columns(columns)}
+      				],
+      		#{"'fnRowCallback': function( nRow, aData, iDisplayIndex ) { #{row_callback} }," if row_callback}
+          "fnServerData": function ( sSource, aoData, fnCallback ) {
+            aoData.push( #{additional_data_string} );
+            $.getJSON( sSource, aoData, function (json) {
+      				fnCallback(json);
+      			} );
+          }
+        })#{append};
+    });
+    </script>
+    }
+  end
+
+  private
+    def formatted_columns(columns)
+      i = 0
+      columns.map {|c|
+        i += 1
+        if c.nil? or c.empty?
+          "null"
+        else
+          searchable = c[:searchable].to_s.present? ? c[:searchable].to_s : "true"
+          sortable = c[:sortable].to_s.present? ? c[:sortable].to_s : "true"
+
+          "{
+          'sType': '#{c[:type] || "string"}',
+          'bSortable':#{sortable},
+          'bSearchable':#{searchable}
+          #{",'sClass':'#{c[:class]}'" if c[:class]}
+          }"
+        end
+      }.join(",")
+    end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rails_datatables/test/rails_datatables_test.rb b/vendor/plugins/rails_datatables/test/rails_datatables_test.rb
new file mode 100644
index 000000000..e96dcb002
--- /dev/null
+++ b/vendor/plugins/rails_datatables/test/rails_datatables_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class RailsDatatablesTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
diff --git a/vendor/plugins/rails_datatables/test/test_helper.rb b/vendor/plugins/rails_datatables/test/test_helper.rb
new file mode 100644
index 000000000..cf148b8b4
--- /dev/null
+++ b/vendor/plugins/rails_datatables/test/test_helper.rb
@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'active_support'
+require 'active_support/test_case'
\ No newline at end of file
diff --git a/vendor/plugins/rails_datatables/uninstall.rb b/vendor/plugins/rails_datatables/uninstall.rb
new file mode 100644
index 000000000..973833346
--- /dev/null
+++ b/vendor/plugins/rails_datatables/uninstall.rb
@@ -0,0 +1 @@
+# Uninstall hook code here

From c23312ad5160ff6f2aef0d7fce03c7271fed1606 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Wed, 11 Jan 2012 21:43:33 +0200
Subject: [PATCH 36/40] Research and fix problem with build_lists#auto_publish
 feature. Fix specs. Refs #97

---
 app/controllers/build_lists_controller.rb |  2 +-
 db/schema.rb                              | 11 +++++------
 spec/spec_helper.rb                       |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/controllers/build_lists_controller.rb b/app/controllers/build_lists_controller.rb
index 143ddc880..fc650a4b3 100644
--- a/app/controllers/build_lists_controller.rb
+++ b/app/controllers/build_lists_controller.rb
@@ -113,7 +113,7 @@ class BuildListsController < ApplicationController
     @build_list.notified_at = Time.current
     @build_list.save
 
-    @build_list.publish if @build_list.auto_publish # && @build_list.can_publish?
+    @build_list.delay.publish if @build_list.auto_publish # && @build_list.can_publish?
 
     render :nothing => true, :status => 200
   end
diff --git a/db/schema.rb b/db/schema.rb
index c4eb51827..e80b0c134 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -246,7 +246,6 @@ ActiveRecord::Schema.define(:version => 20111228182425) do
     t.string   "object_type"
     t.integer  "target_id"
     t.string   "target_type"
-    t.integer  "role_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "role"
@@ -283,16 +282,16 @@ ActiveRecord::Schema.define(:version => 20111228182425) do
 
   create_table "users", :force => true do |t|
     t.string   "name"
-    t.string   "email",                                 :default => "", :null => false
-    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.string   "email",                               :default => "", :null => false
+    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
+    t.string   "password_salt",                       :default => "", :null => false
     t.string   "reset_password_token"
-    t.datetime "reset_password_sent_at"
+    t.string   "remember_token"
     t.datetime "remember_created_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "uname"
     t.text     "ssh_key"
-    t.integer  "role_id"
+    t.string   "uname"
     t.string   "role"
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e15db9c3b..a79b3ce74 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -37,9 +37,9 @@ def stub_rsync_methods
   any_instance_of(Platform, :umount_directory_for_rsync => true)
 end
 
+Delayed::Worker.delay_jobs = false # Execute all jobs realtime
+
 # Add testing root_path
 %x(rm -Rf #{Rails.root}/tmp/test_root)
 %x(mkdir -p #{Rails.root}/tmp/test_root)
 APP_CONFIG['root_path'] = "#{Rails.root}/tmp/test_root"
-
-

From 49082c2a8da1beb335b7d4d6f99460212c7e8e6e Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Thu, 12 Jan 2012 01:12:56 +0400
Subject: [PATCH 37/40] [issue #76] Fixed bug with JSON generation.

---
 app/controllers/repositories_controller.rb    |  2 +-
 app/views/repositories/_proj_ajax.js.erb      | 25 +++++++++++--------
 app/views/repositories/_proj_list.html.haml   | 16 +++++-------
 .../repositories/projects_list.html.haml      |  2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index bb6dbdbe5..c1c24c242 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -68,7 +68,7 @@ class RepositoriesController < ApplicationController
 #      else
 #        @projects = Project.addable_to_repository(@repository.id).paginate(:page => params[:project_page])
 #      end
-      render 'projects_list'
+      render :projects_list
     end
   end
 
diff --git a/app/views/repositories/_proj_ajax.js.erb b/app/views/repositories/_proj_ajax.js.erb
index b70fc996f..942b4b1e2 100644
--- a/app/views/repositories/_proj_ajax.js.erb
+++ b/app/views/repositories/_proj_ajax.js.erb
@@ -1,12 +1,15 @@
-{"sEcho": <%= params[:sEcho] || -1 %>,
- "iTotalRecords": <%= @total_projects %>,
- "iTotalDisplayRecords": <%= @total_project %>,
- "aaData":[
-<% @projects.each do |project| %>
-  ['<%= link_to(project.owner.uname, project.owner) %>',
-   '<%= link_to(project.name, project) %>',
-   '<%= link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id) %>'
-  ],
-<% end %>
-]}
+{
+  "sEcho": <%=h params[:sEcho].to_i || -1 %>,
+  "iTotalRecords": <%= @total_projects %>,
+  "iTotalDisplayRecords": <%= @total_project %>,
+  "aaData": [
+  <% @projects.each do |project| %>
+    [
+      "<%=j link_to project.owner.uname, project.owner %>",
+      "<%=j link_to project.name, project %>",
+      "<%=j link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id) %>"
+    ]<%= project == @projects.last ? '' : ',' %>
+  <% end %>
+  ]
+}
 
diff --git a/app/views/repositories/_proj_list.html.haml b/app/views/repositories/_proj_list.html.haml
index 67bdd09f1..a326b40ed 100644
--- a/app/views/repositories/_proj_list.html.haml
+++ b/app/views/repositories/_proj_list.html.haml
@@ -2,16 +2,12 @@
 = raw datatable(columns, {:sort_by => "[1, 'asc']", :ajax_source => "#{url_for :controller => :repositories, :action => :projects_list, :id => @repository.id}" })
 
 %table.table.datatable
-  %tr
-    %th.first= t("activerecord.attributes.user.uname")
-    %th= t("activerecord.attributes.project.name")
-    %th.last &nbsp;
-  -# @projects.each do |project|
-    %tr{:class => cycle("odd", "even")}
-      %td
-        = link_to project.owner.uname + '/' + project.name, project_path(project)
-      %td.last
-        #{link_to t("layout.show"), project_path(project)} | #{link_to t("layout.add"), url_for(:controller => :repositories, :action => :add_project, :project_id => project.id)}
+  %thead
+    %tr
+      %th.first= t("activerecord.attributes.user.uname")
+      %th= t("activerecord.attributes.project.name")
+      %th.last &nbsp;
+  %tbody
 
 = content_for :javascripts do
   = javascript_include_tag 'jquery.dataTables.min.js'
diff --git a/app/views/repositories/projects_list.html.haml b/app/views/repositories/projects_list.html.haml
index 56f66de84..af5a9a1a9 100644
--- a/app/views/repositories/projects_list.html.haml
+++ b/app/views/repositories/projects_list.html.haml
@@ -39,7 +39,7 @@
     %h2.title
       = t("layout.projects.list_header")
     .inner
-      = render :partial => 'shared/search_form'
+      -#= render :partial => 'shared/search_form'
       = render :partial => 'proj_list', :object => @projects
       -#.actions-bar.wat-cf
         .actions

From 73b710ae4ea784690616b6b0ffba2df2552a3306 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Thu, 12 Jan 2012 20:37:50 +0400
Subject: [PATCH 38/40] [close #76] Changed styles. Fixed bug with pagination.

---
 app/controllers/repositories_controller.rb    | 18 +++++++-----
 app/views/layouts/_stylesheets.html.haml      |  2 +-
 app/views/repositories/_proj_list.html.haml   | 14 +++++++--
 config/locales/ru.yml                         | 11 +++++++
 .../rails_datatables/lib/rails_datatables.rb  | 29 ++++++++++++++++++-
 5 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c1c24c242..85d0175cc 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -54,7 +54,6 @@ class RepositoriesController < ApplicationController
   def add_project
     if params[:project_id]
       @project = Project.find(params[:project_id])
-      # params[:project_id] = nil
       unless @repository.projects.find_by_name(@project.name)
         @repository.projects << @project
         flash[:notice] = t('flash.repository.project_added')
@@ -63,22 +62,27 @@ class RepositoriesController < ApplicationController
       end
       redirect_to repository_path(@repository)
     else
-#      if @repository.platform.platform_type == 'main'
-#        @projects = Project.addable_to_repository(@repository.id).by_visibilities(['open']).paginate(:page => params[:project_page])
-#      else
-#        @projects = Project.addable_to_repository(@repository.id).paginate(:page => params[:project_page])
-#      end
       render :projects_list
     end
   end
 
   def projects_list
+    owner_subquery = "
+      INNER JOIN (
+        SELECT id, 'User' AS type, uname
+        FROM users
+        UNION
+        SELECT id, 'Group' AS type, uname
+        FROM groups
+      ) AS owner
+      ON projects.owner_id = owner.id AND projects.owner_type = owner.type"
     colName = ['owner.uname', 'projects.name']
     sort_col = params[:iSortCol_0] || 0
     sort_dir = params[:sSortDir_0]=="asc" ? 'asc' : 'desc'
     order = "#{colName[sort_col.to_i]} #{sort_dir}"
 
-    @projects = Project.addable_to_repository(@repository.id)
+    @projects = Project.joins(owner_subquery).addable_to_repository(@repository.id)
+    @projects = @projects.paginate(:page => (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i).to_i + 1, :per_page => params[:iDisplayLength])
     @projects = @projects.by_visibilities(['open']) if @repository.platform.platform_type == 'main'
 
     @total_projects = @projects.count
diff --git a/app/views/layouts/_stylesheets.html.haml b/app/views/layouts/_stylesheets.html.haml
index b2e58f3b8..b74e60ab4 100644
--- a/app/views/layouts/_stylesheets.html.haml
+++ b/app/views/layouts/_stylesheets.html.haml
@@ -1,6 +1,6 @@
 -#= include_stylesheets :application
 
 = stylesheet_link_tag "web-app-theme/base.css", "web-app-theme/themes/default/style.css", "web-app-theme/override.css", "git/style.css"
-= stylesheet_link_tag "jquery-ui-1.8.16.custom.css"
+= stylesheet_link_tag "jquery-ui-1.8.16.custom.css", "datatable.css"
 
 = yield :stylesheets
diff --git a/app/views/repositories/_proj_list.html.haml b/app/views/repositories/_proj_list.html.haml
index a326b40ed..64d8a5da8 100644
--- a/app/views/repositories/_proj_list.html.haml
+++ b/app/views/repositories/_proj_list.html.haml
@@ -1,13 +1,21 @@
-- columns = [{:type => 'html', :sortable => false, :searchable => false}, {:type => 'html'}, {:type => nil}]
-= raw datatable(columns, {:sort_by => "[1, 'asc']", :ajax_source => "#{url_for :controller => :repositories, :action => :projects_list, :id => @repository.id}" })
+- columns = [{:type => 'html', :searchable => false}, {:type => 'html'}, {:type => nil, :sortable => false, :searchable => false}]
+= raw datatable(columns, {:sort_by => "[1, 'asc']", :search_label => t("layout.search_by_name"), :processing => t("layout.processing"),
+                          :pagination_labels => {:first => t("datatables.first_label"), :previous => t("datatables.previous_label"),
+                                                 :next => t("datatables.next_label"), :last => t("datatables.last_label")},
+                          :empty_label      => t("datatables.empty_label"),
+                          :info_label       => t("datatables.info_label"),
+                          :info_empty_label => t("datatables.info_empty_label"),
+                          :filtered_label   => t("datatables.filtered_label"),
+                          :ajax_source => "#{url_for :controller => :repositories, :action => :projects_list, :id => @repository.id}" })
 
 %table.table.datatable
   %thead
     %tr
-      %th.first= t("activerecord.attributes.user.uname")
+      %th.first{:style => 'width: 80px'}= t("activerecord.attributes.user.uname")
       %th= t("activerecord.attributes.project.name")
       %th.last &nbsp;
   %tbody
+%br
 
 = content_for :javascripts do
   = javascript_include_tag 'jquery.dataTables.min.js'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index dbc4294dc..7fcd2b6c0 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3,6 +3,16 @@ ru:
     previous_label: ‹ Предыдущая
     next_label: Следующая › 
     page_gap: ...
+    
+  datatables:
+    previous_label: ‹ Пред.
+    next_label: След. › 
+    first_label: « Первая
+    last_label: Последняя »
+    empty_label: Нет доступных данных
+    info_label: Показаны записи с _START_ по _END_ из _TOTAL_
+    info_empty_label: Показаны записи с 0 по 0 из 0
+    filtered_label: (отфильтровано из _MAX_)
 
   layout:
     logged_in_as: Вы вошли как
@@ -30,6 +40,7 @@ ru:
     not_access: Нет доступа!
     owner: Владелец
     confirm: Уверенны?
+    processing: Обрабатывается...
 
     downloads:
       title: Статистика закачек пакетов
diff --git a/vendor/plugins/rails_datatables/lib/rails_datatables.rb b/vendor/plugins/rails_datatables/lib/rails_datatables.rb
index 68bc52d9b..1088cb9fe 100644
--- a/vendor/plugins/rails_datatables/lib/rails_datatables.rb
+++ b/vendor/plugins/rails_datatables/lib/rails_datatables.rb
@@ -12,6 +12,22 @@ module RailsDatatables
     auto_width = opts[:auto_width].present? ? opts[:auto_width].to_s : "true"
     row_callback = opts[:row_callback] || nil
 
+    empty_label      = opts[:empty_label]      if opts[:empty_label].present?
+    info_label       = opts[:info_label]       if opts[:info_label].present?
+    info_empty_label = opts[:info_empty_label] if opts[:info_empty_label].present?
+    filtered_label   = opts[:filtered_label]   if opts[:filtered_label].present?
+
+    if opts[:pagination_labels].present?
+      pagination_labels = []
+      pagination_labels << "'sFirst': '#{opts[:pagination_labels][:first]}'" if opts[:pagination_labels][:first].present?
+      pagination_labels << "'sLast': '#{opts[:pagination_labels][:last]}'" if opts[:pagination_labels][:last].present?
+      pagination_labels << "'sPrevious': '#{opts[:pagination_labels][:previous]}'" if opts[:pagination_labels][:previous].present?
+      pagination_labels << "'sNext': '#{opts[:pagination_labels][:next]}'" if opts[:pagination_labels][:next].present?
+      pagination_labels = pagination_labels.join(",\n")
+    else
+      pagination_labels = false
+    end
+
     append = opts[:append] || nil
 
     ajax_source = opts[:ajax_source] || nil
@@ -30,6 +46,17 @@ module RailsDatatables
           "oLanguage": {
             "sSearch": "#{search_label}",
             #{"'sZeroRecords': '#{no_records_message}'," if no_records_message}
+            #{"
+              'oPaginate': {
+                #{pagination_labels}
+              },
+            " if pagination_labels}
+
+            #{"'sEmptyTable': '#{empty_label}',"      if empty_label}
+            #{"'sInfo': '#{info_label}',"             if info_label}
+            #{"'sInfoEmpty': '#{info_empty_label}',"  if info_empty_label}
+            #{"'sInfoFiltered': '#{filtered_label}'," if filtered_label}
+
             "sProcessing": '#{processing}'
           },
           "sPaginationType": "full_numbers",
@@ -78,4 +105,4 @@ module RailsDatatables
         end
       }.join(",")
     end
-end
\ No newline at end of file
+end

From f8177f88ad56e2f6a64e06d69e8317acf7c3275e Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Thu, 12 Jan 2012 22:46:56 +0400
Subject: [PATCH 39/40] [update #76] Removed unnecessary files.

---
 .../rails_datatables/test/rails_datatables_test.rb        | 8 --------
 vendor/plugins/rails_datatables/test/test_helper.rb       | 3 ---
 2 files changed, 11 deletions(-)
 delete mode 100644 vendor/plugins/rails_datatables/test/rails_datatables_test.rb
 delete mode 100644 vendor/plugins/rails_datatables/test/test_helper.rb

diff --git a/vendor/plugins/rails_datatables/test/rails_datatables_test.rb b/vendor/plugins/rails_datatables/test/rails_datatables_test.rb
deleted file mode 100644
index e96dcb002..000000000
--- a/vendor/plugins/rails_datatables/test/rails_datatables_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class RailsDatatablesTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/vendor/plugins/rails_datatables/test/test_helper.rb b/vendor/plugins/rails_datatables/test/test_helper.rb
deleted file mode 100644
index cf148b8b4..000000000
--- a/vendor/plugins/rails_datatables/test/test_helper.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'rubygems'
-require 'active_support'
-require 'active_support/test_case'
\ No newline at end of file

From 8d35c14fc11536d4a58fbed6d4bc851e6a99684a Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Fri, 13 Jan 2012 17:48:48 +0400
Subject: [PATCH 40/40] [update #76] Added forgotten files.

---
 public/images/datatables/Sorting icons.psd    |   Bin 0 -> 27490 bytes
 public/images/datatables/back_disabled.jpg    |   Bin 0 -> 612 bytes
 public/images/datatables/back_enabled.jpg     |   Bin 0 -> 807 bytes
 public/images/datatables/favicon.ico          |   Bin 0 -> 894 bytes
 public/images/datatables/forward_disabled.jpg |   Bin 0 -> 635 bytes
 public/images/datatables/forward_enabled.jpg  |   Bin 0 -> 852 bytes
 public/images/datatables/sort_asc.png         |   Bin 0 -> 263 bytes
 .../images/datatables/sort_asc_disabled.png   |   Bin 0 -> 252 bytes
 public/images/datatables/sort_both.png        |   Bin 0 -> 282 bytes
 public/images/datatables/sort_desc.png        |   Bin 0 -> 260 bytes
 .../images/datatables/sort_desc_disabled.png  |   Bin 0 -> 251 bytes
 public/javascripts/jquery.dataTables.js       | 11349 ++++++++++++++++
 public/stylesheets/datatable.css              |   550 +
 13 files changed, 11899 insertions(+)
 create mode 100644 public/images/datatables/Sorting icons.psd
 create mode 100644 public/images/datatables/back_disabled.jpg
 create mode 100644 public/images/datatables/back_enabled.jpg
 create mode 100644 public/images/datatables/favicon.ico
 create mode 100644 public/images/datatables/forward_disabled.jpg
 create mode 100644 public/images/datatables/forward_enabled.jpg
 create mode 100644 public/images/datatables/sort_asc.png
 create mode 100644 public/images/datatables/sort_asc_disabled.png
 create mode 100644 public/images/datatables/sort_both.png
 create mode 100644 public/images/datatables/sort_desc.png
 create mode 100644 public/images/datatables/sort_desc_disabled.png
 create mode 100644 public/javascripts/jquery.dataTables.js
 create mode 100644 public/stylesheets/datatable.css

diff --git a/public/images/datatables/Sorting icons.psd b/public/images/datatables/Sorting icons.psd
new file mode 100644
index 0000000000000000000000000000000000000000..53b2e06850767cb57c52b316f0b845b1a8e0ca0e
GIT binary patch
literal 27490
zcmeG^33yY*)^oGAX}T}$5K3uTx@2jaq_m}N($WHj(w42FkS4cnARAd|!3_{mfhUTH
zY|1K#_&`w>abZ<N*=2D-Ux9~!BBID%$$w^Uk|t%5yeIE_|Mzn9&D=9*o0&6b=FXkT
zTtz`y1)>mhao`qBLJ(pzsNq?Pf|62BSCWcgaLqBHCE&EOUv}>Xi$*(!wu`FiTD>VJ
z{+AE7#EbO0ocN&`rQ%YHimuZaPq5Mz69!ajCydc5b@9D(1=$T*4MvNRwrfNUMuW+g
z)sPdf(V461EPydOEnY-e>|=7`WvP->Ns2@wjn5T`M51h~t|qHoUF4F4R8D-I-EPTB
zORKN1Ppy}wnys~I5~Wg^CYGj2r76IXVjFL=YZ_8awl0hkw;nZZ(^~ZwyWVUPVZEAa
zv%{VfACEKgTuc#lT2DR}ht)uG(P`6Y18t;Dc3T=0GR>nLWV3bJtQxb`sIlj2EEa=a
ztHHUXjWg*|NmWxVb!NNSR%f<kr!}*>GR{uJrSU2qsXEr$0{>^FZqQgf#WvYoIcv?v
zG$25c#lA%bWR}WGYwTugrP*xA&BtvbDsvZ9q^gjLhU!f^bG<DaYw%%iwpq4^M5{G+
zI#()|h*QMShVn|WA}d{%B~w;;$umqX#7oUOea-mW#FbeYvMh0?OWcd8r8qc|PGi^n
znF4RN2Vncs(tBIqXuPcfN=viUW~~D|Rf#&+;n3@{q*Ae}C_ht?o-UTDizJeKWxk?7
zU63i3<)^EaVl}a)ubi(rfL3C%*)=9D?bfN17i1L5KmlmEmrgIazuG=_eNA)U^>I#2
zx!pT4Hfx|&50)W)DOZx6b{o#C;)FJ=oVJ+_4&3*0<x;U&DNd7!;c|(3lUs@ozqhD2
zxus~c<Y1HDo-1|b)&kv9Y5-Jg9Ie*Z(l(IE$V`@I$RQ{oD3hg`(qyST9RlDK>B$)~
zF$4*~fLF+prOM1?nOKr6lPDl4lQX0cWKzI^9=R9-@XB#I1LzQB=`v}rf^>;GQ!SAw
z)Y8n1LTRB?kzbUNAum)aRbsg$-)&)^lDUfgmyJ<$gZ?glfGM~80mf#P=^JRnFtr}~
zi4C`{M46p-M}n7;o9V;vCg??IDX20V%+?Bc+R@nYh%PTwOKu;F$ubq0>B;G0Wu}<K
z&`NTNl!>JT!^AScXGj>H^kgh0Co!}rv=(3>228plLrh|5O@N^-A%@nM%fL5q4Ezu)
zajXDNh;d#r@Dv>5Tx8%uI0jjWi7fa}x+EQ_IEK<f%wXgMR^V6(<%F2<C^G<-OEF#!
zz6LRPWV%ENI&q9;l?p7YRA3&Z0`n-9ghweMFxI9d+LTJ1qmt-U;*!8KBQqJiHW@rU
zIWt+FtVmWSgJ~p^WQjCcB1@K}CxaIQlSG~jE-wXM=m^jcpo?TcZvkhAegW>@OP-$z
z*2q+<rQ(7@m0T*96%-Z~h?PYJDpiqOmEmekpBDS8ecbb~zw`6JL%!YHJ)|t+ZScsW
zb7k3ScS3vlU^BTyr7E+UYxD*>*H+%AKvYtw%9JQGGgG9g;Kq04yQ7|By$z-X<I_Ad
zkvmRNm_Y%iXE4c2^UU(xGM*{b0|A<g{Xo<+N&}hrW!!+d0_O6|0)8<EyenWXzbxPv
zbHKX-=JLw|elZ8UD_}0aEZ`S&z`FwG^2-8#F$cUWU@pHb;1_eiy8`C&%L0Be2fQm_
zF25|`7jwY70_O6|0)8<EyenWXzbxPvbHKX-=JLw|elZ8UD_}0aEZ`S&z`FwG^2-8#
zF$cUWU@pHb;1_eiy8`C&%L0Be2fQm_F25|`7jwY70_O6|0)8<EyenWXzbxPvbHKX-
z=JLw|elg$Ey9CYWCTSBKmaK<UkqDowWdBUgSw^5@)&Mx6$#UPxnae~%3nMX!dQU`*
z)CH0Z6;@g`CYwcLrA^xLgu;m>l#URGqDo{%8e~E?WP!UC(Ew}Fc$bb}2q$QFIthf3
zj$(9lAZdI~lu3tr(ha0sZ9M6Yqz;!zI+(-|xwHsK8cv;Jo+Rc}slamzl|>{k6P{v}
zR#O8M1H?R+6oXkZZ@vd3C910+cJpKqOiD9`=)4AL1T}_w-RWYV#pF9toX&rThVv#S
zL(qzBl49YU5Mu`d60DejTnb-|eQ^zNt?&umFv1f=FxX~*W92cy)f%{M5o&Iowm8YU
z0uh#S$zYtxVKBfApYaW<*4XF)8Y5j<III%VTr?QGf(D<!7Y|Osnsl~-)uXkLa-9<{
z*V-kJBKcIBEh2;2REwGM)t|1hd#4NRW}_>OPZp!{+B!EKr+GFw4olmH82Z~FMfv2z
zB{V=sLEw`_iP}pyzt(DYSbR`CvsDjgk7<*`2r|OL3alN@2?7q%p&EzX+=n*NRyc~P
z0|crZZ=qex0)`o5Fr~y;D}vjDu0I>j54#NSGA?c!Ured3*4;P^4^LyTS88f~xWcqF
z$k7e<5?gU)Y5!_Cvx}L7+-M)>;5xH)LcT#?>$X%lQ~6>y8YKBTx<=zL*Z~Y4M_cW8
zU?1W}`?7~r*OK!|UdD}N^cVE;5I_VCFq^QggY9O^K!@E%yB!151O{-V+pxlFvmG4j
zHhc&)aa{{`(p$P=T}TLl>V1*GOuq^z=wcuh_t%@uEa)3Xlii9>MGYHXCF1Xco*E4O
z4*XoBwOL9lig4dRaAHb?k4`a~NDNlKa+K*AU#1k7i9}ws`vD`h7AqK;Dg$Pj4i2FM
zJOyAwz1@QGxYRM#V=&CZJub!y1q8S?hHDu(neZ@h9)@*B6Zkg^m)W8->M*<$;Ah7<
zu-~)$13Yz{o~{S@Fu(~0hfxnO9v@?jv<CVj2iq*cPHXD`76UA_R+g&(&IYFv)_TF!
zUa%b;5O|TwY#C3QMAS{&T?B{u6ry6f-ay;!DP{1D0F6~AQkjhwjR~GOOr5b5in{Gs
z8bLGBJ&9g?_X2U-GW1J>NSje{dzx|0lFc~tQW#s|S;T&!8CN|Ip^Z-?)cTudT*6|6
z!lxj#VZT>>;;_GXeUU&<Yg4g7J=dQycsTD4c;%Oh^Ya|(6RDXVEW%!`g(IsDs|aQU
zT3VFS(ux0NL9b$Yl_R;FuA%YFgBA?|FVmZ9p}9>uJ^8qT-sE%e&`ZO=DCVUBgN$DT
z5WV~siW!-TBKF51_Ro6|CprYNN4y3U%F}NBgNGp8^M-ah!}vYGKqs+J#F`07mQ7Ed
z3P@F6DbhNu;}{kWzH#Ac9*$yA8`KeXLETUak|H_kh4N4#>Wc=#jB7Z01m;+E$OzBY
zdh{5Ygr=hD=mqpLnvWKt<!BXJgVv#q=tHy(eTu$72hb7pEowxk(NE|ix`J-Ptbk92
zQqfc!suR_f>Pbl{1(iz`QvIoNYB)8Ds-;YngL;g5ikeQ%qUKXes8!TE)ce#nYBzO|
z`kFdHouhuEZm`%aAuEQ}ftAQgV<}kqtbVLY*2An?)>zgA))dzBthubEthZPjSld`%
zu#T`ASwFEZvk^Ol9mnp>PGKw9D)vBj6}yIQWk125#-77o%3j0X%-+TRlHJHY&%Vy#
zaiTdQP70?Nr<gOCqved{Ji(d4na_EHvw^dd^Cjm5=OX78H<a6++moBcE#VI1)^h8)
zQ@L}vE4b^qpKy<GPjj#Ec)U1X5>L)6<_+hK<~_=r!F!drmbaC6kavoAna}69;rHa{
z@CWiWd^>+Ce;)rW{ucfr{%QWTppc+WLDHb2psFBK(Bz;wL2m|q9CRq?Owi5Xh~Tcl
zS-}H?b;09<X9h11-W<F?_;m11L8Kr_kRzxRj2281%oVH=d?Gk5xD*l+5+9-r85E)q
znHVxR<n55pLQaHS7e)zt2vx!nLWl5q;Y#6F;n%`Tp`oFPp?RTIq4v<{Lsy0F2>m|v
zT3B>gYFJ5_F6_y$1z{V)4uxF^4-W4do*({5_=NB|;qQj;4?iCf9FZ8IiqJ$n5wRfR
z{fJ``mm{MiC6NOojgd1V-;CTHc{Yk4l^9hRrHh&pwJd5!)TwB8beCvVv^M&w=;hI$
zM4yh~#U#a)#Eg!a9`pB@eK8kfqhixzhr~9-E{OdowlR(!ml#(PXNa2_w=V8z+>KTp
zTIIK*TRqomO{+t#uC{L1I<Ga|dRptXt&g<6(MHs!u+5k@FSgm(=DW6>wmsSoYFpp-
zwYHzMJ>M>-U9Wc9cGKFeYxhliR{I|9%iBNNep&lH?Jsxe*r87cONV(Kc62!3F|K1?
z$I%^Ucl@~HxlYlYay#ie&F-|N(~qK9QNG9^nk(8Vy4bmW=i<(e&PzJ)>wGglDSmML
z<oLDm-*pjmQFN*4GP}$6E*BFzC6p#SmasbEo36oK6<zDPzS4D9*Q<$1i9-{gN!*xt
zHmP+|Nz#O*)k(*@g?8)RZEUxt-41u>bysvB)BV-%2YRr2Wb~-(v7pEPo~)jkJ@q|b
z?RhYn3&+Jx$xD-ur3h2<Q^uvNPC1bpm)bvda_Yv^3uy^yRcSA#?Mk~P&JY{K%f;VH
zq9lDKlO>xaze#&YwbBLB!?I9Wk?cv?CfTp)J=5v**V4brh|Va@cqU_e#vhsTOl#(v
z%yaSt`6&59`7uR|qD(PE@tKmVEKokF{7`v4D>KWUwJz(IUMaoC^m?<`+3cijI(vEc
zshs#6P0o^>##~YEsNBW5jlDbf*7RQ5`($31JYC+3yfgXT^GD~um4Bf?TwpC&UvO2G
zrFvYoRn1oSQBPCvD~u`}TsXh*`=a=w+M?A(7yD%Nd9=^gVs3H2;unjLm2@c4maHnd
z*jL{7@xD9z3Hw#_o8Rwb{~rCV{Wq7gO8b_+RC;_s*8!#h8wa9+B?Dg?_+432+1RoV
z2Jr@!4O%ehhjK~zW97RlqANyLyjgLjvY>Ki<+p>o4R#FPJ|uj|h#{+nTpg+&I%{a-
zu(V;15Bp+x+u{1*o2vL#L#kF(U4E$Wp_d;zJtAYo)DcG?PI|cE;oXn4eZ=s{M<c^W
zYDT_0iaToPs5eJ7X$ESRYA#ooR4=T)s8wlS(f*{%)6LeMqjTt4^qHERnprhxYjbK}
zsy$cNyKYY1dA&+MU;pdq;?avnUmY`W%*ruN!%)LoV~}x_@qJU2X^d&7xudzke9+R<
zGS$*JHf!w5V=r3!Sy$L7+rzd^_86E<?QwK-Jnc9!E_d95ao6gH)W6#h*<fneGrq_8
z=f<CzP&DE7M>&sbAKm^~=f@^JcH;5;$Co@oJyHF{_9weMIpxXI6Z=ejW0GLfm`Qsl
zizm;T{QFZwpV~a7!<30rPCeb{>D5!irdp>Sd#2Yji=O2?tABRibF$~=J$GxGZrbP5
z#nb0ZZ<?W<@%i5*f1CR^=kqns@0*!9^R*XvFPL69`eN@F-<TCSYr?EkFO|NuVYX=Y
zwAsJEJo4q;bJFK5dPVSx<CVs_{pW6)moV>zc}?@{<{w#5uwd=N_6wg|c=c7?tA}38
zdu`344vVHQy0KWl_^Ty-mTXv>xOC1k-m-Daepo(a`L5R$udiCscE$7+f2=gEY<#2q
zjh(CHt5&_){>_=IS*snZ&%HI`tpk5o|9#V%lr>A%#;u+HHhSCf_K)w3dgti6e(Scs
zt9W<KdtKjKxITLQv<=jT@f$8~tlQYQY51mt@ArLw`{rJo*ME@u!O9Oif4JbI*pFs@
zEckfJ$IdMiwp`w7*?N9k?Y2|fM{fUi$FLoTcMjUQ?~{I?eD-P4r#p7#@7nTN&SxL)
z&f5L{=Zeoaev$dbhCLa3*6+>OyMABhz76~3`!^j>9@u;^`{2iidLP>MrTWWH50@PN
z;>ds_2agUu`qi-!#~Q!VeRcM0!`HulGwz$4-%dQvJwENbi0|fn-~Rih|LFdYwT+pL
zADvL2*mJVt<hQ4^r+)gU?VnAjr~DB5!<;jn&a65sJ^SIgqH_m+eCWs1KUsddd4B58
zkv}iI(Cxx|zvTV0=i;!7r+>Bn>iliSr8bvV{+|B(_RD3LzrSL<a`Wo6Yi+K*ab0nJ
z*Nve!&fKhT;y2Cxqx&D5Z}q!%+-Y<=$-71jnGN8{KsZU`88l)wK!oQL_-z*lm_Ku1
zj?5Z?S|iH&m9r5=^erkWLKF+3V)!BF&qzqVwlq>z3LF<u7)c@BM3APO-=Zl<7!(u~
z93%`57Dk2$LLy_sg~IUI*3r?i(b26Vh2(PGm_*B%3JnPf4GWD33yX*e3k!?EQCJKk
z5_vxgoLf<35L73cO~oTtB*l)ToZrEM0L!_P>J6o2mN4AYC^l4%!{zaVf(0Q|OCqdn
zvE9T7L~$rKi^Jmbc|lyZPzJ<EHm7rxgquG|6CFQxl9U(o;*xg?x+KJwZ>yH2TPGh>
z@w?8dxOn1Mtt}&N>AI&9)h|`*3b!w_XSO;t_$2+?yHj?2={R+%C~5Zcr{8;d=iz_;
z{`&e)j-0+cq-NaIIV(1Ndh~}Y@;*ar>z{dL<;Gpd&RmT|EEbfOL(0VGaWhB}I!mHB
zP=c}X(Ol`I7h`Y<wv`{eC`+h5VVyinRS~PTrT^NMhYP?@%-DVi3bCw}u5fUsoj&O)
z!re=d)LaDTH%Q1Pc}Ak%=yK%?zr@Xd^<0Owr&p?eJ2G_ZyNTcJUw>%Z;t1XrYhP2s
ztdj1|1D6NKJ>K#7qGh{!p0>}bxLn@vbmgoH=hwssJA=<4SkZwt!L1RF@{taiQ8g^^
zh+yJd2e2K2jX)OQi2f4}5mKQFnA&2eCOO0dh^W-kQq%*0AjGGl$hs0VG~nC9ycn}0
zR86(>z@w>dE*@}tN&@fN2(^b`rKAMLJ?Z&p^kjtz%Pxm-012ADK?qh0UH5x@kqqI_
zjAe->SrWNO?D|d^s6gz+RCC!Dvpo8v7qgpT%m^2cf+;WDDOd&Yst47vxgJ!acRg5?
zTL+cOYSvAZK?FUU*n!-!<-!+ZQqU-)8Nb`R^1>)sdw~Gzyf04*13GUCz=Vj`Eis<s
z2JUvpOqeqe0yYTv!2hNX;4#2;vA+i(0s=F{gjH&+wY0qg*6Lv02CvHFSqoAbtd%~i
z^8#imS5s}kYq)p>$2{(pe4OO#ZG{aQtsSpL<1{L@+f}|gm=A3Ya%k{~hDTdeU=X?Y
z6Ub=R$7=FPm+O4#l~$9@z1SV1(dkNEpK)~K1bEHAoYpzCw7VRUcrDCYiAxTvQg*A^
z;8Uo`=8Cz<P%K<Op}`EFH`NiccRhu+I(?135H#sMI~lkt;jrLUM_cm^wXiE;uY=Fi
zkzI*!wJ#d8s%vaygMyJLqpe!_vY~6M1Di&GKiXA9J|XJft|;<gfX*o!&_{v!^d>uP
zHNYC5&Rtuf$y}<j+o7sZX*V($io(=`$%Hh0logu^uhF$EauhM34+Szq74XGVxW$46
z4QALQDAm{?_c9G$=k-{-o!x6AvPISJVG-BfK<hh58(~Yz+c@F%bae%80$;n~5{68G
zEe0Kvt4|{bS7Ablsm2Uk90<YMI*rLh8<_1R*P}C(Hd^X5HvI$|@2t3u7vaGUp|$WK
zG~$0aH*Sr=Y_@vsP{ok!$>-8)ts3J{n(R_|@1^|*%0cEDOK|y6iV-$h;NINZIj)^R
z>;Qb&&%qy1^i+UIF2#Z<$Y@K4-2%iRxMc))&8RWyOUjGNA$1<(^G#|zUhIL;oP+mX
zBg!wTaJL*$QDiMK-Er^FEkzs?xX8X={*S8?uox(D_dnkqL$?%eP*h~|*&2krt?r#j
zOa^+9)txu4vRiw9mB+h)3)ib0{2Ra^EQK#(gXIKlZ>+Jx&IuVGyz1;4OHue)7zPeI
zZxUW6!lP+4o}|Hj072p1eGKC<W&qZ0f{yNFHisJt2ZHrvvKNn~?i~aLu)l&gMqvX8
z>oPb@xO}Z42v7m+^=r`>R0}K6X5@f9e;wf&uh#(`TaAm;T0=FiF9#P3r}d^9{1!{B
ziqm6EW8B?_$-`!;@unNJ2E2RhW3QS9s|9e_MlCPA3y$9s@HTIl%QAflQ#`Q@ykSBr
z9_Q?38L%w5?%Og#wYlCTqD^?*$JNF9T-L$w9zvuBo796%MC9KP8hA-E0Myb#d@T1M
zEtDs9I)B@<Ze5-ncC3F9jE1t|hQJoW|D(8n3pD~azV6#Xg25J#eY~v0_|9PX-^9Hw
zL&k;&X&I(EKJndsr!TQuU*bD`n|%j6C406@$9-ESl=zNLZ*w^hu})0`yarRGSAagR
z-tYDA3RIyrhz6VNMP16Q+PvXt&+)Olu(yR7$+NO(SVg_wuC2q57Tn0F!d#^Hc~B7y
z5J)!Ic|EM9FcWe;Kw;KoD#hXhV2H!_fflXZlWPgaFc-|wM84`_Z%_p^GWWuBE1lU<
zoo8-z@gs!iUoCNXj^>La_OKQW1AEK>QKpX=O%)i%s-SL|MQ79DhlmUUi#Rl<;h_aP
zx97r~Mu$O!s4X5GGY<WG;^tZd&b<eO=G@8OeLnt(DIa_R-h?1i{P=g{^o&%`Ka+wg
zdW%)l<8Vvh5uW9#B2*Js4rk-3B#~m?+<})|tSwuJ^J0Cz6e0~@a0Rw_2;`qqcuZvS
z#=H|<<zVD6ziW&W0e`617^g#eSoZOZa<1{P`AI<jZS)`R&A1EPd7QgTZ^qr9jXe%u
z_uZRAV4PFC`ZBRlpeK8JJh4ZhCqut;4*>slJsCegLSRi7KabUa(u>JX#DAg}Z*|Y?
zVD0*Teixkg^MhgVe?=Q=Afvt0S;ad+pdAQRVW3G2?Y#qlIe3s0H#sl0!vLD&#7|DR
zqISayHM#Ko5I<~N*zDR2-`^cLUb^P<y939qYd$}c6Pb`=h_@S0-r;IsN{QNCV#*Dr
zbUL9XxZH5TAJ=eAoX!(GQa6Aa?vU35DeqrqU$kJseE7jNAMQ9{7%sTaU&s(h0;6ye
z0-!NCe<4F)q|kq*CftmSBmJB03bn%*t~PTcNep^yh6#*~TsIGe5E$x0Y$sRxzep1^
zV=9BSHEglly_obu0gTik@a8Rmx8WezNovtEUFiqPb*FK*$%)R~*o%H{ayB`sTVFQq
zMPJ`^-gKg$|JY0IyK>Wc!->AWwHKYd0TAcPzP<Zz+;CoZvQF+ja~<Dres$}*^O_U=
zaqTXn`2Q>Y=)!HkCK$=U231X{2~oTgP@Nq&5v<}={o$mV#5d6m7{_io(VQCqambK-
Y16@Zf7?Q8!JB-NJ(KYBs*Ff|C0Zg4MIsgCw

literal 0
HcmV?d00001

diff --git a/public/images/datatables/back_disabled.jpg b/public/images/datatables/back_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1e73a546e3609636f9cf4c543c2a4fe4050866c3
GIT binary patch
literal 612
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3@r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tyUn
z+02YUSHb}sD?0}l&^EXLguy7lz`(-H!phDIlVN0HVHIR%V-ON%S2Pq6HFFG{Xryc+
zmRQ($@S#&sld*HEn>dFcBLmQ_$YwDLDjGT#PW*q1fd^<YlOVGogFVCRyQwLwf|@66
ze!$4fpt!)cj7zNLKSN?_SjIEf$Z0nVqZh4{&j?Wu4PU>^;oX+iLI)z|@;wX;U8Xr>
zT8Qgxn;R!Cottl}#(8Ri${a3d=J*$R5qBRbK9bRJe*4BYwq9(uIM4mLS9%TSY?*y6
zE==owYH)vf>dq6(Uzum+IyVJqc3N&dRPD57vW(=l(=(DZ-K_<Unt1pe8#qknGCi3V
zkh;vl;B4~gY1f{Kz2M5sJrOKuSm0ZhaMrL}#<_9H6t<5or9~0qKc;W}wfIQk>!LSx
zwPk@>bN@4B-OI9gCf>Wc_;CDAS%c@BJZ}k<t>BlbDz~@y-*&Y^_U+@};q`xNUthN}
On^Cj9W}Eu@|2F})$f79#

literal 0
HcmV?d00001

diff --git a/public/images/datatables/back_enabled.jpg b/public/images/datatables/back_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d764c79c7a2047b6bf65bf9d96fcafd5161e38
GIT binary patch
literal 807
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3@r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2*U&h
z1}0{pBN2d|gO!bok%5r~RhW^Pm5qg+Lx6#Sm5Gs^od+h%$i&RTD#*spplB#0EW!~u
z(MZ`u)XXulu<_tSr=TWdXR%Z_aiE1jZ7eM8Fl&IpCkWK1$Y$s$#2&a&N#sM~M5iWU
z<^Q)Bc$gW1&SMs2uxGfw`}E06etb^r9k|jMc@Dlk(IlSD-Wwx*G{%4ThHhR%HnTsw
zbu3z!=BtbC=-In5f5nt;je{+vrKZdWckk$U`c^FEYC6}Jn=<Phg&RGxWowtu+j4vL
zuDrGP=1IPrb~kp*>lG)17QB>6z3khm7PHhg<-pEGSO0F>VA}N6`w53!8pr$>MbUW|
zME<s?dezw;U%dR;`Kd)lCauvOXRNpVXgK`4pX=Sp-@CZj9x15&y*j<b<JPA<K_*#K
z<@>sFn=(%w+^5v0yp7Lmb+~3PpI4(#G~bQ$y_;t)oo+U5`bnSHZcn){CH~m7Ys2rz
z2!R@xgGrCtcPz?eOPOzKr2P26p~(mTGjR1-c<x%~cJ0>3?psA>uUGsyt|R2Ts3~!B
zN71DGSrW%W*`w8#2{O$LX)%%8*<4Ycyr;tN(Hm<XHM0xJ?{xF0EskFCh5u=&<iulr
zYNyl=#<wqXD&+4u8oF^$)m7<lY@VgXk9azsKIKz?vp4^)yx{evPw)J-Dth+P<;w$q
z`@Q9}`(-Xi+_IiGtB&jWay`d}j~$NpR@hm5{cf*szhAZWsp!3Z`)}>8|M=_HtvR>P
P+Rcr(b5Xx$|NkZcT0jT?

literal 0
HcmV?d00001

diff --git a/public/images/datatables/favicon.ico b/public/images/datatables/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6eeaa2a0d393190ce748107222d9a026f992e4a7
GIT binary patch
literal 894
zcmZQzU<5(|0R|u`!H~hsz#zuJz@P!dKp_SNAO?xUfG{@$0|>*we<X0{?!DZ?LR&jK
zJ4*`(D+_yj`}mZUV<%4{DS<No{rlI{+GcBJTomZJrYz@lN9~2?%3V3hT|wRfwpN+B
zxv$^6LDrRDRAizmzo(`AZg1n=>Y}F;x;`B~@Mg`jC-vo5%k$%{OoKy1zkdA+(K2o3
zEDKGQQ~gcX+N!Tt<ln6-e!X((x9eB`|NHmj>Ej1|9e2tL(rheJva*5dKY#gZsIRxM
zB;!h7<JJ1on-%#_W>5Wi?9l5?>z>S-`t`=OAFp5C?(007k>qM(bnVuyja#;c*qL9N
z(Q%=@`f7d2?T&^wySIHjy#MKh?rZrO7i!Bt-@f(!@WDrwB`uD&)%Eqcd3o(gVV7ri
zp6ji@(BF7(+uE0x&)(R!?s#YIg_7JW1=-KHZv1@s(DS<L4gNk(j*fnQelrS_FV5;Z
zF}eA|vYC(19e;50(BU}~*0+>xD9<^am-%+f#!uU}z9=j>5*%b{WE2`20#tutPWS1#
zz4s39d~xOMwaqJzOl{rMU%#oo=xj&xyY1WF&71o?Hs-LOkA<OOT|+}_QrMM+6RvMw
z{^IiKhevmxo!@_KTI>D^4SRbV?yXz(e#efNwKXpT1J^s+yE;1`KXoe5&f?1A$<NLo
z|MBttt(|L+O=>tYso}un=1c3AzCL>B&D=RpqN3i1hL&lnclP!D`u*G0#bsJv!oAH)
z-rc|T`^Wdkrw?7(xb)_p%`Y#WdAn`Pvz+W#0Rbo6-Ha3zp1gPgjDkZ)k6Gz!@9D0(
zG^hL4?)Be4zWep#`{$>RUhUoaq@wgyfd9*oU{6tz+SXQhl3284sj;T&{L=I*bGxt4
z@4vfX%A<*$FN^a&MMa!<bG7B?%PuH@D~2#OZ`<zU;hyB_*c#=(G&yozSimf6i&AxU
ucVnZ@2@}v1L%4tb{$0CaV_ZU_m8GSrv9VuZ;G~(e-hB9gtQeLL$fW`Ph4SP8

literal 0
HcmV?d00001

diff --git a/public/images/datatables/forward_disabled.jpg b/public/images/datatables/forward_disabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..28a9dc53fa232919299ac980dc9b61167c1868bd
GIT binary patch
literal 635
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3@r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tySE
z1JEp>E8&2Nm4%I+g9~UMTnNHo6kuRrVP;|B;)Y2uGBL9Vva&G<iLfgg3UfFHPBdy#
zHW3vwODt@B=oDn^oa!bn$jHFNjA9g{prWDU#Q(P#c!1(eg3N*p_6)E5E7rbHvEH7V
z8#+gHc2rxYci=nCmS=BPhUq>lzGLeh=CM*_u2I6%$1L~6;-1yGa|?*Fva<AVW}f$w
zM|jiv%AS4aZbfpP)?S?%8?6+<6*?uQG@xF)s3@1Q<(tn>vCW+<XI6GdMB6yB9$3U&
z#>Av>{Flt>+*?d?iZ`9)^O?_H|D3t8;Og6lD<#WHQvW(mo1ETsD>A@mr8@sqg(?1R
z%d@qrmWLWmIn1#pQuo}{brVW*C8t%EDXbOt_DabwXgGW3;wDX1;~7hWrYL+ZX=qre
z&-y^2q0zm?-FJb#(AWJTHOJ-3`S`D|JEhzC{KvY_h0kZinXP-?w!g_L@p#JQO^!z$
mYCgVwS7#SryXs@?>&L&t^Z(SozHVt~@Z#>58}s)6zX<@qORf(9

literal 0
HcmV?d00001

diff --git a/public/images/datatables/forward_enabled.jpg b/public/images/datatables/forward_enabled.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..598c075f13ab0e4bbe05a4eeea7cf777ba73cf03
GIT binary patch
literal 852
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3@r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!63{a%*-grz$D1XEXer(2tywO
z0~0eN(3Nn&%Fe>Z!NthH$ciG&$iU3P%Em6hz`z1zu=B#yGcqx=2(q#<2(fb*3M-3<
zDh5t8G7&R#Oe}1C=oHjs?40T*F37+LbR`oj+(bq}CT0c}Rz*W0Hg?Cv#)(EB0yioN
zi~PUEzyov)lOVGogFVA5dn3uE%Z<*rn&ugY^FIG9<<=87L*?mOy^~u`Rq(Eg+UDw^
z@^Uh}zJ$t~P2YpRT#sm2p`oEt8zJ-EBRfY;>b?DxZo!24Z)Q(O&}!Mbt}27`dKa(x
zr)AHkZg5MjKa&4$syaupXWNXgp32dQs<o<XGr#5u9@=#E+?+!}FI~Pa)LWslJ}B36
z`Lb3YheKCCm%VOu;VpX6(0MkYSk}6t@aOKz+;_*D4{7|~^5)^QORgNty2^@M51##X
zueaWLX7+9e=RH;{oZr5)jkOooU8VU}TQps%p>_rj-?|M=Q9pN^hZg^mV7=UWs>}D5
z$40(ME7Q1T4h8p}ZJ8O!G-Xk84;P~#ci!&o`A5I3kG@gLm*VlJbn%kvSqIh?3Y?HQ
zAX0NL>XIkpf=MN83*!%}9-aN5)p7^py2Am>F9gW&pFSp#V0dxX#ZPW;UoD(gaI@8E
z(rNQz1DBIiM13!LtZ|85lHB@$wW~n0fhRz-$?R&m{@z;uI}N|35As;}zdXB<<FOu#
z{FTp-PcAia6ML~>I#+N1k=r*G-&mI78vJ_Ezs!yIV%J}l7d*c9>7Bn;xyLT84V&`$
z@9WMTAJ6DZyR)~=FS6P2e3MDv7lHB>{C&1H^7EJ9PIf=EdUwUYtGE9%$X9(m*ZWLf
M_rC2^{;K~s0TRp{r2qf`

literal 0
HcmV?d00001

diff --git a/public/images/datatables/sort_asc.png b/public/images/datatables/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a56d0e21902ce620cd57f87fa58a6d3e804135cf
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45@5J;
zXU0OHl&hzUV@SoVE9Xw~GAQscA1s)^?0*rXqM}DeLv7?|BU8z@Q<ntt9<njnJ|j`Y
znD@ZlWoHa-oW7$XVs$3z>COGupVzP9Hek5&L+Gnl%BD>~0~tJB{an^LB{Ts5b0m7=

literal 0
HcmV?d00001

diff --git a/public/images/datatables/sort_asc_disabled.png b/public/images/datatables/sort_asc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7e621ef1c68da839ce077cec6e201a55c1ba168
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV-@pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnW*L
z7srr_TUXBQ7Ge<Kak=PnB>V6G?@}f$7k6Jhw{qGm$-QDzD`qrDaZ3s$b2XF;fBBPU
nqjNDy&Nw~puHFA+-v&m8`?>-yUFVHK{$ucT^>bP0l+XkKhw^g=

literal 0
HcmV?d00001

diff --git a/public/images/datatables/sort_both.png b/public/images/datatables/sort_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..839ac4bb5b0b414834c950de9deafff6dd94ed2d
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV-@pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0K#2rT
z7srr_TRjsz`4|*ASOSl%eg6Ob+(JtRwX|O@S}a^IES<M^Rar)~R7{gT(8t-3AepQp
zDW<l1NyH(qlCXQ0@AfT`xZ2rtb0gcPuhQK|E$f?fe^;k=XM|b({WbrT_5p@zx%{&^
T>QC<i+Qs1M>gTe~DWM4fR9b+X

literal 0
HcmV?d00001

diff --git a/public/images/datatables/sort_desc.png b/public/images/datatables/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b295159df995329b3a84340d32761f3d1dbade
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>l2Ka=y{`vF&<?H{u_y6mi^6%Qs
z|I63>J9*~+_wWBdfBFCW_y37A{>@tOZ^^2EJ(K_a|Nno&o$%d2jr=7+e!)O45@5J;
zXU0OHl#{26V@SoVqz8vtc$~v}dc~O{CLEF2anNavMpdMP)0v(X&o(k0opIq!LdvtJ
wj~up7@0`wiSoe($&y07EkGxK6U|?nlJSz0{?wJWUfu=Edy85}Sb4q9e0C9MGu>b%7

literal 0
HcmV?d00001

diff --git a/public/images/datatables/sort_desc_disabled.png b/public/images/datatables/sort_desc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2409653dc94cd21a281a31c0e3819323b84704b7
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=)2l#}z{`>du$&)AV-@pIy<HzUE
zpI^Ot_51hlzkmNec<|ufy?c)zKfZJ4&j0`aCog>d9;k)4B*-rq$b|z2+ZRf0KnX`r
z7srr_TS*TNvhX;E^>j)zMNBv%VR68zN24n8K+>5N&kUJbBQCy4c=qgBiu3mAQ)hD?
n)_oJhGvi(If!Apb49pB3GXz|UGFKJ=4P)?h^>bP0l+XkK*57ji

literal 0
HcmV?d00001

diff --git a/public/javascripts/jquery.dataTables.js b/public/javascripts/jquery.dataTables.js
new file mode 100644
index 000000000..1d84033a8
--- /dev/null
+++ b/public/javascripts/jquery.dataTables.js
@@ -0,0 +1,11349 @@
+/**
+ * @summary     DataTables
+ * @description Paginate, search and sort HTML tables
+ * @version     1.9.0.dev.2
+ * @file        jquery.dataTables.js
+ * @author      Allan Jardine (www.sprymedia.co.uk)
+ * @contact     www.sprymedia.co.uk/contact
+ *
+ * @copyright Copyright 2008-2012 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ * 
+ * For details please refer to: http://www.datatables.net
+ */
+
+/*jslint evil: true, undef: true, browser: true */
+/*globals $, jQuery,_fnExternApiFunc,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnCreateTr,_fnGatherData,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnServerParams,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAdjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnCalculateEnd,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnReOrderIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnCreateCookie,_fnReadCookie,_fnDetectHeader,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap,_fnGetRowData,_fnGetCellData,_fnSetCellData,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnApplyColumnDefs,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnJsonString*/
+
+(/** @lends <global> */function($, window, document, undefined) {
+	/** 
+	 * DataTables is a plug-in for the jQuery Javascript library. It is a 
+	 * highly flexible tool, based upon the foundations of progressive 
+	 * enhancement, which will add advanced interaction controls to any 
+	 * HTML table. For a full list of features please refer to
+	 * <a href="http://datatables.net">DataTables.net</a>.
+	 *
+	 * Note that the <i>DataTable</i> object is not a global variable but is
+	 * aliased to <i>jQuery.fn.DataTable</i> and <i>jQuery.fn.dataTable</i> through which 
+	 * it may be  accessed.
+	 *
+	 *  @class
+	 *  @param {object} [oInit={}] Configuration object for DataTables. Options
+	 *    are defined by {@link DataTable.defaults}
+	 *  @requires jQuery 1.3+
+	 * 
+	 *  @example
+	 *    // Basic initialisation
+	 *    $(document).ready( function {
+	 *      $('#example').dataTable();
+	 *    } );
+	 *  
+	 *  @example
+	 *    // Initialisation with configuration options - in this case, disable
+	 *    // pagination and sorting.
+	 *    $(document).ready( function {
+	 *      $('#example').dataTable( {
+	 *        "bPaginate": false,
+	 *        "bSort": false 
+	 *      } );
+	 *    } );
+	 */
+	var DataTable = function( oInit )
+	{
+		
+		
+		/**
+		 * Add a column to the list used for the table with default values
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {node} nTh The th element for this column
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAddColumn( oSettings, nTh )
+		{
+			var oDefaults = DataTable.defaults.columns;
+			var iCol = oSettings.aoColumns.length;
+			var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, {
+				"sSortingClass": oSettings.oClasses.sSortable,
+				"sSortingClassJUI": oSettings.oClasses.sSortJUI,
+				"nTh": nTh ? nTh : document.createElement('th'),
+				"sTitle":    oDefaults.sTitle    ? oDefaults.sTitle    : nTh ? nTh.innerHTML : '',
+				"aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol],
+				"mDataProp": oDefaults.mDataProp ? oDefaults.oDefaults : iCol
+			} );
+			oSettings.aoColumns.push( oCol );
+			
+			/* Add a column specific filter */
+			if ( !oSettings.aoPreSearchCols[ iCol ] )
+			{
+				oSettings.aoPreSearchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch );
+			}
+			else
+			{
+				var oPre = oSettings.aoPreSearchCols[ iCol ];
+				
+				/* Don't require that the user must specify bRegex, bSmart or bCaseInsensitive */
+				if ( oPre.bRegex === undefined )
+				{
+					oPre.bRegex = true;
+				}
+				
+				if ( oPre.bSmart === undefined )
+				{
+					oPre.bSmart = true;
+				}
+				
+				if ( oPre.bCaseInsensitive === undefined )
+				{
+					oPre.bCaseInsensitive = true;
+				}
+			}
+			
+			/* Use the column options function to initialise classes etc */
+			_fnColumnOptions( oSettings, iCol, null );
+		}
+		
+		
+		/**
+		 * Apply options for a column
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iCol column index to consider
+		 *  @param {object} oOptions object with sType, bVisible and bSearchable
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnColumnOptions( oSettings, iCol, oOptions )
+		{
+			var oCol = oSettings.aoColumns[ iCol ];
+			
+			/* User specified column options */
+			if ( oOptions !== undefined && oOptions !== null )
+			{
+				if ( oOptions.sType !== undefined )
+				{
+					oCol.sType = oOptions.sType;
+					oCol._bAutoType = false;
+				}
+				
+				$.extend( oCol, oOptions );
+				_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
+		
+				/* iDataSort to be applied (backwards compatibility), but aDataSort will take
+				 * priority if defined
+				 */
+				if ( oOptions.iDataSort !== undefined )
+				{
+					oCol.aDataSort = [ oOptions.iDataSort ];
+				}
+				_fnMap( oCol, oOptions, "aDataSort" );
+			}
+		
+			/* Cache the data get and set functions for speed */
+			oCol.fnGetData = _fnGetObjectDataFn( oCol.mDataProp );
+			oCol.fnSetData = _fnSetObjectDataFn( oCol.mDataProp );
+			
+			/* Feature sorting overrides column specific when off */
+			if ( !oSettings.oFeatures.bSort )
+			{
+				oCol.bSortable = false;
+			}
+			
+			/* Check that the class assignment is correct for sorting */
+			if ( !oCol.bSortable ||
+				 ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) )
+			{
+				oCol.sSortingClass = oSettings.oClasses.sSortableNone;
+				oCol.sSortingClassJUI = "";
+			}
+			else if ( oCol.bSortable ||
+			          ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) )
+			{
+			  oCol.sSortingClass = oSettings.oClasses.sSortable;
+			  oCol.sSortingClassJUI = oSettings.oClasses.sSortJUI;
+			}
+			else if ( $.inArray('asc', oCol.asSorting) != -1 && $.inArray('desc', oCol.asSorting) == -1 )
+			{
+				oCol.sSortingClass = oSettings.oClasses.sSortableAsc;
+				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIAscAllowed;
+			}
+			else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) != -1 )
+			{
+				oCol.sSortingClass = oSettings.oClasses.sSortableDesc;
+				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIDescAllowed;
+			}
+		}
+		
+		
+		/**
+		 * Adjust the table column widths for new data. Note: you would probably want to 
+		 * do a redraw after calling this function!
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAdjustColumnSizing ( oSettings )
+		{
+			/* Not interested in doing column width calculation if autowidth is disabled */
+			if ( oSettings.oFeatures.bAutoWidth === false )
+			{
+				return false;
+			}
+			
+			_fnCalculateColumnWidths( oSettings );
+			for ( var i=0 , iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				oSettings.aoColumns[i].nTh.style.width = oSettings.aoColumns[i].sWidth;
+			}
+		}
+		
+		
+		/**
+		 * Covert the index of a visible column to the index in the data array (take account
+		 * of hidden columns)
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iMatch Visible column index to lookup
+		 *  @returns {int} i the data index
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnVisibleToColumnIndex( oSettings, iMatch )
+		{
+			var iColumn = -1;
+			
+			for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible === true )
+				{
+					iColumn++;
+				}
+				
+				if ( iColumn == iMatch )
+				{
+					return i;
+				}
+			}
+			
+			return null;
+		}
+		
+		
+		/**
+		 * Covert the index of an index in the data array and convert it to the visible
+		 *   column index (take account of hidden columns)
+		 *  @param {int} iMatch Column index to lookup
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {int} i the data index
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnColumnIndexToVisible( oSettings, iMatch )
+		{
+			var iVisible = -1;
+			for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible === true )
+				{
+					iVisible++;
+				}
+				
+				if ( i == iMatch )
+				{
+					return oSettings.aoColumns[i].bVisible === true ? iVisible : null;
+				}
+			}
+			
+			return null;
+		}
+		
+		
+		/**
+		 * Get the number of visible columns
+		 *  @returns {int} i the number of visible columns
+		 *  @param {object} oS dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnVisbleColumns( oS )
+		{
+			var iVis = 0;
+			for ( var i=0 ; i<oS.aoColumns.length ; i++ )
+			{
+				if ( oS.aoColumns[i].bVisible === true )
+				{
+					iVis++;
+				}
+			}
+			return iVis;
+		}
+		
+		
+		/**
+		 * Get the sort type based on an input string
+		 *  @param {string} sData data we wish to know the type of
+		 *  @returns {string} type (defaults to 'string' if no type can be detected)
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnDetectType( sData )
+		{
+			var aTypes = DataTable.ext.aTypes;
+			var iLen = aTypes.length;
+			
+			for ( var i=0 ; i<iLen ; i++ )
+			{
+				var sType = aTypes[i]( sData );
+				if ( sType !== null )
+				{
+					return sType;
+				}
+			}
+			
+			return 'string';
+		}
+		
+		
+		/**
+		 * Figure out how to reorder a display list
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns array {int} aiReturn index list for reordering
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnReOrderIndex ( oSettings, sColumns )
+		{
+			var aColumns = sColumns.split(',');
+			var aiReturn = [];
+			
+			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				for ( var j=0 ; j<iLen ; j++ )
+				{
+					if ( oSettings.aoColumns[i].sName == aColumns[j] )
+					{
+						aiReturn.push( j );
+						break;
+					}
+				}
+			}
+			
+			return aiReturn;
+		}
+		
+		
+		/**
+		 * Get the column ordering that DataTables expects
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {string} comma separated list of names
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnColumnOrdering ( oSettings )
+		{
+			var sNames = '';
+			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				sNames += oSettings.aoColumns[i].sName+',';
+			}
+			if ( sNames.length == iLen )
+			{
+				return "";
+			}
+			return sNames.slice(0, -1);
+		}
+		
+		
+		/**
+		 * Take the column definitions and static columns arrays and calculate how
+		 * they relate to column indexes. The callback function will then apply the
+		 * definition found for a column to a suitable configuration object.
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {array} aoColDefs The aoColumnDefs array that is to be applied
+		 *  @param {array} aoCols The aoColumns array that defines columns individually
+		 *  @param {function} fn Callback function - takes two parameters, the calculated
+		 *    column index and the definition for that column.
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, fn )
+		{
+			var i, iLen, j, jLen, k, kLen;
+		
+			// Column definitions with aTargets
+			if ( aoColDefs )
+			{
+				/* Loop over the definitions array - loop in reverse so first instance has priority */
+				for ( i=aoColDefs.length-1 ; i>=0 ; i-- )
+				{
+					/* Each definition can target multiple columns, as it is an array */
+					var aTargets = aoColDefs[i].aTargets;
+					if ( !$.isArray( aTargets ) )
+					{
+						_fnLog( oSettings, 1, 'aTargets must be an array of targets, not a '+(typeof aTargets) );
+					}
+		
+					for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
+					{
+						if ( typeof aTargets[j] === 'number' && aTargets[j] >= 0 )
+						{
+							/* Add columns that we don't yet know about */
+							while( oSettings.aoColumns.length <= aTargets[j] )
+							{
+								_fnAddColumn( oSettings );
+							}
+		
+							/* Integer, basic index */
+							fn( aTargets[j], aoColDefs[i] );
+						}
+						else if ( typeof aTargets[j] === 'number' && aTargets[j] < 0 )
+						{
+							/* Negative integer, right to left column counting */
+							fn( oSettings.aoColumns.length+aTargets[j], aoColDefs[i] );
+						}
+						else if ( typeof aTargets[j] === 'string' )
+						{
+							/* Class name matching on TH element */
+							for ( k=0, kLen=oSettings.aoColumns.length ; k<kLen ; k++ )
+							{
+								if ( aTargets[j] == "_all" ||
+								     $(oSettings.aoColumns[k].nTh).hasClass( aTargets[j] ) )
+								{
+									fn( k, aoColDefs[i] );
+								}
+							}
+						}
+					}
+				}
+			}
+		
+			// Statically defined columns array
+			if ( aoCols )
+			{
+				for ( i=0, iLen=aoCols.length ; i<iLen ; i++ )
+				{
+					fn( i, aoCols[i] );
+				}
+			}
+		}
+		
+		
+		
+		/**
+		 * Add a data array to the table, creating DOM node etc. This is the parallel to 
+		 * _fnGatherData, but for adding rows from a Javascript source, rather than a
+		 * DOM source.
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {array} aData data array to be added
+		 *  @returns {int} >=0 if successful (index of new aoData entry), -1 if failed
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAddData ( oSettings, aDataSupplied )
+		{
+			var oCol;
+			
+			/* Take an independent copy of the data source so we can bash it about as we wish */
+			var aDataIn = ($.isArray(aDataSupplied)) ?
+				aDataSupplied.slice() :
+				$.extend( true, {}, aDataSupplied );
+			
+			/* Create the object for storing information about this new row */
+			var iRow = oSettings.aoData.length;
+			var oData = $.extend( true, {}, DataTable.models.oRow, {
+				"_aData": aDataIn
+			} );
+			oSettings.aoData.push( oData );
+		
+			/* Create the cells */
+			var nTd, sThisType;
+			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				oCol = oSettings.aoColumns[i];
+		
+				/* Use rendered data for filtering/sorting */
+				if ( typeof oCol.fnRender === 'function' && oCol.bUseRendered && oCol.mDataProp !== null )
+				{
+					_fnSetCellData( oSettings, iRow, i, oCol.fnRender( {
+						"iDataRow": iRow,
+						"iDataColumn": i,
+						"aData": oData._aData,
+						"oSettings": oSettings,
+						"mDataProp": oCol.mDataProp
+					}, _fnGetCellData(oSettings, iRow, i, 'display') ) );
+				}
+				
+				/* See if we should auto-detect the column type */
+				if ( oCol._bAutoType && oCol.sType != 'string' )
+				{
+					/* Attempt to auto detect the type - same as _fnGatherData() */
+					var sVarType = _fnGetCellData( oSettings, iRow, i, 'type' );
+					if ( sVarType !== null && sVarType !== '' )
+					{
+						sThisType = _fnDetectType( sVarType );
+						if ( oCol.sType === null )
+						{
+							oCol.sType = sThisType;
+						}
+						else if ( oCol.sType != sThisType && oCol.sType != "html" )
+						{
+							/* String is always the 'fallback' option */
+							oCol.sType = 'string';
+						}
+					}
+				}
+			}
+			
+			/* Add to the display array */
+			oSettings.aiDisplayMaster.push( iRow );
+		
+			/* Create the DOM imformation */
+			if ( !oSettings.oFeatures.bDeferRender )
+			{
+				_fnCreateTr( oSettings, iRow );
+			}
+		
+			return iRow;
+		}
+		
+		
+		/**
+		 * Read in the data from the target table from the DOM
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGatherData( oSettings )
+		{
+			var iLoop, i, iLen, j, jLen, jInner,
+			 	nTds, nTrs, nTd, aLocalData, iThisIndex,
+				iRow, iRows, iColumn, iColumns, sNodeName,
+				oCol, oData;
+			
+			/*
+			 * Process by row first
+			 * Add the data object for the whole table - storing the tr node. Note - no point in getting
+			 * DOM based data if we are going to go and replace it with Ajax source data.
+			 */
+			if ( oSettings.bDeferLoading || oSettings.sAjaxSource === null )
+			{
+				nTrs = oSettings.nTBody.childNodes;
+				for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+				{
+					if ( nTrs[i].nodeName.toUpperCase() == "TR" )
+					{
+						iThisIndex = oSettings.aoData.length;
+						oSettings.aoData.push( $.extend( true, {}, DataTable.models.oRow, {
+							"nTr": nTrs[i]
+						} ) );
+						
+						oSettings.aiDisplayMaster.push( iThisIndex );
+						nTds = nTrs[i].childNodes;
+						jInner = 0;
+						
+						for ( j=0, jLen=nTds.length ; j<jLen ; j++ )
+						{
+							sNodeName = nTds[j].nodeName.toUpperCase();
+							if ( sNodeName == "TD" || sNodeName == "TH" )
+							{
+								_fnSetCellData( oSettings, iThisIndex, jInner, $.trim(nTds[j].innerHTML) );
+								jInner++;
+							}
+						}
+					}
+				}
+			}
+			
+			/* Gather in the TD elements of the Table - note that this is basically the same as
+			 * fnGetTdNodes, but that function takes account of hidden columns, which we haven't yet
+			 * setup!
+			 */
+			nTrs = _fnGetTrNodes( oSettings );
+			nTds = [];
+			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+			{
+				for ( j=0, jLen=nTrs[i].childNodes.length ; j<jLen ; j++ )
+				{
+					nTd = nTrs[i].childNodes[j];
+					sNodeName = nTd.nodeName.toUpperCase();
+					if ( sNodeName == "TD" || sNodeName == "TH" )
+					{
+						nTds.push( nTd );
+					}
+				}
+			}
+			
+			/* Now process by column */
+			for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
+			{
+				oCol = oSettings.aoColumns[iColumn];
+		
+				/* Get the title of the column - unless there is a user set one */
+				if ( oCol.sTitle === null )
+				{
+					oCol.sTitle = oCol.nTh.innerHTML;
+				}
+				
+				var
+					bAutoType = oCol._bAutoType,
+					bRender = typeof oCol.fnRender === 'function',
+					bClass = oCol.sClass !== null,
+					bVisible = oCol.bVisible,
+					nCell, sThisType, sRendered, sValType;
+				
+				/* A single loop to rule them all (and be more efficient) */
+				if ( bAutoType || bRender || bClass || !bVisible )
+				{
+					for ( iRow=0, iRows=oSettings.aoData.length ; iRow<iRows ; iRow++ )
+					{
+						oData = oSettings.aoData[iRow];
+						nCell = nTds[ (iRow*iColumns) + iColumn ];
+						
+						/* Type detection */
+						if ( bAutoType && oCol.sType != 'string' )
+						{
+							sValType = _fnGetCellData( oSettings, iRow, iColumn, 'type' );
+							if ( sValType !== '' )
+							{
+								sThisType = _fnDetectType( sValType );
+								if ( oCol.sType === null )
+								{
+									oCol.sType = sThisType;
+								}
+								else if ( oCol.sType != sThisType && 
+								          oCol.sType != "html" )
+								{
+									/* String is always the 'fallback' option */
+									oCol.sType = 'string';
+								}
+							}
+						}
+						
+						/* Rendering */
+						if ( bRender )
+						{
+							sRendered = oCol.fnRender( {
+									"iDataRow": iRow,
+									"iDataColumn": iColumn,
+									"aData": oData._aData,
+									"oSettings": oSettings,
+									"mDataProp": oCol.mDataProp
+								}, _fnGetCellData(oSettings, iRow, iColumn, 'display') );
+							nCell.innerHTML = sRendered;
+							if ( oCol.bUseRendered )
+							{
+								/* Use the rendered data for filtering/sorting */
+								_fnSetCellData( oSettings, iRow, iColumn, sRendered );
+							}
+						}
+						
+						/* Classes */
+						if ( bClass )
+						{
+							nCell.className += ' '+oCol.sClass;
+						}
+						
+						/* Column visability */
+						if ( !bVisible )
+						{
+							oData._anHidden[iColumn] = nCell;
+							nCell.parentNode.removeChild( nCell );
+						}
+						else
+						{
+							oData._anHidden[iColumn] = null;
+						}
+		
+						if ( oCol.fnCreatedCell )
+						{
+							oCol.fnCreatedCell.call( oSettings.oInstance,
+								nCell, _fnGetCellData( oSettings, iRow, iColumn, 'display' ), oData._aData, iRow, iColumn
+							);
+						}
+					}
+				}
+			}
+		
+			/* Row created callbacks */
+			if ( oSettings.aoRowCreatedCallback.length !== 0 )
+			{
+				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				{
+					oData = oSettings.aoData[i];
+					_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [oData.nTr, oData._aData, i] );
+				}
+			}
+		}
+		
+		
+		/**
+		 * Take a TR element and convert it to an index in aoData
+		 *  @param {object} s dataTables settings object
+		 *  @param {node} n the TR element to find
+		 *  @returns {int} index if found, null if not
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnNodeToDataIndex( s, n )
+		{
+			var i, iLen;
+			
+			/* Optimisation - see if the nodes which are currently visible match, since that is
+			 * the most likely node to be asked for (a selector or event for example)
+			 */
+			for ( i=s._iDisplayStart, iLen=s._iDisplayEnd ; i<iLen ; i++ )
+			{
+				if ( s.aoData[ s.aiDisplay[i] ].nTr == n )
+				{
+					return s.aiDisplay[i];
+				}
+			}
+			
+			/* Otherwise we are in for a slog through the whole data cache */
+			for ( i=0, iLen=s.aoData.length ; i<iLen ; i++ )
+			{
+				if ( s.aoData[i].nTr == n )
+				{
+					return i;
+				}
+			}
+			return null;
+		}
+		
+		
+		/**
+		 * Get an array of data for a given row from the internal data cache
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iRow aoData row id
+		 *  @param {string} sSpecific data get type ('type' 'filter' 'sort')
+		 *  @returns {array} Data array
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetRowData( oSettings, iRow, sSpecific )
+		{
+			var out = [];
+			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				out.push( _fnGetCellData( oSettings, iRow, i, sSpecific ) );
+			}
+			return out;
+		}
+		
+		
+		/**
+		 * Get the data for a given cell from the internal cache, taking into account data mapping
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iRow aoData row id
+		 *  @param {int} iCol Column index
+		 *  @param {string} sSpecific data get type ('display', 'type' 'filter' 'sort')
+		 *  @returns {*} Cell data
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetCellData( oSettings, iRow, iCol, sSpecific )
+		{
+			var sData;
+			var oCol = oSettings.aoColumns[iCol];
+			var oData = oSettings.aoData[iRow]._aData;
+		
+			if ( (sData=oCol.fnGetData( oData, sSpecific )) === undefined )
+			{
+				if ( oSettings.iDrawError != oSettings.iDraw && oCol.sDefaultContent === null )
+				{
+					_fnLog( oSettings, 0, "Requested unknown parameter '"+oCol.mDataProp+
+						"' from the data source for row "+iRow );
+					oSettings.iDrawError = oSettings.iDraw;
+				}
+				return oCol.sDefaultContent;
+			}
+		
+			/* When the data source is null, we can use default column data */
+			if ( sData === null && oCol.sDefaultContent !== null )
+			{
+				sData = oCol.sDefaultContent;
+			}
+			else if ( typeof sData === 'function' )
+			{
+				/* If the data source is a function, then we run it and use the return */
+				return sData();
+			}
+		
+			if ( sSpecific == 'display' && sData === null )
+			{
+				return '';
+			}
+			return sData;
+		}
+		
+		
+		/**
+		 * Set the value for a specific cell, into the internal data cache
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iRow aoData row id
+		 *  @param {int} iCol Column index
+		 *  @param {*} val Value to set
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSetCellData( oSettings, iRow, iCol, val )
+		{
+			var oCol = oSettings.aoColumns[iCol];
+			var oData = oSettings.aoData[iRow]._aData;
+		
+			oCol.fnSetData( oData, val );
+		}
+		
+		
+		/**
+		 * Return a function that can be used to get data from a source object, taking
+		 * into account the ability to use nested objects as a source
+		 *  @param {string|int|function} mSource The data source for the object
+		 *  @returns {function} Data get function
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetObjectDataFn( mSource )
+		{
+			if ( mSource === null )
+			{
+				/* Give an empty string for rendering / sorting etc */
+				return function (data, type) {
+					return null;
+				};
+			}
+			else if ( typeof mSource === 'function' )
+			{
+			    return function (data, type) {
+			        return mSource( data, type );
+			    };
+			}
+			else if ( typeof mSource === 'string' && mSource.indexOf('.') != -1 )
+			{
+				/* If there is a . in the source string then the data source is in a nested object
+				 * we provide two 'quick' functions for the look up to speed up the most common
+				 * operation, and a generalised one for when it is needed
+				 */
+				var a = mSource.split('.');
+				if ( a.length == 2 )
+				{
+					return function (data, type) {
+						return data[ a[0] ][ a[1] ];
+					};
+				}
+				else if ( a.length == 3 )
+				{
+					return function (data, type) {
+						return data[ a[0] ][ a[1] ][ a[2] ];
+					};
+				}
+				else
+				{
+					return function (data, type) {
+						for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+						{
+							data = data[ a[i] ];
+						}
+						return data;
+					};
+				}
+			}
+			else
+			{
+				/* Array or flat object mapping */
+				return function (data, type) {
+					return data[mSource];	
+				};
+			}
+		}
+		
+		
+		/**
+		 * Return a function that can be used to set data from a source object, taking
+		 * into account the ability to use nested objects as a source
+		 *  @param {string|int|function} mSource The data source for the object
+		 *  @returns {function} Data set function
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSetObjectDataFn( mSource )
+		{
+			if ( mSource === null )
+			{
+				/* Nothing to do when the data source is null */
+				return function (data, val) {};
+			}
+			else if ( typeof mSource === 'function' )
+			{
+			    return function (data, val) {
+			        return mSource( data, val );
+			    };
+			}
+			else if ( typeof mSource === 'string' && mSource.indexOf('.') != -1 )
+			{
+				/* Like the get, we need to get data from a nested object. Again two fast lookup
+				 * functions are provided, and a generalised one.
+				 */
+				var a = mSource.split('.');
+				if ( a.length == 2 )
+				{
+					return function (data, val) {
+						data[ a[0] ][ a[1] ] = val;
+					};
+				}
+				else if ( a.length == 3 )
+				{
+					return function (data, val) {
+						data[ a[0] ][ a[1] ][ a[2] ] = val;
+					};
+				}
+				else
+				{
+					return function (data, val) {
+						for ( var i=0, iLen=a.length-1 ; i<iLen ; i++ )
+						{
+							data = data[ a[i] ];
+						}
+						data[ a[a.length-1] ] = val;
+					};
+				}
+			}
+			else
+			{
+				/* Array or flat object mapping */
+				return function (data, val) {
+					data[mSource] = val;	
+				};
+			}
+		}
+		
+		
+		/**
+		 * Return an array with the full table data
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns array {array} aData Master data array
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetDataMaster ( oSettings )
+		{
+			var aData = [];
+			var iLen = oSettings.aoData.length;
+			for ( var i=0 ; i<iLen; i++ )
+			{
+				aData.push( oSettings.aoData[i]._aData );
+			}
+			return aData;
+		}
+		
+		
+		/**
+		 * Nuke the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnClearTable( oSettings )
+		{
+			oSettings.aoData.splice( 0, oSettings.aoData.length );
+			oSettings.aiDisplayMaster.splice( 0, oSettings.aiDisplayMaster.length );
+			oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length );
+			_fnCalculateEnd( oSettings );
+		}
+		
+		
+		 /**
+		 * Take an array of integers (index array) and remove a target integer (value - not 
+		 * the key!)
+		 *  @param {array} a Index array to target
+		 *  @param {int} iTarget value to find
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnDeleteIndex( a, iTarget )
+		{
+			var iTargetIndex = -1;
+			
+			for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+			{
+				if ( a[i] == iTarget )
+				{
+					iTargetIndex = i;
+				}
+				else if ( a[i] > iTarget )
+				{
+					a[i]--;
+				}
+			}
+			
+			if ( iTargetIndex != -1 )
+			{
+				a.splice( iTargetIndex, 1 );
+			}
+		}
+		
+		
+		
+		/**
+		 * Create a new TR element (and it's TD children) for a row
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iRow Row to consider
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnCreateTr ( oSettings, iRow )
+		{
+			var oData = oSettings.aoData[iRow];
+			var nTd;
+		
+			if ( oData.nTr === null )
+			{
+				oData.nTr = document.createElement('tr');
+		
+				/* Special parameters can be given by the data source to be used on the row */
+				if ( oData._aData.DT_RowId )
+				{
+					oData.nTr.id = oData._aData.DT_RowId;
+				}
+		
+				if ( oData._aData.DT_RowClass )
+				{
+					$(oData.nTr).addClass( oData._aData.DT_RowClass );
+				}
+		
+				/* Process each column */
+				for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					var oCol = oSettings.aoColumns[i];
+					nTd = document.createElement('td');
+		
+					/* Render if needed - if bUseRendered is true then we already have the rendered
+					 * value in the data source - so can just use that
+					 */
+					if ( typeof oCol.fnRender === 'function' && (!oCol.bUseRendered || oCol.mDataProp === null) )
+					{
+						nTd.innerHTML = oCol.fnRender( {
+							"iDataRow": iRow,
+							"iDataColumn": i,
+							"aData": oData._aData,
+							"oSettings": oSettings,
+							"mDataProp": oCol.mDataProp
+						}, _fnGetCellData(oSettings, iRow, i, 'display') );
+					}
+					else
+					{
+						nTd.innerHTML = _fnGetCellData( oSettings, iRow, i, 'display' );
+					}
+				
+					/* Add user defined class */
+					if ( oCol.sClass !== null )
+					{
+						nTd.className = oCol.sClass;
+					}
+					
+					if ( oCol.bVisible )
+					{
+						oData.nTr.appendChild( nTd );
+						oData._anHidden[i] = null;
+					}
+					else
+					{
+						oData._anHidden[i] = nTd;
+					}
+		
+					if ( oCol.fnCreatedCell )
+					{
+						oCol.fnCreatedCell.call( oSettings.oInstance,
+							nTd, _fnGetCellData( oSettings, iRow, i, 'display' ), oData._aData, iRow, i
+						);
+					}
+				}
+		
+				_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [oData.nTr, oData._aData, iRow] );
+			}
+		}
+		
+		
+		/**
+		 * Create the HTML header for the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnBuildHead( oSettings )
+		{
+			var i, nTh, iLen, j, jLen;
+			var iThs = oSettings.nTHead.getElementsByTagName('th').length;
+			var iCorrector = 0;
+			var jqChildren;
+			
+			/* If there is a header in place - then use it - otherwise it's going to get nuked... */
+			if ( iThs !== 0 )
+			{
+				/* We've got a thead from the DOM, so remove hidden columns and apply width to vis cols */
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					nTh = oSettings.aoColumns[i].nTh;
+					nTh.setAttribute('role', 'columnheader');
+					if ( oSettings.aoColumns[i].bSortable )
+					{
+						nTh.setAttribute('tabindex', oSettings.iTabIndex);
+						nTh.setAttribute('aria-controls', oSettings.sTableId);
+					}
+		
+					if ( oSettings.aoColumns[i].sClass !== null )
+					{
+						$(nTh).addClass( oSettings.aoColumns[i].sClass );
+					}
+					
+					/* Set the title of the column if it is user defined (not what was auto detected) */
+					if ( oSettings.aoColumns[i].sTitle != nTh.innerHTML )
+					{
+						nTh.innerHTML = oSettings.aoColumns[i].sTitle;
+					}
+				}
+			}
+			else
+			{
+				/* We don't have a header in the DOM - so we are going to have to create one */
+				var nTr = document.createElement( "tr" );
+				
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					nTh = oSettings.aoColumns[i].nTh;
+					nTh.innerHTML = oSettings.aoColumns[i].sTitle;
+					nTh.setAttribute('tabindex', '0');
+					
+					if ( oSettings.aoColumns[i].sClass !== null )
+					{
+						$(nTh).addClass( oSettings.aoColumns[i].sClass );
+					}
+					
+					nTr.appendChild( nTh );
+				}
+				$(oSettings.nTHead).html( '' )[0].appendChild( nTr );
+				_fnDetectHeader( oSettings.aoHeader, oSettings.nTHead );
+			}
+			
+			/* ARIA role for the rows */	
+			$(oSettings.nTHead).children('tr').attr('role', 'row');
+			
+			/* Add the extra markup needed by jQuery UI's themes */
+			if ( oSettings.bJUI )
+			{
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					nTh = oSettings.aoColumns[i].nTh;
+					
+					var nDiv = document.createElement('div');
+					nDiv.className = oSettings.oClasses.sSortJUIWrapper;
+					$(nTh).contents().appendTo(nDiv);
+					
+					var nSpan = document.createElement('span');
+					nSpan.className = oSettings.oClasses.sSortIcon;
+					nDiv.appendChild( nSpan );
+					nTh.appendChild( nDiv );
+				}
+			}
+			
+			if ( oSettings.oFeatures.bSort )
+			{
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bSortable !== false )
+					{
+						_fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
+					}
+					else
+					{
+						$(oSettings.aoColumns[i].nTh).addClass( oSettings.oClasses.sSortableNone );
+					}
+				}
+			}
+			
+			/* Deal with the footer - add classes if required */
+			if ( oSettings.oClasses.sFooterTH !== "" )
+			{
+				$(oSettings.nTFoot).children('tr').children('th').addClass( oSettings.oClasses.sFooterTH );
+			}
+			
+			/* Cache the footer elements */
+			if ( oSettings.nTFoot !== null )
+			{
+				var anCells = _fnGetUniqueThs( oSettings, null, oSettings.aoFooter );
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					if ( anCells[i] )
+					{
+						oSettings.aoColumns[i].nTf = anCells[i];
+						if ( oSettings.aoColumns[i].sClass )
+						{
+							$(anCells[i]).addClass( oSettings.aoColumns[i].sClass );
+						}
+					}
+				}
+			}
+		}
+		
+		
+		/**
+		 * Draw the header (or footer) element based on the column visibility states. The
+		 * methodology here is to use the layout array from _fnDetectHeader, modified for
+		 * the instantaneous column visibility, to construct the new layout. The grid is
+		 * traversed over cell at a time in a rows x columns grid fashion, although each 
+		 * cell insert can cover multiple elements in the grid - which is tracks using the
+		 * aApplied array. Cell inserts in the grid will only occur where there isn't
+		 * already a cell in that position.
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param array {objects} aoSource Layout array from _fnDetectHeader
+		 *  @param {boolean} [bIncludeHidden=false] If true then include the hidden columns in the calc, 
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnDrawHead( oSettings, aoSource, bIncludeHidden )
+		{
+			var i, iLen, j, jLen, k, kLen;
+			var aoLocal = [];
+			var aApplied = [];
+			var iColumns = oSettings.aoColumns.length;
+			var iRowspan, iColspan;
+		
+			if (  bIncludeHidden === undefined )
+			{
+				bIncludeHidden = false;
+			}
+		
+			/* Make a copy of the master layout array, but without the visible columns in it */
+			for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
+			{
+				aoLocal[i] = aoSource[i].slice();
+				aoLocal[i].nTr = aoSource[i].nTr;
+		
+				/* Remove any columns which are currently hidden */
+				for ( j=iColumns-1 ; j>=0 ; j-- )
+				{
+					if ( !oSettings.aoColumns[j].bVisible && !bIncludeHidden )
+					{
+						aoLocal[i].splice( j, 1 );
+					}
+				}
+		
+				/* Prep the applied array - it needs an element for each row */
+				aApplied.push( [] );
+			}
+		
+			for ( i=0, iLen=aoLocal.length ; i<iLen ; i++ )
+			{
+				/* All cells are going to be replaced, so empty out the row */
+				if ( aoLocal[i].nTr )
+				{
+					for ( k=0, kLen=aoLocal[i].nTr.childNodes.length ; k<kLen ; k++ )
+					{
+						aoLocal[i].nTr.removeChild( aoLocal[i].nTr.childNodes[0] );
+					}
+				}
+		
+				for ( j=0, jLen=aoLocal[i].length ; j<jLen ; j++ )
+				{
+					iRowspan = 1;
+					iColspan = 1;
+		
+					/* Check to see if there is already a cell (row/colspan) covering our target
+					 * insert point. If there is, then there is nothing to do.
+					 */
+					if ( aApplied[i][j] === undefined )
+					{
+						aoLocal[i].nTr.appendChild( aoLocal[i][j].cell );
+						aApplied[i][j] = 1;
+		
+						/* Expand the cell to cover as many rows as needed */
+						while ( aoLocal[i+iRowspan] !== undefined &&
+						        aoLocal[i][j].cell == aoLocal[i+iRowspan][j].cell )
+						{
+							aApplied[i+iRowspan][j] = 1;
+							iRowspan++;
+						}
+		
+						/* Expand the cell to cover as many columns as needed */
+						while ( aoLocal[i][j+iColspan] !== undefined &&
+						        aoLocal[i][j].cell == aoLocal[i][j+iColspan].cell )
+						{
+							/* Must update the applied array over the rows for the columns */
+							for ( k=0 ; k<iRowspan ; k++ )
+							{
+								aApplied[i+k][j+iColspan] = 1;
+							}
+							iColspan++;
+						}
+		
+						/* Do the actual expansion in the DOM */
+						aoLocal[i][j].cell.rowSpan = iRowspan;
+						aoLocal[i][j].cell.colSpan = iColspan;
+					}
+				}
+			}
+		}
+		
+		
+		/**
+		 * Insert the required TR nodes into the table for display
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnDraw( oSettings )
+		{
+			var i, iLen;
+			var anRows = [];
+			var iRowCount = 0;
+			var iStripes = oSettings.asStripeClasses.length;
+			var iOpenRows = oSettings.aoOpenRows.length;
+			
+			/* Provide a pre-callback function which can be used to cancel the draw is false is returned */
+			var aPreDraw = _fnCallbackFire( oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings] );
+			if ( $.inArray( false, aPreDraw ) !== -1 )
+			{
+				return;
+			}
+			
+			oSettings.bDrawing = true;
+			
+			/* Check and see if we have an initial draw position from state saving */
+			if ( oSettings.iInitDisplayStart && oSettings.iInitDisplayStart != -1 )
+			{
+				if ( oSettings.oFeatures.bServerSide )
+				{
+					oSettings._iDisplayStart = oSettings.iInitDisplayStart;
+				}
+				else
+				{
+					oSettings._iDisplayStart = (oSettings.iInitDisplayStart >= oSettings.fnRecordsDisplay()) ?
+						0 : oSettings.iInitDisplayStart;
+				}
+				oSettings.iInitDisplayStart = -1;
+				_fnCalculateEnd( oSettings );
+			}
+			
+			/* Server-side processing draw intercept */
+			if ( oSettings.bDeferLoading )
+			{
+				oSettings.bDeferLoading = false;
+				oSettings.iDraw++;
+			}
+			else if ( !oSettings.oFeatures.bServerSide )
+			{
+				oSettings.iDraw++;
+			}
+			else if ( !oSettings.bDestroying && !_fnAjaxUpdate( oSettings ) )
+			{
+				return;
+			}
+			
+			if ( oSettings.aiDisplay.length !== 0 )
+			{
+				var iStart = oSettings._iDisplayStart;
+				var iEnd = oSettings._iDisplayEnd;
+				
+				if ( oSettings.oFeatures.bServerSide )
+				{
+					iStart = 0;
+					iEnd = oSettings.aoData.length;
+				}
+				
+				for ( var j=iStart ; j<iEnd ; j++ )
+				{
+					var aoData = oSettings.aoData[ oSettings.aiDisplay[j] ];
+					if ( aoData.nTr === null )
+					{
+						_fnCreateTr( oSettings, oSettings.aiDisplay[j] );
+					}
+		
+					var nRow = aoData.nTr;
+					
+					/* Remove the old striping classes and then add the new one */
+					if ( iStripes !== 0 )
+					{
+						var sStripe = oSettings.asStripeClasses[ iRowCount % iStripes ];
+						if ( aoData._sRowStripe != sStripe )
+						{
+							$(nRow).removeClass( aoData._sRowStripe ).addClass( sStripe );
+							aoData._sRowStripe = sStripe;
+						}
+					}
+					
+					/* Row callback functions - might want to manipule the row */
+					_fnCallbackFire( oSettings, 'aoRowCallback', null, 
+						[nRow, oSettings.aoData[ oSettings.aiDisplay[j] ]._aData, iRowCount, j] );
+					
+					anRows.push( nRow );
+					iRowCount++;
+					
+					/* If there is an open row - and it is attached to this parent - attach it on redraw */
+					if ( iOpenRows !== 0 )
+					{
+						for ( var k=0 ; k<iOpenRows ; k++ )
+						{
+							if ( nRow == oSettings.aoOpenRows[k].nParent )
+							{
+								anRows.push( oSettings.aoOpenRows[k].nTr );
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				/* Table is empty - create a row with an empty message in it */
+				anRows[ 0 ] = document.createElement( 'tr' );
+				
+				if ( oSettings.asStripeClasses[0] )
+				{
+					anRows[ 0 ].className = oSettings.asStripeClasses[0];
+				}
+		
+				var sZero = oSettings.oLanguage.sZeroRecords.replace(
+					'_MAX_', oSettings.fnFormatNumber(oSettings.fnRecordsTotal()) );
+				if ( oSettings.iDraw == 1 && oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
+				{
+					sZero = oSettings.oLanguage.sLoadingRecords;
+				}
+				else if ( oSettings.oLanguage.sEmptyTable && oSettings.fnRecordsTotal() === 0 )
+				{
+					sZero = oSettings.oLanguage.sEmptyTable;
+				}
+		
+				var nTd = document.createElement( 'td' );
+				nTd.setAttribute( 'valign', "top" );
+				nTd.colSpan = _fnVisbleColumns( oSettings );
+				nTd.className = oSettings.oClasses.sRowEmpty;
+				nTd.innerHTML = sZero;
+				
+				anRows[ iRowCount ].appendChild( nTd );
+			}
+			
+			/* Header and footer callbacks */
+			_fnCallbackFire( oSettings, 'aoHeaderCallback', 'header', [ $(oSettings.nTHead).children('tr')[0], 
+				_fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(), oSettings.aiDisplay ] );
+			
+			_fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0], 
+				_fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(), oSettings.aiDisplay ] );
+			
+			/* 
+			 * Need to remove any old row from the display - note we can't just empty the tbody using
+			 * $().html('') since this will unbind the jQuery event handlers (even although the node 
+			 * still exists!) - equally we can't use innerHTML, since IE throws an exception.
+			 */
+			var
+				nAddFrag = document.createDocumentFragment(),
+				nRemoveFrag = document.createDocumentFragment(),
+				nBodyPar, nTrs;
+			
+			if ( oSettings.nTBody )
+			{
+				nBodyPar = oSettings.nTBody.parentNode;
+				nRemoveFrag.appendChild( oSettings.nTBody );
+				
+				/* When doing infinite scrolling, only remove child rows when sorting, filtering or start
+				 * up. When not infinite scroll, always do it.
+				 */
+				if ( !oSettings.oScroll.bInfinite || !oSettings._bInitComplete ||
+				 	oSettings.bSorted || oSettings.bFiltered )
+				{
+					nTrs = oSettings.nTBody.childNodes;
+					for ( i=nTrs.length-1 ; i>=0 ; i-- )
+					{
+						nTrs[i].parentNode.removeChild( nTrs[i] );
+					}
+				}
+				
+				/* Put the draw table into the dom */
+				for ( i=0, iLen=anRows.length ; i<iLen ; i++ )
+				{
+					nAddFrag.appendChild( anRows[i] );
+				}
+				
+				oSettings.nTBody.appendChild( nAddFrag );
+				if ( nBodyPar !== null )
+				{
+					nBodyPar.appendChild( oSettings.nTBody );
+				}
+			}
+			
+			/* Call all required callback functions for the end of a draw */
+			_fnCallbackFire( oSettings, 'aoDrawCallback', 'draw', [oSettings] );
+			
+			/* Draw is complete, sorting and filtering must be as well */
+			oSettings.bSorted = false;
+			oSettings.bFiltered = false;
+			oSettings.bDrawing = false;
+			
+			if ( oSettings.oFeatures.bServerSide )
+			{
+				_fnProcessingDisplay( oSettings, false );
+				if ( !oSettings._bInitComplete )
+				{
+					_fnInitComplete( oSettings );
+				}
+			}
+		}
+		
+		
+		/**
+		 * Redraw the table - taking account of the various features which are enabled
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnReDraw( oSettings )
+		{
+			if ( oSettings.oFeatures.bSort )
+			{
+				/* Sorting will refilter and draw for us */
+				_fnSort( oSettings, oSettings.oPreviousSearch );
+			}
+			else if ( oSettings.oFeatures.bFilter )
+			{
+				/* Filtering will redraw for us */
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch );
+			}
+			else
+			{
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+		}
+		
+		
+		/**
+		 * Add the options to the page HTML for the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAddOptionsHtml ( oSettings )
+		{
+			/*
+			 * Create a temporary, empty, div which we can later on replace with what we have generated
+			 * we do it this way to rendering the 'options' html offline - speed :-)
+			 */
+			var nHolding = $('<div></div>')[0];
+			oSettings.nTable.parentNode.insertBefore( nHolding, oSettings.nTable );
+			
+			/* 
+			 * All DataTables are wrapped in a div
+			 */
+			oSettings.nTableWrapper = $('<div id="'+oSettings.sTableId+'_wrapper" class="'+oSettings.oClasses.sWrapper+'" role="grid"></div>')[0];
+			oSettings.nTableReinsertBefore = oSettings.nTable.nextSibling;
+		
+			/* Track where we want to insert the option */
+			var nInsertNode = oSettings.nTableWrapper;
+			
+			/* Loop over the user set positioning and place the elements as needed */
+			var aDom = oSettings.sDom.split('');
+			var nTmp, iPushFeature, cOption, nNewNode, cNext, sAttr, j;
+			for ( var i=0 ; i<aDom.length ; i++ )
+			{
+				iPushFeature = 0;
+				cOption = aDom[i];
+				
+				if ( cOption == '<' )
+				{
+					/* New container div */
+					nNewNode = $('<div></div>')[0];
+					
+					/* Check to see if we should append an id and/or a class name to the container */
+					cNext = aDom[i+1];
+					if ( cNext == "'" || cNext == '"' )
+					{
+						sAttr = "";
+						j = 2;
+						while ( aDom[i+j] != cNext )
+						{
+							sAttr += aDom[i+j];
+							j++;
+						}
+						
+						/* Replace jQuery UI constants */
+						if ( sAttr == "H" )
+						{
+							sAttr = "fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";
+						}
+						else if ( sAttr == "F" )
+						{
+							sAttr = "fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";
+						}
+						
+						/* The attribute can be in the format of "#id.class", "#id" or "class" This logic
+						 * breaks the string into parts and applies them as needed
+						 */
+						if ( sAttr.indexOf('.') != -1 )
+						{
+							var aSplit = sAttr.split('.');
+							nNewNode.id = aSplit[0].substr(1, aSplit[0].length-1);
+							nNewNode.className = aSplit[1];
+						}
+						else if ( sAttr.charAt(0) == "#" )
+						{
+							nNewNode.id = sAttr.substr(1, sAttr.length-1);
+						}
+						else
+						{
+							nNewNode.className = sAttr;
+						}
+						
+						i += j; /* Move along the position array */
+					}
+					
+					nInsertNode.appendChild( nNewNode );
+					nInsertNode = nNewNode;
+				}
+				else if ( cOption == '>' )
+				{
+					/* End container div */
+					nInsertNode = nInsertNode.parentNode;
+				}
+				else if ( cOption == 'l' && oSettings.oFeatures.bPaginate && oSettings.oFeatures.bLengthChange )
+				{
+					/* Length */
+					nTmp = _fnFeatureHtmlLength( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 'f' && oSettings.oFeatures.bFilter )
+				{
+					/* Filter */
+					nTmp = _fnFeatureHtmlFilter( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 'r' && oSettings.oFeatures.bProcessing )
+				{
+					/* pRocessing */
+					nTmp = _fnFeatureHtmlProcessing( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 't' )
+				{
+					/* Table */
+					nTmp = _fnFeatureHtmlTable( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption ==  'i' && oSettings.oFeatures.bInfo )
+				{
+					/* Info */
+					nTmp = _fnFeatureHtmlInfo( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 'p' && oSettings.oFeatures.bPaginate )
+				{
+					/* Pagination */
+					nTmp = _fnFeatureHtmlPaginate( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( DataTable.ext.aoFeatures.length !== 0 )
+				{
+					/* Plug-in features */
+					var aoFeatures = DataTable.ext.aoFeatures;
+					for ( var k=0, kLen=aoFeatures.length ; k<kLen ; k++ )
+					{
+						if ( cOption == aoFeatures[k].cFeature )
+						{
+							nTmp = aoFeatures[k].fnInit( oSettings );
+							if ( nTmp )
+							{
+								iPushFeature = 1;
+							}
+							break;
+						}
+					}
+				}
+				
+				/* Add to the 2D features array */
+				if ( iPushFeature == 1 && nTmp !== null )
+				{
+					if ( typeof oSettings.aanFeatures[cOption] !== 'object' )
+					{
+						oSettings.aanFeatures[cOption] = [];
+					}
+					oSettings.aanFeatures[cOption].push( nTmp );
+					nInsertNode.appendChild( nTmp );
+				}
+			}
+			
+			/* Built our DOM structure - replace the holding div with what we want */
+			nHolding.parentNode.replaceChild( oSettings.nTableWrapper, nHolding );
+		}
+		
+		
+		/**
+		 * Use the DOM source to create up an array of header cells. The idea here is to
+		 * create a layout grid (array) of rows x columns, which contains a reference
+		 * to the cell that that point in the grid (regardless of col/rowspan), such that
+		 * any column / row could be removed and the new grid constructed
+		 *  @param array {object} aLayout Array to store the calculated layout in
+		 *  @param {node} nThead The header/footer element for the table
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnDetectHeader ( aLayout, nThead )
+		{
+			var nTrs = $(nThead).children('tr');
+			var nCell;
+			var i, j, k, l, iLen, jLen, iColShifted;
+			var fnShiftCol = function ( a, i, j ) {
+				while ( a[i][j] ) {
+					j++;
+				}
+				return j;
+			};
+		
+			aLayout.splice( 0, aLayout.length );
+			
+			/* We know how many rows there are in the layout - so prep it */
+			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+			{
+				aLayout.push( [] );
+			}
+			
+			/* Calculate a layout array */
+			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+			{
+				var iColumn = 0;
+				
+				/* For every cell in the row... */
+				for ( j=0, jLen=nTrs[i].childNodes.length ; j<jLen ; j++ )
+				{
+					nCell = nTrs[i].childNodes[j];
+		
+					if ( nCell.nodeName.toUpperCase() == "TD" ||
+					     nCell.nodeName.toUpperCase() == "TH" )
+					{
+						/* Get the col and rowspan attributes from the DOM and sanitise them */
+						var iColspan = nCell.getAttribute('colspan') * 1;
+						var iRowspan = nCell.getAttribute('rowspan') * 1;
+						iColspan = (!iColspan || iColspan===0 || iColspan===1) ? 1 : iColspan;
+						iRowspan = (!iRowspan || iRowspan===0 || iRowspan===1) ? 1 : iRowspan;
+		
+						/* There might be colspan cells already in this row, so shift our target 
+						 * accordingly
+						 */
+						iColShifted = fnShiftCol( aLayout, i, iColumn );
+						
+						/* If there is col / rowspan, copy the information into the layout grid */
+						for ( l=0 ; l<iColspan ; l++ )
+						{
+							for ( k=0 ; k<iRowspan ; k++ )
+							{
+								aLayout[i+k][iColShifted+l] = {
+									"cell": nCell,
+									"unique": iColspan == 1 ? true : false
+								};
+								aLayout[i+k].nTr = nTrs[i];
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		
+		/**
+		 * Get an array of unique th elements, one for each column
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {node} nHeader automatically detect the layout from this node - optional
+		 *  @param {array} aLayout thead/tfoot layout from _fnDetectHeader - optional
+		 *  @returns array {node} aReturn list of unique ths
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetUniqueThs ( oSettings, nHeader, aLayout )
+		{
+			var aReturn = [];
+			if ( !aLayout )
+			{
+				aLayout = oSettings.aoHeader;
+				if ( nHeader )
+				{
+					aLayout = [];
+					_fnDetectHeader( aLayout, nHeader );
+				}
+			}
+		
+			for ( var i=0, iLen=aLayout.length ; i<iLen ; i++ )
+			{
+				for ( var j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
+				{
+					if ( aLayout[i][j].unique && 
+						 (!aReturn[j] || !oSettings.bSortCellsTop) )
+					{
+						aReturn[j] = aLayout[i][j].cell;
+					}
+				}
+			}
+			
+			return aReturn;
+		}
+		
+		
+		
+		/**
+		 * Update the table using an Ajax call
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {boolean} Block the table drawing or not
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAjaxUpdate( oSettings )
+		{
+			if ( oSettings.bAjaxDataGet )
+			{
+				oSettings.iDraw++;
+				_fnProcessingDisplay( oSettings, true );
+				var iColumns = oSettings.aoColumns.length;
+				var aoData = _fnAjaxParameters( oSettings );
+				_fnServerParams( oSettings, aoData );
+				
+				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
+					function(json) {
+						_fnAjaxUpdateDraw( oSettings, json );
+					}, oSettings );
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+		
+		
+		/**
+		 * Build up the parameters in an object needed for a server-side processing request
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {bool} block the table drawing or not
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAjaxParameters( oSettings )
+		{
+			var iColumns = oSettings.aoColumns.length;
+			var aoData = [], mDataProp;
+			var i;
+			
+			aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
+			aoData.push( { "name": "iColumns",       "value": iColumns } );
+			aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
+			aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
+			aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
+				oSettings._iDisplayLength : -1 } );
+				
+			for ( i=0 ; i<iColumns ; i++ )
+			{
+			  mDataProp = oSettings.aoColumns[i].mDataProp;
+				aoData.push( { "name": "mDataProp_"+i, "value": typeof(mDataProp)==="function" ? 'function' : mDataProp } );
+			}
+			
+			/* Filtering */
+			if ( oSettings.oFeatures.bFilter !== false )
+			{
+				aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
+				aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
+				for ( i=0 ; i<iColumns ; i++ )
+				{
+					aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
+					aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
+					aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
+				}
+			}
+			
+			/* Sorting */
+			if ( oSettings.oFeatures.bSort !== false )
+			{
+				var iFixed = oSettings.aaSortingFixed !== null ? oSettings.aaSortingFixed.length : 0;
+				var iUser = oSettings.aaSorting.length;
+				aoData.push( { "name": "iSortingCols",   "value": iFixed+iUser } );
+				for ( i=0 ; i<iFixed ; i++ )
+				{
+					aoData.push( { "name": "iSortCol_"+i,  "value": oSettings.aaSortingFixed[i][0] } );
+					aoData.push( { "name": "sSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
+				}
+				
+				for ( i=0 ; i<iUser ; i++ )
+				{
+					aoData.push( { "name": "iSortCol_"+(i+iFixed),  "value": oSettings.aaSorting[i][0] } );
+					aoData.push( { "name": "sSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
+				}
+				
+				for ( i=0 ; i<iColumns ; i++ )
+				{
+					aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
+				}
+			}
+			
+			return aoData;
+		}
+		
+		
+		/**
+		 * Add Ajax parameters from plugins
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param array {objects} aoData name/value pairs to send to the server
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnServerParams( oSettings, aoData )
+		{
+			_fnCallbackFire( oSettings, 'aoServerParams', 'serverParams', [aoData] );
+		}
+		
+		
+		/**
+		 * Data the data from the server (nuking the old) and redraw the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {object} json json data return from the server.
+		 *  @param {string} json.sEcho Tracking flag for DataTables to match requests
+		 *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
+		 *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
+		 *  @param {array} json.aaData The data to display on this page
+		 *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnAjaxUpdateDraw ( oSettings, json )
+		{
+			if ( json.sEcho !== undefined )
+			{
+				/* Protect against old returns over-writing a new one. Possible when you get
+				 * very fast interaction, and later queires are completed much faster
+				 */
+				if ( json.sEcho*1 < oSettings.iDraw )
+				{
+					return;
+				}
+				else
+				{
+					oSettings.iDraw = json.sEcho * 1;
+				}
+			}
+			
+			if ( !oSettings.oScroll.bInfinite ||
+				   (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
+			{
+				_fnClearTable( oSettings );
+			}
+			oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
+			oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
+			
+			/* Determine if reordering is required */
+			var sOrdering = _fnColumnOrdering(oSettings);
+			var bReOrder = (json.sColumns !== undefined && sOrdering !== "" && json.sColumns != sOrdering );
+			var aiIndex;
+			if ( bReOrder )
+			{
+				aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
+			}
+			
+			var aData = _fnGetObjectDataFn( oSettings.sAjaxDataProp )( json );
+			for ( var i=0, iLen=aData.length ; i<iLen ; i++ )
+			{
+				if ( bReOrder )
+				{
+					/* If we need to re-order, then create a new array with the correct order and add it */
+					var aDataSorted = [];
+					for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
+					{
+						aDataSorted.push( aData[i][ aiIndex[j] ] );
+					}
+					_fnAddData( oSettings, aDataSorted );
+				}
+				else
+				{
+					/* No re-order required, sever got it "right" - just straight add */
+					_fnAddData( oSettings, aData[i] );
+				}
+			}
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			oSettings.bAjaxDataGet = false;
+			_fnDraw( oSettings );
+			oSettings.bAjaxDataGet = true;
+			_fnProcessingDisplay( oSettings, false );
+		}
+		
+		
+		
+		/**
+		 * Generate the node required for filtering text
+		 *  @returns {node} Filter control element
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFeatureHtmlFilter ( oSettings )
+		{
+			var sSearchStr = oSettings.oLanguage.sSearch;
+			sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
+			  sSearchStr.replace('_INPUT_', '<input type="text" />') :
+			  sSearchStr==="" ? '<input type="text" />' : sSearchStr+' <input type="text" />';
+			
+			var nFilter = document.createElement( 'div' );
+			nFilter.className = oSettings.oClasses.sFilter;
+			nFilter.innerHTML = '<label>'+sSearchStr+'</label>';
+			if ( !oSettings.aanFeatures.f )
+			{
+				nFilter.id = oSettings.sTableId+'_filter';
+			}
+			
+			var jqFilter = $("input", nFilter);
+			jqFilter.val( oSettings.oPreviousSearch.sSearch.replace('"','&quot;') );
+			jqFilter.bind( 'keyup.DT', function(e) {
+				/* Update all other filter input elements for the new display */
+				var n = oSettings.aanFeatures.f;
+				for ( var i=0, iLen=n.length ; i<iLen ; i++ )
+				{
+					if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
+					{
+						$('input', n[i]).val( this.value );
+					}
+				}
+				
+				/* Now do the filter */
+				if ( this.value != oSettings.oPreviousSearch.sSearch )
+				{
+					_fnFilterComplete( oSettings, { 
+						"sSearch": this.value, 
+						"bRegex": oSettings.oPreviousSearch.bRegex,
+						"bSmart": oSettings.oPreviousSearch.bSmart ,
+						"bCaseInsensitive": oSettings.oPreviousSearch.bCaseInsensitive 
+					} );
+				}
+			} );
+		
+			jqFilter
+				.attr('aria-controls', oSettings.sTableId)
+				.bind( 'keypress.DT', function(e) {
+					/* Prevent form submission */
+					if ( e.keyCode == 13 )
+					{
+						return false;
+					}
+				}
+			);
+			
+			return nFilter;
+		}
+		
+		
+		/**
+		 * Filter the table using both the global filter and column based filtering
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {object} oSearch search information
+		 *  @param {int} [iForce] force a research of the master array (1) or not (undefined or 0)
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFilterComplete ( oSettings, oInput, iForce )
+		{
+			var oPrevSearch = oSettings.oPreviousSearch;
+			var aoPrevSearch = oSettings.aoPreSearchCols;
+			var fnSaveFilter = function ( oFilter ) {
+				/* Save the filtering values */
+				oPrevSearch.sSearch = oFilter.sSearch;
+				oPrevSearch.bRegex = oFilter.bRegex;
+				oPrevSearch.bSmart = oFilter.bSmart;
+				oPrevSearch.bCaseInsensitive = oFilter.bCaseInsensitive;
+			};
+		
+			/* In server-side processing all filtering is done by the server, so no point hanging around here */
+			if ( !oSettings.oFeatures.bServerSide )
+			{
+				/* Global filter */
+				_fnFilter( oSettings, oInput.sSearch, iForce, oInput.bRegex, oInput.bSmart, oInput.bCaseInsensitive );
+				fnSaveFilter( oInput );
+		
+				/* Now do the individual column filter */
+				for ( var i=0 ; i<oSettings.aoPreSearchCols.length ; i++ )
+				{
+					_fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, aoPrevSearch[i].bRegex, 
+						aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
+				}
+				
+				/* Custom filtering */
+				_fnFilterCustom( oSettings );
+			}
+			else
+			{
+				fnSaveFilter( oInput );
+			}
+			
+			/* Tell the draw function we have been filtering */
+			oSettings.bFiltered = true;
+			$(oSettings.oInstance).trigger('filter', oSettings);
+			
+			/* Redraw the table */
+			oSettings._iDisplayStart = 0;
+			_fnCalculateEnd( oSettings );
+			_fnDraw( oSettings );
+			
+			/* Rebuild search array 'offline' */
+			_fnBuildSearchArray( oSettings, 0 );
+		}
+		
+		
+		/**
+		 * Apply custom filtering functions
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFilterCustom( oSettings )
+		{
+			var afnFilters = DataTable.ext.afnFiltering;
+			for ( var i=0, iLen=afnFilters.length ; i<iLen ; i++ )
+			{
+				var iCorrector = 0;
+				for ( var j=0, jLen=oSettings.aiDisplay.length ; j<jLen ; j++ )
+				{
+					var iDisIndex = oSettings.aiDisplay[j-iCorrector];
+					
+					/* Check if we should use this row based on the filtering function */
+					if ( !afnFilters[i]( oSettings, _fnGetRowData( oSettings, iDisIndex, 'filter' ), iDisIndex ) )
+					{
+						oSettings.aiDisplay.splice( j-iCorrector, 1 );
+						iCorrector++;
+					}
+				}
+			}
+		}
+		
+		
+		/**
+		 * Filter the table on a per-column basis
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {string} sInput string to filter on
+		 *  @param {int} iColumn column to filter
+		 *  @param {bool} bRegex treat search string as a regular expression or not
+		 *  @param {bool} bSmart use smart filtering or not
+		 *  @param {bool} bCaseInsensitive Do case insenstive matching or not
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFilterColumn ( oSettings, sInput, iColumn, bRegex, bSmart, bCaseInsensitive )
+		{
+			if ( sInput === "" )
+			{
+				return;
+			}
+			
+			var iIndexCorrector = 0;
+			var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart, bCaseInsensitive );
+			
+			for ( var i=oSettings.aiDisplay.length-1 ; i>=0 ; i-- )
+			{
+				var sData = _fnDataToSearch( _fnGetCellData( oSettings, oSettings.aiDisplay[i], iColumn, 'filter' ),
+					oSettings.aoColumns[iColumn].sType );
+				if ( ! rpSearch.test( sData ) )
+				{
+					oSettings.aiDisplay.splice( i, 1 );
+					iIndexCorrector++;
+				}
+			}
+		}
+		
+		
+		/**
+		 * Filter the data table based on user input and draw the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {string} sInput string to filter on
+		 *  @param {int} iForce optional - force a research of the master array (1) or not (undefined or 0)
+		 *  @param {bool} bRegex treat as a regular expression or not
+		 *  @param {bool} bSmart perform smart filtering or not
+		 *  @param {bool} bCaseInsensitive Do case insenstive matching or not
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFilter( oSettings, sInput, iForce, bRegex, bSmart, bCaseInsensitive )
+		{
+			var i;
+			var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart, bCaseInsensitive );
+			var oPrevSearch = oSettings.oPreviousSearch;
+			
+			/* Check if we are forcing or not - optional parameter */
+			if ( !iForce )
+			{
+				iForce = 0;
+			}
+			
+			/* Need to take account of custom filtering functions - always filter */
+			if ( DataTable.ext.afnFiltering.length !== 0 )
+			{
+				iForce = 1;
+			}
+			
+			/*
+			 * If the input is blank - we want the full data set
+			 */
+			if ( sInput.length <= 0 )
+			{
+				oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
+				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			}
+			else
+			{
+				/*
+				 * We are starting a new search or the new search string is smaller 
+				 * then the old one (i.e. delete). Search from the master array
+			 	 */
+				if ( oSettings.aiDisplay.length == oSettings.aiDisplayMaster.length ||
+					   oPrevSearch.sSearch.length > sInput.length || iForce == 1 ||
+					   sInput.indexOf(oPrevSearch.sSearch) !== 0 )
+				{
+					/* Nuke the old display array - we are going to rebuild it */
+					oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
+					
+					/* Force a rebuild of the search array */
+					_fnBuildSearchArray( oSettings, 1 );
+					
+					/* Search through all records to populate the search array
+					 * The the oSettings.aiDisplayMaster and asDataSearch arrays have 1 to 1 
+					 * mapping
+					 */
+					for ( i=0 ; i<oSettings.aiDisplayMaster.length ; i++ )
+					{
+						if ( rpSearch.test(oSettings.asDataSearch[i]) )
+						{
+							oSettings.aiDisplay.push( oSettings.aiDisplayMaster[i] );
+						}
+					}
+			  }
+			  else
+				{
+			  	/* Using old search array - refine it - do it this way for speed
+			  	 * Don't have to search the whole master array again
+					 */
+			  	var iIndexCorrector = 0;
+			  	
+			  	/* Search the current results */
+			  	for ( i=0 ; i<oSettings.asDataSearch.length ; i++ )
+					{
+			  		if ( ! rpSearch.test(oSettings.asDataSearch[i]) )
+						{
+			  			oSettings.aiDisplay.splice( i-iIndexCorrector, 1 );
+			  			iIndexCorrector++;
+			  		}
+			  	}
+			  }
+			}
+		}
+		
+		
+		/**
+		 * Create an array which can be quickly search through
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iMaster use the master data array - optional
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnBuildSearchArray ( oSettings, iMaster )
+		{
+			if ( !oSettings.oFeatures.bServerSide )
+			{
+				/* Clear out the old data */
+				oSettings.asDataSearch.splice( 0, oSettings.asDataSearch.length );
+				
+				var aArray = (iMaster && iMaster===1) ?
+				 	oSettings.aiDisplayMaster : oSettings.aiDisplay;
+				
+				for ( var i=0, iLen=aArray.length ; i<iLen ; i++ )
+				{
+					oSettings.asDataSearch[i] = _fnBuildSearchRow( oSettings,
+						_fnGetRowData( oSettings, aArray[i], 'filter' ) );
+				}
+			}
+		}
+		
+		
+		/**
+		 * Create a searchable string from a single data row
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {array} aData Row data array to use for the data to search
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnBuildSearchRow( oSettings, aData )
+		{
+			var sSearch = '';
+			if ( oSettings.__nTmpFilter === undefined )
+			{
+				oSettings.__nTmpFilter = document.createElement('div');
+			}
+			var nTmp = oSettings.__nTmpFilter;
+			
+			for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
+			{
+				if ( oSettings.aoColumns[j].bSearchable )
+				{
+					var sData = aData[j];
+					sSearch += _fnDataToSearch( sData, oSettings.aoColumns[j].sType )+'  ';
+				}
+			}
+			
+			/* If it looks like there is an HTML entity in the string, attempt to decode it */
+			if ( sSearch.indexOf('&') !== -1 )
+			{
+				nTmp.innerHTML = sSearch;
+				sSearch = nTmp.textContent ? nTmp.textContent : nTmp.innerText;
+				
+				/* IE and Opera appear to put an newline where there is a <br> tag - remove it */
+				sSearch = sSearch.replace(/\n/g," ").replace(/\r/g,"");
+			}
+			
+			return sSearch;
+		}
+		
+		/**
+		 * Build a regular expression object suitable for searching a table
+		 *  @param {string} sSearch string to search for
+		 *  @param {bool} bRegex treat as a regular expression or not
+		 *  @param {bool} bSmart perform smart filtering or not
+		 *  @param {bool} bCaseInsensitive Do case insenstive matching or not
+		 *  @returns {RegExp} constructed object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFilterCreateSearch( sSearch, bRegex, bSmart, bCaseInsensitive )
+		{
+			var asSearch, sRegExpString;
+			
+			if ( bSmart )
+			{
+				/* Generate the regular expression to use. Something along the lines of:
+				 * ^(?=.*?\bone\b)(?=.*?\btwo\b)(?=.*?\bthree\b).*$
+				 */
+				asSearch = bRegex ? sSearch.split( ' ' ) : _fnEscapeRegex( sSearch ).split( ' ' );
+				sRegExpString = '^(?=.*?'+asSearch.join( ')(?=.*?' )+').*$';
+				return new RegExp( sRegExpString, bCaseInsensitive ? "i" : "" );
+			}
+			else
+			{
+				sSearch = bRegex ? sSearch : _fnEscapeRegex( sSearch );
+				return new RegExp( sSearch, bCaseInsensitive ? "i" : "" );
+			}
+		}
+		
+		
+		/**
+		 * Convert raw data into something that the user can search on
+		 *  @param {string} sData data to be modified
+		 *  @param {string} sType data type
+		 *  @returns {string} search string
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnDataToSearch ( sData, sType )
+		{
+			if ( typeof DataTable.ext.ofnSearch[sType] === "function" )
+			{
+				return DataTable.ext.ofnSearch[sType]( sData );
+			}
+			else if ( sType == "html" )
+			{
+				return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" );
+			}
+			else if ( typeof sData === "string" )
+			{
+				return sData.replace(/[\r\n]/g," ");
+			}
+			else if ( sData === null )
+			{
+				return '';
+			}
+			return sData;
+		}
+		
+		
+		/**
+		 * scape a string stuch that it can be used in a regular expression
+		 *  @param {string} sVal string to escape
+		 *  @returns {string} escaped string
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnEscapeRegex ( sVal )
+		{
+			var acEscape = [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^' ];
+			var reReplace = new RegExp( '(\\' + acEscape.join('|\\') + ')', 'g' );
+			return sVal.replace(reReplace, '\\$1');
+		}
+		
+		
+		
+		/**
+		 * Generate the node required for the info display
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {node} Information element
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFeatureHtmlInfo ( oSettings )
+		{
+			var nInfo = document.createElement( 'div' );
+			nInfo.className = oSettings.oClasses.sInfo;
+			
+			/* Actions that are to be taken once only for this feature */
+			if ( !oSettings.aanFeatures.i )
+			{
+				/* Add draw callback */
+				oSettings.aoDrawCallback.push( {
+					"fn": _fnUpdateInfo,
+					"sName": "information"
+				} );
+				
+				/* Add id */
+				nInfo.id = oSettings.sTableId+'_info';
+			}
+			oSettings.nTable.setAttribute( 'aria-describedby', oSettings.sTableId+'_info' );
+			
+			return nInfo;
+		}
+		
+		
+		/**
+		 * Update the information elements in the display
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnUpdateInfo ( oSettings )
+		{
+			/* Show information about the table */
+			if ( !oSettings.oFeatures.bInfo || oSettings.aanFeatures.i.length === 0 )
+			{
+				return;
+			}
+			
+			var
+				iStart = oSettings._iDisplayStart+1, iEnd = oSettings.fnDisplayEnd(),
+				iMax = oSettings.fnRecordsTotal(), iTotal = oSettings.fnRecordsDisplay(),
+				sStart = oSettings.fnFormatNumber( iStart ), sEnd = oSettings.fnFormatNumber( iEnd ),
+				sMax = oSettings.fnFormatNumber( iMax ), sTotal = oSettings.fnFormatNumber( iTotal ),
+				sOut;
+			
+			/* When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
+			 * internally
+			 */
+			if ( oSettings.oScroll.bInfinite )
+			{
+				sStart = oSettings.fnFormatNumber( 1 );
+			}
+			
+			if ( oSettings.fnRecordsDisplay() === 0 && 
+				   oSettings.fnRecordsDisplay() == oSettings.fnRecordsTotal() )
+			{
+				/* Empty record set */
+				sOut = oSettings.oLanguage.sInfoEmpty+ oSettings.oLanguage.sInfoPostFix;
+			}
+			else if ( oSettings.fnRecordsDisplay() === 0 )
+			{
+				/* Rmpty record set after filtering */
+				sOut = oSettings.oLanguage.sInfoEmpty +' '+ 
+					oSettings.oLanguage.sInfoFiltered.replace('_MAX_', sMax)+
+						oSettings.oLanguage.sInfoPostFix;
+			}
+			else if ( oSettings.fnRecordsDisplay() == oSettings.fnRecordsTotal() )
+			{
+				/* Normal record set */
+				sOut = oSettings.oLanguage.sInfo.
+						replace('_START_', sStart).
+						replace('_END_',   sEnd).
+						replace('_TOTAL_', sTotal)+ 
+					oSettings.oLanguage.sInfoPostFix;
+			}
+			else
+			{
+				/* Record set after filtering */
+				sOut = oSettings.oLanguage.sInfo.
+						replace('_START_', sStart).
+						replace('_END_',   sEnd).
+						replace('_TOTAL_', sTotal) +' '+ 
+					oSettings.oLanguage.sInfoFiltered.replace('_MAX_', 
+						oSettings.fnFormatNumber(oSettings.fnRecordsTotal()))+ 
+					oSettings.oLanguage.sInfoPostFix;
+			}
+			
+			if ( oSettings.oLanguage.fnInfoCallback !== null )
+			{
+				sOut = oSettings.oLanguage.fnInfoCallback.call( oSettings.oInstance, 
+					oSettings, iStart, iEnd, iMax, iTotal, sOut );
+			}
+			
+			var n = oSettings.aanFeatures.i;
+			for ( var i=0, iLen=n.length ; i<iLen ; i++ )
+			{
+				$(n[i]).html( sOut );
+			}
+		}
+		
+		
+		
+		/**
+		 * Draw the table for the first time, adding all required features
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnInitialise ( oSettings )
+		{
+			var i, iLen, iAjaxStart=oSettings.iInitDisplayStart;
+			
+			/* Ensure that the table data is fully initialised */
+			if ( oSettings.bInitialised === false )
+			{
+				setTimeout( function(){ _fnInitialise( oSettings ); }, 200 );
+				return;
+			}
+			
+			/* Show the display HTML options */
+			_fnAddOptionsHtml( oSettings );
+			
+			/* Build and draw the header / footer for the table */
+			_fnBuildHead( oSettings );
+			_fnDrawHead( oSettings, oSettings.aoHeader );
+			if ( oSettings.nTFoot )
+			{
+				_fnDrawHead( oSettings, oSettings.aoFooter );
+			}
+		
+			/* Okay to show that something is going on now */
+			_fnProcessingDisplay( oSettings, true );
+			
+			/* Calculate sizes for columns */
+			if ( oSettings.oFeatures.bAutoWidth )
+			{
+				_fnCalculateColumnWidths( oSettings );
+			}
+			
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aoColumns[i].sWidth !== null )
+				{
+					oSettings.aoColumns[i].nTh.style.width = _fnStringToCss( oSettings.aoColumns[i].sWidth );
+				}
+			}
+			
+			/* If there is default sorting required - let's do it. The sort function will do the
+			 * drawing for us. Otherwise we draw the table regardless of the Ajax source - this allows
+			 * the table to look initialised for Ajax sourcing data (show 'loading' message possibly)
+			 */
+			if ( oSettings.oFeatures.bSort )
+			{
+				_fnSort( oSettings );
+			}
+			else if ( oSettings.oFeatures.bFilter )
+			{
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch );
+			}
+			else
+			{
+				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+			
+			/* if there is an ajax source load the data */
+			if ( oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
+			{
+				var aoData = [];
+				_fnServerParams( oSettings, aoData );
+				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData, function(json) {
+					var aData = (oSettings.sAjaxDataProp !== "") ?
+					 	_fnGetObjectDataFn( oSettings.sAjaxDataProp )(json) : json;
+		
+					/* Got the data - add it to the table */
+					for ( i=0 ; i<aData.length ; i++ )
+					{
+						_fnAddData( oSettings, aData[i] );
+					}
+					
+					/* Reset the init display for cookie saving. We've already done a filter, and
+					 * therefore cleared it before. So we need to make it appear 'fresh'
+					 */
+					oSettings.iInitDisplayStart = iAjaxStart;
+					
+					if ( oSettings.oFeatures.bSort )
+					{
+						_fnSort( oSettings );
+					}
+					else
+					{
+						oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+						_fnCalculateEnd( oSettings );
+						_fnDraw( oSettings );
+					}
+					
+					_fnProcessingDisplay( oSettings, false );
+					_fnInitComplete( oSettings, json );
+				}, oSettings );
+				return;
+			}
+			
+			/* Server-side processing initialisation complete is done at the end of _fnDraw */
+			if ( !oSettings.oFeatures.bServerSide )
+			{
+				_fnProcessingDisplay( oSettings, false );
+				_fnInitComplete( oSettings );
+			}
+		}
+		
+		
+		/**
+		 * Draw the table for the first time, adding all required features
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {object} [json] JSON from the server that completed the table, if using Ajax source
+		 *    with client-side processing (optional)
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnInitComplete ( oSettings, json )
+		{
+			oSettings._bInitComplete = true;
+			_fnCallbackFire( oSettings, 'aoInitComplete', 'init', [oSettings, json] );
+		}
+		
+		
+		/**
+		 * Language compatibility - when certain options are given, and others aren't, we
+		 * need to duplicate the values over, in order to provide backwards compatibility
+		 * with older language files.
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnLanguageCompat( oLanguage )
+		{
+			/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
+			 * sZeroRecords - assuming that is given.
+			 */
+			if ( !oLanguage.sEmptyTable && oLanguage.sZeroRecords )
+			{
+				_fnMap( oLanguage, oLanguage, 'sZeroRecords', 'sEmptyTable' );
+			}
+		
+			/* Likewise with loading records */
+			if ( !oLanguage.sLoadingRecords && oLanguage.sZeroRecords )
+			{
+				_fnMap( oLanguage, oLanguage, 'sZeroRecords', 'sLoadingRecords' );
+			}
+		}
+		
+		
+		
+		/**
+		 * Generate the node required for user display length changing
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {node} Display length feature node
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFeatureHtmlLength ( oSettings )
+		{
+			if ( oSettings.oScroll.bInfinite )
+			{
+				return null;
+			}
+			
+			/* This can be overruled by not using the _MENU_ var/macro in the language variable */
+			var sName = 'name="'+oSettings.sTableId+'_length"';
+			var sStdMenu = '<select size="1" '+sName+'>';
+			var i, iLen;
+			
+			if ( oSettings.aLengthMenu.length == 2 && typeof oSettings.aLengthMenu[0] === 'object' && 
+					typeof oSettings.aLengthMenu[1] === 'object' )
+			{
+				for ( i=0, iLen=oSettings.aLengthMenu[0].length ; i<iLen ; i++ )
+				{
+					sStdMenu += '<option value="'+oSettings.aLengthMenu[0][i]+'">'+
+						oSettings.aLengthMenu[1][i]+'</option>';
+				}
+			}
+			else
+			{
+				for ( i=0, iLen=oSettings.aLengthMenu.length ; i<iLen ; i++ )
+				{
+					sStdMenu += '<option value="'+oSettings.aLengthMenu[i]+'">'+
+						oSettings.aLengthMenu[i]+'</option>';
+				}
+			}
+			sStdMenu += '</select>';
+			
+			var nLength = document.createElement( 'div' );
+			if ( !oSettings.aanFeatures.l )
+			{
+				nLength.id = oSettings.sTableId+'_length';
+			}
+			nLength.className = oSettings.oClasses.sLength;
+			nLength.innerHTML = '<label>'+oSettings.oLanguage.sLengthMenu.replace( '_MENU_', sStdMenu )+'</label>';
+			
+			/*
+			 * Set the length to the current display length - thanks to Andrea Pavlovic for this fix,
+			 * and Stefan Skopnik for fixing the fix!
+			 */
+			$('select option[value="'+oSettings._iDisplayLength+'"]', nLength).attr("selected", true);
+			
+			$('select', nLength).bind( 'change.DT', function(e) {
+				var iVal = $(this).val();
+				
+				/* Update all other length options for the new display */
+				var n = oSettings.aanFeatures.l;
+				for ( i=0, iLen=n.length ; i<iLen ; i++ )
+				{
+					if ( n[i] != this.parentNode )
+					{
+						$('select', n[i]).val( iVal );
+					}
+				}
+				
+				/* Redraw the table */
+				oSettings._iDisplayLength = parseInt(iVal, 10);
+				_fnCalculateEnd( oSettings );
+				
+				/* If we have space to show extra rows (backing up from the end point - then do so */
+				if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() )
+				{
+					oSettings._iDisplayStart = oSettings.fnDisplayEnd() - oSettings._iDisplayLength;
+					if ( oSettings._iDisplayStart < 0 )
+					{
+						oSettings._iDisplayStart = 0;
+					}
+				}
+				
+				if ( oSettings._iDisplayLength == -1 )
+				{
+					oSettings._iDisplayStart = 0;
+				}
+				
+				_fnDraw( oSettings );
+			} );
+		
+		
+			$('select', nLength).attr('aria-controls', oSettings.sTableId);
+			
+			return nLength;
+		}
+		
+		
+		/**
+		 * Rcalculate the end point based on the start point
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnCalculateEnd( oSettings )
+		{
+			if ( oSettings.oFeatures.bPaginate === false )
+			{
+				oSettings._iDisplayEnd = oSettings.aiDisplay.length;
+			}
+			else
+			{
+				/* Set the end point of the display - based on how many elements there are
+				 * still to display
+				 */
+				if ( oSettings._iDisplayStart + oSettings._iDisplayLength > oSettings.aiDisplay.length ||
+					   oSettings._iDisplayLength == -1 )
+				{
+					oSettings._iDisplayEnd = oSettings.aiDisplay.length;
+				}
+				else
+				{
+					oSettings._iDisplayEnd = oSettings._iDisplayStart + oSettings._iDisplayLength;
+				}
+			}
+		}
+		
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Note that most of the paging logic is done in 
+		 * DataTable.ext.oPagination
+		 */
+		
+		/**
+		 * Generate the node required for default pagination
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {node} Pagination feature node
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFeatureHtmlPaginate ( oSettings )
+		{
+			if ( oSettings.oScroll.bInfinite )
+			{
+				return null;
+			}
+			
+			var nPaginate = document.createElement( 'div' );
+			nPaginate.className = oSettings.oClasses.sPaging+oSettings.sPaginationType;
+			
+			DataTable.ext.oPagination[ oSettings.sPaginationType ].fnInit( oSettings, nPaginate, 
+				function( oSettings ) {
+					_fnCalculateEnd( oSettings );
+					_fnDraw( oSettings );
+				}
+			);
+			
+			/* Add a draw callback for the pagination on first instance, to update the paging display */
+			if ( !oSettings.aanFeatures.p )
+			{
+				oSettings.aoDrawCallback.push( {
+					"fn": function( oSettings ) {
+						DataTable.ext.oPagination[ oSettings.sPaginationType ].fnUpdate( oSettings, function( oSettings ) {
+							_fnCalculateEnd( oSettings );
+							_fnDraw( oSettings );
+						} );
+					},
+					"sName": "pagination"
+				} );
+			}
+			return nPaginate;
+		}
+		
+		
+		/**
+		 * Alter the display settings to change the page
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
+		 *    or page number to jump to (integer)
+		 *  @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnPageChange ( oSettings, mAction )
+		{
+			var iOldStart = oSettings._iDisplayStart;
+			
+			if ( typeof mAction === "number" )
+			{
+				oSettings._iDisplayStart = mAction * oSettings._iDisplayLength;
+				if ( oSettings._iDisplayStart > oSettings.fnRecordsDisplay() )
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			else if ( mAction == "first" )
+			{
+				oSettings._iDisplayStart = 0;
+			}
+			else if ( mAction == "previous" )
+			{
+				oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
+					oSettings._iDisplayStart - oSettings._iDisplayLength :
+					0;
+				
+				/* Correct for underrun */
+				if ( oSettings._iDisplayStart < 0 )
+				{
+				  oSettings._iDisplayStart = 0;
+				}
+			}
+			else if ( mAction == "next" )
+			{
+				if ( oSettings._iDisplayLength >= 0 )
+				{
+					/* Make sure we are not over running the display array */
+					if ( oSettings._iDisplayStart + oSettings._iDisplayLength < oSettings.fnRecordsDisplay() )
+					{
+						oSettings._iDisplayStart += oSettings._iDisplayLength;
+					}
+				}
+				else
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			else if ( mAction == "last" )
+			{
+				if ( oSettings._iDisplayLength >= 0 )
+				{
+					var iPages = parseInt( (oSettings.fnRecordsDisplay()-1) / oSettings._iDisplayLength, 10 ) + 1;
+					oSettings._iDisplayStart = (iPages-1) * oSettings._iDisplayLength;
+				}
+				else
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			else
+			{
+				_fnLog( oSettings, 0, "Unknown paging action: "+mAction );
+			}
+			$(oSettings.oInstance).trigger('page', oSettings);
+			
+			return iOldStart != oSettings._iDisplayStart;
+		}
+		
+		
+		
+		/**
+		 * Generate the node required for the processing node
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {node} Processing element
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFeatureHtmlProcessing ( oSettings )
+		{
+			var nProcessing = document.createElement( 'div' );
+			
+			if ( !oSettings.aanFeatures.r )
+			{
+				nProcessing.id = oSettings.sTableId+'_processing';
+			}
+			nProcessing.innerHTML = oSettings.oLanguage.sProcessing;
+			nProcessing.className = oSettings.oClasses.sProcessing;
+			oSettings.nTable.parentNode.insertBefore( nProcessing, oSettings.nTable );
+			
+			return nProcessing;
+		}
+		
+		
+		/**
+		 * Display or hide the processing indicator
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {bool} bShow Show the processing indicator (true) or not (false)
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnProcessingDisplay ( oSettings, bShow )
+		{
+			if ( oSettings.oFeatures.bProcessing )
+			{
+				var an = oSettings.aanFeatures.r;
+				for ( var i=0, iLen=an.length ; i<iLen ; i++ )
+				{
+					an[i].style.visibility = bShow ? "visible" : "hidden";
+				}
+			}
+		
+			$(oSettings.oInstance).trigger('processing', [oSettings, bShow]);
+		}
+		
+		
+		
+		/**
+		 * Add any control elements for the table - specifically scrolling
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {node} Node to add to the DOM
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnFeatureHtmlTable ( oSettings )
+		{
+			/* Check if scrolling is enabled or not - if not then leave the DOM unaltered */
+			if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
+			{
+				return oSettings.nTable;
+			}
+			
+			/*
+			 * The HTML structure that we want to generate in this function is:
+			 *  div - nScroller
+			 *    div - nScrollHead
+			 *      div - nScrollHeadInner
+			 *        table - nScrollHeadTable
+			 *          thead - nThead
+			 *    div - nScrollBody
+			 *      table - oSettings.nTable
+			 *        thead - nTheadSize
+			 *        tbody - nTbody
+			 *    div - nScrollFoot
+			 *      div - nScrollFootInner
+			 *        table - nScrollFootTable
+			 *          tfoot - nTfoot
+			 */
+			var
+			 	nScroller = document.createElement('div'),
+			 	nScrollHead = document.createElement('div'),
+			 	nScrollHeadInner = document.createElement('div'),
+			 	nScrollBody = document.createElement('div'),
+			 	nScrollFoot = document.createElement('div'),
+			 	nScrollFootInner = document.createElement('div'),
+			 	nScrollHeadTable = oSettings.nTable.cloneNode(false),
+			 	nScrollFootTable = oSettings.nTable.cloneNode(false),
+				nThead = oSettings.nTable.getElementsByTagName('thead')[0],
+			 	nTfoot = oSettings.nTable.getElementsByTagName('tfoot').length === 0 ? null : 
+					oSettings.nTable.getElementsByTagName('tfoot')[0],
+				oClasses = oSettings.oClasses;
+			
+			nScrollHead.appendChild( nScrollHeadInner );
+			nScrollFoot.appendChild( nScrollFootInner );
+			nScrollBody.appendChild( oSettings.nTable );
+			nScroller.appendChild( nScrollHead );
+			nScroller.appendChild( nScrollBody );
+			nScrollHeadInner.appendChild( nScrollHeadTable );
+			nScrollHeadTable.appendChild( nThead );
+			if ( nTfoot !== null )
+			{
+				nScroller.appendChild( nScrollFoot );
+				nScrollFootInner.appendChild( nScrollFootTable );
+				nScrollFootTable.appendChild( nTfoot );
+			}
+			
+			nScroller.className = oClasses.sScrollWrapper;
+			nScrollHead.className = oClasses.sScrollHead;
+			nScrollHeadInner.className = oClasses.sScrollHeadInner;
+			nScrollBody.className = oClasses.sScrollBody;
+			nScrollFoot.className = oClasses.sScrollFoot;
+			nScrollFootInner.className = oClasses.sScrollFootInner;
+			
+			if ( oSettings.oScroll.bAutoCss )
+			{
+				nScrollHead.style.overflow = "hidden";
+				nScrollHead.style.position = "relative";
+				nScrollFoot.style.overflow = "hidden";
+				nScrollBody.style.overflow = "auto";
+			}
+			
+			nScrollHead.style.border = "0";
+			nScrollHead.style.width = "100%";
+			nScrollFoot.style.border = "0";
+			nScrollHeadInner.style.width = "150%"; /* will be overwritten */
+			
+			/* Modify attributes to respect the clones */
+			nScrollHeadTable.removeAttribute('id');
+			nScrollHeadTable.style.marginLeft = "0";
+			oSettings.nTable.style.marginLeft = "0";
+			if ( nTfoot !== null )
+			{
+				nScrollFootTable.removeAttribute('id');
+				nScrollFootTable.style.marginLeft = "0";
+			}
+			
+			/* Move any caption elements from the body to the header */
+			var nCaptions = $(oSettings.nTable).children('caption');
+			for ( var i=0, iLen=nCaptions.length ; i<iLen ; i++ )
+			{
+				nScrollHeadTable.appendChild( nCaptions[i] );
+			}
+			
+			/*
+			 * Sizing
+			 */
+			/* When xscrolling add the width and a scroller to move the header with the body */
+			if ( oSettings.oScroll.sX !== "" )
+			{
+				nScrollHead.style.width = _fnStringToCss( oSettings.oScroll.sX );
+				nScrollBody.style.width = _fnStringToCss( oSettings.oScroll.sX );
+				
+				if ( nTfoot !== null )
+				{
+					nScrollFoot.style.width = _fnStringToCss( oSettings.oScroll.sX );	
+				}
+				
+				/* When the body is scrolled, then we also want to scroll the headers */
+				$(nScrollBody).scroll( function (e) {
+					nScrollHead.scrollLeft = this.scrollLeft;
+					
+					if ( nTfoot !== null )
+					{
+						nScrollFoot.scrollLeft = this.scrollLeft;
+					}
+				} );
+			}
+			
+			/* When yscrolling, add the height */
+			if ( oSettings.oScroll.sY !== "" )
+			{
+				nScrollBody.style.height = _fnStringToCss( oSettings.oScroll.sY );
+			}
+			
+			/* Redraw - align columns across the tables */
+			oSettings.aoDrawCallback.push( {
+				"fn": _fnScrollDraw,
+				"sName": "scrolling"
+			} );
+			
+			/* Infinite scrolling event handlers */
+			if ( oSettings.oScroll.bInfinite )
+			{
+				$(nScrollBody).scroll( function() {
+					/* Use a blocker to stop scrolling from loading more data while other data is still loading */
+					if ( !oSettings.bDrawing && $(this).scrollTop() !== 0 )
+					{
+						/* Check if we should load the next data set */
+						if ( $(this).scrollTop() + $(this).height() > 
+							$(oSettings.nTable).height() - oSettings.oScroll.iLoadGap )
+						{
+							/* Only do the redraw if we have to - we might be at the end of the data */
+							if ( oSettings.fnDisplayEnd() < oSettings.fnRecordsDisplay() )
+							{
+								_fnPageChange( oSettings, 'next' );
+								_fnCalculateEnd( oSettings );
+								_fnDraw( oSettings );
+							}
+						}
+					}
+				} );
+			}
+			
+			oSettings.nScrollHead = nScrollHead;
+			oSettings.nScrollFoot = nScrollFoot;
+			
+			return nScroller;
+		}
+		
+		
+		/**
+		 * Update the various tables for resizing. It's a bit of a pig this function, but
+		 * basically the idea to:
+		 *   1. Re-create the table inside the scrolling div
+		 *   2. Take live measurements from the DOM
+		 *   3. Apply the measurements
+		 *   4. Clean up
+		 *  @param {object} o dataTables settings object
+		 *  @returns {node} Node to add to the DOM
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnScrollDraw ( o )
+		{
+			var
+				nScrollHeadInner = o.nScrollHead.getElementsByTagName('div')[0],
+				nScrollHeadTable = nScrollHeadInner.getElementsByTagName('table')[0],
+				nScrollBody = o.nTable.parentNode,
+				i, iLen, j, jLen, anHeadToSize, anHeadSizers, anFootSizers, anFootToSize, oStyle, iVis,
+				iWidth, aApplied=[], iSanityWidth,
+				nScrollFootInner = (o.nTFoot !== null) ? o.nScrollFoot.getElementsByTagName('div')[0] : null,
+				nScrollFootTable = (o.nTFoot !== null) ? nScrollFootInner.getElementsByTagName('table')[0] : null,
+				ie67 = $.browser.msie && $.browser.version <= 7;
+			
+			/*
+			 * 1. Re-create the table inside the scrolling div
+			 */
+			
+			/* Remove the old minimised thead and tfoot elements in the inner table */
+			var nTheadSize = o.nTable.getElementsByTagName('thead');
+			if ( nTheadSize.length > 0 )
+			{
+				o.nTable.removeChild( nTheadSize[0] );
+			}
+			
+			var nTfootSize;
+			if ( o.nTFoot !== null )
+			{
+				/* Remove the old minimised footer element in the cloned header */
+				nTfootSize = o.nTable.getElementsByTagName('tfoot');
+				if ( nTfootSize.length > 0 )
+				{
+					o.nTable.removeChild( nTfootSize[0] );
+				}
+			}
+			
+			/* Clone the current header and footer elements and then place it into the inner table */
+			nTheadSize = o.nTHead.cloneNode(true);
+			o.nTable.insertBefore( nTheadSize, o.nTable.childNodes[0] );
+			
+			if ( o.nTFoot !== null )
+			{
+				nTfootSize = o.nTFoot.cloneNode(true);
+				o.nTable.insertBefore( nTfootSize, o.nTable.childNodes[1] );
+			}
+			
+			/*
+			 * 2. Take live measurements from the DOM - do not alter the DOM itself!
+			 */
+			
+			/* Remove old sizing and apply the calculated column widths
+			 * Get the unique column headers in the newly created (cloned) header. We want to apply the
+			 * calclated sizes to this header
+			 */
+			if ( o.oScroll.sX === "" )
+			{
+				nScrollBody.style.width = '100%';
+				nScrollHeadInner.parentNode.style.width = '100%';
+			}
+			
+			var nThs = _fnGetUniqueThs( o, nTheadSize );
+			for ( i=0, iLen=nThs.length ; i<iLen ; i++ )
+			{
+				iVis = _fnVisibleToColumnIndex( o, i );
+				nThs[i].style.width = o.aoColumns[iVis].sWidth;
+			}
+			
+			if ( o.nTFoot !== null )
+			{
+				_fnApplyToChildren( function(n) {
+					n.style.width = "";
+				}, nTfootSize.getElementsByTagName('tr') );
+			}
+			
+			/* Size the table as a whole */
+			iSanityWidth = $(o.nTable).outerWidth();
+			if ( o.oScroll.sX === "" )
+			{
+				/* No x scrolling */
+				o.nTable.style.width = "100%";
+				
+				/* I know this is rubbish - but IE7 will make the width of the table when 100% include
+				 * the scrollbar - which is shouldn't. When there is a scrollbar we need to take this
+				 * into account.
+				 */
+				if ( ie67 && (nScrollBody.scrollHeight > 
+					nScrollBody.offsetHeight || $(nScrollBody).css('overflow-y') == "scroll")  )
+				{
+					o.nTable.style.width = _fnStringToCss( $(o.nTable).outerWidth()-o.oScroll.iBarWidth );
+				}
+			}
+			else
+			{
+				if ( o.oScroll.sXInner !== "" )
+				{
+					/* x scroll inner has been given - use it */
+					o.nTable.style.width = _fnStringToCss(o.oScroll.sXInner);
+				}
+				else if ( iSanityWidth == $(nScrollBody).width() &&
+				   $(nScrollBody).height() < $(o.nTable).height() )
+				{
+					/* There is y-scrolling - try to take account of the y scroll bar */
+					o.nTable.style.width = _fnStringToCss( iSanityWidth-o.oScroll.iBarWidth );
+					if ( $(o.nTable).outerWidth() > iSanityWidth-o.oScroll.iBarWidth )
+					{
+						/* Not possible to take account of it */
+						o.nTable.style.width = _fnStringToCss( iSanityWidth );
+					}
+				}
+				else
+				{
+					/* All else fails */
+					o.nTable.style.width = _fnStringToCss( iSanityWidth );
+				}
+			}
+			
+			/* Recalculate the sanity width - now that we've applied the required width, before it was
+			 * a temporary variable. This is required because the column width calculation is done
+			 * before this table DOM is created.
+			 */
+			iSanityWidth = $(o.nTable).outerWidth();
+			
+			/* We want the hidden header to have zero height, so remove padding and borders. Then
+			 * set the width based on the real headers
+			 */
+			anHeadToSize = o.nTHead.getElementsByTagName('tr');
+			anHeadSizers = nTheadSize.getElementsByTagName('tr');
+			
+			_fnApplyToChildren( function(nSizer, nToSize) {
+				oStyle = nSizer.style;
+				oStyle.paddingTop = "0";
+				oStyle.paddingBottom = "0";
+				oStyle.borderTopWidth = "0";
+				oStyle.borderBottomWidth = "0";
+				oStyle.height = 0;
+				
+				iWidth = $(nSizer).width();
+				nToSize.style.width = _fnStringToCss( iWidth );
+				aApplied.push( iWidth );
+			}, anHeadSizers, anHeadToSize );
+			$(anHeadSizers).height(0);
+			
+			if ( o.nTFoot !== null )
+			{
+				/* Clone the current footer and then place it into the body table as a "hidden header" */
+				anFootSizers = nTfootSize.getElementsByTagName('tr');
+				anFootToSize = o.nTFoot.getElementsByTagName('tr');
+				
+				_fnApplyToChildren( function(nSizer, nToSize) {
+					oStyle = nSizer.style;
+					oStyle.paddingTop = "0";
+					oStyle.paddingBottom = "0";
+					oStyle.borderTopWidth = "0";
+					oStyle.borderBottomWidth = "0";
+					oStyle.height = 0;
+					
+					iWidth = $(nSizer).width();
+					nToSize.style.width = _fnStringToCss( iWidth );
+					aApplied.push( iWidth );
+				}, anFootSizers, anFootToSize );
+				$(anFootSizers).height(0);
+			}
+			
+			/*
+			 * 3. Apply the measurements
+			 */
+			
+			/* "Hide" the header and footer that we used for the sizing. We want to also fix their width
+			 * to what they currently are
+			 */
+			_fnApplyToChildren( function(nSizer) {
+				nSizer.innerHTML = "";
+				nSizer.style.width = _fnStringToCss( aApplied.shift() );
+			}, anHeadSizers );
+			
+			if ( o.nTFoot !== null )
+			{
+				_fnApplyToChildren( function(nSizer) {
+					nSizer.innerHTML = "";
+					nSizer.style.width = _fnStringToCss( aApplied.shift() );
+				}, anFootSizers );
+			}
+			
+			/* Sanity check that the table is of a sensible width. If not then we are going to get
+			 * misalignment - try to prevent this by not allowing the table to shrink below its min width
+			 */
+			if ( $(o.nTable).outerWidth() < iSanityWidth )
+			{
+				/* The min width depends upon if we have a vertical scrollbar visible or not */
+				var iCorrection = ((nScrollBody.scrollHeight > nScrollBody.offsetHeight || 
+					$(nScrollBody).css('overflow-y') == "scroll")) ?
+						iSanityWidth+o.oScroll.iBarWidth : iSanityWidth;
+				
+				/* IE6/7 are a law unto themselves... */
+				if ( ie67 && (nScrollBody.scrollHeight > 
+					nScrollBody.offsetHeight || $(nScrollBody).css('overflow-y') == "scroll")  )
+				{
+					o.nTable.style.width = _fnStringToCss( iCorrection-o.oScroll.iBarWidth );
+				}
+				
+				/* Apply the calculated minimum width to the table wrappers */
+				nScrollBody.style.width = _fnStringToCss( iCorrection );
+				nScrollHeadInner.parentNode.style.width = _fnStringToCss( iCorrection );
+				
+				if ( o.nTFoot !== null )
+				{
+					nScrollFootInner.parentNode.style.width = _fnStringToCss( iCorrection );
+				}
+				
+				/* And give the user a warning that we've stopped the table getting too small */
+				if ( o.oScroll.sX === "" )
+				{
+					_fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
+						" misalignment. The table has been drawn at its minimum possible width." );
+				}
+				else if ( o.oScroll.sXInner !== "" )
+				{
+					_fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
+						" misalignment. Increase the sScrollXInner value or remove it to allow automatic"+
+						" calculation" );
+				}
+			}
+			else
+			{
+				nScrollBody.style.width = _fnStringToCss( '100%' );
+				nScrollHeadInner.parentNode.style.width = _fnStringToCss( '100%' );
+				
+				if ( o.nTFoot !== null )
+				{
+					nScrollFootInner.parentNode.style.width = _fnStringToCss( '100%' );
+				}
+			}
+			
+			
+			/*
+			 * 4. Clean up
+			 */
+			
+			if ( o.oScroll.sY === "" )
+			{
+				/* IE7< puts a vertical scrollbar in place (when it shouldn't be) due to subtracting
+				 * the scrollbar height from the visible display, rather than adding it on. We need to
+				 * set the height in order to sort this. Don't want to do it in any other browsers.
+				 */
+				if ( ie67 )
+				{
+					nScrollBody.style.height = _fnStringToCss( o.nTable.offsetHeight+o.oScroll.iBarWidth );
+				}
+			}
+			
+			if ( o.oScroll.sY !== "" && o.oScroll.bCollapse )
+			{
+				nScrollBody.style.height = _fnStringToCss( o.oScroll.sY );
+				
+				var iExtra = (o.oScroll.sX !== "" && o.nTable.offsetWidth > nScrollBody.offsetWidth) ?
+				 	o.oScroll.iBarWidth : 0;
+				if ( o.nTable.offsetHeight < nScrollBody.offsetHeight )
+				{
+					nScrollBody.style.height = _fnStringToCss( $(o.nTable).height()+iExtra );
+				}
+			}
+			
+			/* Finally set the width's of the header and footer tables */
+			var iOuterWidth = $(o.nTable).outerWidth();
+			nScrollHeadTable.style.width = _fnStringToCss( iOuterWidth );
+			nScrollHeadInner.style.width = _fnStringToCss( iOuterWidth+o.oScroll.iBarWidth );
+			
+			if ( o.nTFoot !== null )
+			{
+				nScrollFootInner.style.width = _fnStringToCss( o.nTable.offsetWidth+o.oScroll.iBarWidth );
+				nScrollFootTable.style.width = _fnStringToCss( o.nTable.offsetWidth );
+			}
+			
+			/* If sorting or filtering has occurred, jump the scrolling back to the top */
+			if ( o.bSorted || o.bFiltered )
+			{
+				nScrollBody.scrollTop = 0;
+			}
+		}
+		
+		
+		/**
+		 * Apply a given function to the display child nodes of an element array (typically
+		 * TD children of TR rows
+		 *  @param {function} fn Method to apply to the objects
+		 *  @param array {nodes} an1 List of elements to look through for display children
+		 *  @param array {nodes} an2 Another list (identical structure to the first) - optional
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnApplyToChildren( fn, an1, an2 )
+		{
+			for ( var i=0, iLen=an1.length ; i<iLen ; i++ )
+			{
+				for ( var j=0, jLen=an1[i].childNodes.length ; j<jLen ; j++ )
+				{
+					if ( an1[i].childNodes[j].nodeType == 1 )
+					{
+						if ( an2 )
+						{
+							fn( an1[i].childNodes[j], an2[i].childNodes[j] );
+						}
+						else
+						{
+							fn( an1[i].childNodes[j] );
+						}
+					}
+				}
+			}
+		}
+		
+		
+		
+		/**
+		 * Convert a CSS unit width to pixels (e.g. 2em)
+		 *  @param {string} sWidth width to be converted
+		 *  @param {node} nParent parent to get the with for (required for relative widths) - optional
+		 *  @returns {int} iWidth width in pixels
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnConvertToWidth ( sWidth, nParent )
+		{
+			if ( !sWidth || sWidth === null || sWidth === '' )
+			{
+				return 0;
+			}
+			
+			if ( !nParent )
+			{
+				nParent = document.getElementsByTagName('body')[0];
+			}
+			
+			var iWidth;
+			var nTmp = document.createElement( "div" );
+			nTmp.style.width = _fnStringToCss( sWidth );
+			
+			nParent.appendChild( nTmp );
+			iWidth = nTmp.offsetWidth;
+			nParent.removeChild( nTmp );
+			
+			return ( iWidth );
+		}
+		
+		
+		/**
+		 * Calculate the width of columns for the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnCalculateColumnWidths ( oSettings )
+		{
+			var iTableWidth = oSettings.nTable.offsetWidth;
+			var iUserInputs = 0;
+			var iTmpWidth;
+			var iVisibleColumns = 0;
+			var iColums = oSettings.aoColumns.length;
+			var i, iIndex, iCorrector, iWidth;
+			var oHeaders = $('th', oSettings.nTHead);
+			var widthAttr = oSettings.nTable.getAttribute('width');
+			
+			/* Convert any user input sizes into pixel sizes */
+			for ( i=0 ; i<iColums ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible )
+				{
+					iVisibleColumns++;
+					
+					if ( oSettings.aoColumns[i].sWidth !== null )
+					{
+						iTmpWidth = _fnConvertToWidth( oSettings.aoColumns[i].sWidthOrig, 
+							oSettings.nTable.parentNode );
+						if ( iTmpWidth !== null )
+						{
+							oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
+						}
+							
+						iUserInputs++;
+					}
+				}
+			}
+			
+			/* If the number of columns in the DOM equals the number that we have to process in 
+			 * DataTables, then we can use the offsets that are created by the web-browser. No custom 
+			 * sizes can be set in order for this to happen, nor scrolling used
+			 */
+			if ( iColums == oHeaders.length && iUserInputs === 0 && iVisibleColumns == iColums &&
+				oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
+			{
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					iTmpWidth = $(oHeaders[i]).width();
+					if ( iTmpWidth !== null )
+					{
+						oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
+					}
+				}
+			}
+			else
+			{
+				/* Otherwise we are going to have to do some calculations to get the width of each column.
+				 * Construct a 1 row table with the widest node in the data, and any user defined widths,
+				 * then insert it into the DOM and allow the browser to do all the hard work of
+				 * calculating table widths.
+				 */
+				var
+					nCalcTmp = oSettings.nTable.cloneNode( false ),
+					nTheadClone = oSettings.nTHead.cloneNode(true),
+					nBody = document.createElement( 'tbody' ),
+					nTr = document.createElement( 'tr' ),
+					nDivSizing;
+				
+				nCalcTmp.removeAttribute( "id" );
+				nCalcTmp.appendChild( nTheadClone );
+				if ( oSettings.nTFoot !== null )
+				{
+					nCalcTmp.appendChild( oSettings.nTFoot.cloneNode(true) );
+					_fnApplyToChildren( function(n) {
+						n.style.width = "";
+					}, nCalcTmp.getElementsByTagName('tr') );
+				}
+				
+				nCalcTmp.appendChild( nBody );
+				nBody.appendChild( nTr );
+				
+				/* Remove any sizing that was previously applied by the styles */
+				var jqColSizing = $('thead th', nCalcTmp);
+				if ( jqColSizing.length === 0 )
+				{
+					jqColSizing = $('tbody tr:eq(0)>td', nCalcTmp);
+				}
+		
+				/* Apply custom sizing to the cloned header */
+				var nThs = _fnGetUniqueThs( oSettings, nTheadClone );
+				iCorrector = 0;
+				for ( i=0 ; i<iColums ; i++ )
+				{
+					var oColumn = oSettings.aoColumns[i];
+					if ( oColumn.bVisible && oColumn.sWidthOrig !== null && oColumn.sWidthOrig !== "" )
+					{
+						nThs[i-iCorrector].style.width = _fnStringToCss( oColumn.sWidthOrig );
+					}
+					else if ( oColumn.bVisible )
+					{
+						nThs[i-iCorrector].style.width = "";
+					}
+					else
+					{
+						iCorrector++;
+					}
+				}
+		
+				/* Find the biggest td for each column and put it into the table */
+				for ( i=0 ; i<iColums ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						var nTd = _fnGetWidestNode( oSettings, i );
+						if ( nTd !== null )
+						{
+							nTd = nTd.cloneNode(true);
+							if ( oSettings.aoColumns[i].sContentPadding !== "" )
+							{
+								nTd.innerHTML += oSettings.aoColumns[i].sContentPadding;
+							}
+							nTr.appendChild( nTd );
+						}
+					}
+				}
+				
+				/* Build the table and 'display' it */
+				var nWrapper = oSettings.nTable.parentNode;
+				nWrapper.appendChild( nCalcTmp );
+				
+				/* When scrolling (X or Y) we want to set the width of the table as appropriate. However,
+				 * when not scrolling leave the table width as it is. This results in slightly different,
+				 * but I think correct behaviour
+				 */
+				if ( oSettings.oScroll.sX !== "" && oSettings.oScroll.sXInner !== "" )
+				{
+					nCalcTmp.style.width = _fnStringToCss(oSettings.oScroll.sXInner);
+				}
+				else if ( oSettings.oScroll.sX !== "" )
+				{
+					nCalcTmp.style.width = "";
+					if ( $(nCalcTmp).width() < nWrapper.offsetWidth )
+					{
+						nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
+					}
+				}
+				else if ( oSettings.oScroll.sY !== "" )
+				{
+					nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
+				}
+				else if ( widthAttr )
+				{
+					nCalcTmp.style.width = _fnStringToCss( widthAttr );
+				}
+				nCalcTmp.style.visibility = "hidden";
+				
+				/* Scrolling considerations */
+				_fnScrollingWidthAdjust( oSettings, nCalcTmp );
+				
+				/* Read the width's calculated by the browser and store them for use by the caller. We
+				 * first of all try to use the elements in the body, but it is possible that there are
+				 * no elements there, under which circumstances we use the header elements
+				 */
+				var oNodes = $("tbody tr:eq(0)", nCalcTmp).children();
+				if ( oNodes.length === 0 )
+				{
+					oNodes = _fnGetUniqueThs( oSettings, $('thead', nCalcTmp)[0] );
+				}
+		
+				/* Browsers need a bit of a hand when a width is assigned to any columns when 
+				 * x-scrolling as they tend to collapse the table to the min-width, even if
+				 * we sent the column widths. So we need to keep track of what the table width
+				 * should be by summing the user given values, and the automatic values
+				 */
+				if ( oSettings.oScroll.sX !== "" )
+				{
+					var iTotal = 0;
+					iCorrector = 0;
+					for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+					{
+						if ( oSettings.aoColumns[i].bVisible )
+						{
+							if ( oSettings.aoColumns[i].sWidthOrig === null )
+							{
+								iTotal += $(oNodes[iCorrector]).outerWidth();
+							}
+							else
+							{
+								iTotal += parseInt(oSettings.aoColumns[i].sWidth.replace('px',''), 10) +
+									($(oNodes[iCorrector]).outerWidth() - $(oNodes[iCorrector]).width());
+							}
+							iCorrector++;
+						}
+					}
+					
+					nCalcTmp.style.width = _fnStringToCss( iTotal );
+					oSettings.nTable.style.width = _fnStringToCss( iTotal );
+				}
+		
+				iCorrector = 0;
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						iWidth = $(oNodes[iCorrector]).width();
+						if ( iWidth !== null && iWidth > 0 )
+						{
+							oSettings.aoColumns[i].sWidth = _fnStringToCss( iWidth );
+						}
+						iCorrector++;
+					}
+				}
+		
+				var cssWidth = $(nCalcTmp).css('width');
+				oSettings.nTable.style.width = (cssWidth.indexOf('%') !== -1) ?
+				    cssWidth : _fnStringToCss( $(nCalcTmp).outerWidth() );
+				nCalcTmp.parentNode.removeChild( nCalcTmp );
+			}
+		
+			if ( widthAttr )
+			{
+				oSettings.nTable.style.width = _fnStringToCss( widthAttr );
+			}
+		}
+		
+		
+		/**
+		 * Adjust a table's width to take account of scrolling
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {node} n table node
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnScrollingWidthAdjust ( oSettings, n )
+		{
+			if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY !== "" )
+			{
+				/* When y-scrolling only, we want to remove the width of the scroll bar so the table
+				 * + scroll bar will fit into the area avaialble.
+				 */
+				var iOrigWidth = $(n).width();
+				n.style.width = _fnStringToCss( $(n).outerWidth()-oSettings.oScroll.iBarWidth );
+			}
+			else if ( oSettings.oScroll.sX !== "" )
+			{
+				/* When x-scrolling both ways, fix the table at it's current size, without adjusting */
+				n.style.width = _fnStringToCss( $(n).outerWidth() );
+			}
+		}
+		
+		
+		/**
+		 * Get the widest node
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iCol column of interest
+		 *  @returns {string} max strlens for each column
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetWidestNode( oSettings, iCol )
+		{
+			var iMaxIndex = _fnGetMaxLenString( oSettings, iCol );
+			if ( iMaxIndex < 0 )
+			{
+				return null;
+			}
+		
+			if ( oSettings.aoData[iMaxIndex].nTr === null )
+			{
+				var n = document.createElement('td');
+				n.innerHTML = _fnGetCellData( oSettings, iMaxIndex, iCol, '' );
+				return n;
+			}
+			return _fnGetTdNodes(oSettings, iMaxIndex)[iCol];
+		}
+		
+		
+		/**
+		 * Get the maximum strlen for each data column
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iCol column of interest
+		 *  @returns {string} max strlens for each column
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetMaxLenString( oSettings, iCol )
+		{
+			var iMax = -1;
+			var iMaxIndex = -1;
+			
+			for ( var i=0 ; i<oSettings.aoData.length ; i++ )
+			{
+				var s = _fnGetCellData( oSettings, i, iCol, 'display' )+"";
+				s = s.replace( /<.*?>/g, "" );
+				if ( s.length > iMax )
+				{
+					iMax = s.length;
+					iMaxIndex = i;
+				}
+			}
+			
+			return iMaxIndex;
+		}
+		
+		
+		/**
+		 * Append a CSS unit (only if required) to a string
+		 *  @param {array} aArray1 first array
+		 *  @param {array} aArray2 second array
+		 *  @returns {int} 0 if match, 1 if length is different, 2 if no match
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnStringToCss( s )
+		{
+			if ( s === null )
+			{
+				return "0px";
+			}
+			
+			if ( typeof s == 'number' )
+			{
+				if ( s < 0 )
+				{
+					return "0px";
+				}
+				return s+"px";
+			}
+			
+			/* Check if the last character is not 0-9 */
+			var c = s.charCodeAt( s.length-1 );
+			if (c < 0x30 || c > 0x39)
+			{
+				return s;
+			}
+			return s+"px";
+		}
+		
+		
+		/**
+		 * Get the width of a scroll bar in this browser being used
+		 *  @returns {int} width in pixels
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnScrollBarWidth ()
+		{  
+			var inner = document.createElement('p');
+			var style = inner.style;
+			style.width = "100%";
+			style.height = "200px";
+			style.padding = "0px";
+			
+			var outer = document.createElement('div');
+			style = outer.style;
+			style.position = "absolute";
+			style.top = "0px";
+			style.left = "0px";
+			style.visibility = "hidden";
+			style.width = "200px";
+			style.height = "150px";
+			style.padding = "0px";
+			style.overflow = "hidden";
+			outer.appendChild(inner);
+			
+			document.body.appendChild(outer);
+			var w1 = inner.offsetWidth;
+			outer.style.overflow = 'scroll';
+			var w2 = inner.offsetWidth;
+			if ( w1 == w2 )
+			{
+				w2 = outer.clientWidth;
+			}
+			
+			document.body.removeChild(outer);
+			return (w1 - w2);  
+		}
+		
+		
+		
+		/**
+		 * Change the order of the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {bool} bApplyClasses optional - should we apply classes or not
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSort ( oSettings, bApplyClasses )
+		{
+			var
+				i, iLen, j, jLen, k, kLen,
+				sDataType, nTh,
+				aaSort = [],
+			 	aiOrig = [],
+				oSort = DataTable.ext.oSort,
+				aoData = oSettings.aoData,
+				aoColumns = oSettings.aoColumns,
+				oAria = oSettings.oLanguage.oAria;
+			
+			/* No sorting required if server-side or no sorting array */
+			if ( !oSettings.oFeatures.bServerSide && 
+				(oSettings.aaSorting.length !== 0 || oSettings.aaSortingFixed !== null) )
+			{
+				if ( oSettings.aaSortingFixed !== null )
+				{
+					aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting );
+				}
+				else
+				{
+					aaSort = oSettings.aaSorting.slice();
+				}
+				
+				/* If there is a sorting data type, and a fuction belonging to it, then we need to
+				 * get the data from the developer's function and apply it for this column
+				 */
+				for ( i=0 ; i<aaSort.length ; i++ )
+				{
+					var iColumn = aaSort[i][0];
+					var iVisColumn = _fnColumnIndexToVisible( oSettings, iColumn );
+					sDataType = oSettings.aoColumns[ iColumn ].sSortDataType;
+					if ( DataTable.ext.afnSortData[sDataType] )
+					{
+						var aData = DataTable.ext.afnSortData[sDataType]( oSettings, iColumn, iVisColumn );
+						for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
+						{
+							_fnSetCellData( oSettings, j, iColumn, aData[j] );
+						}
+					}
+				}
+				
+				/* Create a value - key array of the current row positions such that we can use their
+				 * current position during the sort, if values match, in order to perform stable sorting
+				 */
+				for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
+				{
+					aiOrig[ oSettings.aiDisplayMaster[i] ] = i;
+				}
+		
+				/* Build an internal data array which is specific to the sort, so we can get and prep
+				 * the data to be sorted only once, rather than needing to do it every time the sorting
+				 * function runs. This make the sorting function a very simple comparison
+				 */
+				var iSortLen = aaSort.length;
+				var fnSortFormat, aDataSort;
+				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
+				{
+					for ( j=0 ; j<iSortLen ; j++ )
+					{
+						aDataSort = aoColumns[ aaSort[j][0] ].aDataSort;
+		
+						for ( k=0, kLen=aDataSort.length ; k<kLen ; k++ )
+						{
+							sDataType = aoColumns[ aDataSort[k] ].sType;
+							fnSortFormat = oSort[ (sDataType ? sDataType : 'string')+"-pre" ];
+							
+							aoData[i]._aSortData[ aDataSort[k] ] = fnSortFormat ?
+								fnSortFormat( _fnGetCellData( oSettings, i, aDataSort[k], 'sort' ) ) :
+								_fnGetCellData( oSettings, i, aDataSort[k], 'sort' );
+						}
+					}
+				}
+				
+				/* Do the sort - here we want multi-column sorting based on a given data source (column)
+				 * and sorting function (from oSort) in a certain direction. It's reasonably complex to
+				 * follow on it's own, but this is what we want (example two column sorting):
+				 *  fnLocalSorting = function(a,b){
+				 *  	var iTest;
+				 *  	iTest = oSort['string-asc']('data11', 'data12');
+				 *  	if (iTest !== 0)
+				 *  		return iTest;
+				 *    iTest = oSort['numeric-desc']('data21', 'data22');
+				 *    if (iTest !== 0)
+				 *  		return iTest;
+				 *  	return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
+				 *  }
+				 * Basically we have a test for each sorting column, if the data in that column is equal,
+				 * test the next column. If all columns match, then we use a numeric sort on the row 
+				 * positions in the original data array to provide a stable sort.
+				 */
+				oSettings.aiDisplayMaster.sort( function ( a, b ) {
+					var k, l, lLen, iTest, aDataSort, sDataType;
+					for ( k=0 ; k<iSortLen ; k++ )
+					{
+						aDataSort = aoColumns[ aaSort[k][0] ].aDataSort;
+		
+						for ( l=0, lLen=aDataSort.length ; l<lLen ; l++ )
+						{
+							sDataType = aoColumns[ aDataSort[l] ].sType;
+							
+							iTest = oSort[ (sDataType ? sDataType : 'string')+"-"+aaSort[k][1] ](
+								aoData[a]._aSortData[ aDataSort[l] ],
+								aoData[b]._aSortData[ aDataSort[l] ]
+							);
+						
+							if ( iTest !== 0 )
+							{
+								return iTest;
+							}
+						}
+					}
+					
+					return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
+				} );
+			}
+			
+			/* Alter the sorting classes to take account of the changes */
+			if ( (bApplyClasses === undefined || bApplyClasses) && !oSettings.oFeatures.bDeferRender )
+			{
+				_fnSortingClasses( oSettings );
+			}
+		
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				nTh = aoColumns[i].nTh;
+				nTh.removeAttribute('aria-sort');
+				nTh.removeAttribute('aria-label');
+				
+				/* In ARIA only the first sorting column can be marked as sorting - no multi-sort option */
+				if ( aoColumns[i].bSortable )
+				{
+					if ( aaSort.length > 0 && aaSort[0][0] == i )
+					{
+						nTh.setAttribute('aria-sort', aaSort[0][1]=="asc" ? "ascending" : "descending" );
+						
+						var nextSort = (aoColumns[i].asSorting[ aaSort[0][2]+1 ]) ? 
+							aoColumns[i].asSorting[ aaSort[0][2]+1 ] : aoColumns[i].asSorting[0];
+						nTh.setAttribute('aria-label', aoColumns[i].sTitle+
+							(nextSort=="asc" ? oAria.sSortAscending : oAria.sSortDescending) );
+					}
+					else
+					{
+						nTh.setAttribute('aria-label', aoColumns[i].sTitle+
+							(aoColumns[i].asSorting[0]=="asc" ? oAria.sSortAscending : oAria.sSortDescending) );
+					}
+				}
+				else
+				{
+					nTh.setAttribute('aria-label', aoColumns[i].sTitle);
+				}
+			}
+			
+			/* Tell the draw function that we have sorted the data */
+			oSettings.bSorted = true;
+			$(oSettings.oInstance).trigger('sort', oSettings);
+			
+			/* Copy the master data into the draw array and re-draw */
+			if ( oSettings.oFeatures.bFilter )
+			{
+				/* _fnFilter() will redraw the table for us */
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
+			}
+			else
+			{
+				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+				oSettings._iDisplayStart = 0; /* reset display back to page 0 */
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+		}
+		
+		
+		/**
+		 * Attach a sort handler (click) to a node
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {node} nNode node to attach the handler to
+		 *  @param {int} iDataIndex column sorting index
+		 *  @param {function} [fnCallback] callback function
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSortAttachListener ( oSettings, nNode, iDataIndex, fnCallback )
+		{
+			_fnBindAction( nNode, {}, function (e) {
+				/* If the column is not sortable - don't to anything */
+				if ( oSettings.aoColumns[iDataIndex].bSortable === false )
+				{
+					return;
+				}
+				
+				/*
+				 * This is a little bit odd I admit... I declare a temporary function inside the scope of
+				 * _fnBuildHead and the click handler in order that the code presented here can be used 
+				 * twice - once for when bProcessing is enabled, and another time for when it is 
+				 * disabled, as we need to perform slightly different actions.
+				 *   Basically the issue here is that the Javascript engine in modern browsers don't 
+				 * appear to allow the rendering engine to update the display while it is still excuting
+				 * it's thread (well - it does but only after long intervals). This means that the 
+				 * 'processing' display doesn't appear for a table sort. To break the js thread up a bit
+				 * I force an execution break by using setTimeout - but this breaks the expected 
+				 * thread continuation for the end-developer's point of view (their code would execute
+				 * too early), so we on;y do it when we absolutely have to.
+				 */
+				var fnInnerSorting = function () {
+					var iColumn, iNextSort;
+					
+					/* If the shift key is pressed then we are multipe column sorting */
+					if ( e.shiftKey )
+					{
+						/* Are we already doing some kind of sort on this column? */
+						var bFound = false;
+						for ( var i=0 ; i<oSettings.aaSorting.length ; i++ )
+						{
+							if ( oSettings.aaSorting[i][0] == iDataIndex )
+							{
+								bFound = true;
+								iColumn = oSettings.aaSorting[i][0];
+								iNextSort = oSettings.aaSorting[i][2]+1;
+								
+								if ( !oSettings.aoColumns[iColumn].asSorting[iNextSort] )
+								{
+									/* Reached the end of the sorting options, remove from multi-col sort */
+									oSettings.aaSorting.splice( i, 1 );
+								}
+								else
+								{
+									/* Move onto next sorting direction */
+									oSettings.aaSorting[i][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
+									oSettings.aaSorting[i][2] = iNextSort;
+								}
+								break;
+							}
+						}
+						
+						/* No sort yet - add it in */
+						if ( bFound === false )
+						{
+							oSettings.aaSorting.push( [ iDataIndex, 
+								oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
+						}
+					}
+					else
+					{
+						/* If no shift key then single column sort */
+						if ( oSettings.aaSorting.length == 1 && oSettings.aaSorting[0][0] == iDataIndex )
+						{
+							iColumn = oSettings.aaSorting[0][0];
+							iNextSort = oSettings.aaSorting[0][2]+1;
+							if ( !oSettings.aoColumns[iColumn].asSorting[iNextSort] )
+							{
+								iNextSort = 0;
+							}
+							oSettings.aaSorting[0][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
+							oSettings.aaSorting[0][2] = iNextSort;
+						}
+						else
+						{
+							oSettings.aaSorting.splice( 0, oSettings.aaSorting.length );
+							oSettings.aaSorting.push( [ iDataIndex, 
+								oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
+						}
+					}
+					
+					/* Run the sort */
+					_fnSort( oSettings );
+				}; /* /fnInnerSorting */
+				
+				if ( !oSettings.oFeatures.bProcessing )
+				{
+					fnInnerSorting();
+				}
+				else
+				{
+					_fnProcessingDisplay( oSettings, true );
+					setTimeout( function() {
+						fnInnerSorting();
+						if ( !oSettings.oFeatures.bServerSide )
+						{
+							_fnProcessingDisplay( oSettings, false );
+						}
+					}, 0 );
+				}
+				
+				/* Call the user specified callback function - used for async user interaction */
+				if ( typeof fnCallback == 'function' )
+				{
+					fnCallback( oSettings );
+				}
+			} );
+		}
+		
+		
+		/**
+		 * Set the sorting classes on the header, Note: it is safe to call this function 
+		 * when bSort and bSortClasses are false
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSortingClasses( oSettings )
+		{
+			var i, iLen, j, jLen, iFound;
+			var aaSort, sClass;
+			var iColumns = oSettings.aoColumns.length;
+			var oClasses = oSettings.oClasses;
+			
+			for ( i=0 ; i<iColumns ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bSortable )
+				{
+					$(oSettings.aoColumns[i].nTh).removeClass( oClasses.sSortAsc +" "+ oClasses.sSortDesc +
+						" "+ oSettings.aoColumns[i].sSortingClass );
+				}
+			}
+			
+			if ( oSettings.aaSortingFixed !== null )
+			{
+				aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting );
+			}
+			else
+			{
+				aaSort = oSettings.aaSorting.slice();
+			}
+			
+			/* Apply the required classes to the header */
+			for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bSortable )
+				{
+					sClass = oSettings.aoColumns[i].sSortingClass;
+					iFound = -1;
+					for ( j=0 ; j<aaSort.length ; j++ )
+					{
+						if ( aaSort[j][0] == i )
+						{
+							sClass = ( aaSort[j][1] == "asc" ) ?
+								oClasses.sSortAsc : oClasses.sSortDesc;
+							iFound = j;
+							break;
+						}
+					}
+					$(oSettings.aoColumns[i].nTh).addClass( sClass );
+					
+					if ( oSettings.bJUI )
+					{
+						/* jQuery UI uses extra markup */
+						var jqSpan = $("span."+oClasses.sSortIcon,  oSettings.aoColumns[i].nTh);
+						jqSpan.removeClass(oClasses.sSortJUIAsc +" "+ oClasses.sSortJUIDesc +" "+ 
+							oClasses.sSortJUI +" "+ oClasses.sSortJUIAscAllowed +" "+ oClasses.sSortJUIDescAllowed );
+						
+						var sSpanClass;
+						if ( iFound == -1 )
+						{
+						 	sSpanClass = oSettings.aoColumns[i].sSortingClassJUI;
+						}
+						else if ( aaSort[iFound][1] == "asc" )
+						{
+							sSpanClass = oClasses.sSortJUIAsc;
+						}
+						else
+						{
+							sSpanClass = oClasses.sSortJUIDesc;
+						}
+						
+						jqSpan.addClass( sSpanClass );
+					}
+				}
+				else
+				{
+					/* No sorting on this column, so add the base class. This will have been assigned by
+					 * _fnAddColumn
+					 */
+					$(oSettings.aoColumns[i].nTh).addClass( oSettings.aoColumns[i].sSortingClass );
+				}
+			}
+			
+			/* 
+			 * Apply the required classes to the table body
+			 * Note that this is given as a feature switch since it can significantly slow down a sort
+			 * on large data sets (adding and removing of classes is always slow at the best of times..)
+			 * Further to this, note that this code is admitadly fairly ugly. It could be made a lot 
+			 * simpiler using jQuery selectors and add/removeClass, but that is significantly slower
+			 * (on the order of 5 times slower) - hence the direct DOM manipulation here.
+			 * Note that for defered drawing we do use jQuery - the reason being that taking the first
+			 * row found to see if the whole column needs processed can miss classes since the first
+			 * column might be new.
+			 */
+			sClass = oClasses.sSortColumn;
+			
+			if ( oSettings.oFeatures.bSort && oSettings.oFeatures.bSortClasses )
+			{
+				var nTds = _fnGetTdNodes( oSettings );
+		
+				/* Remove the old classes */
+				if ( oSettings.oFeatures.bDeferRender )
+				{
+					$(nTds).removeClass(sClass+'1 '+sClass+'2 '+sClass+'3');
+				}
+				else if ( nTds.length >= iColumns )
+				{
+					for ( i=0 ; i<iColumns ; i++ )
+					{
+						if ( nTds[i].className.indexOf(sClass+"1") != -1 )
+						{
+							for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+							{
+								nTds[(iColumns*j)+i].className = 
+									$.trim( nTds[(iColumns*j)+i].className.replace( sClass+"1", "" ) );
+							}
+						}
+						else if ( nTds[i].className.indexOf(sClass+"2") != -1 )
+						{
+							for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+							{
+								nTds[(iColumns*j)+i].className = 
+									$.trim( nTds[(iColumns*j)+i].className.replace( sClass+"2", "" ) );
+							}
+						}
+						else if ( nTds[i].className.indexOf(sClass+"3") != -1 )
+						{
+							for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+							{
+								nTds[(iColumns*j)+i].className = 
+									$.trim( nTds[(iColumns*j)+i].className.replace( " "+sClass+"3", "" ) );
+							}
+						}
+					}
+				}
+				
+				/* Add the new classes to the table */
+				var iClass = 1, iTargetCol;
+				for ( i=0 ; i<aaSort.length ; i++ )
+				{
+					iTargetCol = parseInt( aaSort[i][0], 10 );
+					for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+					{
+						nTds[(iColumns*j)+iTargetCol].className += " "+sClass+iClass;
+					}
+					
+					if ( iClass < 3 )
+					{
+						iClass++;
+					}
+				}
+			}
+		}
+		
+		
+		
+		/**
+		 * Save the state of a table in a cookie such that the page can be reloaded
+		 *  @param {object} oSettings dataTables settings object
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSaveState ( oSettings )
+		{
+			if ( !oSettings.oFeatures.bStateSave || oSettings.bDestroying )
+			{
+				return;
+			}
+		
+			/* Store the interesting variables */
+			var i, iLen, bInfinite=oSettings.oScroll.bInfinite;
+			var oState = {
+				"iCreate":      new Date().getTime(),
+				"iStart":       (bInfinite ? 0 : oSettings._iDisplayStart),
+				"iEnd":         (bInfinite ? oSettings._iDisplayLength : oSettings._iDisplayEnd),
+				"iLength":      oSettings._iDisplayLength,
+				"aaSorting":    $.extend( true, [], oSettings.aaSorting ),
+				"oSearch":      $.extend( true, {}, oSettings.oPreviousSearch ),
+				"aoSearchCols": $.extend( true, [], oSettings.aoPreSearchCols ),
+				"abVisCols":    []
+			};
+		
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				oState.abVisCols.push( oSettings.aoColumns[i].bVisible );
+			}
+		
+			_fnCallbackFire( oSettings, "aoStateSaveParams", 'stateSaveParams', [oSettings, oState] );
+			
+			oSettings.fnStateSave.call( oSettings.oInstance, oSettings, oState );
+		}
+		
+		
+		/**
+		 * Attempt to load a saved table state from a cookie
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {object} oInit DataTables init object so we can override settings
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnLoadState ( oSettings, oInit )
+		{
+			if ( !oSettings.oFeatures.bStateSave )
+			{
+				return;
+			}
+		
+			var oData = oSettings.fnStateLoad.call( oSettings.oInstance, oSettings );
+			if ( !oData )
+			{
+				return;
+			}
+			
+			/* Allow custom and plug-in manipulation functions to alter the saved data set and
+			 * cancelling of loading by returning false
+			 */
+			var abStateLoad = _fnCallbackFire( oSettings, 'aoStateLoadParams', 'stateLoadParams', [oSettings, oData] );
+			if ( $.inArray( false, abStateLoad ) !== -1 )
+			{
+				return;
+			}
+			
+			/* Store the saved state so it might be accessed at any time */
+			oSettings.oLoadedState = $.extend( true, {}, oData );
+			
+			/* Restore key features */
+			oSettings._iDisplayStart    = oData.iStart;
+			oSettings.iInitDisplayStart = oData.iStart;
+			oSettings._iDisplayEnd      = oData.iEnd;
+			oSettings._iDisplayLength   = oData.iLength;
+			oSettings.aaSorting         = oData.aaSorting.slice();
+			oSettings.saved_aaSorting   = oData.aaSorting.slice();
+			
+			/* Search filtering  */
+			$.extend( oSettings.oPreviousSearch, oData.oSearch );
+			$.extend( true, oSettings.aoPreSearchCols, oData.aoSearchCols );
+			
+			/* Column visibility state
+			 * Pass back visibiliy settings to the init handler, but to do not here override
+			 * the init object that the user might have passed in
+			 */
+			oInit.saved_aoColumns = [];
+			for ( var i=0 ; i<oData.abVisCols.length ; i++ )
+			{
+				oInit.saved_aoColumns[i] = {};
+				oInit.saved_aoColumns[i].bVisible = oData.abVisCols[i];
+			}
+		
+			_fnCallbackFire( oSettings, 'aoStateLoaded', 'stateLoaded', [oSettings, oData] );
+		}
+		
+		
+		/**
+		 * Create a new cookie with a value to store the state of a table
+		 *  @param {string} sName name of the cookie to create
+		 *  @param {string} sValue the value the cookie should take
+		 *  @param {int} iSecs duration of the cookie
+		 *  @param {string} sBaseName sName is made up of the base + file name - this is the base
+		 *  @param {function} fnCallback User definable function to modify the cookie
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnCreateCookie ( sName, sValue, iSecs, sBaseName, fnCallback )
+		{
+			var date = new Date();
+			date.setTime( date.getTime()+(iSecs*1000) );
+			
+			/* 
+			 * Shocking but true - it would appear IE has major issues with having the path not having
+			 * a trailing slash on it. We need the cookie to be available based on the path, so we
+			 * have to append the file name to the cookie name. Appalling. Thanks to vex for adding the
+			 * patch to use at least some of the path
+			 */
+			var aParts = window.location.pathname.split('/');
+			var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase();
+			var sFullCookie, oData;
+			
+			if ( fnCallback !== null )
+			{
+				oData = (typeof $.parseJSON === 'function') ? 
+					$.parseJSON( sValue ) : eval( '('+sValue+')' );
+				sFullCookie = fnCallback( sNameFile, oData, date.toGMTString(),
+					aParts.join('/')+"/" );
+			}
+			else
+			{
+				sFullCookie = sNameFile + "=" + encodeURIComponent(sValue) +
+					"; expires=" + date.toGMTString() +"; path=" + aParts.join('/')+"/";
+			}
+			
+			/* Are we going to go over the cookie limit of 4KiB? If so, try to delete a cookies
+			 * belonging to DataTables. This is FAR from bullet proof
+			 */
+			var sOldName="", iOldTime=9999999999999;
+			var iLength = _fnReadCookie( sNameFile )!==null ? document.cookie.length : 
+				sFullCookie.length + document.cookie.length;
+			
+			if ( iLength+10 > 4096 ) /* Magic 10 for padding */
+			{
+				var aCookies =document.cookie.split(';');
+				for ( var i=0, iLen=aCookies.length ; i<iLen ; i++ )
+				{
+					if ( aCookies[i].indexOf( sBaseName ) != -1 )
+					{
+						/* It's a DataTables cookie, so eval it and check the time stamp */
+						var aSplitCookie = aCookies[i].split('=');
+						try { oData = eval( '('+decodeURIComponent(aSplitCookie[1])+')' ); }
+						catch( e ) { continue; }
+						
+						if ( oData.iCreate && oData.iCreate < iOldTime )
+						{
+							sOldName = aSplitCookie[0];
+							iOldTime = oData.iCreate;
+						}
+					}
+				}
+				
+				if ( sOldName !== "" )
+				{
+					document.cookie = sOldName+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+
+						aParts.join('/') + "/";
+				}
+			}
+			
+			document.cookie = sFullCookie;
+		}
+		
+		
+		/**
+		 * Read an old cookie to get a cookie with an old table state
+		 *  @param {string} sName name of the cookie to read
+		 *  @returns {string} contents of the cookie - or null if no cookie with that name found
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnReadCookie ( sName )
+		{
+			var
+				aParts = window.location.pathname.split('/'),
+				sNameEQ = sName + '_' + aParts[aParts.length-1].replace(/[\/:]/g,"").toLowerCase() + '=',
+			 	sCookieContents = document.cookie.split(';');
+			
+			for( var i=0 ; i<sCookieContents.length ; i++ )
+			{
+				var c = sCookieContents[i];
+				
+				while (c.charAt(0)==' ')
+				{
+					c = c.substring(1,c.length);
+				}
+				
+				if (c.indexOf(sNameEQ) === 0)
+				{
+					return decodeURIComponent( c.substring(sNameEQ.length,c.length) );
+				}
+			}
+			return null;
+		}
+		
+		
+		
+		/**
+		 * Return the settings object for a particular table
+		 *  @param {node} nTable table we are using as a dataTable
+		 *  @returns {object} Settings object - or null if not found
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnSettingsFromNode ( nTable )
+		{
+			for ( var i=0 ; i<DataTable.settings.length ; i++ )
+			{
+				if ( DataTable.settings[i].nTable === nTable )
+				{
+					return DataTable.settings[i];
+				}
+			}
+			
+			return null;
+		}
+		
+		
+		/**
+		 * Return an array with the TR nodes for the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {array} TR array
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetTrNodes ( oSettings )
+		{
+			var aNodes = [];
+			for ( var i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aoData[i].nTr !== null )
+				{
+					aNodes.push( oSettings.aoData[i].nTr );
+				}
+			}
+			return aNodes;
+		}
+		
+		
+		/**
+		 * Return an flat array with all TD nodes for the table, or row
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} [iIndividualRow] aoData index to get the nodes for - optional 
+		 *    if not given then the return array will contain all nodes for the table
+		 *  @returns {array} TD array
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnGetTdNodes ( oSettings, iIndividualRow )
+		{
+			var anReturn = [];
+			var iCorrector;
+			var anTds;
+			var iRow, iRows=oSettings.aoData.length,
+				iColumn, iColumns, oData, sNodeName, iStart=0, iEnd=iRows;
+			
+			/* Allow the collection to be limited to just one row */
+			if ( iIndividualRow )
+			{
+				iStart = iIndividualRow;
+				iEnd = iIndividualRow+1;
+			}
+		
+			for ( iRow=iStart ; iRow<iEnd ; iRow++ )
+			{
+				oData = oSettings.aoData[iRow];
+				if ( oData.nTr !== null )
+				{
+					/* get the TD child nodes - taking into account text etc nodes */
+					anTds = [];
+					for ( iColumn=0, iColumns=oData.nTr.childNodes.length ; iColumn<iColumns ; iColumn++ )
+					{
+						sNodeName = oData.nTr.childNodes[iColumn].nodeName.toLowerCase();
+						if ( sNodeName == 'td' || sNodeName == 'th' )
+						{
+							anTds.push( oData.nTr.childNodes[iColumn] );
+						}
+					}
+		
+					iCorrector = 0;
+					for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
+					{
+						if ( oSettings.aoColumns[iColumn].bVisible )
+						{
+							anReturn.push( anTds[iColumn-iCorrector] );
+						}
+						else
+						{
+							anReturn.push( oData._anHidden[iColumn] );
+							iCorrector++;
+						}
+					}
+				}
+			}
+		
+			return anReturn;
+		}
+		
+		
+		/**
+		 * Log an error message
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {int} iLevel log error messages, or display them to the user
+		 *  @param {string} sMesg error message
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnLog( oSettings, iLevel, sMesg )
+		{
+			var sAlert = (oSettings===null) ?
+				"DataTables warning: "+sMesg :
+				"DataTables warning (table id = '"+oSettings.sTableId+"'): "+sMesg;
+			
+			if ( iLevel === 0 )
+			{
+				if ( DataTable.ext.sErrMode == 'alert' )
+				{
+					alert( sAlert );
+				}
+				else
+				{
+					throw sAlert;
+				}
+				return;
+			}
+			else if ( console !== undefined && console.log )
+			{
+				console.log( sAlert );
+			}
+		}
+		
+		
+		/**
+		 * See if a property is defined on one object, if so assign it to the other object
+		 *  @param {object} oRet target object
+		 *  @param {object} oSrc source object
+		 *  @param {string} sName property
+		 *  @param {string} [sMappedName] name to map too - optional, sName used if not given
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnMap( oRet, oSrc, sName, sMappedName )
+		{
+			if ( sMappedName === undefined )
+			{
+				sMappedName = sName;
+			}
+			if ( oSrc[sName] !== undefined )
+			{
+				oRet[sMappedName] = oSrc[sName];
+			}
+		}
+		
+		
+		/**
+		 * Extend objects - very similar to jQuery.extend, but deep copy objects, and shallow
+		 * copy arrays. The reason we need to do this, is that we don't want to deep copy array
+		 * init values (such as aaSorting) since the dev wouldn't be able to override them, but
+		 * we do want to deep copy arrays.
+		 *  @param {object} oOut Object to extend
+		 *  @param {object} oExtender Object from which the properties will be applied to oOut
+		 *  @returns {object} oOut Reference, just for convenience - oOut === the return.
+		 *  @memberof DataTable#oApi
+		 *  @todo This doesn't take account of arrays inside the deep copied objects.
+		 */
+		function _fnExtend( oOut, oExtender )
+		{
+			for ( var prop in oOut )
+			{
+				if ( oOut.hasOwnProperty(prop) && oExtender[prop] !== undefined )
+				{
+					if ( typeof oInit[prop] === 'object' && $.isArray(oExtender[prop]) === false )
+					{
+						$.extend( true, oOut[prop], oExtender[prop] );
+					}
+					else
+					{
+						oOut[prop] = oExtender[prop];
+					}
+				}
+			}
+		
+			return oOut;
+		}
+		
+		
+		/**
+		 * Bind an event handers to allow a click or return key to activate the callback.
+		 * This is good for accessability since a return on the keyboard will have the
+		 * same effect as a click, if the element has focus.
+		 *  @param {element} n Element to bind the action to
+		 *  @param {object} oData Data object to pass to the triggered function
+		 *  @param {function) fn Callback function for when the event is triggered
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnBindAction( n, oData, fn )
+		{
+			$(n)
+				.bind( 'click.DT', oData, function (e) {
+						fn(e);
+						n.blur(); // Remove focus outline for mouse users
+					} )
+				.bind( 'keypress.DT', oData, function (e){
+					if ( e.which === 13 ) {
+						fn(e);
+					} } )
+				.bind( 'selectstart.DT', function () {
+					/* Take the brutal approach to cancelling text selection */
+					return false;
+					} );
+		}
+		
+		
+		/**
+		 * Register a callback function. Easily allows a callback function to be added to
+		 * an array store of callback functions that can then all be called together.
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {string} sStore Name of the array storeage for the callbacks in oSettings
+		 *  @param {function} fn Function to be called back
+		 *  @param {string) sName Identifying name for the callback (i.e. a label)
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnCallbackReg( oSettings, sStore, fn, sName )
+		{
+			if ( fn )
+			{
+				oSettings[sStore].push( {
+					"fn": fn,
+					"sName": sName
+				} );
+			}
+		}
+		
+		
+		/**
+		 * Fire callback functions and trigger events. Note that the loop over the callback
+		 * array store is done backwards! Further note that you do not want to fire off triggers
+		 * in time sensitive applications (for example cell creation) as its slow.
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {string} sStore Name of the array storeage for the callbacks in oSettings
+		 *  @param {string} sTrigger Name of the jQuery custom event to trigger. If null no trigger
+		 *    is fired
+		 *  @param {array) aArgs Array of arguments to pass to the callback function / trigger
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnCallbackFire( oSettings, sStore, sTrigger, aArgs )
+		{
+			var aoStore = oSettings[sStore];
+			var aRet =[];
+		
+			for ( var i=aoStore.length-1 ; i>=0 ; i-- )
+			{
+				aRet.push( aoStore[i].fn.apply( oSettings.oInstance, aArgs ) );
+			}
+		
+			if ( sTrigger !== null )
+			{
+				$(oSettings.oInstance).trigger(sTrigger, aArgs);
+			}
+		
+			return aRet;
+		}
+		
+		
+		/**
+		 * JSON stringify. If JSON.stringify it provided by the browser, json2.js or any other
+		 * library, then we use that as it is fast, safe and accurate. If the function isn't 
+		 * available then we need to built it ourselves - the insperation for this function comes
+		 * from Craig Buckler ( http://www.sitepoint.com/javascript-json-serialization/ ). It is
+		 * not perfect and absolutely should not be used as a replacement to json2.js - but it does
+		 * do what we need, without requiring a dependency for DataTables.
+		 *  @param {object} o JSON object to be converted
+		 *  @returns {string} JSON string
+		 *  @memberof DataTable#oApi
+		 */
+		var _fnJsonString = (window.JSON) ? JSON.stringify : function( o )
+		{
+			/* Not an object or array */
+			var sType = typeof o;
+			if (sType !== "object" || o === null)
+			{
+				// simple data type
+				if (sType === "string")
+				{
+					o = '"'+o+'"';
+				}
+				return o+"";
+			}
+		
+			/* If object or array, need to recurse over it */
+			var
+				sProp, mValue,
+				json = [],
+				bArr = $.isArray(o);
+			
+			for (sProp in o)
+			{
+				mValue = o[sProp];
+				sType = typeof mValue;
+		
+				if (sType === "string")
+				{
+					mValue = '"'+mValue+'"';
+				}
+				else if (sType === "object" && mValue !== null)
+				{
+					mValue = _fnJsonString(mValue);
+				}
+		
+				json.push((bArr ? "" : '"'+sProp+'":') + mValue);
+			}
+		
+			return (bArr ? "[" : "{") + json + (bArr ? "]" : "}");
+		};
+		
+
+		
+		
+		/**
+		 * Perform a jQuery selector action on the table's TR elements (from the tbody) and
+		 * return the resulting jQuery object.
+		 *  @param {string} sSelector jQuery selector
+		 *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
+		 *  @param {string} [oOpts.filter=none] Select TR elements that meet the current filter
+		 *    criterion ("applied") or all TR elements (i.e. no filter).
+		 *  @param {string} [oOpts.order=current] Order of the TR elements in the processed array.
+		 *    Can be either 'current', whereby the current sorting of the table is used, or
+		 *    'original' whereby the original order the data was read into the table is used.
+		 *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
+		 *    ("current") or not ("all"). If 'current' is given, then order is assumed to be 
+		 *    'current' and filter is 'applied', regardless of what they might be given as.
+		 *  @returns {object} jQuery object, filtered by the given selector.
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Highlight every second row
+		 *      oTable.$('tr:odd').css('backgroundColor', 'blue');
+		 *    } );
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Filter to rows with 'Webkit' in them, add a background colour and then
+		 *      // remove the filter, thus highlighting the 'Webkit' rows only.
+		 *      oTable.fnFilter('Webkit');
+		 *      oTable.$('tr', {"filter": "applied"}).css('backgroundColor', 'blue');
+		 *      oTable.fnFilter('');
+		 *    } );
+		 */
+		this.$ = function ( sSelector, oOpts )
+		{
+			var i, iLen, a = [];
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+		
+			if ( !oOpts )
+			{
+				oOpts = {};
+			}
+		
+			oOpts = $.extend( {}, {
+				"filter": "none", // applied
+				"order": "current", // "original"
+				"page": "all" // current
+			}, oOpts );
+		
+			// Current page implies that order=current and fitler=applied, since it is fairly
+			// senseless otherwise
+			if ( oOpts.page == 'current' )
+			{
+				for ( i=oSettings._iDisplayStart, iLen=oSettings.fnDisplayEnd() ; i<iLen ; i++ )
+				{
+					a.push( oSettings.aoData[ oSettings.aiDisplay[i] ].nTr );
+				}
+			}
+			else if ( oOpts.order == "current" && oOpts.filter == "none" )
+			{
+				for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
+				{
+					a.push( oSettings.aoData[ oSettings.aiDisplayMaster[i] ].nTr );
+				}
+			}
+			else if ( oOpts.order == "current" && oOpts.filter == "applied" )
+			{
+				for ( i=0, iLen=oSettings.aiDisplay.length ; i<iLen ; i++ )
+				{
+					a.push( oSettings.aoData[ oSettings.aiDisplay[i] ].nTr );
+				}
+			}
+			else if ( oOpts.order == "original" && oOpts.filter == "none" )
+			{
+				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				{
+					a.push( oSettings.aoData[ i ].nTr );
+				}
+			}
+			else if ( oOpts.order == "original" && oOpts.filter == "applied" )
+			{
+				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				{
+					if ( $.inArray( i, oSettings.aiDisplay ) !== -1 )
+					{
+						a.push( oSettings.aoData[ i ].nTr );
+					}
+				}
+			}
+			else
+			{
+				_fnLog( oSettings, 1, "Unknown selection options" );
+			}
+		
+			/* We need to filter on the TR elements and also 'find' in their descendants
+			 * to make the selector act like it would in a full table - so we need
+			 * to build both results and then combine them together
+			 */
+			var jqA = $(a);
+			var jqTRs = jqA.filter( sSelector );
+			var jqDescendants = jqA.find( sSelector );
+		
+			return $( [].concat($.makeArray(jqTRs), $.makeArray(jqDescendants)) );
+		};
+		
+		
+		/**
+		 * Add a single new row or multiple rows of data to the table. Please note
+		 * that this is suitable for client-side processing only - if you are using 
+		 * server-side processing (i.e. "bServerSide": true), then to add data, you
+		 * must add it to the data source, i.e. the server-side, through an Ajax call.
+		 *  @param {array|object} mData The data to be added to the table. This can be:
+		 *    <ul>
+		 *      <li>1D array of data - add a single row with the data provided</li>
+		 *      <li>2D array of arrays - add multiple rows in a single call</li>
+		 *      <li>object - data object when using <i>mDataProp</i></li>
+		 *      <li>array of objects - multiple data objects when using <i>mDataProp</i></li>
+		 *    </ul>
+		 *  @param {bool} [bRedraw=true] redraw the table or not
+		 *  @returns {array} An array of integers, representing the list of indexes in 
+		 *    <i>aoData</i> ({@link DataTable.models.oSettings}) that have been added to 
+		 *    the table.
+		 *
+		 *  @example
+		 *    // Global var for counter
+		 *    var giCount = 2;
+		 *    
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable();
+		 *    } );
+		 *    
+		 *    function fnClickAddRow() {
+		 *      $('#example').dataTable().fnAddData( [
+		 *        giCount+".1",
+		 *        giCount+".2",
+		 *        giCount+".3",
+		 *        giCount+".4" ]
+		 *      );
+		 *        
+		 *      giCount++;
+		 *    }
+		 */
+		this.fnAddData = function( mData, bRedraw )
+		{
+			if ( mData.length === 0 )
+			{
+				return [];
+			}
+			
+			var aiReturn = [];
+			var iTest;
+			
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			/* Check if we want to add multiple rows or not */
+			if ( typeof mData[0] === "object" )
+			{
+				for ( var i=0 ; i<mData.length ; i++ )
+				{
+					iTest = _fnAddData( oSettings, mData[i] );
+					if ( iTest == -1 )
+					{
+						return aiReturn;
+					}
+					aiReturn.push( iTest );
+				}
+			}
+			else
+			{
+				iTest = _fnAddData( oSettings, mData );
+				if ( iTest == -1 )
+				{
+					return aiReturn;
+				}
+				aiReturn.push( iTest );
+			}
+			
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			if ( bRedraw === undefined || bRedraw )
+			{
+				_fnReDraw( oSettings );
+			}
+			return aiReturn;
+		};
+		
+		
+		/**
+		 * This function will make DataTables recalculate the column sizes, based on the data 
+		 * contained in the table and the sizes applied to the columns (in the DOM, CSS or 
+		 * through the sWidth parameter). This can be useful when the width of the table's 
+		 * parent element changes (for example a window resize).
+		 *  @param {boolean} [bRedraw=true] Redraw the table or not, you will typically want to
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable( {
+		 *        "sScrollY": "200px",
+		 *        "bPaginate": false
+		 *      } );
+		 *      
+		 *      $(window).bind('resize', function () {
+		 *        oTable.fnAdjustColumnSizing();
+		 *      } );
+		 *    } );
+		 */
+		this.fnAdjustColumnSizing = function ( bRedraw )
+		{
+			var oSettings = _fnSettingsFromNode(this[DataTable.ext.iApiIndex]);
+			_fnAdjustColumnSizing( oSettings );
+			
+			if ( bRedraw === undefined || bRedraw )
+			{
+				this.fnDraw( false );
+			}
+			else if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
+			{
+				/* If not redrawing, but scrolling, we want to apply the new column sizes anyway */
+				this.oApi._fnScrollDraw(oSettings);
+			}
+		};
+		
+		
+		/**
+		 * Quickly and simply clear a table
+		 *  @param {bool} [bRedraw=true] redraw the table or not
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Immediately 'nuke' the current rows (perhaps waiting for an Ajax callback...)
+		 *      oTable.fnClearTable();
+		 *    } );
+		 */
+		this.fnClearTable = function( bRedraw )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			_fnClearTable( oSettings );
+			
+			if ( bRedraw === undefined || bRedraw )
+			{
+				_fnDraw( oSettings );
+			}
+		};
+		
+		
+		/**
+		 * The exact opposite of 'opening' a row, this function will close any rows which 
+		 * are currently 'open'.
+		 *  @param {node} nTr the table row to 'close'
+		 *  @returns {int} 0 on success, or 1 if failed (can't find the row)
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable;
+		 *      
+		 *      // 'open' an information row when a row is clicked on
+		 *      $('#example tbody tr').click( function () {
+		 *        if ( oTable.fnIsOpen(this) ) {
+		 *          oTable.fnClose( this );
+		 *        } else {
+		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+		 *        }
+		 *      } );
+		 *      
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnClose = function( nTr )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
+			{
+				if ( oSettings.aoOpenRows[i].nParent == nTr )
+				{
+					var nTrParent = oSettings.aoOpenRows[i].nTr.parentNode;
+					if ( nTrParent )
+					{
+						/* Remove it if it is currently on display */
+						nTrParent.removeChild( oSettings.aoOpenRows[i].nTr );
+					}
+					oSettings.aoOpenRows.splice( i, 1 );
+					return 0;
+				}
+			}
+			return 1;
+		};
+		
+		
+		/**
+		 * Remove a row for the table
+		 *  @param {mixed} mTarget The index of the row from aoData to be deleted, or
+		 *    the TR element you want to delete
+		 *  @param {function|null} [fnCallBack] Callback function
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *  @returns {array} The row that was deleted
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Immediately remove the first row
+		 *      oTable.fnDeleteRow( 0 );
+		 *    } );
+		 */
+		this.fnDeleteRow = function( mTarget, fnCallBack, bRedraw )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			var i, iAODataIndex;
+			
+			iAODataIndex = (typeof mTarget === 'object') ? 
+				_fnNodeToDataIndex(oSettings, mTarget) : mTarget;
+			
+			/* Return the data array from this row */
+			var oData = oSettings.aoData.splice( iAODataIndex, 1 );
+			
+			/* Remove the target row from the search array */
+			var iDisplayIndex = $.inArray( iAODataIndex, oSettings.aiDisplay );
+			oSettings.asDataSearch.splice( iDisplayIndex, 1 );
+			
+			/* Delete from the display arrays */
+			_fnDeleteIndex( oSettings.aiDisplayMaster, iAODataIndex );
+			_fnDeleteIndex( oSettings.aiDisplay, iAODataIndex );
+			
+			/* If there is a user callback function - call it */
+			if ( typeof fnCallBack === "function" )
+			{
+				fnCallBack.call( this, oSettings, oData );
+			}
+			
+			/* Check for an 'overflow' they case for dislaying the table */
+			if ( oSettings._iDisplayStart >= oSettings.aiDisplay.length )
+			{
+				oSettings._iDisplayStart -= oSettings._iDisplayLength;
+				if ( oSettings._iDisplayStart < 0 )
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			
+			if ( bRedraw === undefined || bRedraw )
+			{
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+			
+			return oData;
+		};
+		
+		
+		/**
+		 * Restore the table to it's original state in the DOM by removing all of DataTables 
+		 * enhancements, alterations to the DOM structure of the table and event listeners.
+		 *  @param {boolean} [bRemove=false] Completely remove the table from the DOM
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      // This example is fairly pointless in reality, but shows how fnDestroy can be used
+		 *      var oTable = $('#example').dataTable();
+		 *      oTable.fnDestroy();
+		 *    } );
+		 */
+		this.fnDestroy = function ( bRemove )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			var nOrig = oSettings.nTableWrapper.parentNode;
+			var nBody = oSettings.nTBody;
+			var i, iLen;
+		
+			bRemove = (bRemove===undefined) ? false : true;
+			
+			/* Flag to note that the table is currently being destroyed - no action should be taken */
+			oSettings.bDestroying = true;
+			
+			/* Restore hidden columns */
+			for ( i=0, iLen=oSettings.aoDestroyCallback.length ; i<iLen ; i++ ) {
+				oSettings.aoDestroyCallback[i].fn();
+			}
+			
+			/* Restore hidden columns */
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible === false )
+				{
+					this.fnSetColumnVis( i, true );
+				}
+			}
+			
+			/* Blitz all DT events */
+			$(oSettings.nTableWrapper).find('*').andSelf().unbind('.DT');
+			
+			/* If there is an 'empty' indicator row, remove it */
+			$('tbody>tr>td.'+oSettings.oClasses.sRowEmpty, oSettings.nTable).parent().remove();
+			
+			/* When scrolling we had to break the table up - restore it */
+			if ( oSettings.nTable != oSettings.nTHead.parentNode )
+			{
+				$(oSettings.nTable).children('thead').remove();
+				oSettings.nTable.appendChild( oSettings.nTHead );
+			}
+			
+			if ( oSettings.nTFoot && oSettings.nTable != oSettings.nTFoot.parentNode )
+			{
+				$(oSettings.nTable).children('tfoot').remove();
+				oSettings.nTable.appendChild( oSettings.nTFoot );
+			}
+			
+			/* Remove the DataTables generated nodes, events and classes */
+			oSettings.nTable.parentNode.removeChild( oSettings.nTable );
+			$(oSettings.nTableWrapper).remove();
+			
+			oSettings.aaSorting = [];
+			oSettings.aaSortingFixed = [];
+			_fnSortingClasses( oSettings );
+			
+			$(_fnGetTrNodes( oSettings )).removeClass( oSettings.asStripeClasses.join(' ') );
+			
+			$('th, td', oSettings.nTHead).removeClass( [
+				oSettings.oClasses.sSortable,
+				oSettings.oClasses.sSortableAsc,
+				oSettings.oClasses.sSortableDesc,
+				oSettings.oClasses.sSortableNone ].join(' ')
+			);
+			if ( oSettings.bJUI )
+			{
+				$('th span.'+oSettings.oClasses.sSortIcon
+					+ ', td span.'+oSettings.oClasses.sSortIcon, oSettings.nTHead).remove();
+		
+				$('th, td', oSettings.nTHead).each( function () {
+					var jqWrapper = $('div.'+oSettings.oClasses.sSortJUIWrapper, this);
+					var kids = jqWrapper.contents();
+					$(this).append( kids );
+					jqWrapper.remove();
+				} );
+			}
+			
+			/* Add the TR elements back into the table in their original order */
+			if ( !bRemove && oSettings.nTableReinsertBefore )
+			{
+				nOrig.insertBefore( oSettings.nTable, oSettings.nTableReinsertBefore );
+			}
+			else if ( !bRemove )
+			{
+				nOrig.appendChild( oSettings.nTable );
+			}
+		
+			for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aoData[i].nTr !== null )
+				{
+					nBody.appendChild( oSettings.aoData[i].nTr );
+				}
+			}
+			
+			/* Restore the width of the original table */
+			if ( oSettings.oFeatures.bAutoWidth === true )
+			{
+			  oSettings.nTable.style.width = _fnStringToCss(oSettings.sDestroyWidth);
+			}
+			
+			/* If the were originally odd/even type classes - then we add them back here. Note
+			 * this is not fool proof (for example if not all rows as odd/even classes - but 
+			 * it's a good effort without getting carried away
+			 */
+			$(nBody).children('tr:even').addClass( oSettings.asDestroyStripes[0] );
+			$(nBody).children('tr:odd').addClass( oSettings.asDestroyStripes[1] );
+			
+			/* Remove the settings object from the settings array */
+			for ( i=0, iLen=DataTable.settings.length ; i<iLen ; i++ )
+			{
+				if ( DataTable.settings[i] == oSettings )
+				{
+					DataTable.settings.splice( i, 1 );
+				}
+			}
+			
+			/* End it all */
+			oSettings = null;
+		};
+		
+		
+		/**
+		 * Redraw the table
+		 *  @param {bool} [bComplete=true] Re-filter and resort (if enabled) the table before the draw.
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Re-draw the table - you wouldn't want to do it here, but it's an example :-)
+		 *      oTable.fnDraw();
+		 *    } );
+		 */
+		this.fnDraw = function( bComplete )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			if ( bComplete )
+			{
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+			else
+			{
+				_fnReDraw( oSettings );
+			}
+		};
+		
+		
+		/**
+		 * Filter the input based on data
+		 *  @param {string} sInput String to filter the table on
+		 *  @param {int|null} [iColumn] Column to limit filtering to
+		 *  @param {bool} [bRegex=false] Treat as regular expression or not
+		 *  @param {bool} [bSmart=true] Perform smart filtering or not
+		 *  @param {bool} [bShowGlobal=true] Show the input global filter in it's input box(es)
+		 *  @param {bool} [bCaseInsensitive=true] Do case-insensitive matching (true) or not (false)
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Sometime later - filter...
+		 *      oTable.fnFilter( 'test string' );
+		 *    } );
+		 */
+		this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseInsensitive )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			if ( !oSettings.oFeatures.bFilter )
+			{
+				return;
+			}
+			
+			if ( bRegex === undefined || bRegex === null )
+			{
+				bRegex = false;
+			}
+			
+			if ( bSmart === undefined || bSmart === null )
+			{
+				bSmart = true;
+			}
+			
+			if ( bShowGlobal === undefined || bShowGlobal === null )
+			{
+				bShowGlobal = true;
+			}
+			
+			if ( bCaseInsensitive === undefined || bCaseInsensitive === null )
+			{
+				bCaseInsensitive = true;
+			}
+			
+			if ( iColumn === undefined || iColumn === null )
+			{
+				/* Global filter */
+				_fnFilterComplete( oSettings, {
+					"sSearch":sInput+"",
+					"bRegex": bRegex,
+					"bSmart": bSmart,
+					"bCaseInsensitive": bCaseInsensitive
+				}, 1 );
+				
+				if ( bShowGlobal && oSettings.aanFeatures.f )
+				{
+					var n = oSettings.aanFeatures.f;
+					for ( var i=0, iLen=n.length ; i<iLen ; i++ )
+					{
+						$('input', n[i]).val( sInput );
+					}
+				}
+			}
+			else
+			{
+				/* Single column filter */
+				$.extend( oSettings.aoPreSearchCols[ iColumn ], {
+					"sSearch": sInput+"",
+					"bRegex": bRegex,
+					"bSmart": bSmart,
+					"bCaseInsensitive": bCaseInsensitive
+				} );
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
+			}
+		};
+		
+		
+		/**
+		 * Return an array with the data which is used to make up the table
+		 * or string if both row and column are given
+		 *  @param {mixed} [mRow] The TR row element to get the data for, or the aoData
+		 *    internal index (mapped to the TR element)
+		 *  @param {int} [iCol] Optional column index that you want the data of
+		 *  @returns {array|string} If mRow is undefined, then the data for all rows is
+		 *    returned. If mRow is defined, just data for that row, and is iCol is
+		 *    defined, only data for the designated cell is returned.
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example tbody td').click( function () {
+		 *        // Get the position of the current data from the node
+		 *        var aPos = oTable.fnGetPosition( this );
+		 *        
+		 *        // Get the data array for this row
+		 *        var aData = oTable.fnGetData( this.parentNode );
+		 *        
+		 *        // Update the data array and return the value
+		 *        aData[ aPos[1] ] = 'clicked';
+		 *        this.innerHTML = 'clicked';
+		 *      } );
+		 *      
+		 *      // Init DataTables
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnGetData = function( mRow, iCol )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			if ( mRow !== undefined )
+			{
+				var iRow = (typeof mRow === 'object') ? 
+					_fnNodeToDataIndex(oSettings, mRow) : mRow;
+				
+				if ( iCol !== undefined )
+				{
+					return _fnGetCellData( oSettings, iRow, iCol, '' );
+				}
+				return oSettings.aoData[iRow]._aData;
+			}
+			return _fnGetDataMaster( oSettings );
+		};
+		
+		
+		/**
+		 * Get an array of the TR nodes that are used in the table's body. Note that you will 
+		 * typically want to use the '$' API method in preference to this as it is more 
+		 * flexible.
+		 *  @param {int} [iRow] Optional row index for the TR element you want
+		 *  @returns {array|node} If iRow is undefined, returns an array of all TR elements
+		 *    in the table's body, or iRow is defined, just the TR element requested.
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Get the nodes from the table
+		 *      var nNodes = oTable.fnGetNodes( );
+		 *    } );
+		 */
+		this.fnGetNodes = function( iRow )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			return (iRow !== undefined) ?
+				oSettings.aoData[iRow].nTr :
+				_fnGetTrNodes( oSettings );
+		};
+		
+		
+		/**
+		 * Get the array indexes of a particular cell from it's DOM element
+		 * and column index including hidden columns
+		 *  @param {node} nNode this can either be a TR, TD or TH in the table's body
+		 *  @returns {int} If nNode is given as a TR, then a single index is returned, or
+		 *    if given as a cell, an array of [row index, column index (visible)] is given.
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example tbody td').click( function () {
+		 *        // Get the position of the current data from the node
+		 *        var aPos = oTable.fnGetPosition( this );
+		 *        
+		 *        // Get the data array for this row
+		 *        var aData = oTable.fnGetData( aPos[0] );
+		 *        
+		 *        // Update the data array and return the value
+		 *        aData[ aPos[1] ] = 'clicked';
+		 *        this.innerHTML = 'clicked';
+		 *      } );
+		 *      
+		 *      // Init DataTables
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnGetPosition = function( nNode )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			var sNodeName = nNode.nodeName.toUpperCase();
+			
+			if ( sNodeName == "TR" )
+			{
+				return _fnNodeToDataIndex(oSettings, nNode);
+			}
+			else if ( sNodeName == "TD" || sNodeName == "TH" )
+			{
+				var iDataIndex = _fnNodeToDataIndex(oSettings, nNode.parentNode);
+				var anCells = _fnGetTdNodes( oSettings, iDataIndex );
+		
+				for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					if ( anCells[i] == nNode )
+					{
+						return [ iDataIndex, _fnColumnIndexToVisible(oSettings, i ), i ];
+					}
+				}
+			}
+			return null;
+		};
+		
+		
+		/**
+		 * Check to see if a row is 'open' or not.
+		 *  @param {node} nTr the table row to check
+		 *  @returns {boolean} true if the row is currently open, false otherwise
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable;
+		 *      
+		 *      // 'open' an information row when a row is clicked on
+		 *      $('#example tbody tr').click( function () {
+		 *        if ( oTable.fnIsOpen(this) ) {
+		 *          oTable.fnClose( this );
+		 *        } else {
+		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+		 *        }
+		 *      } );
+		 *      
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnIsOpen = function( nTr )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
+			{
+				if ( oSettings.aoOpenRows[i].nParent == nTr )
+				{
+					return true;
+				}
+			}
+			return false;
+		};
+		
+		
+		/**
+		 * This function will place a new row directly after a row which is currently 
+		 * on display on the page, with the HTML contents that is passed into the 
+		 * function. This can be used, for example, to ask for confirmation that a 
+		 * particular record should be deleted.
+		 *  @param {node} nTr The table row to 'open'
+		 *  @param {string|node|jQuery} mHtml The HTML to put into the row
+		 *  @param {string} sClass Class to give the new TD cell
+		 *  @returns {node} The row opened
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable;
+		 *      
+		 *      // 'open' an information row when a row is clicked on
+		 *      $('#example tbody tr').click( function () {
+		 *        if ( oTable.fnIsOpen(this) ) {
+		 *          oTable.fnClose( this );
+		 *        } else {
+		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+		 *        }
+		 *      } );
+		 *      
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnOpen = function( nTr, mHtml, sClass )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			
+			/* the old open one if there is one */
+			this.fnClose( nTr );
+			
+			var nNewRow = document.createElement("tr");
+			var nNewCell = document.createElement("td");
+			nNewRow.appendChild( nNewCell );
+			nNewCell.className = sClass;
+			nNewCell.colSpan = _fnVisbleColumns( oSettings );
+		
+			if( mHtml.jquery !== undefined || typeof mHtml === "object" )
+			{
+				nNewCell.appendChild( mHtml );
+			}
+			else
+			{
+				nNewCell.innerHTML = mHtml;
+			}
+		
+			/* If the nTr isn't on the page at the moment - then we don't insert at the moment */
+			var nTrs = $('tr', oSettings.nTBody);
+			if ( $.inArray(nTr, nTrs) != -1 )
+			{
+				$(nNewRow).insertAfter(nTr);
+			}
+			
+			oSettings.aoOpenRows.push( {
+				"nTr": nNewRow,
+				"nParent": nTr
+			} );
+			
+			return nNewRow;
+		};
+		
+		
+		/**
+		 * Change the pagination - provides the internal logic for pagination in a simple API 
+		 * function. With this function you can have a DataTables table go to the next, 
+		 * previous, first or last pages.
+		 *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
+		 *    or page number to jump to (integer), note that page 0 is the first page.
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      oTable.fnPageChange( 'next' );
+		 *    } );
+		 */
+		this.fnPageChange = function ( mAction, bRedraw )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			_fnPageChange( oSettings, mAction );
+			_fnCalculateEnd( oSettings );
+			
+			if ( bRedraw === undefined || bRedraw )
+			{
+				_fnDraw( oSettings );
+			}
+		};
+		
+		
+		/**
+		 * Show a particular column
+		 *  @param {int} iCol The column whose display should be changed
+		 *  @param {bool} bShow Show (true) or hide (false) the column
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Hide the second column after initialisation
+		 *      oTable.fnSetColumnVis( 1, false );
+		 *    } );
+		 */
+		this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			var i, iLen;
+			var iColumns = oSettings.aoColumns.length;
+			var nTd, nCell, anTrs, jqChildren, bAppend, iBefore;
+			
+			/* No point in doing anything if we are requesting what is already true */
+			if ( oSettings.aoColumns[iCol].bVisible == bShow )
+			{
+				return;
+			}
+			
+			/* Show the column */
+			if ( bShow )
+			{
+				var iInsert = 0;
+				for ( i=0 ; i<iCol ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						iInsert++;
+					}
+				}
+				
+				/* Need to decide if we should use appendChild or insertBefore */
+				bAppend = (iInsert >= _fnVisbleColumns( oSettings ));
+		
+				/* Which coloumn should we be inserting before? */
+				if ( !bAppend )
+				{
+					for ( i=iCol ; i<iColumns ; i++ )
+					{
+						if ( oSettings.aoColumns[i].bVisible )
+						{
+							iBefore = i;
+							break;
+						}
+					}
+				}
+		
+				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				{
+					if ( oSettings.aoData[i].nTr !== null )
+					{
+						if ( bAppend )
+						{
+							oSettings.aoData[i].nTr.appendChild( 
+								oSettings.aoData[i]._anHidden[iCol]
+							);
+						}
+						else
+						{
+							oSettings.aoData[i].nTr.insertBefore(
+								oSettings.aoData[i]._anHidden[iCol], 
+								_fnGetTdNodes( oSettings, i )[iBefore] );
+						}
+					}
+				}
+			}
+			else
+			{
+				/* Remove a column from display */
+				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				{
+					if ( oSettings.aoData[i].nTr !== null )
+					{
+						nTd = _fnGetTdNodes( oSettings, i )[iCol];
+						oSettings.aoData[i]._anHidden[iCol] = nTd;
+						nTd.parentNode.removeChild( nTd );
+					}
+				}
+			}
+		
+			/* Clear to set the visible flag */
+			oSettings.aoColumns[iCol].bVisible = bShow;
+		
+			/* Redraw the header and footer based on the new column visibility */
+			_fnDrawHead( oSettings, oSettings.aoHeader );
+			if ( oSettings.nTFoot )
+			{
+				_fnDrawHead( oSettings, oSettings.aoFooter );
+			}
+			
+			/* If there are any 'open' rows, then we need to alter the colspan for this col change */
+			for ( i=0, iLen=oSettings.aoOpenRows.length ; i<iLen ; i++ )
+			{
+				oSettings.aoOpenRows[i].nTr.colSpan = _fnVisbleColumns( oSettings );
+			}
+			
+			/* Do a redraw incase anything depending on the table columns needs it 
+			 * (built-in: scrolling) 
+			 */
+			if ( bRedraw === undefined || bRedraw )
+			{
+				_fnAdjustColumnSizing( oSettings );
+				_fnDraw( oSettings );
+			}
+			
+			_fnSaveState( oSettings );
+		};
+		
+		
+		/**
+		 * Get the settings for a particular table for external manipulation
+		 *  @returns {object} DataTables settings object. See 
+		 *    {@link DataTable.models.oSettings}
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      var oSettings = oTable.fnSettings();
+		 *      
+		 *      // Show an example parameter from the settings
+		 *      alert( oSettings._iDisplayStart );
+		 *    } );
+		 */
+		this.fnSettings = function()
+		{
+			return _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+		};
+		
+		
+		/**
+		 * Sort the table by a particular row
+		 *  @param {int} iCol the data index to sort on. Note that this will not match the 
+		 *    'display index' if you have hidden data entries
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Sort immediately with columns 0 and 1
+		 *      oTable.fnSort( [ [0,'asc'], [1,'asc'] ] );
+		 *    } );
+		 */
+		this.fnSort = function( aaSort )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			oSettings.aaSorting = aaSort;
+			_fnSort( oSettings );
+		};
+		
+		
+		/**
+		 * Attach a sort listener to an element for a given column
+		 *  @param {node} nNode the element to attach the sort listener to
+		 *  @param {int} iColumn the column that a click on this node will sort on
+		 *  @param {function} [fnCallback] callback function when sort is run
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      
+		 *      // Sort on column 1, when 'sorter' is clicked on
+		 *      oTable.fnSortListener( document.getElementById('sorter'), 1 );
+		 *    } );
+		 */
+		this.fnSortListener = function( nNode, iColumn, fnCallback )
+		{
+			_fnSortAttachListener( _fnSettingsFromNode( this[DataTable.ext.iApiIndex] ), nNode, iColumn,
+			 	fnCallback );
+		};
+		
+		
+		/**
+		 * Update a table cell or row - this method will accept either a single value to
+		 * update the cell with, an array of values with one element for each column or
+		 * an object in the same format as the original data source. The function is
+		 * self-referencing in order to make the multi column updates easier.
+		 *  @param {object|array|string} mData Data to update the cell/row with
+		 *  @param {node|int} mRow TR element you want to update or the aoData index
+		 *  @param {int} [iColumn] The column to update (not used of mData is an array or object)
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *  @param {bool} [bAction=true] Perform predraw actions or not
+		 *  @returns {int} 0 on success, 1 on error
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      oTable.fnUpdate( 'Example update', 0, 0 ); // Single cell
+		 *      oTable.fnUpdate( ['a', 'b', 'c', 'd', 'e'], 1, 0 ); // Row
+		 *    } );
+		 */
+		this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
+		{
+			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			var iVisibleColumn, i, iLen, sDisplay;
+			var iRow = (typeof mRow === 'object') ? 
+				_fnNodeToDataIndex(oSettings, mRow) : mRow;
+			
+			if ( oSettings.__fnUpdateDeep === undefined && $.isArray(mData) && typeof mData === 'object' )
+			{
+				/* Array update - update the whole row */
+				oSettings.aoData[iRow]._aData = mData.slice();
+				
+				/* Flag to the function that we are recursing */
+				oSettings.__fnUpdateDeep = true;
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					this.fnUpdate( _fnGetCellData( oSettings, iRow, i ), iRow, i, false, false );
+				}
+				oSettings.__fnUpdateDeep = undefined;
+			}
+			else if ( oSettings.__fnUpdateDeep === undefined && mData !== null && typeof mData === 'object' )
+			{
+				/* Object update - update the whole row - assume the developer gets the object right */
+				oSettings.aoData[iRow]._aData = $.extend( true, {}, mData );
+		
+				oSettings.__fnUpdateDeep = true;
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					this.fnUpdate( _fnGetCellData( oSettings, iRow, i ), iRow, i, false, false );
+				}
+				oSettings.__fnUpdateDeep = undefined;
+			}
+			else
+			{
+				/* Individual cell update */
+				sDisplay = mData;
+				_fnSetCellData( oSettings, iRow, iColumn, sDisplay );
+				
+				var oCol = oSettings.aoColumns[iColumn];
+				if ( oCol.fnRender !== null )
+				{
+					sDisplay = oCol.fnRender( {
+						"iDataRow": iRow,
+						"iDataColumn": iColumn,
+						"aData": oSettings.aoData[iRow]._aData,
+						"oSettings": oSettings,
+						"mDataProp": oCol.mDataProp
+					}, _fnGetCellData(oSettings, iRow, iColumn, 'display') );
+					
+					if ( oCol.bUseRendered )
+					{
+						_fnSetCellData( oSettings, iRow, iColumn, sDisplay );
+					}
+				}
+				
+				if ( oSettings.aoData[iRow].nTr !== null )
+				{
+					/* Do the actual HTML update */
+					_fnGetTdNodes( oSettings, iRow )[iColumn].innerHTML = sDisplay;
+				}
+			}
+			
+			/* Modify the search index for this row (strictly this is likely not needed, since fnReDraw
+			 * will rebuild the search array - however, the redraw might be disabled by the user)
+			 */
+			var iDisplayIndex = $.inArray( iRow, oSettings.aiDisplay );
+			oSettings.asDataSearch[iDisplayIndex] = _fnBuildSearchRow( oSettings, 
+				_fnGetRowData( oSettings, iRow, 'filter' ) );
+			
+			/* Perform pre-draw actions */
+			if ( bAction === undefined || bAction )
+			{
+				_fnAdjustColumnSizing( oSettings );
+			}
+			
+			/* Redraw the table */
+			if ( bRedraw === undefined || bRedraw )
+			{
+				_fnReDraw( oSettings );
+			}
+			return 0;
+		};
+		
+		
+		/**
+		 * Provide a common method for plug-ins to check the version of DataTables being used, in order
+		 * to ensure compatibility.
+		 *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
+		 *    formats "X" and "X.Y" are also acceptable.
+		 *  @returns {boolean} true if this version of DataTables is greater or equal to the required
+		 *    version, or false if this version of DataTales is not suitable
+		 *  @method
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      alert( oTable.fnVersionCheck( '1.9.0' ) );
+		 *    } );
+		 */
+		this.fnVersionCheck = DataTable.ext.fnVersionCheck;
+		
+		
+		/*
+		 * This is really a good bit rubbish this method of exposing the internal methods
+		 * publically... - To be fixed in 2.0 using methods on the prototype
+		 */
+		
+		
+		/**
+		 * Create a wrapper function for exporting an internal functions to an external API.
+		 *  @param {string} sFunc API function name
+		 *  @returns {function} wrapped function
+		 *  @memberof DataTable#oApi
+		 */
+		function _fnExternApiFunc (sFunc)
+		{
+			return function() {
+				var aArgs = [_fnSettingsFromNode(this[DataTable.ext.iApiIndex])].concat( 
+					Array.prototype.slice.call(arguments) );
+				return DataTable.ext.oApi[sFunc].apply( this, aArgs );
+			};
+		}
+		
+		
+		/**
+		 * Reference to internal functions for use by plug-in developers. Note that these
+		 * methods are references to internal functions and are considered to be private.
+		 * If you use these methods, be aware that they are liable to change between versions
+		 * (check the upgrade notes).
+		 *  @namespace
+		 */
+		this.oApi = {
+			"_fnExternApiFunc": _fnExternApiFunc,
+			"_fnInitialise": _fnInitialise,
+			"_fnInitComplete": _fnInitComplete,
+			"_fnLanguageCompat": _fnLanguageCompat,
+			"_fnAddColumn": _fnAddColumn,
+			"_fnColumnOptions": _fnColumnOptions,
+			"_fnAddData": _fnAddData,
+			"_fnCreateTr": _fnCreateTr,
+			"_fnGatherData": _fnGatherData,
+			"_fnBuildHead": _fnBuildHead,
+			"_fnDrawHead": _fnDrawHead,
+			"_fnDraw": _fnDraw,
+			"_fnReDraw": _fnReDraw,
+			"_fnAjaxUpdate": _fnAjaxUpdate,
+			"_fnAjaxParameters": _fnAjaxParameters,
+			"_fnAjaxUpdateDraw": _fnAjaxUpdateDraw,
+			"_fnServerParams": _fnServerParams,
+			"_fnAddOptionsHtml": _fnAddOptionsHtml,
+			"_fnFeatureHtmlTable": _fnFeatureHtmlTable,
+			"_fnScrollDraw": _fnScrollDraw,
+			"_fnAdjustColumnSizing": _fnAdjustColumnSizing,
+			"_fnFeatureHtmlFilter": _fnFeatureHtmlFilter,
+			"_fnFilterComplete": _fnFilterComplete,
+			"_fnFilterCustom": _fnFilterCustom,
+			"_fnFilterColumn": _fnFilterColumn,
+			"_fnFilter": _fnFilter,
+			"_fnBuildSearchArray": _fnBuildSearchArray,
+			"_fnBuildSearchRow": _fnBuildSearchRow,
+			"_fnFilterCreateSearch": _fnFilterCreateSearch,
+			"_fnDataToSearch": _fnDataToSearch,
+			"_fnSort": _fnSort,
+			"_fnSortAttachListener": _fnSortAttachListener,
+			"_fnSortingClasses": _fnSortingClasses,
+			"_fnFeatureHtmlPaginate": _fnFeatureHtmlPaginate,
+			"_fnPageChange": _fnPageChange,
+			"_fnFeatureHtmlInfo": _fnFeatureHtmlInfo,
+			"_fnUpdateInfo": _fnUpdateInfo,
+			"_fnFeatureHtmlLength": _fnFeatureHtmlLength,
+			"_fnFeatureHtmlProcessing": _fnFeatureHtmlProcessing,
+			"_fnProcessingDisplay": _fnProcessingDisplay,
+			"_fnVisibleToColumnIndex": _fnVisibleToColumnIndex,
+			"_fnColumnIndexToVisible": _fnColumnIndexToVisible,
+			"_fnNodeToDataIndex": _fnNodeToDataIndex,
+			"_fnVisbleColumns": _fnVisbleColumns,
+			"_fnCalculateEnd": _fnCalculateEnd,
+			"_fnConvertToWidth": _fnConvertToWidth,
+			"_fnCalculateColumnWidths": _fnCalculateColumnWidths,
+			"_fnScrollingWidthAdjust": _fnScrollingWidthAdjust,
+			"_fnGetWidestNode": _fnGetWidestNode,
+			"_fnGetMaxLenString": _fnGetMaxLenString,
+			"_fnStringToCss": _fnStringToCss,
+			"_fnDetectType": _fnDetectType,
+			"_fnSettingsFromNode": _fnSettingsFromNode,
+			"_fnGetDataMaster": _fnGetDataMaster,
+			"_fnGetTrNodes": _fnGetTrNodes,
+			"_fnGetTdNodes": _fnGetTdNodes,
+			"_fnEscapeRegex": _fnEscapeRegex,
+			"_fnDeleteIndex": _fnDeleteIndex,
+			"_fnReOrderIndex": _fnReOrderIndex,
+			"_fnColumnOrdering": _fnColumnOrdering,
+			"_fnLog": _fnLog,
+			"_fnClearTable": _fnClearTable,
+			"_fnSaveState": _fnSaveState,
+			"_fnLoadState": _fnLoadState,
+			"_fnCreateCookie": _fnCreateCookie,
+			"_fnReadCookie": _fnReadCookie,
+			"_fnDetectHeader": _fnDetectHeader,
+			"_fnGetUniqueThs": _fnGetUniqueThs,
+			"_fnScrollBarWidth": _fnScrollBarWidth,
+			"_fnApplyToChildren": _fnApplyToChildren,
+			"_fnMap": _fnMap,
+			"_fnGetRowData": _fnGetRowData,
+			"_fnGetCellData": _fnGetCellData,
+			"_fnSetCellData": _fnSetCellData,
+			"_fnGetObjectDataFn": _fnGetObjectDataFn,
+			"_fnSetObjectDataFn": _fnSetObjectDataFn,
+			"_fnApplyColumnDefs": _fnApplyColumnDefs,
+			"_fnBindAction": _fnBindAction,
+			"_fnExtend": _fnExtend,
+			"_fnCallbackReg": _fnCallbackReg,
+			"_fnCallbackFire": _fnCallbackFire,
+			"_fnJsonString": _fnJsonString
+		};
+		
+		$.extend( DataTable.ext.oApi, this.oApi );
+		
+		for ( var sFunc in DataTable.ext.oApi )
+		{
+			if ( sFunc )
+			{
+				this[sFunc] = _fnExternApiFunc(sFunc);
+			}
+		}
+		
+		
+		var _that = this;
+		return this.each(function() {
+			
+			var i=0, iLen, j, jLen, k, kLen;
+			var sId = this.getAttribute( 'id' );
+			var bInitHandedOff = false;
+			var bUsePassedData = false;
+			
+			
+			/* Sanity check */
+			if ( this.nodeName.toLowerCase() != 'table' )
+			{
+				_fnLog( null, 0, "Attempted to initialise DataTables on a node which is not a "+
+					"table: "+this.nodeName );
+				return;
+			}
+			
+			/* Check to see if we are re-initialising a table */
+			for ( i=0, iLen=DataTable.settings.length ; i<iLen ; i++ )
+			{
+				/* Base check on table node */
+				if ( DataTable.settings[i].nTable == this )
+				{
+					if ( oInit === undefined || oInit.bRetrieve )
+					{
+						return DataTable.settings[i].oInstance;
+					}
+					else if ( oInit.bDestroy )
+					{
+						DataTable.settings[i].oInstance.fnDestroy();
+						break;
+					}
+					else
+					{
+						_fnLog( DataTable.settings[i], 0, "Cannot reinitialise DataTable.\n\n"+
+							"To retrieve the DataTables object for this table, pass no arguments or see "+
+							"the docs for bRetrieve and bDestroy" );
+						return;
+					}
+				}
+				
+				/* If the element we are initialising has the same ID as a table which was previously
+				 * initialised, but the table nodes don't match (from before) then we destroy the old
+				 * instance by simply deleting it. This is under the assumption that the table has been
+				 * destroyed by other methods. Anyone using non-id selectors will need to do this manually
+				 */
+				if ( DataTable.settings[i].sTableId == this.id )
+				{
+					DataTable.settings.splice( i, 1 );
+					break;
+				}
+			}
+			
+			/* Ensure the table has an ID - required for accessibility */
+			if ( sId === null )
+			{
+				sId = "DataTables_Table_"+(DataTable.ext._oExternConfig.iNextUnique++);
+				this.id = sId;
+			}
+			
+			/* Create the settings object for this table and set some of the default parameters */
+			var oSettings = $.extend( true, {}, DataTable.models.oSettings, {
+				"nTable":        this,
+				"oApi":          _that.oApi,
+				"oInit":         oInit,
+				"oInstance":     (_that.length===1) ? _that : $(this).dataTable(),
+				"sDestroyWidth": $(this).width(),
+				"sInstance":     sId,
+				"sTableId":      sId
+			} );
+			DataTable.settings.push( oSettings );
+			
+			/* Setting up the initialisation object */
+			if ( !oInit )
+			{
+				oInit = {};
+			}
+			
+			// Backwards compatibility, before we apply all the defaults
+			if ( oInit.oLanguage )
+			{
+				_fnLanguageCompat( oInit.oLanguage );
+			}
+			
+			oInit = _fnExtend( $.extend(true, {}, DataTable.defaults), oInit );
+			
+			// Map the initialisation options onto the settings object
+			_fnMap( oSettings.oFeatures, oInit, "bPaginate" );
+			_fnMap( oSettings.oFeatures, oInit, "bLengthChange" );
+			_fnMap( oSettings.oFeatures, oInit, "bFilter" );
+			_fnMap( oSettings.oFeatures, oInit, "bSort" );
+			_fnMap( oSettings.oFeatures, oInit, "bInfo" );
+			_fnMap( oSettings.oFeatures, oInit, "bProcessing" );
+			_fnMap( oSettings.oFeatures, oInit, "bAutoWidth" );
+			_fnMap( oSettings.oFeatures, oInit, "bSortClasses" );
+			_fnMap( oSettings.oFeatures, oInit, "bServerSide" );
+			_fnMap( oSettings.oFeatures, oInit, "bDeferRender" );
+			_fnMap( oSettings.oScroll, oInit, "sScrollX", "sX" );
+			_fnMap( oSettings.oScroll, oInit, "sScrollXInner", "sXInner" );
+			_fnMap( oSettings.oScroll, oInit, "sScrollY", "sY" );
+			_fnMap( oSettings.oScroll, oInit, "bScrollCollapse", "bCollapse" );
+			_fnMap( oSettings.oScroll, oInit, "bScrollInfinite", "bInfinite" );
+			_fnMap( oSettings.oScroll, oInit, "iScrollLoadGap", "iLoadGap" );
+			_fnMap( oSettings.oScroll, oInit, "bScrollAutoCss", "bAutoCss" );
+			_fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy
+			_fnMap( oSettings, oInit, "asStripeClasses" );
+			_fnMap( oSettings, oInit, "fnServerData" );
+			_fnMap( oSettings, oInit, "fnFormatNumber" );
+			_fnMap( oSettings, oInit, "sServerMethod" );
+			_fnMap( oSettings, oInit, "aaSorting" );
+			_fnMap( oSettings, oInit, "aaSortingFixed" );
+			_fnMap( oSettings, oInit, "aLengthMenu" );
+			_fnMap( oSettings, oInit, "sPaginationType" );
+			_fnMap( oSettings, oInit, "sAjaxSource" );
+			_fnMap( oSettings, oInit, "sAjaxDataProp" );
+			_fnMap( oSettings, oInit, "iCookieDuration" );
+			_fnMap( oSettings, oInit, "sCookiePrefix" );
+			_fnMap( oSettings, oInit, "sDom" );
+			_fnMap( oSettings, oInit, "bSortCellsTop" );
+			_fnMap( oSettings, oInit, "iTabIndex" );
+			_fnMap( oSettings, oInit, "oSearch", "oPreviousSearch" );
+			_fnMap( oSettings, oInit, "aoSearchCols", "aoPreSearchCols" );
+			_fnMap( oSettings, oInit, "iDisplayLength", "_iDisplayLength" );
+			_fnMap( oSettings, oInit, "bJQueryUI", "bJUI" );
+			_fnMap( oSettings, oInit, "fnCookieCallback" );
+			_fnMap( oSettings, oInit, "fnStateLoad" );
+			_fnMap( oSettings, oInit, "fnStateSave" );
+			_fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
+			
+			/* Callback functions which are array driven */
+			_fnCallbackReg( oSettings, 'aoDrawCallback',       oInit.fnDrawCallback,      'user' );
+			_fnCallbackReg( oSettings, 'aoServerParams',       oInit.fnServerParams,      'user' );
+			_fnCallbackReg( oSettings, 'aoStateSaveParams',    oInit.fnStateSaveParams,   'user' );
+			_fnCallbackReg( oSettings, 'aoStateLoadParams',    oInit.fnStateLoadParams,   'user' );
+			_fnCallbackReg( oSettings, 'aoStateLoaded',        oInit.fnStateLoaded,       'user' );
+			_fnCallbackReg( oSettings, 'aoRowCallback',        oInit.fnRowCallback,       'user' );
+			_fnCallbackReg( oSettings, 'aoRowCreatedCallback', oInit.fnCreatedRow,        'user' );
+			_fnCallbackReg( oSettings, 'aoHeaderCallback',     oInit.fnHeaderCallback,    'user' );
+			_fnCallbackReg( oSettings, 'aoFooterCallback',     oInit.fnFooterCallback,    'user' );
+			_fnCallbackReg( oSettings, 'aoInitComplete',       oInit.fnInitComplete,      'user' );
+			_fnCallbackReg( oSettings, 'aoPreDrawCallback',    oInit.fnPreDrawCallback,   'user' );
+			
+			if ( oSettings.oFeatures.bServerSide && oSettings.oFeatures.bSort &&
+				   oSettings.oFeatures.bSortClasses )
+			{
+				/* Enable sort classes for server-side processing. Safe to do it here, since server-side
+				 * processing must be enabled by the developer
+				 */
+				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSortingClasses, 'server_side_sort_classes' );
+			}
+			else if ( oSettings.oFeatures.bDeferRender )
+			{
+				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSortingClasses, 'defer_sort_classes' );
+			}
+			
+			if ( oInit.bJQueryUI )
+			{
+				/* Use the JUI classes object for display. You could clone the oStdClasses object if 
+				 * you want to have multiple tables with multiple independent classes 
+				 */
+				$.extend( oSettings.oClasses, DataTable.ext.oJUIClasses );
+				
+				if ( oInit.sDom === DataTable.defaults.sDom && DataTable.defaults.sDom === "lfrtip" )
+				{
+					/* Set the DOM to use a layout suitable for jQuery UI's theming */
+					oSettings.sDom = '<"H"lfr>t<"F"ip>';
+				}
+			}
+			else
+			{
+				$.extend( oSettings.oClasses, DataTable.ext.oStdClasses );
+			}
+			$(this).addClass( oSettings.oClasses.sTable );
+			
+			/* Calculate the scroll bar width and cache it for use later on */
+			if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
+			{
+				oSettings.oScroll.iBarWidth = _fnScrollBarWidth();
+			}
+			
+			if ( oSettings.iInitDisplayStart === undefined )
+			{
+				/* Display start point, taking into account the save saving */
+				oSettings.iInitDisplayStart = oInit.iDisplayStart;
+				oSettings._iDisplayStart = oInit.iDisplayStart;
+			}
+			
+			/* Must be done after everything which can be overridden by a cookie! */
+			if ( oInit.bStateSave )
+			{
+				oSettings.oFeatures.bStateSave = true;
+				_fnLoadState( oSettings, oInit );
+				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' );
+			}
+			
+			if ( oInit.iDeferLoading !== null )
+			{
+				oSettings.bDeferLoading = true;
+				oSettings._iRecordsTotal = oInit.iDeferLoading;
+				oSettings._iRecordsDisplay = oInit.iDeferLoading;
+			}
+			
+			if ( oInit.aaData !== null )
+			{
+				bUsePassedData = true;
+			}
+			
+			/* Language definitions */
+			if ( oInit.oLanguage.sUrl !== "" )
+			{
+				/* Get the language definitions from a file - because this Ajax call makes the language
+				 * get async to the remainder of this function we use bInitHandedOff to indicate that 
+				 * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor
+				 */
+				oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
+				$.getJSON( oSettings.oLanguage.sUrl, null, function( json ) {
+					_fnLanguageCompat( json );
+					$.extend( true, oSettings.oLanguage, oInit.oLanguage, json );
+					_fnInitialise( oSettings );
+				} );
+				bInitHandedOff = true;
+			}
+			else
+			{
+				$.extend( true, oSettings.oLanguage, oInit.oLanguage );
+			}
+			
+			
+			/*
+			 * Stripes
+			 */
+			
+			/* Remove row stripe classes if they are already on the table row */
+			var bStripeRemove = false;
+			var anRows = $(this).children('tbody').children('tr');
+			for ( i=0, iLen=oSettings.asStripeClasses.length ; i<iLen ; i++ )
+			{
+				if ( anRows.filter(":lt(2)").hasClass( oSettings.asStripeClasses[i]) )
+				{
+					bStripeRemove = true;
+					break;
+				}
+			}
+					
+			if ( bStripeRemove )
+			{
+				/* Store the classes which we are about to remove so they can be readded on destroy */
+				oSettings.asDestroyStripes = [ '', '' ];
+				if ( $(anRows[0]).hasClass(oSettings.oClasses.sStripeOdd) )
+				{
+					oSettings.asDestroyStripes[0] += oSettings.oClasses.sStripeOdd+" ";
+				}
+				if ( $(anRows[0]).hasClass(oSettings.oClasses.sStripeEven) )
+				{
+					oSettings.asDestroyStripes[0] += oSettings.oClasses.sStripeEven;
+				}
+				if ( $(anRows[1]).hasClass(oSettings.oClasses.sStripeOdd) )
+				{
+					oSettings.asDestroyStripes[1] += oSettings.oClasses.sStripeOdd+" ";
+				}
+				if ( $(anRows[1]).hasClass(oSettings.oClasses.sStripeEven) )
+				{
+					oSettings.asDestroyStripes[1] += oSettings.oClasses.sStripeEven;
+				}
+				
+				anRows.removeClass( oSettings.asStripeClasses.join(' ') );
+			}
+			
+			
+			/*
+			 * Columns
+			 * See if we should load columns automatically or use defined ones
+			 */
+			var anThs = [];
+			var aoColumnsInit;
+			var nThead = this.getElementsByTagName('thead');
+			if ( nThead.length !== 0 )
+			{
+				_fnDetectHeader( oSettings.aoHeader, nThead[0] );
+				anThs = _fnGetUniqueThs( oSettings );
+			}
+			
+			/* If not given a column array, generate one with nulls */
+			if ( oInit.aoColumns === null )
+			{
+				aoColumnsInit = [];
+				for ( i=0, iLen=anThs.length ; i<iLen ; i++ )
+				{
+					aoColumnsInit.push( null );
+				}
+			}
+			else
+			{
+				aoColumnsInit = oInit.aoColumns;
+			}
+			
+			/* Add the columns */
+			for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
+			{
+				/* Short cut - use the loop to check if we have column visibility state to restore */
+				if ( oInit.saved_aoColumns !== undefined && oInit.saved_aoColumns.length == iLen )
+				{
+					if ( aoColumnsInit[i] === null )
+					{
+						aoColumnsInit[i] = {};
+					}
+					aoColumnsInit[i].bVisible = oInit.saved_aoColumns[i].bVisible;
+				}
+				
+				_fnAddColumn( oSettings, anThs ? anThs[i] : null );
+			}
+			
+			/* Apply the column definitions */
+			_fnApplyColumnDefs( oSettings, oInit.aoColumnDefs, aoColumnsInit, function (iCol, oDef) {
+				_fnColumnOptions( oSettings, iCol, oDef );
+			} );
+			
+			
+			/*
+			 * Sorting
+			 * Check the aaSorting array
+			 */
+			for ( i=0, iLen=oSettings.aaSorting.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aaSorting[i][0] >= oSettings.aoColumns.length )
+				{
+					oSettings.aaSorting[i][0] = 0;
+				}
+				var oColumn = oSettings.aoColumns[ oSettings.aaSorting[i][0] ];
+				
+				/* Add a default sorting index */
+				if ( oSettings.aaSorting[i][2] === undefined )
+				{
+					oSettings.aaSorting[i][2] = 0;
+				}
+				
+				/* If aaSorting is not defined, then we use the first indicator in asSorting */
+				if ( oInit.aaSorting === undefined && oSettings.saved_aaSorting === undefined )
+				{
+					oSettings.aaSorting[i][1] = oColumn.asSorting[0];
+				}
+				
+				/* Set the current sorting index based on aoColumns.asSorting */
+				for ( j=0, jLen=oColumn.asSorting.length ; j<jLen ; j++ )
+				{
+					if ( oSettings.aaSorting[i][1] == oColumn.asSorting[j] )
+					{
+						oSettings.aaSorting[i][2] = j;
+						break;
+					}
+				}
+			}
+				
+			/* Do a first pass on the sorting classes (allows any size changes to be taken into
+			 * account, and also will apply sorting disabled classes if disabled
+			 */
+			_fnSortingClasses( oSettings );
+			
+			
+			/*
+			 * Final init
+			 * Cache the header, body and footer as required, creating them if needed
+			 */
+			var thead = $(this).children('thead');
+			if ( thead.length === 0 )
+			{
+				thead = [ document.createElement( 'thead' ) ];
+				this.appendChild( thead[0] );
+			}
+			oSettings.nTHead = thead[0];
+			
+			var tbody = $(this).children('tbody');
+			if ( tbody.length === 0 )
+			{
+				tbody = [ document.createElement( 'tbody' ) ];
+				this.appendChild( tbody[0] );
+			}
+			oSettings.nTBody = tbody[0];
+			oSettings.nTBody.setAttribute( "role", "alert" );
+			oSettings.nTBody.setAttribute( "aria-live", "polite" );
+			oSettings.nTBody.setAttribute( "aria-relevant", "all" );
+			
+			var tfoot = $(this).children('tfoot');
+			if ( tfoot.length > 0 )
+			{
+				oSettings.nTFoot = tfoot[0];
+				_fnDetectHeader( oSettings.aoFooter, oSettings.nTFoot );
+			}
+			
+			/* Check if there is data passing into the constructor */
+			if ( bUsePassedData )
+			{
+				for ( i=0 ; i<oInit.aaData.length ; i++ )
+				{
+					_fnAddData( oSettings, oInit.aaData[ i ] );
+				}
+			}
+			else
+			{
+				/* Grab the data from the page */
+				_fnGatherData( oSettings );
+			}
+			
+			/* Copy the data index array */
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			/* Initialisation complete - table can be drawn */
+			oSettings.bInitialised = true;
+			
+			/* Check if we need to initialise the table (it might not have been handed off to the
+			 * language processor)
+			 */
+			if ( bInitHandedOff === false )
+			{
+				_fnInitialise( oSettings );
+			}
+		} );
+	};
+
+	/**
+	 * Version string for plug-ins to check compatibility. Allowed format is
+	 * a.b.c.d.e where: a:int, b:int, c:int, d:string(dev|beta), e:int. d and
+	 * e are optional
+	 *  @member
+	 *  @type string
+	 *  @default Version number
+	 */
+	DataTable.version = "1.9.0.dev.2";
+
+	/**
+	 * Private data store, containing all of the settings objects that are created for the
+	 * tables on a given page.
+	 * 
+	 * Note that the <i>DataTable.settings</i> object is aliased to <i>jQuery.fn.dataTableExt</i> 
+	 * through which is may be accessed and manipulated, or <i>jQuery.fn.dataTable.settings</i>.
+	 *  @member
+	 *  @type array
+	 *  @default []
+	 *  @private
+	 */
+	DataTable.settings = [];
+
+	/**
+	 * Object models container, for the various models that DataTables has available
+	 * to it. These models define the objects that are used to hold the active state 
+	 * and configuration of the table.
+	 *  @namespace
+	 */
+	DataTable.models = {};
+	
+	
+	/**
+	 * DataTables extension options and plug-ins. This namespace acts as a collection "area"
+	 * for plug-ins that can be used to extend the default DataTables behaviour - indeed many
+	 * of the build in methods use this method to provide their own capabilities (sorting methods
+	 * for example).
+	 * 
+	 * Note that this namespace is aliased to jQuery.fn.dataTableExt so it can be readily accessed
+	 * and modified by plug-ins.
+	 *  @namespace
+	 */
+	DataTable.models.ext = {
+		/**
+		 * Plug-in filtering functions - this method of filtering is complimentary to the default
+		 * type based filtering, and a lot more comprehensive as it allows you complete control
+		 * over the filtering logic. Each element in this array is a function (parameters
+		 * described below) that is called for every row in the table, and your logic decides if
+		 * it should be included in the filtered data set or not.
+		 *   <ul>
+		 *     <li>
+		 *       Function input parameters:
+		 *       <ul>
+		 *         <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
+		 *         <li>{array|object} Data for the row to be processed (same as the original format
+		 *           that was passed in as the data source, or an array from a DOM data source</li>
+		 *         <li>{int} Row index in aoData ({@link DataTable.models.oSettings.aoData}), which can
+		 *           be useful to retrieve the TR element if you need DOM interaction.</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>
+		 *       Function return:
+		 *       <ul>
+		 *         <li>{boolean} Include the row in the filtered result set (true) or not (false)</li>
+		 *       </ul>
+		 *     </il>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 *
+		 *  @example
+		 *    // The following example shows custom filtering being applied to the fourth column (i.e.
+		 *    // the aData[3] index) based on two input values from the end-user, matching the data in 
+		 *    // a certain range.
+		 *    $.fn.dataTableExt.afnFiltering.push(
+		 *      function( oSettings, aData, iDataIndex ) {
+		 *        var iMin = document.getElementById('min').value * 1;
+		 *        var iMax = document.getElementById('max').value * 1;
+		 *        var iVersion = aData[3] == "-" ? 0 : aData[3]*1;
+		 *        if ( iMin == "" && iMax == "" ) {
+		 *          return true;
+		 *        }
+		 *        else if ( iMin == "" && iVersion < iMax ) {
+		 *          return true;
+		 *        }
+		 *        else if ( iMin < iVersion && "" == iMax ) {
+		 *          return true;
+		 *        }
+		 *        else if ( iMin < iVersion && iVersion < iMax ) {
+		 *          return true;
+		 *        }
+		 *        return false;
+		 *      }
+		 *    );
+		 */
+		"afnFiltering": [],
+	
+	
+		/**
+		 * Plug-in sorting functions - this method of sorting is complimentary to the default type
+		 * based sorting that DataTables does automatically, allowing much greater control over the
+		 * the data that is being used to sort a column. This is useful if you want to do sorting
+		 * based on live data (for example the contents of an 'input' element) rather than just the
+		 * static string that DataTables knows of. The way these plug-ins work is that you create
+		 * an array of the values you wish to be sorted for the column in question and then return
+		 * that array. Which pre-sorting function is run here depends on the sSortDataType parameter
+		 * that is used for the column (if any). This is the corollary of <i>ofnSearch</i> for sort 
+		 * data.
+		 *   <ul>
+	     *     <li>
+	     *       Function input parameters:
+	     *       <ul>
+		 *         <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
+	     *         <li>{int} Target column index</li>
+	     *       </ul>
+	     *     </li>
+		 *     <li>
+		 *       Function return:
+		 *       <ul>
+		 *         <li>{array} Data for the column to be sorted upon</li>
+		 *       </ul>
+		 *     </il>
+		 *   </ul>
+		 *  
+		 * Note that as of v1.9, it is typically preferable to use <i>mDataProp</i> to prepare data for
+		 * the different uses that DataTables can put the data to. Specifically <i>mDataProp</i> when
+		 * used as a function will give you a 'type' (sorting, filtering etc) that you can use to 
+		 * prepare the data as required for the different types. As such, this method is deprecated.
+		 *  @type array
+		 *  @default []
+		 *  @deprecated
+		 *
+		 *  @example
+		 *    // Updating the cached sorting information with user entered values in HTML input elements
+		 *    jQuery.fn.dataTableExt.afnSortData['dom-text'] = function  ( oSettings, iColumn )
+		 *    {
+		 *      var aData = [];
+		 *      $( 'td:eq('+iColumn+') input', oSettings.oApi._fnGetTrNodes(oSettings) ).each( function () {
+		 *        aData.push( this.value );
+		 *      } );
+		 *      return aData;
+		 *    }
+		 */
+		"afnSortData": [],
+	
+	
+		/**
+		 * Feature plug-ins - This is an array of objects which describe the feature plug-ins that are
+		 * available to DataTables. These feature plug-ins are accessible through the sDom initialisation
+		 * option. As such, each feature plug-in must describe a function that is used to initialise
+		 * itself (fnInit), a character so the feature can be enabled by sDom (cFeature) and the name
+		 * of the feature (sFeature). Thus the objects attached to this method must provide:
+		 *   <ul>
+		 *     <li>{function} fnInit Initialisation of the plug-in
+		 *       <ul>
+	     *         <li>
+	     *           Function input parameters:
+	     *           <ul>
+		 *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
+	     *           </ul>
+	     *         </li>
+		 *         <li>
+		 *           Function return:
+		 *           <ul>
+		 *             <li>{node|null} The element which contains your feature. Note that the return
+		 *                may also be void if your plug-in does not require to inject any DOM elements 
+		 *                into DataTables control (sDom) - for example this might be useful when 
+		 *                developing a plug-in which allows table control via keyboard entry.</li>
+		 *           </ul>
+		 *         </il>
+		 *       </ul>
+		 *     </li>
+		 *     <li>{character} cFeature Character that will be matched in sDom - case sensitive</li>
+		 *     <li>{string} sFeature Feature name</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 * 
+		 *  @example
+		 *    // How TableTools initialises itself.
+		 *    $.fn.dataTableExt.aoFeatures.push( {
+		 *      "fnInit": function( oSettings ) {
+		 *        return new TableTools( { "oDTSettings": oSettings } );
+		 *      },
+		 *      "cFeature": "T",
+		 *      "sFeature": "TableTools"
+		 *    } );
+		 */
+		"aoFeatures": [],
+	
+	
+		/**
+		 * Type detection plug-in functions - DataTables utilises types to define how sorting and
+		 * filtering behave, and types can be either  be defined by the developer (sType for the
+		 * column) or they can be automatically detected by the methods in this array. The functions
+		 * defined in the array are quite simple, taking a single parameter (the data to analyse) 
+		 * and returning the type if it is a known type, or null otherwise.
+		 *   <ul>
+	     *     <li>
+	     *       Function input parameters:
+	     *       <ul>
+		 *         <li>{*} Data from the column cell to be analysed</li>
+	     *       </ul>
+	     *     </li>
+		 *     <li>
+		 *       Function return:
+		 *       <ul>
+		 *         <li>{string|null} Data type detected, or null if unknown (and thus pass it
+		 *           on to the other type detection functions.</li>
+		 *       </ul>
+		 *     </il>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 *  
+		 *  @example
+		 *    // Currency type detection plug-in:
+		 *    jQuery.fn.dataTableExt.aTypes.push(
+		 *      function ( sData ) {
+		 *        var sValidChars = "0123456789.-";
+		 *        var Char;
+		 *        
+		 *        // Check the numeric part
+		 *        for ( i=1 ; i<sData.length ; i++ ) {
+		 *          Char = sData.charAt(i); 
+		 *          if (sValidChars.indexOf(Char) == -1) {
+		 *            return null;
+		 *          }
+		 *        }
+		 *        
+		 *        // Check prefixed by currency
+		 *        if ( sData.charAt(0) == '$' || sData.charAt(0) == '£' ) {
+		 *          return 'currency';
+		 *        }
+		 *        return null;
+		 *      }
+		 *    );
+		 */
+		"aTypes": [],
+	
+	
+		/**
+		 * Provide a common method for plug-ins to check the version of DataTables being used, 
+		 * in order to ensure compatibility.
+		 *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note 
+		 *    that the formats "X" and "X.Y" are also acceptable.
+		 *  @returns {boolean} true if this version of DataTables is greater or equal to the 
+		 *    required version, or false if this version of DataTales is not suitable
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      alert( oTable.fnVersionCheck( '1.9.0' ) );
+		 *    } );
+		 */
+		"fnVersionCheck": function( sVersion )
+		{
+			/* This is cheap, but very effective */
+			var fnZPad = function (Zpad, count)
+			{
+				while(Zpad.length < count) {
+					Zpad += '0';
+				}
+				return Zpad;
+			};
+			var aThis = DataTable.ext.sVersion.split('.');
+			var aThat = sVersion.split('.');
+			var sThis = '', sThat = '';
+			
+			for ( var i=0, iLen=aThat.length ; i<iLen ; i++ )
+			{
+				sThis += fnZPad( aThis[i], 3 );
+				sThat += fnZPad( aThat[i], 3 );
+			}
+			
+			return parseInt(sThis, 10) >= parseInt(sThat, 10);
+		},
+	
+	
+		/**
+		 * Index for what 'this' index API functions should use
+		 *  @type int
+		 *  @default 0
+		 */
+		"iApiIndex": 0,
+	
+	
+		/**
+		 * Pre-processing of filtering data plug-ins - When you assign the sType for a column
+		 * (or have it automatically detected for you by DataTables or a type detection plug-in), 
+		 * you will typically be using this for custom sorting, but it can also be used to provide 
+		 * custom filtering by allowing you to pre-processing the data and returning the data in
+		 * the format that should be filtered upon. This is done by adding functions this object 
+		 * with a parameter name which matches the sType for that target column. This is the
+		 * corollary of <i>afnSortData</i> for filtering data.
+		 *   <ul>
+	     *     <li>
+	     *       Function input parameters:
+	     *       <ul>
+		 *         <li>{*} Data from the column cell to be prepared for filtering</li>
+	     *       </ul>
+	     *     </li>
+		 *     <li>
+		 *       Function return:
+		 *       <ul>
+		 *         <li>{string|null} Formatted string that will be used for the filtering.</li>
+		 *       </ul>
+		 *     </il>
+		 *   </ul>
+		 * 
+		 * Note that as of v1.9, it is typically preferable to use <i>mDataProp</i> to prepare data for
+		 * the different uses that DataTables can put the data to. Specifically <i>mDataProp</i> when
+		 * used as a function will give you a 'type' (sorting, filtering etc) that you can use to 
+		 * prepare the data as required for the different types. As such, this method is deprecated.
+		 *  @type object
+		 *  @default {}
+		 *  @deprecated
+		 *
+		 *  @example
+		 *    $.fn.dataTableExt.ofnSearch['title-numeric'] = function ( sData ) {
+		 *      return sData.replace(/\n/g," ").replace( /<.*?>/g, "" );
+		 *    }
+		 */
+		"ofnSearch": {},
+	
+	
+		/**
+		 * Container for all private functions in DataTables so they can be exposed externally
+		 *  @type object
+		 *  @default {}
+		 */
+		"oApi": {},
+	
+	
+		/**
+		 * Storage for the various classes that DataTables uses
+		 *  @type object
+		 *  @default {}
+		 */
+		"oStdClasses": {},
+		
+	
+		/**
+		 * Storage for the various classes that DataTables uses - jQuery UI suitable
+		 *  @type object
+		 *  @default {}
+		 */
+		"oJUIClasses": {},
+	
+	
+		/**
+		 * Pagination plug-in methods - The style and controls of the pagination can significantly 
+		 * impact on how the end user interacts with the data in your table, and DataTables allows 
+		 * the addition of pagination controls by extending this object, which can then be enabled
+		 * through the <i>sPaginationType</i> initialisation parameter. Each pagination type that
+		 * is added is an object (the property name of which is what <i>sPaginationType</i> refers
+		 * to) that has two properties, both methods that are used by DataTables to update the
+		 * control's state.
+		 *   <ul>
+		 *     <li>
+		 *       fnInit -  Initialisation of the paging controls. Called only during initialisation 
+		 *         of the table. It is expected that this function will add the required DOM elements 
+		 *         to the page for the paging controls to work. The element pointer 
+		 *         'oSettings.aanFeatures.p' array is provided by DataTables to contain the paging 
+		 *         controls (note that this is a 2D array to allow for multiple instances of each 
+		 *         DataTables DOM element). It is suggested that you add the controls to this element 
+		 *         as children
+		 *       <ul>
+	     *         <li>
+	     *           Function input parameters:
+	     *           <ul>
+		 *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
+		 *             <li>{node} Container into which the pagination controls must be inserted</li>
+		 *             <li>{function} Draw callback function - whenever the controls cause a page
+		 *               change, this method must be called to redraw the table.</li>
+	     *           </ul>
+	     *         </li>
+		 *         <li>
+		 *           Function return:
+		 *           <ul>
+		 *             <li>No return required</li>
+		 *           </ul>
+		 *         </il>
+		 *       </ul>
+		 *     </il>
+		 *     <li>
+		 *       fnInit -  This function is called whenever the paging status of the table changes and is
+		 *         typically used to update classes and/or text of the paging controls to reflex the new 
+		 *         status.
+		 *       <ul>
+	     *         <li>
+	     *           Function input parameters:
+	     *           <ul>
+		 *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
+		 *             <li>{function} Draw callback function - in case you need to redraw the table again
+		 *               or attach new event listeners</li>
+	     *           </ul>
+	     *         </li>
+		 *         <li>
+		 *           Function return:
+		 *           <ul>
+		 *             <li>No return required</li>
+		 *           </ul>
+		 *         </il>
+		 *       </ul>
+		 *     </il>
+		 *   </ul>
+		 *  @type object
+		 *  @default {}
+		 *
+		 *  @example
+		 *    $.fn.dataTableExt.oPagination.four_button = {
+		 *      "fnInit": function ( oSettings, nPaging, fnCallbackDraw ) {
+		 *        nFirst = document.createElement( 'span' );
+		 *        nPrevious = document.createElement( 'span' );
+		 *        nNext = document.createElement( 'span' );
+		 *        nLast = document.createElement( 'span' );
+		 *        
+		 *        nFirst.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sFirst ) );
+		 *        nPrevious.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sPrevious ) );
+		 *        nNext.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sNext ) );
+		 *        nLast.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sLast ) );
+		 *        
+		 *        nFirst.className = "paginate_button first";
+		 *        nPrevious.className = "paginate_button previous";
+		 *        nNext.className="paginate_button next";
+		 *        nLast.className = "paginate_button last";
+		 *        
+		 *        nPaging.appendChild( nFirst );
+		 *        nPaging.appendChild( nPrevious );
+		 *        nPaging.appendChild( nNext );
+		 *        nPaging.appendChild( nLast );
+		 *        
+		 *        $(nFirst).click( function () {
+		 *          oSettings.oApi._fnPageChange( oSettings, "first" );
+		 *          fnCallbackDraw( oSettings );
+		 *        } );
+		 *        
+		 *        $(nPrevious).click( function() {
+		 *          oSettings.oApi._fnPageChange( oSettings, "previous" );
+		 *          fnCallbackDraw( oSettings );
+		 *        } );
+		 *        
+		 *        $(nNext).click( function() {
+		 *          oSettings.oApi._fnPageChange( oSettings, "next" );
+		 *          fnCallbackDraw( oSettings );
+		 *        } );
+		 *        
+		 *        $(nLast).click( function() {
+		 *          oSettings.oApi._fnPageChange( oSettings, "last" );
+		 *          fnCallbackDraw( oSettings );
+		 *        } );
+		 *        
+		 *        $(nFirst).bind( 'selectstart', function () { return false; } );
+		 *        $(nPrevious).bind( 'selectstart', function () { return false; } );
+		 *        $(nNext).bind( 'selectstart', function () { return false; } );
+		 *        $(nLast).bind( 'selectstart', function () { return false; } );
+		 *      },
+		 *      
+		 *      "fnUpdate": function ( oSettings, fnCallbackDraw ) {
+		 *        if ( !oSettings.aanFeatures.p ) {
+		 *          return;
+		 *        }
+		 *        
+		 *        // Loop over each instance of the pager
+		 *        var an = oSettings.aanFeatures.p;
+		 *        for ( var i=0, iLen=an.length ; i<iLen ; i++ ) {
+		 *          var buttons = an[i].getElementsByTagName('span');
+		 *          if ( oSettings._iDisplayStart === 0 ) {
+		 *            buttons[0].className = "paginate_disabled_previous";
+		 *            buttons[1].className = "paginate_disabled_previous";
+		 *          }
+		 *          else {
+		 *            buttons[0].className = "paginate_enabled_previous";
+		 *            buttons[1].className = "paginate_enabled_previous";
+		 *          }
+		 *          
+		 *          if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) {
+		 *            buttons[2].className = "paginate_disabled_next";
+		 *            buttons[3].className = "paginate_disabled_next";
+		 *          }
+		 *          else {
+		 *            buttons[2].className = "paginate_enabled_next";
+		 *            buttons[3].className = "paginate_enabled_next";
+		 *          }
+		 *        }
+		 *      }
+		 *    };
+		 */
+		"oPagination": {},
+	
+	
+		/**
+		 * Sorting plug-in methods - Sorting in DataTables is based on the detected type of the
+		 * data column (you can add your own type detection functions, or override automatic 
+		 * detection using sType). With this specific type given to the column, DataTables will 
+		 * apply the required sort from the functions in the object. Each sort type must provide
+		 * two mandatory methods, one each for ascending and descending sorting, and can optionally
+		 * provide a pre-formatting method that will help speed up sorting by allowing DataTables
+		 * to pre-format the sort data only once (rather than every time the actual sort functions
+		 * are run). The two sorting functions are typical Javascript sort methods:
+		 *   <ul>
+	     *     <li>
+	     *       Function input parameters:
+	     *       <ul>
+		 *         <li>{*} Data to compare to the second parameter</li>
+		 *         <li>{*} Data to compare to the first parameter</li>
+	     *       </ul>
+	     *     </li>
+		 *     <li>
+		 *       Function return:
+		 *       <ul>
+		 *         <li>{int} Sorting match: <0 if first parameter should be sorted lower than
+		 *           the second parameter, ===0 if the two parameters are equal and >0 if
+		 *           the first parameter should be sorted height than the second parameter.</li>
+		 *       </ul>
+		 *     </il>
+		 *   </ul>
+		 *  @type object
+		 *  @default {}
+		 *
+		 *  @example
+		 *    // Case-sensitive string sorting, with no pre-formatting method
+		 *    $.extend( $.fn.dataTableExt.oSort, {
+		 *      "string-case-asc": function(x,y) {
+		 *        return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+		 *      },
+		 *      "string-case-desc": function(x,y) {
+		 *        return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+		 *      }
+		 *    } );
+		 *
+		 *  @example
+		 *    // Case-insensitive string sorting, with pre-formatting
+		 *    $.extend( $.fn.dataTableExt.oSort, {
+		 *      "string-pre": function(x) {
+		 *        return x.toLowerCase();
+		 *      },
+		 *      "string-asc": function(x,y) {
+		 *        return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+		 *      },
+		 *      "string-desc": function(x,y) {
+		 *        return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+		 *      }
+		 *    } );
+		 */
+		"oSort": {},
+	
+	
+		/**
+		 * Version string for plug-ins to check compatibility. Allowed format is
+		 * a.b.c.d.e where: a:int, b:int, c:int, d:string(dev|beta), e:int. d and
+		 * e are optional
+		 *  @type string
+		 *  @default Version number
+		 */
+		"sVersion": DataTable.version,
+	
+	
+		/**
+		 * How should DataTables report an error. Can take the value 'alert' or 'throw'
+		 *  @type string
+		 *  @default alert
+		 */
+		"sErrMode": "alert",
+	
+	
+		/**
+		 * Store information for DataTables to access globally about other instances
+		 *  @namespace
+		 *  @private
+		 */
+		"_oExternConfig": {
+			/* int:iNextUnique - next unique number for an instance */
+			"iNextUnique": 0
+		}
+	};
+	
+	
+	
+	
+	/**
+	 * Template object for the way in which DataTables holds information about
+	 * search information for the global filter and individual column filters.
+	 *  @namespace
+	 */
+	DataTable.models.oSearch = {
+		/**
+		 * Flag to indicate if the filtering should be case insensitive or not
+		 *  @type boolean
+		 *  @default true
+		 */
+		"bCaseInsensitive": true,
+	
+		/**
+		 * Applied search term
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 */
+		"sSearch": "",
+	
+		/**
+		 * Flag to indicate if the search term should be interpreted as a
+		 * regular expression (true) or not (false) and therefore and special
+		 * regex characters escaped.
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bRegex": false,
+	
+		/**
+		 * Flag to indicate if DataTables is to use its smart filtering or not.
+		 *  @type boolean
+		 *  @default true
+		 */
+		"bSmart": true
+	};
+	
+	
+	
+	
+	/**
+	 * Template object for the way in which DataTables holds information about
+	 * each individual row. This is the object format used for the settings 
+	 * aoData array.
+	 *  @namespace
+	 */
+	DataTable.models.oRow = {
+		/**
+		 * TR element for the row
+		 *  @type node
+		 *  @default null
+		 */
+		"nTr": null,
+	
+		/**
+		 * Data object from the original data source for the row. This is either
+		 * an array if using the traditional form of DataTables, or an object if
+		 * using mDataProp options. The exact type will depend on the passed in
+		 * data from the data source, or will be an array if using DOM a data 
+		 * source.
+		 *  @type array|object
+		 *  @default []
+		 */
+		"_aData": [],
+	
+		/**
+		 * Sorting data cache - this array is ostensibly the same length as the
+		 * number of columns (although each index is generated only as it is 
+		 * needed), and holds the data that is used for sorting each column in the
+		 * row. We do this cache generation at the start of the sort in order that
+		 * the formatting of the sort data need be done only once for each cell
+		 * per sort. This array should not be read from or written to by anything
+		 * other than the master sorting methods.
+		 *  @type array
+		 *  @default []
+		 *  @private
+		 */
+		"_aSortData": [],
+	
+		/**
+		 * Array of TD elements that are cached for hidden rows, so they can be
+		 * reinserted into the table if a column is made visible again (or to act
+		 * as a store if a column is made hidden). Only hidden columns have a 
+		 * reference in the array. For non-hidden columns the value is either
+		 * undefined or null.
+		 *  @type array nodes
+		 *  @default []
+		 *  @private
+		 */
+		"_anHidden": [],
+	
+		/**
+		 * Cache of the class name that DataTables has applied to the row, so we
+		 * can quickly look at this variable rather than needing to do a DOM check
+		 * on className for the nTr property.
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 *  @private
+		 */
+		"_sRowStripe": ""
+	};
+	
+	
+	
+	/**
+	 * Template object for the column information object in DataTables. This object
+	 * is held in the settings aoColumns array and contains all the information that
+	 * DataTables needs about each individual column.
+	 * 
+	 * Note that this object is related to {@link DataTable.defaults.columns} 
+	 * but this one is the internal data store for DataTables's cache of columns.
+	 * It should NOT be manipulated outside of DataTables. Any configuration should
+	 * be done through the initialisation options.
+	 *  @namespace
+	 */
+	DataTable.models.oColumn = {
+		/**
+		 * A list of the columns that sorting should occur on when this column
+		 * is sorted. That this property is an array allows multi-column sorting
+		 * to be defined for a column (for example first name / last name columns
+		 * would benefit from this). The values are integers pointing to the
+		 * columns to be sorted on (typically it will be a single integer pointing
+		 * at itself, but that doesn't need to be the case).
+		 *  @type array
+		 */
+		"aDataSort": null,
+	
+		/**
+		 * Define the sorting directions that are applied to the column, in sequence
+		 * as the column is repeatedly sorted upon - i.e. the first value is used
+		 * as the sorting direction when the column if first sorted (clicked on).
+		 * Sort it again (click again) and it will move on to the next index.
+		 * Repeat until loop.
+		 *  @type array
+		 */
+		"asSorting": null,
+		
+		/**
+		 * Flag to indicate if the column is searchable, and thus should be included
+		 * in the filtering or not.
+		 *  @type boolean
+		 */
+		"bSearchable": null,
+		
+		/**
+		 * Flag to indicate if the column is sortable or not.
+		 *  @type boolean
+		 */
+		"bSortable": null,
+		
+		/**
+		 * When using fnRender, you have two options for what to do with the data,
+		 * and this property serves as the switch. Firstly, you can have the sorting
+		 * and filtering use the rendered value (true - default), or you can have
+		 * the sorting and filtering us the original value (false).
+		 * 
+		 * *NOTE* It is it is advisable now to use mDataProp as a function and make 
+		 * use of the 'type' that it gives, allowing (potentially) different data to
+		 * be used for sorting, filtering, display and type detection.
+		 *  @type boolean
+		 *  @deprecated
+		 */
+		"bUseRendered": null,
+		
+		/**
+		 * Flag to indicate if the column is currently visible in the table or not
+		 *  @type boolean
+		 */
+		"bVisible": null,
+		
+		/**
+		 * Flag to indicate to the type detection method if the automatic type
+		 * detection should be used, or if a column type (sType) has been specified
+		 *  @type boolean
+		 *  @default true
+		 *  @private
+		 */
+		"_bAutoType": true,
+		
+		/**
+		 * Developer definable function that is called whenever a cell is created (Ajax source,
+		 * etc) or processed for input (DOM source). This can be used as a compliment to fnRender
+		 * allowing you to modify the DOM element (add background colour for example) when the
+		 * element is available (since it is not when fnRender is called).
+		 *  @type function
+		 *  @param {element} nTd The TD node that has been created
+		 *  @param {*} sData The Data for the cell
+		 *  @param {array|object} oData The data for the whole row
+		 *  @param {int} iRow The row index for the aoData data store
+		 *  @default null
+		 */
+		"fnCreatedCell": null,
+		
+		/**
+		 * Function to get data from a cell in a column. You should <b>never</b>
+		 * access data directly through _aData internally in DataTables - always use
+		 * the method attached to this property. It allows mDataProp to function as
+		 * required. This function is automatically assigned by the column 
+		 * initialisation method
+		 *  @type function
+		 *  @param {array|object} oData The data array/object for the array 
+		 *    (i.e. aoData[]._aData)
+		 *  @param {string} sSpecific The specific data type you want to get - 
+		 *    'display', 'type' 'filter' 'sort'
+		 *  @returns {*} The data for the cell from the given row's data
+		 *  @default null
+		 */
+		"fnGetData": null,
+		
+		/**
+		 * Custom display function that will be called for the display of each cell 
+		 * in this column.
+		 *  @type function
+		 *  @param {object} o Object with the following parameters:
+		 *  @param {int}    o.iDataRow The row in aoData
+		 *  @param {int}    o.iDataColumn The column in question
+		 *  @param {array   o.aData The data for the row in question
+		 *  @param {object} o.oSettings The settings object for this DataTables instance
+		 *  @returns {string} The string you which to use in the display
+		 *  @default null
+		 */
+		"fnRender": null,
+		
+		/**
+		 * Function to set data for a cell in the column. You should <b>never</b> 
+		 * set the data directly to _aData internally in DataTables - always use
+		 * this method. It allows mDataProp to function as required. This function
+		 * is automatically assigned by the column initialisation method
+		 *  @type function
+		 *  @param {array|object} oData The data array/object for the array 
+		 *    (i.e. aoData[]._aData)
+		 *  @param {*} sValue Value to set
+		 *  @default null
+		 */
+		"fnSetData": null,
+		
+		/**
+		 * Property to read the value for the cells in the column from the data 
+		 * source array / object. If null, then the default content is used, if a
+		 * function is given then the return from the function is used.
+		 *  @type function|int|string|null
+		 *  @default null
+		 */
+		"mDataProp": null,
+		
+		/**
+		 * Unique header TH/TD element for this column - this is what the sorting
+		 * listener is attached to (if sorting is enabled.)
+		 *  @type node
+		 *  @default null
+		 */
+		"nTh": null,
+		
+		/**
+		 * Unique footer TH/TD element for this column (if there is one). Not used 
+		 * in DataTables as such, but can be used for plug-ins to reference the 
+		 * footer for each column.
+		 *  @type node
+		 *  @default null
+		 */
+		"nTf": null,
+		
+		/**
+		 * The class to apply to all TD elements in the table's TBODY for the column
+		 *  @type string
+		 *  @default null
+		 */
+		"sClass": null,
+		
+		/**
+		 * When DataTables calculates the column widths to assign to each column,
+		 * it finds the longest string in each column and then constructs a
+		 * temporary table and reads the widths from that. The problem with this
+		 * is that "mmm" is much wider then "iiii", but the latter is a longer 
+		 * string - thus the calculation can go wrong (doing it properly and putting
+		 * it into an DOM object and measuring that is horribly(!) slow). Thus as
+		 * a "work around" we provide this option. It will append its value to the
+		 * text that is found to be the longest string for the column - i.e. padding.
+		 *  @type string
+		 */
+		"sContentPadding": null,
+		
+		/**
+		 * Allows a default value to be given for a column's data, and will be used
+		 * whenever a null data source is encountered (this can be because mDataProp
+		 * is set to null, or because the data source itself is null).
+		 *  @type string
+		 *  @default null
+		 */
+		"sDefaultContent": null,
+		
+		/**
+		 * Name for the column, allowing reference to the column by name as well as
+		 * by index (needs a lookup to work by name).
+		 *  @type string
+		 */
+		"sName": null,
+		
+		/**
+		 * Custom sorting data type - defines which of the available plug-ins in
+		 * afnSortData the custom sorting will use - if any is defined.
+		 *  @type string
+		 *  @default std
+		 */
+		"sSortDataType": 'std',
+		
+		/**
+		 * Class to be applied to the header element when sorting on this column
+		 *  @type string
+		 *  @default null
+		 */
+		"sSortingClass": null,
+		
+		/**
+		 * Class to be applied to the header element when sorting on this column -
+		 * when jQuery UI theming is used.
+		 *  @type string
+		 *  @default null
+		 */
+		"sSortingClassJUI": null,
+		
+		/**
+		 * Title of the column - what is seen in the TH element (nTh).
+		 *  @type string
+		 */
+		"sTitle": null,
+		
+		/**
+		 * Column sorting and filtering type
+		 *  @type string
+		 *  @default null
+		 */
+		"sType": null,
+		
+		/**
+		 * Width of the column
+		 *  @type string
+		 *  @default null
+		 */
+		"sWidth": null,
+		
+		/**
+		 * Width of the column when it was first "encountered"
+		 *  @type string
+		 *  @default null
+		 */
+		"sWidthOrig": null
+	};
+	
+	
+	
+	/**
+	 * Initialisation options that can be given to DataTables at initialisation 
+	 * time.
+	 *  @namespace
+	 */
+	DataTable.defaults = {
+		/**
+		 * An array of data to use for the table, passed in at initialisation which 
+		 * will be used in preference to any data which is already in the DOM. This is
+		 * particularly useful for constructing tables purely in Javascript, for
+		 * example with a custom Ajax call.
+		 *  @type array
+		 *  @default null
+		 * 
+		 *  @example
+		 *    // Using a 2D array data source
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "aaData": [
+		 *          ['Trident', 'Internet Explorer 4.0', 'Win 95+', 4, 'X'],
+		 *          ['Trident', 'Internet Explorer 5.0', 'Win 95+', 5, 'C'],
+		 *        ],
+		 *        "aoColumns": [
+		 *          { "sTitle": "Engine" },
+		 *          { "sTitle": "Browser" },
+		 *          { "sTitle": "Platform" },
+		 *          { "sTitle": "Version" },
+		 *          { "sTitle": "Grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using an array of objects as a data source (mDataProp)
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "aaData": [
+		 *          {
+		 *            "engine":   "Trident",
+		 *            "browser":  "Internet Explorer 4.0",
+		 *            "platform": "Win 95+",
+		 *            "version":  4,
+		 *            "grade":    "X"
+		 *          },
+		 *          {
+		 *            "engine":   "Trident",
+		 *            "browser":  "Internet Explorer 5.0",
+		 *            "platform": "Win 95+",
+		 *            "version":  5,
+		 *            "grade":    "C"
+		 *          }
+		 *        ],
+		 *        "aoColumns": [
+		 *          { "sTitle": "Engine",   "mDataProp": "engine" },
+		 *          { "sTitle": "Browser",  "mDataProp": "browser" },
+		 *          { "sTitle": "Platform", "mDataProp": "platform" },
+		 *          { "sTitle": "Version",  "mDataProp": "version" },
+		 *          { "sTitle": "Grade",    "mDataProp": "grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"aaData": null,
+	
+	
+		/**
+		 * If sorting is enabled, then DataTables will perform a first pass sort on 
+		 * initialisation. You can define which column(s) the sort is performed upon, 
+		 * and the sorting direction, with this variable. The aaSorting array should 
+		 * contain an array for each column to be sorted initially containing the 
+		 * column's index and a direction string ('asc' or 'desc').
+		 *  @type array
+		 *  @default [[0,'asc']]
+		 * 
+		 *  @example
+		 *    // Sort by 3rd column first, and then 4th column
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "aaSorting": [[2,'asc'], [3,'desc']]
+		 *      } );
+		 *    } );
+		 *    
+		 *    // No initial sorting
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "aaSorting": []
+		 *      } );
+		 *    } );
+		 */
+		"aaSorting": [[0,'asc']],
+	
+	
+		/**
+		 * This parameter is basically identical to the aaSorting parameter, but 
+		 * cannot be overridden by user interaction with the table. What this means 
+		 * is that you could have a column (visible or hidden) which the sorting will 
+		 * always be forced on first - any sorting after that (from the user) will 
+		 * then be performed as required. This can be useful for grouping rows 
+		 * together.
+		 *  @type array
+		 *  @default null
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "aaSortingFixed": [[0,'asc']]
+		 *      } );
+		 *    } )
+		 */
+		"aaSortingFixed": null,
+	
+	
+		/**
+		 * This parameter allows you to readily specify the entries in the length drop
+		 * down menu that DataTables shows when pagination is enabled. It can be 
+		 * either a 1D array of options which will be used for both the displayed 
+		 * option and the value, or a 2D array which will use the array in the first 
+		 * position as the value, and the array in the second position as the 
+		 * displayed options (useful for language strings such as 'All').
+		 *  @type array
+		 *  @default [ 10, 25, 50, 100 ]
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]]
+		 *      } );
+		 *    } );
+		 *  
+		 *  @example
+		 *    // Setting the default display length as well as length menu
+		 *    // This is likely to be wanted if you remove the '10' option which
+		 *    // is the iDisplayLength default.
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "iDisplayLength": 25,
+		 *        "aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]]
+		 *      } );
+		 *    } );
+		 */
+		"aLengthMenu": [ 10, 25, 50, 100 ],
+	
+	
+		/**
+		 * The aoColumns option in the initialisation parameter allows you to define
+		 * details about the way individual columns behave. For a full list of
+		 * column options that can be set, please see 
+		 * {@link DataTable.defaults.columns}. Note that if you use aoColumns to
+		 * define your columns, you must have an entry in the array for every single
+		 * column that you have in your table (these can be null if you don't which
+		 * to specify any options).
+		 *  @member
+		 */
+		"aoColumns": null,
+	
+		/**
+		 * Very similar to aoColumns, aoColumnDefs allows you to target a specific 
+		 * column, multiple columns, or all columns, using the aTargets property of 
+		 * each object in the array. This allows great flexibility when creating 
+		 * tables, as the aoColumnDefs arrays can be of any length, targeting the 
+		 * columns you specifically want. aoColumnDefs may use any of the column 
+		 * options available: {@link DataTable.defaults.columns}, but it _must_
+		 * have aTargets defined in each object in the array. Values in the aTargets
+		 * array may be:
+		 *   <ul>
+		 *     <li>a string - class name will be matched on the TH for the column</li>
+		 *     <li>0 or a positive integer - column index counting from the left</li>
+		 *     <li>a negative integer - column index counting from the right</li>
+		 *     <li>the string "_all" - all columns (i.e. assign a default)</li>
+		 *   </ul>
+		 *  @member
+		 */
+		"aoColumnDefs": null,
+	
+	
+		/**
+		 * Basically the same as oSearch, this parameter defines the individual column
+		 * filtering state at initialisation time. The array must be of the same size 
+		 * as the number of columns, and each element be an object with the parameters
+		 * "sSearch" and "bEscapeRegex" (the latter is optional). 'null' is also
+		 * accepted and the default will be used.
+		 *  @type array
+		 *  @default []
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "aoSearchCols": [
+		 *          null,
+		 *          { "sSearch": "My filter" },
+		 *          null,
+		 *          { "sSearch": "^[0-9]", "bEscapeRegex": false }
+		 *        ]
+		 *      } );
+		 *    } )
+		 */
+		"aoSearchCols": [],
+	
+	
+		/**
+		 * An array of CSS classes that should be applied to displayed rows. This 
+		 * array may be of any length, and DataTables will apply each class 
+		 * sequentially, looping when required.
+		 *  @type array
+		 *  @default [ 'odd', 'even' ]
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "asStripeClasses": [ 'strip1', 'strip2', 'strip3' ]
+		 *      } );
+		 *    } )
+		 */
+		"asStripeClasses": [ 'odd', 'even' ],
+	
+	
+		/**
+		 * Enable or disable automatic column width calculation. This can be disabled
+		 * as an optimisation (it takes some time to calculate the widths) if the
+		 * tables widths are passed in using aoColumns.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bAutoWidth": false
+		 *      } );
+		 *    } );
+		 */
+		"bAutoWidth": true,
+	
+	
+		/**
+		 * Deferred rendering can provide DataTables with a huge speed boost when you
+		 * are using an Ajax or JS data source for the table. This option, when set to
+		 * true, will cause DataTables to defer the creation of the table elements for
+		 * each row until they are needed for a draw - saving a significant amount of
+		 * time.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable( {
+		 *        "sAjaxSource": "sources/arrays.txt",
+		 *        "bDeferRender": true
+		 *      } );
+		 *    } );
+		 */
+		"bDeferRender": false,
+	
+	
+		/**
+		 * Replace a DataTable which matches the given selector and replace it with 
+		 * one which has the properties of the new initialisation object passed. If no
+		 * table matches the selector, then the new DataTable will be constructed as
+		 * per normal.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sScrollY": "200px",
+		 *        "bPaginate": false
+		 *      } );
+		 *      
+		 *      // Some time later....
+		 *      $('#example').dataTable( {
+		 *        "bFilter": false,
+		 *        "bDestroy": true
+		 *      } );
+		 *    } );
+		 */
+		"bDestroy": false,
+	
+	
+		/**
+		 * Enable or disable filtering of data. Filtering in DataTables is "smart" in
+		 * that it allows the end user to input multiple words (space separated) and
+		 * will match a row containing those words, even if not in the order that was
+		 * specified (this allow matching across multiple columns). Note that if you
+		 * wish to use filtering in DataTables this must remain 'true' - to remove the
+		 * default filtering input box and retain filtering abilities, please use
+		 * @ref{sDom}.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bFilter": false
+		 *      } );
+		 *    } );
+		 */
+		"bFilter": true,
+	
+	
+		/**
+		 * Enable or disable the table information display. This shows information 
+		 * about the data that is currently visible on the page, including information
+		 * about filtered data if that action is being performed.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bInfo": false
+		 *      } );
+		 *    } );
+		 */
+		"bInfo": true,
+	
+	
+		/**
+		 * Enable jQuery UI ThemeRoller support (required as ThemeRoller requires some
+		 * slightly different and additional mark-up from what DataTables has
+		 * traditionally used).
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "bJQueryUI": true
+		 *      } );
+		 *    } );
+		 */
+		"bJQueryUI": false,
+	
+	
+		/**
+		 * Allows the end user to select the size of a formatted page from a select
+		 * menu (sizes are 10, 25, 50 and 100). Requires pagination (bPaginate).
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bLengthChange": false
+		 *      } );
+		 *    } );
+		 */
+		"bLengthChange": true,
+	
+	
+		/**
+		 * Enable or disable pagination.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bPaginate": false
+		 *      } );
+		 *    } );
+		 */
+		"bPaginate": true,
+	
+	
+		/**
+		 * Enable or disable the display of a 'processing' indicator when the table is
+		 * being processed (e.g. a sort). This is particularly useful for tables with
+		 * large amounts of data where it can take a noticeable amount of time to sort
+		 * the entries.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bProcessing": true
+		 *      } );
+		 *    } );
+		 */
+		"bProcessing": false,
+	
+	
+		/**
+		 * Retrieve the DataTables object for the given selector. Note that if the
+		 * table has already been initialised, this parameter will cause DataTables
+		 * to simply return the object that has already been set up - it will not take
+		 * account of any changes you might have made to the initialisation object
+		 * passed to DataTables (setting this parameter to true is an acknowledgement
+		 * that you understand this). bDestroy can be used to reinitialise a table if
+		 * you need.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      initTable();
+		 *      tableActions();
+		 *    } );
+		 *    
+		 *    function initTable ()
+		 *    {
+		 *      return $('#example').dataTable( {
+		 *        "sScrollY": "200px",
+		 *        "bPaginate": false,
+		 *        "bRetrieve": true
+		 *      } );
+		 *    }
+		 *    
+		 *    function tableActions ()
+		 *    {
+		 *      var oTable = initTable();
+		 *      // perform API operations with oTable 
+		 *    }
+		 */
+		"bRetrieve": false,
+	
+	
+		/**
+		 * Indicate if DataTables should be allowed to set the padding / margin
+		 * etc for the scrolling header elements or not. Typically you will want
+		 * this.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bScrollAutoCss": false,
+		 *        "sScrollY": "200px"
+		 *      } );
+		 *    } );
+		 */
+		"bScrollAutoCss": true,
+	
+	
+		/**
+		 * When vertical (y) scrolling is enabled, DataTables will force the height of
+		 * the table's viewport to the given height at all times (useful for layout).
+		 * However, this can look odd when filtering data down to a small data set,
+		 * and the footer is left "floating" further down. This parameter (when
+		 * enabled) will cause DataTables to collapse the table's viewport down when
+		 * the result set will fit within the given Y height.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sScrollY": "200",
+		 *        "bScrollCollapse": true
+		 *      } );
+		 *    } );
+		 */
+		"bScrollCollapse": false,
+	
+	
+		/**
+		 * Enable infinite scrolling for DataTables (to be used in combination with
+		 * sScrollY). Infinite scrolling means that DataTables will continually load
+		 * data as a user scrolls through a table, which is very useful for large
+		 * dataset. This cannot be used with pagination, which is automatically
+		 * disabled.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bScrollInfinite": true,
+		 *        "bScrollCollapse": true,
+		 *        "sScrollY": "200px"
+		 *      } );
+		 *    } );
+		 */
+		"bScrollInfinite": false,
+	
+	
+		/**
+		 * Configure DataTables to use server-side processing. Note that the
+		 * sAjaxSource parameter must also be given in order to give DataTables a
+		 * source to obtain the required data for each draw.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bServerSide": true,
+		 *        "sAjaxSource": "xhr.php"
+		 *      } );
+		 *    } );
+		 */
+		"bServerSide": false,
+	
+	
+		/**
+		 * Enable or disable sorting of columns. Sorting of individual columns can be
+		 * disabled by the "bSortable" option for each column.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bSort": false
+		 *      } );
+		 *    } );
+		 */
+		"bSort": true,
+	
+	
+		/**
+		 * Allows control over whether DataTables should use the top (true) unique
+		 * cell that is found for a single column, or the bottom (false - default).
+		 * This is useful when using complex headers.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bSortCellsTop": true
+		 *      } );
+		 *    } );
+		 */
+		"bSortCellsTop": false,
+	
+	
+		/**
+		 * Enable or disable the addition of the classes 'sorting_1', 'sorting_2' and
+		 * 'sorting_3' to the columns which are currently being sorted on. This is
+		 * presented as a feature switch as it can increase processing time (while
+		 * classes are removed and added) so for large data sets you might want to
+		 * turn this off.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bSortClasses": false
+		 *      } );
+		 *    } );
+		 */
+		"bSortClasses": true,
+	
+	
+		/**
+		 * Enable or disable state saving. When enabled a cookie will be used to save
+		 * table display information such as pagination information, display length,
+		 * filtering and sorting. As such when the end user reloads the page the
+		 * display display will match what thy had previously set up.
+		 *  @type boolean
+		 *  @default false
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true
+		 *      } );
+		 *    } );
+		 */
+		"bStateSave": false,
+	
+	
+		/**
+		 * Customise the cookie and / or the parameters being stored when using
+		 * DataTables with state saving enabled. This function is called whenever
+		 * the cookie is modified, and it expects a fully formed cookie string to be
+		 * returned. Note that the data object passed in is a Javascript object which
+		 * must be converted to a string (JSON.stringify for example).
+		 *  @type function
+		 *  @param {string} sName Name of the cookie defined by DataTables
+		 *  @param {object} oData Data to be stored in the cookie
+		 *  @param {string} sExpires Cookie expires string
+		 *  @param {string} sPath Path of the cookie to set
+		 *  @returns {string} Cookie formatted string (which should be encoded by
+		 *    using encodeURIComponent())
+		 * 
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "fnCookieCallback": function (sName, oData, sExpires, sPath) {
+		 *          // Customise oData or sName or whatever else here
+		 *          return sName + "="+JSON.stringify(oData)+"; expires=" + sExpires +"; path=" + sPath;
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnCookieCallback": null,
+	
+	
+		/**
+		 * This function is called when a TR element is created (and all TD child
+		 * elements have been inserted), or registered if using a DOM source, allowing
+		 * manipulation of the TR element (adding classes etc).
+		 *  @type function
+		 *  @param {node} nRow "TR" element for the current row
+		 *  @param {array} aData Raw data array for this row
+		 *  @param {int} iDataIndex The index of this row in aoData
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "fnCreatedRow": function( nRow, aData, iDataIndex ) {
+		 *          // Bold the grade for all 'A' grade browsers
+		 *          if ( aData[4] == "A" )
+		 *          {
+		 *            $('td:eq(4)', nRow).html( '<b>A</b>' );
+		 *          }
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnCreatedRow": null,
+	
+	
+		/**
+		 * This function is called on every 'draw' event, and allows you to
+		 * dynamically modify any aspect you want about the created DOM.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "fnDrawCallback": function() {
+		 *          alert( 'DataTables has redrawn the table' );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnDrawCallback": null,
+	
+	
+		/**
+		 * Identical to fnHeaderCallback() but for the table footer this function
+		 * allows you to modify the table footer on every 'draw' even.
+		 *  @type function
+		 *  @param {node} nFoot "TR" element for the footer
+		 *  @param {array} aData Full table data (as derived from the original HTML)
+		 *  @param {int} iStart Index for the current display starting point in the 
+		 *    display array
+		 *  @param {int} iEnd Index for the current display ending point in the 
+		 *    display array
+		 *  @param {array int} aiDisplay Index array to translate the visual position
+		 *    to the full data array
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "fnFooterCallback": function( nFoot, aData, iStart, iEnd, aiDisplay ) {
+		 *          nFoot.getElementsByTagName('th')[0].innerHTML = "Starting index is "+iStart;
+		 *        }
+		 *      } );
+		 *    } )
+		 */
+		"fnFooterCallback": null,
+	
+	
+		/**
+		 * When rendering large numbers in the information element for the table
+		 * (i.e. "Showing 1 to 10 of 57 entries") DataTables will render large numbers
+		 * to have a comma separator for the 'thousands' units (e.g. 1 million is
+		 * rendered as "1,000,000") to help readability for the end user. This
+		 * function will override the default method DataTables uses.
+		 *  @type function
+		 *  @param {int} iIn number to be formatted
+		 *  @returns {string} formatted string for DataTables to show the number
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "fnFormatNumber": function ( iIn ) {
+		 *          if ( iIn &lt; 1000 ) {
+		 *            return iIn;
+		 *          } else {
+		 *            var 
+		 *              s=(iIn+""), 
+		 *              a=s.split(""), out="", 
+		 *              iLen=s.length;
+		 *            
+		 *            for ( var i=0 ; i&lt;iLen ; i++ ) {
+		 *              if ( i%3 === 0 &amp;&amp; i !== 0 ) {
+		 *                out = "'"+out;
+		 *              }
+		 *              out = a[iLen-i-1]+out;
+		 *            }
+		 *          }
+		 *          return out;
+		 *        };
+		 *      } );
+		 *    } );
+		 */
+		"fnFormatNumber": function ( iIn ) {
+			if ( iIn < 1000 )
+			{
+				// A small optimisation for what is likely to be the majority of use cases
+				return iIn;
+			}
+	
+			var s=(iIn+""), a=s.split(""), out="", iLen=s.length;
+			
+			for ( var i=0 ; i<iLen ; i++ )
+			{
+				if ( i%3 === 0 && i !== 0 )
+				{
+					out = this.oLanguage.sInfoThousands+out;
+				}
+				out = a[iLen-i-1]+out;
+			}
+			return out;
+		},
+	
+	
+		/**
+		 * This function is called on every 'draw' event, and allows you to
+		 * dynamically modify the header row. This can be used to calculate and
+		 * display useful information about the table.
+		 *  @type function
+		 *  @param {node} nHead "TR" element for the header
+		 *  @param {array} aData Full table data (as derived from the original HTML)
+		 *  @param {int} iStart Index for the current display starting point in the
+		 *    display array
+		 *  @param {int} iEnd Index for the current display ending point in the
+		 *    display array
+		 *  @param {array int} aiDisplay Index array to translate the visual position
+		 *    to the full data array
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "fnHeaderCallback": function( nHead, aData, iStart, iEnd, aiDisplay ) {
+		 *          nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
+		 *        }
+		 *      } );
+		 *    } )
+		 */
+		"fnHeaderCallback": null,
+	
+	
+		/**
+		 * The information element can be used to convey information about the current
+		 * state of the table. Although the internationalisation options presented by
+		 * DataTables are quite capable of dealing with most customisations, there may
+		 * be times where you wish to customise the string further. This callback
+		 * allows you to do exactly that.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {int} iStart Starting position in data for the draw
+		 *  @param {int} iEnd End position in data for the draw
+		 *  @param {int} iMax Total number of rows in the table (regardless of
+		 *    filtering)
+		 *  @param {int} iTotal Total number of rows in the data set, after filtering
+		 *  @param {string} sPre The string that DataTables has formatted using it's
+		 *    own rules
+		 *  @returns {string} The string to be displayed in the information element.
+		 * 
+		 *  @example
+		 *    $('#example').dataTable( {
+		 *      "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) {
+		 *        return iStart +" to "+ iEnd;
+		 *      }
+		 *    } );
+		 */
+		"fnInfoCallback": null,
+	
+	
+		/**
+		 * Called when the table has been initialised. Normally DataTables will
+		 * initialise sequentially and there will be no need for this function,
+		 * however, this does not hold true when using external language information
+		 * since that is obtained using an async XHR call.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {object} json The JSON object request from the server - only
+		 *    present if client-side Ajax sourced data is used</li></ol>
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "fnInitComplete": function(oSettings, json) {
+		 *          alert( 'DataTables has finished its initialisation.' );
+		 *        }
+		 *      } );
+		 *    } )
+		 */
+		"fnInitComplete": null,
+	
+	
+		/**
+		 * Called at the very start of each table draw and can be used to cancel the
+		 * draw by returning false, any other return (including undefined) results in
+		 * the full draw occurring).
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @returns {boolean} False will cancel the draw, anything else (including no
+		 *    return) will allow it to complete.
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "fnPreDrawCallback": function( oSettings ) {
+		 *          if ( $('#test').val() == 1 ) {
+		 *            return false;
+		 *          }
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnPreDrawCallback": null,
+	
+	
+		/**
+		 * This function allows you to 'post process' each row after it have been
+		 * generated for each table draw, but before it is rendered on screen. This
+		 * function might be used for setting the row class name etc.
+		 *  @type function
+		 *  @param {node} nRow "TR" element for the current row
+		 *  @param {array} aData Raw data array for this row
+		 *  @param {int} iDisplayIndex The display index for the current table draw
+		 *  @param {int} iDisplayIndexFull The index of the data in the full list of
+		 *    rows (after filtering)
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
+		 *          // Bold the grade for all 'A' grade browsers
+		 *          if ( aData[4] == "A" )
+		 *          {
+		 *            $('td:eq(4)', nRow).html( '<b>A</b>' );
+		 *          }
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnRowCallback": null,
+	
+	
+		/**
+		 * This parameter allows you to override the default function which obtains
+		 * the data from the server ($.getJSON) so something more suitable for your
+		 * application. For example you could use POST data, or pull information from
+		 * a Gears or AIR database.
+		 *  @type function
+		 *  @param {string} sSource HTTP source to obtain the data from (sAjaxSource)
+		 *  @param {array} aoData A key/value pair object containing the data to send
+		 *    to the server
+		 *  @param {function} fnCallback to be called on completion of the data get
+		 *    process that will draw the data on the page.
+		 *  @param {object} oSettings DataTables settings object
+		 * 
+		 *  @example
+		 *    // POST data to server
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bProcessing": true,
+		 *        "bServerSide": true,
+		 *        "sAjaxSource": "xhr.php",
+		 *        "fnServerData": function ( sSource, aoData, fnCallback ) {
+		 *          $.ajax( {
+		 *            "dataType": 'json', 
+		 *            "type": "POST", 
+		 *            "url": sSource, 
+		 *            "data": aoData, 
+		 *            "success": fnCallback
+		 *          } );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnServerData": function ( sUrl, aoData, fnCallback, oSettings ) {
+			oSettings.jqXHR = $.ajax( {
+				"url":  sUrl,
+				"data": aoData,
+				"success": function (json) {
+					$(oSettings.oInstance).trigger('xhr', oSettings);
+					fnCallback( json );
+				},
+				"dataType": "json",
+				"cache": false,
+				"type": oSettings.sServerMethod,
+				"error": function (xhr, error, thrown) {
+					if ( error == "parsererror" ) {
+						alert( "DataTables warning: JSON data from server could not be parsed. "+
+							"This is caused by a JSON formatting error." );
+					}
+				}
+			} );
+		},
+	
+	
+		/**
+		 * It is often useful to send extra data to the server when making an Ajax
+		 * request - for example custom filtering information, and this callback
+		 * function makes it trivial to send extra information to the server. The
+		 * passed in parameter is the data set that has been constructed by
+		 * DataTables, and you can add to this or modify it as you require.
+		 *  @type function
+		 *  @param {array} aoData Data array (array of objects which are name/value
+		 *    pairs) that has been constructed by DataTables and will be sent to the
+		 *    server. In the case of Ajax sourced data with server-side processing
+		 *    this will be an empty array, for server-side processing there will be a
+		 *    significant number of parameters!
+		 *  @returns {undefined} Ensure that you modify the aoData array passed in,
+		 *    as this is passed by reference.
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bProcessing": true,
+		 *        "bServerSide": true,
+		 *        "sAjaxSource": "scripts/server_processing.php",
+		 *        "fnServerParams": function ( aoData ) {
+		 *          aoData.push( { "name": "more_data", "value": "my_value" } );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnServerParams": null,
+	
+	
+		/**
+		 * Load the table state. With this function you can define from where, and how, the
+		 * state of a table is loaded. By default DataTables will load from its state saving
+		 * cookie, but you might wish to use local storage (HTML5) or a server-side database.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {object} oData The state object to be saved
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true,
+		 *        "fnStateSave": function (oSettings, oData) {
+		 *          var o;
+		 *          
+		 *          // Send an Ajax request to the server to get the data. Note that
+		 *          // this is a synchronous request.
+		 *          $.ajax( {
+		 *            "url": "/state_load",
+		 *            "async": false,
+		 *            "dataType": "json",
+		 *            "success": function (json) {
+		 *              o = json;
+		 *            }
+		 *          } );
+		 *          
+		 *          return o;
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateLoad": function ( oSettings ) {
+			var sData = this.oApi._fnReadCookie( oSettings.sCookiePrefix+oSettings.sInstance );
+			var oData;
+	
+			try {
+				oData = (typeof $.parseJSON === 'function') ? 
+					$.parseJSON(sData) : eval( '('+sData+')' );
+			} catch (e) {
+				oData = null;
+			}
+	
+			return oData;
+		},
+	
+	
+		/**
+		 * Callback which allows modification of the saved state prior to loading that state.
+		 * This callback is called when the table is loading state from the stored data, but
+		 * prior to the settings object being modified by the saved state. Note that for 
+		 * plug-in authors, you should use the 'stateLoadParams' event to load parameters for 
+		 * a plug-in.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {object} oData The state object that is to be loaded
+		 * 
+		 *  @example
+		 *    // Remove a saved filter, so filtering is never loaded
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true,
+		 *        "fnStateLoadParams": function (oSettings, oData) {
+		 *          oData.oFilter.sSearch = "";
+		 *      } );
+		 *    } );
+		 * 
+		 *  @example
+		 *    // Disallow state loading by returning false
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true,
+		 *        "fnStateLoadParams": function (oSettings, oData) {
+		 *          return false;
+		 *      } );
+		 *    } );
+		 */
+		"fnStateLoadParams": null,
+	
+	
+		/**
+		 * Callback that is called when the state has been loaded from the state saving method
+		 * and the DataTables settings object has been modified as a result of the loaded state.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {object} oData The state object that was loaded
+		 * 
+		 *  @example
+		 *    // Show an alert with the filtering value that was saved
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true,
+		 *        "fnStateLoaded": function (oSettings, oData) {
+		 *          alert( 'Saved filter was: '+oData.oFilter.sSearch );
+		 *      } );
+		 *    } );
+		 */
+		"fnStateLoaded": null,
+	
+	
+		/**
+		 * Save the table state. This function allows you to define where and how the state
+		 * information for the table is stored - by default it will use a cookie, but you
+		 * might want to use local storage (HTML5) or a server-side database.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {object} oData The state object to be saved
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true,
+		 *        "fnStateSave": function (oSettings, oData) {
+		 *          // Send an Ajax request to the server with the state object
+		 *          $.ajax( {
+		 *            "url": "/state_save",
+		 *            "data": oData,
+		 *            "dataType": "json",
+		 *            "method": "POST"
+		 *            "success": function () {}
+		 *          } );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateSave": function ( oSettings, oData ) {
+			this.oApi._fnCreateCookie( 
+				oSettings.sCookiePrefix+oSettings.sInstance, 
+				this.oApi._fnJsonString(oData), 
+				oSettings.iCookieDuration, 
+				oSettings.sCookiePrefix, 
+				oSettings.fnCookieCallback
+			);
+		},
+	
+	
+		/**
+		 * Callback which allows modification of the state to be saved. Called when the table 
+		 * has changed state a new state save is required. This method allows modification of
+		 * the state saving object prior to actually doing the save, including addition or 
+		 * other state properties or modification. Note that for plug-in authors, you should 
+		 * use the 'stateSaveParams' event to save parameters for a plug-in.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {object} oData The state object to be saved
+		 * 
+		 *  @example
+		 *    // Remove a saved filter, so filtering is never saved
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bStateSave": true,
+		 *        "fnStateLoadParams": function (oSettings, oData) {
+		 *          oData.oFilter.sSearch = "";
+		 *      } );
+		 *    } );
+		 */
+		"fnStateSaveParams": null,
+	
+	
+		/**
+		 * Duration of the cookie which is used for storing session information. This
+		 * value is given in seconds.
+		 *  @type int
+		 *  @default 7200 <i>(2 hours)</i>
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "iCookieDuration": 60*60*24 // 1 day
+		 *      } );
+		 *    } )
+		 */
+		"iCookieDuration": 7200,
+	
+	
+		/**
+		 * When enabled DataTables will not make a request to the server for the first
+		 * page draw - rather it will use the data already on the page (no sorting etc
+		 * will be applied to it), thus saving on an XHR at load time. iDeferLoading
+		 * is used to indicate that deferred loading is required, but it is also used
+		 * to tell DataTables how many records there are in the full table (allowing
+		 * the information element and pagination to be displayed correctly).
+		 *  @type int
+		 *  @default null
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bServerSide": true,
+		 *        "sAjaxSource": "scripts/server_processing.php",
+		 *        "iDeferLoading": 57
+		 *      } );
+		 *    } );
+		 */
+		"iDeferLoading": null,
+	
+	
+		/**
+		 * Number of rows to display on a single page when using pagination. If
+		 * feature enabled (bLengthChange) then the end user will be able to override
+		 * this to a custom setting using a pop-up menu.
+		 *  @type int
+		 *  @default 10
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "iDisplayLength": 50
+		 *      } );
+		 *    } )
+		 */
+		"iDisplayLength": 10,
+	
+	
+		/**
+		 * Define the starting point for data display when using DataTables with
+		 * pagination. Note that this parameter is the number of records, rather than
+		 * the page number, so if you have 10 records per page and want to start on
+		 * the third page, it should be "20".
+		 *  @type int
+		 *  @default 0
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "iDisplayStart": 20
+		 *      } );
+		 *    } )
+		 */
+		"iDisplayStart": 0,
+	
+	
+		/**
+		 * The scroll gap is the amount of scrolling that is left to go before
+		 * DataTables will load the next 'page' of data automatically. You typically
+		 * want a gap which is big enough that the scrolling will be smooth for the
+		 * user, while not so large that it will load more data than need.
+		 *  @type int
+		 *  @default 100
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bScrollInfinite": true,
+		 *        "bScrollCollapse": true,
+		 *        "sScrollY": "200px",
+		 *        "iScrollLoadGap": 50
+		 *      } );
+		 *    } );
+		 */
+		"iScrollLoadGap": 100,
+	
+	
+		/**
+		 * By default DataTables allows keyboard navigation of the table (sorting, paging,
+		 * and filtering) by adding a tabindex attribute to the required elements. This
+		 * allows you to tab through the controls and press the enter key to activate them.
+		 * The tabindex is default 0, meaning that the tab follows the flow of the document.
+		 * You can overrule this using this parameter if you wish. Use a value of -1 to
+		 * disable built-in keyboard navigation.
+		 *  @type int
+		 *  @default 0
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "iTabIndex": 1
+		 *      } );
+		 *    } );
+		 */
+		"iTabIndex": 0,
+	
+	
+		/**
+		 * All strings that DataTables uses in the user interface that it creates
+		 * are defined in this object, allowing you to modified them individually or
+		 * completely replace them all as required.
+		 *  @namespace
+		 */
+		"oLanguage": {
+			/**
+			 * Strings that are used for WAI-ARIA labels and controls only (these are not
+			 * actually visible on the page, but will be read by screenreaders, and thus
+			 * must be internationalised as well).
+			 *  @namespace
+			 */
+			"oAria": {
+				/**
+				 * ARIA label that is added to the table headers when the column may be
+				 * sorted ascending by activing the column (click or return when focused).
+				 * Note that the column header is prefixed to this string.
+				 *  @type string
+				 *  @default : activate to sort column ascending
+				 * 
+				 *  @example
+				 *    $(document).ready(function() {
+				 *      $('#example').dataTable( {
+				 *        "oLanguage": {
+				 *          "oAria": {
+				 *            "sSortAscending": " - click/return to sort ascending"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sSortAscending": ": activate to sort column ascending",
+	
+				/**
+				 * ARIA label that is added to the table headers when the column may be
+				 * sorted descending by activing the column (click or return when focused).
+				 * Note that the column header is prefixed to this string.
+				 *  @type string
+				 *  @default : activate to sort column ascending
+				 * 
+				 *  @example
+				 *    $(document).ready(function() {
+				 *      $('#example').dataTable( {
+				 *        "oLanguage": {
+				 *          "oAria": {
+				 *            "sSortDescending": " - click/return to sort descending"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sSortDescending": ": activate to sort column descending"
+			},
+	
+			/**
+			 * Pagination string used by DataTables for the two built-in pagination
+			 * control types ("two_button" and "full_numbers")
+			 *  @namespace
+			 */
+			"oPaginate": {
+				/**
+				 * Text to use when using the 'full_numbers' type of pagination for the
+				 * button to take the user to the first page.
+				 *  @type string
+				 *  @default First
+				 * 
+				 *  @example
+				 *    $(document).ready(function() {
+				 *      $('#example').dataTable( {
+				 *        "oLanguage": {
+				 *          "oPaginate": {
+				 *            "sFirst": "First page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sFirst": "First",
+			
+			
+				/**
+				 * Text to use when using the 'full_numbers' type of pagination for the
+				 * button to take the user to the last page.
+				 *  @type string
+				 *  @default Last
+				 * 
+				 *  @example
+				 *    $(document).ready(function() {
+				 *      $('#example').dataTable( {
+				 *        "oLanguage": {
+				 *          "oPaginate": {
+				 *            "sLast": "Last page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sLast": "Last",
+			
+			
+				/**
+				 * Text to use when using the 'full_numbers' type of pagination for the
+				 * button to take the user to the next page.
+				 *  @type string
+				 *  @default Next
+				 * 
+				 *  @example
+				 *    $(document).ready(function() {
+				 *      $('#example').dataTable( {
+				 *        "oLanguage": {
+				 *          "oPaginate": {
+				 *            "sNext": "Next page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sNext": "Next",
+			
+			
+				/**
+				 * Text to use when using the 'full_numbers' type of pagination for the
+				 * button to take the user to the previous page.
+				 *  @type string
+				 *  @default Previous
+				 * 
+				 *  @example
+				 *    $(document).ready(function() {
+				 *      $('#example').dataTable( {
+				 *        "oLanguage": {
+				 *          "oPaginate": {
+				 *            "sPrevious": "Previous page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sPrevious": "Previous"
+			},
+		
+			/**
+			 * This string is shown in preference to sZeroRecords when the table is
+			 * empty of data (regardless of filtering). Note that this is an optional
+			 * parameter - if it is not given, the value of sZeroRecords will be used
+			 * instead (either the default or given value).
+			 *  @type string
+			 *  @default No data available in table
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sEmptyTable": "No data available in table"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sEmptyTable": "No data available in table",
+		
+		
+			/**
+			 * This string gives information to the end user about the information that 
+			 * is current on display on the page. The _START_, _END_ and _TOTAL_ 
+			 * variables are all dynamically replaced as the table display updates, and 
+			 * can be freely moved or removed as the language requirements change.
+			 *  @type string
+			 *  @default Showing _START_ to _END_ of _TOTAL_ entries
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sInfo": "Got a total of _TOTAL_ entries to show (_START_ to _END_)"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
+		
+		
+			/**
+			 * Display information string for when the table is empty. Typically the 
+			 * format of this string should match sInfo.
+			 *  @type string
+			 *  @default Showing 0 to 0 of 0 entries
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sInfoEmpty": "No entries to show"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoEmpty": "Showing 0 to 0 of 0 entries",
+		
+		
+			/**
+			 * When a user filters the information in a table, this string is appended 
+			 * to the information (sInfo) to give an idea of how strong the filtering 
+			 * is. The variable _MAX_ is dynamically updated.
+			 *  @type string
+			 *  @default (filtered from _MAX_ total entries)
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sInfoFiltered": " - filtering from _MAX_ records"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoFiltered": "(filtered from _MAX_ total entries)",
+		
+		
+			/**
+			 * If can be useful to append extra information to the info string at times,
+			 * and this variable does exactly that. This information will be appended to
+			 * the sInfo (sInfoEmpty and sInfoFiltered in whatever combination they are
+			 * being used) at all times.
+			 *  @type string
+			 *  @default <i>Empty string</i>
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sInfoPostFix": "All records shown are derived from real information."
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoPostFix": "",
+		
+		
+			/**
+			 * DataTables has a build in number formatter (fnFormatNumber) which is used
+			 * to format large numbers that are used in the table information. By
+			 * default a comma is used, but this can be trivially changed to any
+			 * character you wish with this parameter.
+			 *  @type string
+			 *  @default ,
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sInfoThousands": "'"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoThousands": ",",
+		
+		
+			/**
+			 * Detail the action that will be taken when the drop down menu for the
+			 * pagination length option is changed. The '_MENU_' variable is replaced
+			 * with a default select list of 10, 25, 50 and 100, and can be replaced
+			 * with a custom select box if required.
+			 *  @type string
+			 *  @default Show _MENU_ entries
+			 * 
+			 *  @example
+			 *    // Language change only
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sLengthMenu": "Display _MENU_ records"
+			 *        }
+			 *      } );
+			 *    } );
+			 *    
+			 *  @example
+			 *    // Language and options change
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sLengthMenu": 'Display <select>'+
+			 *            '<option value="10">10</option>'+
+			 *            '<option value="20">20</option>'+
+			 *            '<option value="30">30</option>'+
+			 *            '<option value="40">40</option>'+
+			 *            '<option value="50">50</option>'+
+			 *            '<option value="-1">All</option>'+
+			 *            '</select> records'
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sLengthMenu": "Show _MENU_ entries",
+		
+		
+			/**
+			 * When using Ajax sourced data and during the first draw when DataTables is
+			 * gathering the data, this message is shown in an empty row in the table to
+			 * indicate to the end user the the data is being loaded. Note that this
+			 * parameter is not used when loading data by server-side processing, just
+			 * Ajax sourced data with client-side processing.
+			 *  @type string
+			 *  @default Loading...
+			 * 
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sLoadingRecords": "Please wait - loading..."
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sLoadingRecords": "Loading...",
+		
+		
+			/**
+			 * Text which is displayed when the table is processing a user action
+			 * (usually a sort command or similar).
+			 *  @type string
+			 *  @default Processing...
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sProcessing": "DataTables is currently busy"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sProcessing": "Processing...",
+		
+		
+			/**
+			 * Details the actions that will be taken when the user types into the
+			 * filtering input text box. The variable "_INPUT_", if used in the string,
+			 * is replaced with the HTML text box for the filtering input allowing
+			 * control over where it appears in the string. If "_INPUT_" is not given
+			 * then the input box is appended to the string automatically.
+			 *  @type string
+			 *  @default Search:
+			 * 
+			 *  @example
+			 *    // Input text box will be appended at the end automatically
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sSearch": "Filter records:"
+			 *        }
+			 *      } );
+			 *    } );
+			 *    
+			 *  @example
+			 *    // Specify where the filter should appear
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sSearch": "Apply filter _INPUT_ to table"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sSearch": "Search:",
+		
+		
+			/**
+			 * All of the language information can be stored in a file on the
+			 * server-side, which DataTables will look up if this parameter is passed.
+			 * It must store the URL of the language file, which is in a JSON format,
+			 * and the object has the same properties as the oLanguage object in the
+			 * initialiser object (i.e. the above parameters). Please refer to one of
+			 * the example language files to see how this works in action.
+			 *  @type string
+			 *  @default <i>Empty string - i.e. disabled</i>
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sUrl": "http://www.sprymedia.co.uk/dataTables/lang.txt"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sUrl": "",
+		
+		
+			/**
+			 * Text shown inside the table records when the is no information to be
+			 * displayed after filtering. sEmptyTable is shown when there is simply no
+			 * information in the table at all (regardless of filtering).
+			 *  @type string
+			 *  @default No matching records found
+			 * 
+			 *  @example
+			 *    $(document).ready(function() {
+			 *      $('#example').dataTable( {
+			 *        "oLanguage": {
+			 *          "sZeroRecords": "No records to display"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sZeroRecords": "No matching records found"
+		},
+	
+	
+		/**
+		 * This parameter allows you to have define the global filtering state at
+		 * initialisation time. As an object the "sSearch" parameter must be
+		 * defined, but all other parameters are optional. When "bRegex" is true,
+		 * the search string will be treated as a regular expression, when false
+		 * (default) it will be treated as a straight string. When "bSmart"
+		 * DataTables will use it's smart filtering methods (to word match at
+		 * any point in the data), when false this will not be done.
+		 *  @type object
+		 *  @extends DataTable.models.oSearch
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "oSearch": {"sSearch": "Initial search"}
+		 *      } );
+		 *    } )
+		 */
+		"oSearch": $.extend( {}, DataTable.models.oSearch ),
+	
+	
+		/**
+		 * By default DataTables will look for the property 'aaData' when obtaining
+		 * data from an Ajax source or for server-side processing - this parameter
+		 * allows that property to be changed. You can use Javascript dotted object
+		 * notation to get a data source for multiple levels of nesting.
+		 *  @type string
+		 *  @default aaData
+		 * 
+		 *  @example
+		 *    // Get data from { "data": [...] }
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable( {
+		 *        "sAjaxSource": "sources/data.txt",
+		 *        "sAjaxDataProp": "data"
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Get data from { "data": { "inner": [...] } }
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable( {
+		 *        "sAjaxSource": "sources/data.txt",
+		 *        "sAjaxDataProp": "data.inner"
+		 *      } );
+		 *    } );
+		 */
+		"sAjaxDataProp": "aaData",
+	
+	
+		/**
+		 * You can instruct DataTables to load data from an external source using this
+		 * parameter (use aData if you want to pass data in you already have). Simply
+		 * provide a url a JSON object can be obtained from. This object must include
+		 * the parameter 'aaData' which is the data source for the table.
+		 *  @type string
+		 *  @default null
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "sAjaxSource": "http://www.sprymedia.co.uk/dataTables/json.php"
+		 *      } );
+		 *    } )
+		 */
+		"sAjaxSource": null,
+	
+	
+		/**
+		 * This parameter can be used to override the default prefix that DataTables
+		 * assigns to a cookie when state saving is enabled.
+		 *  @type string
+		 *  @default SpryMedia_DataTables_
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sCookiePrefix": "my_datatable_",
+		 *      } );
+		 *    } );
+		 */
+		"sCookiePrefix": "SpryMedia_DataTables_",
+	
+	
+		/**
+		 * This initialisation variable allows you to specify exactly where in the
+		 * DOM you want DataTables to inject the various controls it adds to the page
+		 * (for example you might want the pagination controls at the top of the
+		 * table). DIV elements (with or without a custom class) can also be added to
+		 * aid styling. The follow syntax is used:
+		 *   <ul>
+		 *     <li>The following options are allowed:	
+		 *       <ul>
+		 *         <li>'l' - Length changing</li
+		 *         <li>'f' - Filtering input</li>
+		 *         <li>'t' - The table!</li>
+		 *         <li>'i' - Information</li>
+		 *         <li>'p' - Pagination</li>
+		 *         <li>'r' - pRocessing</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>The following constants are allowed:
+		 *       <ul>
+		 *         <li>'H' - jQueryUI theme "header" classes ('fg-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix')</li>
+		 *         <li>'F' - jQueryUI theme "footer" classes ('fg-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix')</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>The following syntax is expected:
+		 *       <ul>
+		 *         <li>'&lt;' and '&gt;' - div elements</li>
+		 *         <li>'&lt;"class" and '&gt;' - div with a class</li>
+		 *         <li>'&lt;"#id" and '&gt;' - div with an ID</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>Examples:
+		 *       <ul>
+		 *         <li>'&lt;"wrapper"flipt&gt;'</li>
+		 *         <li>'&lt;lf&lt;t&gt;ip&gt;'</li>
+		 *       </ul>
+		 *     </li>
+		 *   </ul>
+		 *  @type string
+		 *  @default lfrtip <i>(when bJQueryUI is false)</i> <b>or</b> 
+		 *    <"H"lfr>t<"F"ip> <i>(when bJQueryUI is true)</i>
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sDom": '&lt;"top"i&gt;rt&lt;"bottom"flp&gt;&lt;"clear"&lgt;'
+		 *      } );
+		 *    } );
+		 */
+		"sDom": "lfrtip",
+	
+	
+		/**
+		 * DataTables features two different built-in pagination interaction methods
+		 * ('two_button' or 'full_numbers') which present different page controls to
+		 * the end user. Further methods can be added using the API (see below).
+		 *  @type string
+		 *  @default two_button
+		 * 
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "sPaginationType": "full_numbers"
+		 *      } );
+		 *    } )
+		 */
+		"sPaginationType": "two_button",
+	
+	
+		/**
+		 * Enable horizontal scrolling. When a table is too wide to fit into a certain
+		 * layout, or you have a large number of columns in the table, you can enable
+		 * x-scrolling to show the table in a viewport, which can be scrolled. This
+		 * property can by any CSS unit, or a number (in which case it will be treated
+		 * as a pixel measurement).
+		 *  @type string
+		 *  @default <i>blank string - i.e. disabled</i>
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sScrollX": "100%",
+		 *        "bScrollCollapse": true
+		 *      } );
+		 *    } );
+		 */
+		"sScrollX": "",
+	
+	
+		/**
+		 * This property can be used to force a DataTable to use more width than it
+		 * might otherwise do when x-scrolling is enabled. For example if you have a
+		 * table which requires to be well spaced, this parameter is useful for
+		 * "over-sizing" the table, and thus forcing scrolling. This property can by
+		 * any CSS unit, or a number (in which case it will be treated as a pixel
+		 * measurement).
+		 *  @type string
+		 *  @default <i>blank string - i.e. disabled</i>
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sScrollX": "100%",
+		 *        "sScrollXInner": "110%"
+		 *      } );
+		 *    } );
+		 */
+		"sScrollXInner": "",
+	
+	
+		/**
+		 * Enable vertical scrolling. Vertical scrolling will constrain the DataTable
+		 * to the given height, an enable scrolling for any data which overflows the
+		 * current viewport. This can be used as an alternative to paging to display
+		 * a lot of data in a small area (although paging and scrolling can both be
+		 * enabled at the same time). This property can by any CSS unit, or a number
+		 * (in which case it will be treated as a pixel measurement).
+		 *  @type string
+		 *  @default <i>blank string - i.e. disabled</i>
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "sScrollY": "200px",
+		 *        "bPaginate": false
+		 *      } );
+		 *    } );
+		 */
+		"sScrollY": "",
+	
+	
+		/**
+		 * Set the HTTP method that is used to make the Ajax call for server-side
+		 * processing or Ajax sourced data.
+		 *  @type string
+		 *  @default GET
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "bServerSide": true,
+		 *        "sAjaxSource": "scripts/post.php",
+		 *        "sServerMethod": "POST"
+		 *      } );
+		 *    } );
+		 */
+		"sServerMethod": "GET"
+	};
+	
+	
+	
+	/**
+	 * Column options that can be given to DataTables at initialisation time.
+	 *  @namespace
+	 */
+	DataTable.defaults.columns = {
+		/**
+		 * Allows a column's sorting to take multiple columns into account when 
+		 * doing a sort. For example first name / last name columns make sense to 
+		 * do a multi-column sort over the two columns.
+		 *  @type array
+		 *  @default null <i>Takes the value of the column index automatically</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [
+		 *          { "aDataSort": [ 0, 1 ], "aTargets": [ 0 ] },
+		 *          { "aDataSort": [ 1, 0 ], "aTargets": [ 1 ] },
+		 *          { "aDataSort": [ 2, 3, 4 ], "aTargets": [ 2 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [
+		 *          { "aDataSort": [ 0, 1 ] },
+		 *          { "aDataSort": [ 1, 0 ] },
+		 *          { "aDataSort": [ 2, 3, 4 ] },
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"aDataSort": null,
+	
+	
+		/**
+		 * You can control the default sorting direction, and even alter the behaviour
+		 * of the sort handler (i.e. only allow ascending sorting etc) using this
+		 * parameter.
+		 *  @type array
+		 *  @default [ 'asc', 'desc' ]
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [
+		 *          { "asSorting": [ "asc" ], "aTargets": [ 1 ] },
+		 *          { "asSorting": [ "desc", "asc", "asc" ], "aTargets": [ 2 ] },
+		 *          { "asSorting": [ "desc" ], "aTargets": [ 3 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [
+		 *          null,
+		 *          { "asSorting": [ "asc" ] },
+		 *          { "asSorting": [ "desc", "asc", "asc" ] },
+		 *          { "asSorting": [ "desc" ] },
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"asSorting": [ 'asc', 'desc' ],
+	
+	
+		/**
+		 * Enable or disable filtering on the data in this column.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "bSearchable": false, "aTargets": [ 0 ] }
+		 *        ] } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "bSearchable": false },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ] } );
+		 *    } );
+		 */
+		"bSearchable": true,
+	
+	
+		/**
+		 * Enable or disable sorting on this column.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "bSortable": false, "aTargets": [ 0 ] }
+		 *        ] } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "bSortable": false },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ] } );
+		 *    } );
+		 */
+		"bSortable": true,
+	
+	
+		/**
+		 * When using fnRender() for a column, you may wish to use the original data
+		 * (before rendering) for sorting and filtering (the default is to used the
+		 * rendered data that the user can see). This may be useful for dates etc.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          {
+		 *            "fnRender": function ( oObj ) {
+		 *              return oObj.aData[0] +' '+ oObj.aData[3];
+		 *            },
+		 *            "bUseRendered": false,
+		 *            "aTargets": [ 0 ]
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          {
+		 *            "fnRender": function ( oObj ) {
+		 *              return oObj.aData[0] +' '+ oObj.aData[3];
+		 *            },
+		 *            "bUseRendered": false
+		 *          },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"bUseRendered": true,
+	
+	
+		/**
+		 * Enable or disable the display of this column.
+		 *  @type boolean
+		 *  @default true
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "bVisible": false, "aTargets": [ 0 ] }
+		 *        ] } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "bVisible": false },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ] } );
+		 *    } );
+		 */
+		"bVisible": true,
+		
+		
+		/**
+		 * Developer definable function that is called whenever a cell is created (Ajax source,
+		 * etc) or processed for input (DOM source). This can be used as a compliment to fnRender
+		 * allowing you to modify the DOM element (add background colour for example) when the
+		 * element is available (since it is not when fnRender is called).
+		 *  @type function
+		 *  @param {element} nTd The TD node that has been created
+		 *  @param {*} sData The Data for the cell
+		 *  @param {array|object} oData The data for the whole row
+		 *  @param {int} iRow The row index for the aoData data store
+		 *  @param {int} iCol The column index for aoColumns
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ {
+		 *          "aTargets": [3],
+		 *          "fnCreatedCell": function (nTd, sData, oData, iRow, iCol) {
+		 *            if ( sData == "1.7" ) {
+		 *              $(nTd).css('color', 'blue')
+		 *            }
+		 *          }
+		 *        } ]
+		 *      });
+		 *    } );
+		 */
+		"fnCreatedCell": null,
+	
+	
+		/**
+		 * Custom display function that will be called for the display of each cell in
+		 * this column.
+		 *  @type function
+		 *  @param {object} o Object with the following parameters:
+		 *  @param {int}    o.iDataRow The row in aoData
+		 *  @param {int}    o.iDataColumn The column in question
+		 *  @param {array   o.aData The data for the row in question
+		 *  @param {object} o.oSettings The settings object for this DataTables instance
+		 *  @param {object} o.mDataProp The data property used for this column
+		 *  @param {*}      val The current cell value
+		 *  @returns {string} The string you which to use in the display
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          {
+		 *            "fnRender": function ( o, val ) {
+		 *              return o.aData[0] +' '+ o.aData[3];
+		 *            },
+		 *            "aTargets": [ 0 ]
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "fnRender": function ( o, val ) {
+		 *            return o.aData[0] +' '+ o.aData[3];
+		 *          } },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"fnRender": null,
+	
+	
+		/**
+		 * The column index (starting from 0!) that you wish a sort to be performed
+		 * upon when this column is selected for sorting. This can be used for sorting
+		 * on hidden columns for example.
+		 *  @type int
+		 *  @default -1 <i>Use automatically calculated column index</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "iDataSort": 1, "aTargets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "iDataSort": 1 },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"iDataSort": -1,
+	
+	
+		/**
+		 * This property can be used to read data from any JSON data source property,
+		 * including deeply nested objects / properties. By default DataTables will
+		 * use an array index (incrementally increased for each column) as the data
+		 * source, but a string can be used for this property which will read an
+		 * object property from the data source, a function which will be given the
+		 * data source object to render into a string or null where the cell will be
+		 * treated as empty. For more information see
+		 * http://datatables.net/blog/Extended_data_source_options_with_DataTables
+		 *  @type string|int|function|null
+		 *  @default null <i>Use automatically calculated column index</i>
+		 * 
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable( {
+		 *        "sAjaxSource": "sources/deep.txt",
+		 *        "aoColumns": [
+		 *          { "mDataProp": "engine" },
+		 *          { "mDataProp": "browser" },
+		 *          { "mDataProp": "platform.inner" },
+		 *          { "mDataProp": "platform.details.0" },
+		 *          { "mDataProp": "platform.details.1" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"mDataProp": null,
+	
+	
+		/**
+		 * Class to give to each cell in this column.
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "sClass": "my_class", "aTargets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "sClass": "my_class" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sClass": "",
+		
+		/**
+		 * When DataTables calculates the column widths to assign to each column,
+		 * it finds the longest string in each column and then constructs a
+		 * temporary table and reads the widths from that. The problem with this
+		 * is that "mmm" is much wider then "iiii", but the latter is a longer 
+		 * string - thus the calculation can go wrong (doing it properly and putting
+		 * it into an DOM object and measuring that is horribly(!) slow). Thus as
+		 * a "work around" we provide this option. It will append its value to the
+		 * text that is found to be the longest string for the column - i.e. padding.
+		 * Generally you shouldn't need this, and it is not documented on the 
+		 * general DataTables.net documentation
+		 *  @type string
+		 *  @default <i>Empty string<i>
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          {
+		 *            "sContentPadding": "mmm"
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sContentPadding": "",
+	
+	
+		/**
+		 * Allows a default value to be given for a column's data, and will be used
+		 * whenever a null data source is encountered (this can be because mDataProp
+		 * is set to null, or because the data source itself is null).
+		 *  @type string
+		 *  @default null
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          {
+		 *            "mDataProp": null,
+		 *            "sDefaultContent": "Edit",
+		 *            "aTargets": [ -1 ]
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          {
+		 *            "mDataProp": null,
+		 *            "sDefaultContent": "Edit"
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sDefaultContent": null,
+	
+	
+		/**
+		 * This parameter is only used in DataTables' server-side processing. It can
+		 * be exceptionally useful to know what columns are being displayed on the
+		 * client side, and to map these to database fields. When defined, the names
+		 * also allow DataTables to reorder information from the server if it comes
+		 * back in an unexpected order (i.e. if you switch your columns around on the
+		 * client-side, your server-side code does not also need updating).
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "sName": "engine", "aTargets": [ 0 ] },
+		 *          { "sName": "browser", "aTargets": [ 1 ] },
+		 *          { "sName": "platform", "aTargets": [ 2 ] },
+		 *          { "sName": "version", "aTargets": [ 3 ] },
+		 *          { "sName": "grade", "aTargets": [ 4 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "sName": "engine" },
+		 *          { "sName": "browser" },
+		 *          { "sName": "platform" },
+		 *          { "sName": "version" },
+		 *          { "sName": "grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sName": "",
+	
+	
+		/**
+		 * Defines a data source type for the sorting which can be used to read
+		 * realtime information from the table (updating the internally cached
+		 * version) prior to sorting. This allows sorting to occur on user editable
+		 * elements such as form inputs.
+		 *  @type string
+		 *  @default std
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [
+		 *          { "sSortDataType": "dom-text", "aTargets": [ 2, 3 ] },
+		 *          { "sType": "numeric", "aTargets": [ 3 ] },
+		 *          { "sSortDataType": "dom-select", "aTargets": [ 4 ] },
+		 *          { "sSortDataType": "dom-checkbox", "aTargets": [ 5 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [
+		 *          null,
+		 *          null,
+		 *          { "sSortDataType": "dom-text" },
+		 *          { "sSortDataType": "dom-text", "sType": "numeric" },
+		 *          { "sSortDataType": "dom-select" },
+		 *          { "sSortDataType": "dom-checkbox" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sSortDataType": "std",
+	
+	
+		/**
+		 * The title of this column.
+		 *  @type string
+		 *  @default null <i>Derived from the 'TH' value for this column in the 
+		 *    original HTML table.</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "sTitle": "My column title", "aTargets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "sTitle": "My column title" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sTitle": null,
+	
+	
+		/**
+		 * The type allows you to specify how the data for this column will be sorted.
+		 * Four types (string, numeric, date and html (which will strip HTML tags
+		 * before sorting)) are currently available. Note that only date formats
+		 * understood by Javascript's Date() object will be accepted as type date. For
+		 * example: "Mar 26, 2008 5:03 PM". May take the values: 'string', 'numeric',
+		 * 'date' or 'html' (by default). Further types can be adding through
+		 * plug-ins.
+		 *  @type string
+		 *  @default null <i>Auto-detected from raw data</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "sType": "html", "aTargets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "sType": "html" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sType": null,
+	
+	
+		/**
+		 * Defining the width of the column, this parameter may take any CSS value
+		 * (3em, 20px etc). DataTables applys 'smart' widths to columns which have not
+		 * been given a specific width through this interface ensuring that the table
+		 * remains readable.
+		 *  @type string
+		 *  @default null <i>Automatic</i>
+		 * 
+		 *  @example
+		 *    // Using aoColumnDefs
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumnDefs": [ 
+		 *          { "sWidth": "20%", "aTargets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *    
+		 *  @example
+		 *    // Using aoColumns
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable( {
+		 *        "aoColumns": [ 
+		 *          { "sWidth": "20%" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sWidth": null
+	};
+	
+	
+	
+	/**
+	 * DataTables settings object - this holds all the information needed for a
+	 * given table, including configuration, data and current application of the
+	 * table options. DataTables does not have a single instance for each DataTable
+	 * with the settings attached to that instance, but rather instances of the
+	 * DataTable "class" are created on-the-fly as needed (typically by a 
+	 * $().dataTable() call) and the settings object is then applied to that
+	 * instance.
+	 * 
+	 * Note that this object is related to {@link DataTable.defaults} but this 
+	 * one is the internal data store for DataTables's cache of columns. It should
+	 * NOT be manipulated outside of DataTables. Any configuration should be done
+	 * through the initialisation options.
+	 *  @namespace
+	 *  @todo Really should attach the settings object to individual instances so we
+	 *    don't need to create new instances on each $().dataTable() call (if the
+	 *    table already exists). It would also save passing oSettings around and
+	 *    into every single function. However, this is a very significant 
+	 *    architecture change for DataTables and will almost certainly break
+	 *    backwards compatibility with older installations. This is something that
+	 *    will be done in 2.0.
+	 */
+	DataTable.models.oSettings = {
+		/**
+		 * Primary features of DataTables and their enablement state.
+		 *  @namespace
+		 */
+		"oFeatures": {
+			
+			/**
+			 * Flag to say if DataTables should automatically try to calculate the
+			 * optimum table and columns widths (true) or not (false).
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bAutoWidth": null,
+	
+			/**
+			 * Delay the creation of TR and TD elements until they are actually
+			 * needed by a driven page draw. This can give a significant speed
+			 * increase for Ajax source and Javascript source data, but makes no
+			 * difference at all fro DOM and server-side processing tables.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bDeferRender": null,
+			
+			/**
+			 * Enable filtering on the table or not. Note that if this is disabled
+			 * then there is no filtering at all on the table, including fnFilter.
+			 * To just remove the filtering input use sDom and remove the 'f' option.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bFilter": null,
+			
+			/**
+			 * Table information element (the 'Showing x of y records' div) enable
+			 * flag.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bInfo": null,
+			
+			/**
+			 * Present a user control allowing the end user to change the page size
+			 * when pagination is enabled.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bLengthChange": null,
+	
+			/**
+			 * Pagination enabled or not. Note that if this is disabled then length
+			 * changing must also be disabled.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bPaginate": null,
+			
+			/**
+			 * Processing indicator enable flag whenever DataTables is enacting a
+			 * user request - typically an Ajax request for server-side processing.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bProcessing": null,
+			
+			/**
+			 * Server-side processing enabled flag - when enabled DataTables will
+			 * get all data from the server for every draw - there is no filtering,
+			 * sorting or paging done on the client-side.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bServerSide": null,
+			
+			/**
+			 * Sorting enablement flag.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bSort": null,
+			
+			/**
+			 * Apply a class to the columns which are being sorted to provide a
+			 * visual highlight or not. This can slow things down when enabled since
+			 * there is a lot of DOM interaction.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bSortClasses": null,
+			
+			/**
+			 * State saving enablement flag.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bStateSave": null
+		},
+		
+	
+		/**
+		 * Scrolling settings for a table.
+		 *  @namespace
+		 */
+		"oScroll": {
+			/**
+			 * Indicate if DataTables should be allowed to set the padding / margin
+			 * etc for the scrolling header elements or not. Typically you will want
+			 * this.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bAutoCss": null,
+			
+			/**
+			 * When the table is shorter in height than sScrollY, collapse the
+			 * table container down to the height of the table (when true).
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bCollapse": null,
+			
+			/**
+			 * Infinite scrolling enablement flag. Now deprecated in favour of
+			 * using the Scroller plug-in.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bInfinite": null,
+			
+			/**
+			 * Width of the scrollbar for the web-browser's platform. Calculated
+			 * during table initialisation.
+			 *  @type int
+			 *  @default 0
+			 */
+			"iBarWidth": 0,
+			
+			/**
+			 * Space (in pixels) between the bottom of the scrolling container and 
+			 * the bottom of the scrolling viewport before the next page is loaded
+			 * when using infinite scrolling.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type int
+			 */
+			"iLoadGap": null,
+			
+			/**
+			 * Viewport width for horizontal scrolling. Horizontal scrolling is 
+			 * disabled if an empty string.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type string
+			 */
+			"sX": null,
+			
+			/**
+			 * Width to expand the table to when using x-scrolling. Typically you
+			 * should not need to use this.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type string
+			 *  @deprecated
+			 */
+			"sXInner": null,
+			
+			/**
+			 * Viewport height for vertical scrolling. Vertical scrolling is disabled
+			 * if an empty string.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type string
+			 */
+			"sY": null
+		},
+		
+		/**
+		 * Language information for the table.
+		 *  @namespace
+		 *  @extends DataTable.defaults.oLanguage
+		 */
+		"oLanguage": {
+			/**
+			 * Information callback function. See 
+			 * {@link DataTable.defaults.fnInfoCallback}
+			 *  @type function
+			 *  @default 
+			 */
+			"fnInfoCallback": null
+		},
+		
+		/**
+		 * Array referencing the nodes which are used for the features. The 
+		 * parameters of this object match what is allowed by sDom - i.e.
+		 *   <ul>
+		 *     <li>'l' - Length changing</li>
+		 *     <li>'f' - Filtering input</li>
+		 *     <li>'t' - The table!</li>
+		 *     <li>'i' - Information</li>
+		 *     <li>'p' - Pagination</li>
+		 *     <li>'r' - pRocessing</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 */
+		"aanFeatures": [],
+		
+		/**
+		 * Store data information - see {@link DataTable.models.oRow} for detailed
+		 * information.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoData": [],
+		
+		/**
+		 * Array of indexes which are in the current display (after filtering etc)
+		 *  @type array
+		 *  @default []
+		 */
+		"aiDisplay": [],
+		
+		/**
+		 * Array of indexes for display - no filtering
+		 *  @type array
+		 *  @default []
+		 */
+		"aiDisplayMaster": [],
+		
+		/**
+		 * Store information about each column that is in use
+		 *  @type array
+		 *  @default []
+		 */
+		"aoColumns": [],
+		
+		/**
+		 * Store information about the table's header
+		 *  @type array
+		 *  @default []
+		 */
+		"aoHeader": [],
+		
+		/**
+		 * Store information about the table's footer
+		 *  @type array
+		 *  @default []
+		 */
+		"aoFooter": [],
+		
+		/**
+		 * Search data array for regular expression searching
+		 *  @type array
+		 *  @default []
+		 */
+		"asDataSearch": [],
+		
+		/**
+		 * Store the applied global search information in case we want to force a 
+		 * research or compare the old search to a new one.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @namespace
+		 *  @extends DataTable.models.oSearch
+		 */
+		"oPreviousSearch": {},
+		
+		/**
+		 * Store the applied search for each column - see 
+		 * {@link DataTable.models.oSearch} for the format that is used for the
+		 * filtering information for each column.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoPreSearchCols": [],
+		
+		/**
+		 * Sorting that is applied to the table. Note that the inner arrays are
+		 * used in the following manner:
+		 * <ul>
+		 *   <li>Index 0 - column number</li>
+		 *   <li>Index 1 - current sorting direction</li>
+		 *   <li>Index 2 - index of asSorting for this column</li>
+		 * </ul>
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @todo These inner arrays should really be objects
+		 */
+		"aaSorting": null,
+		
+		/**
+		 * Sorting that is always applied to the table (i.e. prefixed in front of
+		 * aaSorting).
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array|null
+		 *  @default null
+		 */
+		"aaSortingFixed": null,
+		
+		/**
+		 * Classes to use for the striping of a table.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @default []
+		 */
+		"asStripeClasses": null,
+		
+		/**
+		 * If restoring a table - we should restore its striping classes as well
+		 *  @type array
+		 *  @default []
+		 */
+		"asDestroyStripes": [],
+		
+		/**
+		 * If restoring a table - we should restore its width 
+		 *  @type int
+		 *  @default 0
+		 */
+		"sDestroyWidth": 0,
+		
+		/**
+		 * Callback functions array for every time a row is inserted (i.e. on a draw).
+		 *  @type array
+		 *  @default []
+		 */
+		"aoRowCallback": [],
+		
+		/**
+		 * Callback functions for the header on each draw.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoHeaderCallback": [],
+		
+		/**
+		 * Callback function for the footer on each draw.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoFooterCallback": [],
+		
+		/**
+		 * Array of callback functions for draw callback functions
+		 *  @type array
+		 *  @default []
+		 */
+		"aoDrawCallback": [],
+		
+		/**
+		 * Array of callback functions for row created function
+		 *  @type array
+		 *  @default []
+		 */
+		"aoRowCreatedCallback": [],
+		
+		/**
+		 * Callback functions for just before the table is redrawn. A return of 
+		 * false will be used to cancel the draw.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoPreDrawCallback": [],
+		
+		/**
+		 * Callback functions for when the table has been initialised.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoInitComplete": [],
+	
+		
+		/**
+		 * Callbacks for modifying the settings to be stored for state saving, prior to
+		 * saving state.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateSaveParams": [],
+		
+		/**
+		 * Callbacks for modifying the settings that have been stored for state saving
+		 * prior to using the stored values to restore the state.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateLoadParams": [],
+		
+		/**
+		 * Callbacks for operating on the settings object once the saved state has been
+		 * loaded
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateLoaded": [],
+		
+		/**
+		 * Cache the table ID for quick access
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 */
+		"sTableId": "",
+		
+		/**
+		 * The TABLE node for the main table
+		 *  @type node
+		 *  @default null
+		 */
+		"nTable": null,
+		
+		/**
+		 * Permanent ref to the thead element
+		 *  @type node
+		 *  @default null
+		 */
+		"nTHead": null,
+		
+		/**
+		 * Permanent ref to the tfoot element - if it exists
+		 *  @type node
+		 *  @default null
+		 */
+		"nTFoot": null,
+		
+		/**
+		 * Permanent ref to the tbody element
+		 *  @type node
+		 *  @default null
+		 */
+		"nTBody": null,
+		
+		/**
+		 * Cache the wrapper node (contains all DataTables controlled elements)
+		 *  @type node
+		 *  @default null
+		 */
+		"nTableWrapper": null,
+		
+		/**
+		 * Indicate if when using server-side processing the loading of data 
+		 * should be deferred until the second draw.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bDeferLoading": false,
+		
+		/**
+		 * Indicate if all required information has been read in
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bInitialised": false,
+		
+		/**
+		 * Information about open rows. Each object in the array has the parameters
+		 * 'nTr' and 'nParent'
+		 *  @type array
+		 *  @default []
+		 */
+		"aoOpenRows": [],
+		
+		/**
+		 * Dictate the positioning of DataTables' control elements - see
+		 * {@link DataTable.model.oInit.sDom}.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 *  @default null
+		 */
+		"sDom": null,
+		
+		/**
+		 * Which type of pagination should be used.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string 
+		 *  @default two_button
+		 */
+		"sPaginationType": "two_button",
+		
+		/**
+		 * The cookie duration (for bStateSave) in seconds.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type int
+		 *  @default 0
+		 */
+		"iCookieDuration": 0,
+		
+		/**
+		 * The cookie name prefix.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 */
+		"sCookiePrefix": "",
+		
+		/**
+		 * Callback function for cookie creation.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type function
+		 *  @default null
+		 */
+		"fnCookieCallback": null,
+		
+		/**
+		 * Array of callback functions for state saving. Each array element is an 
+		 * object with the following parameters:
+		 *   <ul>
+		 *     <li>function:fn - function to call. Takes two parameters, oSettings
+		 *       and the JSON string to save that has been thus far created. Returns
+		 *       a JSON string to be inserted into a json object 
+		 *       (i.e. '"param": [ 0, 1, 2]')</li>
+		 *     <li>string:sName - name of callback</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateSave": [],
+		
+		/**
+		 * Array of callback functions for state loading. Each array element is an 
+		 * object with the following parameters:
+		 *   <ul>
+		 *     <li>function:fn - function to call. Takes two parameters, oSettings 
+		 *       and the object stored. May return false to cancel state loading</li>
+		 *     <li>string:sName - name of callback</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateLoad": [],
+		
+		/**
+		 * State that was loaded from the cookie. Useful for back reference
+		 *  @type object
+		 *  @default null
+		 */
+		"oLoadedState": null,
+		
+		/**
+		 * Source url for AJAX data for the table.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 *  @default null
+		 */
+		"sAjaxSource": null,
+		
+		/**
+		 * Property from a given object from which to read the table data from. This
+		 * can be an empty string (when not server-side processing), in which case 
+		 * it is  assumed an an array is given directly.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 */
+		"sAjaxDataProp": null,
+		
+		/**
+		 * Note if draw should be blocked while getting data
+		 *  @type boolean
+		 *  @default true
+		 */
+		"bAjaxDataGet": true,
+		
+		/**
+		 * The last jQuery XHR object that was used for server-side data gathering. 
+		 * This can be used for working with the XHR information in one of the 
+		 * callbacks
+		 *  @type object
+		 *  @default null
+		 */
+		"jqXHR": null,
+		
+		/**
+		 * Function to get the server-side data.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type function
+		 */
+		"fnServerData": null,
+		
+		/**
+		 * Functions which are called prior to sending an Ajax request so extra 
+		 * parameters can easily be sent to the server
+		 *  @type array
+		 *  @default []
+		 */
+		"aoServerParams": [],
+		
+		/**
+		 * Send the XHR HTTP method - GET or POST (could be PUT or DELETE if 
+		 * required).
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 */
+		"sServerMethod": null,
+		
+		/**
+		 * Format numbers for display.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type function
+		 */
+		"fnFormatNumber": null,
+		
+		/**
+		 * List of options that can be used for the user selectable length menu.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @default []
+		 */
+		"aLengthMenu": null,
+		
+		/**
+		 * Counter for the draws that the table does. Also used as a tracker for
+		 * server-side processing
+		 *  @type int
+		 *  @default 0
+		 */
+		"iDraw": 0,
+		
+		/**
+		 * Indicate if a redraw is being done - useful for Ajax
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bDrawing": false,
+		
+		/**
+		 * Draw index (iDraw) of the last error when parsing the returned data
+		 *  @type int
+		 *  @default -1
+		 */
+		"iDrawError": -1,
+		
+		/**
+		 * Paging display length
+		 *  @type int
+		 *  @default 10
+		 */
+		"_iDisplayLength": 10,
+	
+		/**
+		 * Paging start point - aiDisplay index
+		 *  @type int
+		 *  @default 0
+		 */
+		"_iDisplayStart": 0,
+	
+		/**
+		 * Paging end point - aiDisplay index. Use fnDisplayEnd rather than
+		 * this property to get the end point
+		 *  @type int
+		 *  @default 10
+		 *  @private
+		 */
+		"_iDisplayEnd": 10,
+		
+		/**
+		 * Server-side processing - number of records in the result set
+		 * (i.e. before filtering), Use fnRecordsTotal rather than
+		 * this property to get the value of the number of records, regardless of
+		 * the server-side processing setting.
+		 *  @type int
+		 *  @default 0
+		 *  @private
+		 */
+		"_iRecordsTotal": 0,
+	
+		/**
+		 * Server-side processing - number of records in the current display set
+		 * (i.e. after filtering). Use fnRecordsDisplay rather than
+		 * this property to get the value of the number of records, regardless of
+		 * the server-side processing setting.
+		 *  @type boolean
+		 *  @default 0
+		 *  @private
+		 */
+		"_iRecordsDisplay": 0,
+		
+		/**
+		 * Flag to indicate if jQuery UI marking and classes should be used.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type boolean
+		 */
+		"bJUI": null,
+		
+		/**
+		 * The classes to use for the table
+		 *  @type object
+		 *  @default {}
+		 */
+		"oClasses": {},
+		
+		/**
+		 * Flag attached to the settings object so you can check in the draw 
+		 * callback if filtering has been done in the draw. Deprecated in favour of
+		 * events.
+		 *  @type boolean
+		 *  @default false
+		 *  @deprecated
+		 */
+		"bFiltered": false,
+		
+		/**
+		 * Flag attached to the settings object so you can check in the draw 
+		 * callback if sorting has been done in the draw. Deprecated in favour of
+		 * events.
+		 *  @type boolean
+		 *  @default false
+		 *  @deprecated
+		 */
+		"bSorted": false,
+		
+		/**
+		 * Indicate that if multiple rows are in the header and there is more than 
+		 * one unique cell per column, if the top one (true) or bottom one (false) 
+		 * should be used for sorting / title by DataTables.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type boolean
+		 */
+		"bSortCellsTop": null,
+		
+		/**
+		 * Initialisation object that is used for the table
+		 *  @type object
+		 *  @default null
+		 */
+		"oInit": null,
+		
+		/**
+		 * Destroy callback functions - for plug-ins to attach themselves to the
+		 * destroy so they can clean up markup and events.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoDestroyCallback": [],
+	
+		
+		/**
+		 * Get the number of records in the current record set, before filtering
+		 *  @type function
+		 */
+		"fnRecordsTotal": function ()
+		{
+			if ( this.oFeatures.bServerSide ) {
+				return parseInt(this._iRecordsTotal, 10);
+			} else {
+				return this.aiDisplayMaster.length;
+			}
+		},
+		
+		/**
+		 * Get the number of records in the current record set, after filtering
+		 *  @type function
+		 */
+		"fnRecordsDisplay": function ()
+		{
+			if ( this.oFeatures.bServerSide ) {
+				return parseInt(this._iRecordsDisplay, 10);
+			} else {
+				return this.aiDisplay.length;
+			}
+		},
+		
+		/**
+		 * Set the display end point - aiDisplay index
+		 *  @type function
+		 *  @todo Should do away with _iDisplayEnd and calculate it on-the-fly here
+		 */
+		"fnDisplayEnd": function ()
+		{
+			if ( this.oFeatures.bServerSide ) {
+				if ( this.oFeatures.bPaginate === false || this._iDisplayLength == -1 ) {
+					return this._iDisplayStart+this.aiDisplay.length;
+				} else {
+					return Math.min( this._iDisplayStart+this._iDisplayLength, 
+						this._iRecordsDisplay );
+				}
+			} else {
+				return this._iDisplayEnd;
+			}
+		},
+		
+		/**
+		 * The DataTables object for this table
+		 *  @type object
+		 *  @default null
+		 */
+		"oInstance": null,
+		
+		/**
+		 * Unique identifier for each instance of the DataTables object. If there
+		 * is an ID on the table node, then it takes that value, otherwise an
+		 * incrementing internal counter is used.
+		 *  @type string
+		 *  @default null
+		 */
+		"sInstance": null,
+	
+		/**
+		 * tabindex attribute value that is added to DataTables control elements, allowing
+		 * keyboard navigation of the table and its controls.
+		 */
+		"iTabIndex": 0
+	};
+
+	/**
+	 * Extension object for DataTables that is used to provide all extension options.
+	 * See {@link DataTable.models.ext} for full information about the extension object.
+	 * 
+	 * Note that the <i>DataTable.ext</i> object is aliased to <i>jQuery.fn.dataTableExt</i> 
+	 * through which is may be accessed and manipulated, or <i>jQuery.fn.dataTable.ext</i>.
+	 *  @namespace
+	 */
+	DataTable.ext = $.extend( true, {}, DataTable.models.ext );
+	
+	$.extend( DataTable.ext.oStdClasses, {
+		"sTable": "dataTable",
+	
+		/* Two buttons buttons */
+		"sPagePrevEnabled": "paginate_enabled_previous",
+		"sPagePrevDisabled": "paginate_disabled_previous",
+		"sPageNextEnabled": "paginate_enabled_next",
+		"sPageNextDisabled": "paginate_disabled_next",
+		"sPageJUINext": "",
+		"sPageJUIPrev": "",
+		
+		/* Full numbers paging buttons */
+		"sPageButton": "paginate_button",
+		"sPageButtonActive": "paginate_active",
+		"sPageButtonStaticDisabled": "paginate_button paginate_button_disabled",
+		"sPageFirst": "first",
+		"sPagePrevious": "previous",
+		"sPageNext": "next",
+		"sPageLast": "last",
+		
+		/* Striping classes */
+		"sStripeOdd": "odd",
+		"sStripeEven": "even",
+		
+		/* Empty row */
+		"sRowEmpty": "dataTables_empty",
+		
+		/* Features */
+		"sWrapper": "dataTables_wrapper",
+		"sFilter": "dataTables_filter",
+		"sInfo": "dataTables_info",
+		"sPaging": "dataTables_paginate paging_", /* Note that the type is postfixed */
+		"sLength": "dataTables_length",
+		"sProcessing": "dataTables_processing",
+		
+		/* Sorting */
+		"sSortAsc": "sorting_asc",
+		"sSortDesc": "sorting_desc",
+		"sSortable": "sorting", /* Sortable in both directions */
+		"sSortableAsc": "sorting_asc_disabled",
+		"sSortableDesc": "sorting_desc_disabled",
+		"sSortableNone": "sorting_disabled",
+		"sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
+		"sSortJUIAsc": "",
+		"sSortJUIDesc": "",
+		"sSortJUI": "",
+		"sSortJUIAscAllowed": "",
+		"sSortJUIDescAllowed": "",
+		"sSortJUIWrapper": "",
+		"sSortIcon": "",
+		
+		/* Scrolling */
+		"sScrollWrapper": "dataTables_scroll",
+		"sScrollHead": "dataTables_scrollHead",
+		"sScrollHeadInner": "dataTables_scrollHeadInner",
+		"sScrollBody": "dataTables_scrollBody",
+		"sScrollFoot": "dataTables_scrollFoot",
+		"sScrollFootInner": "dataTables_scrollFootInner",
+		
+		/* Misc */
+		"sFooterTH": ""
+	} );
+	
+	
+	$.extend( DataTable.ext.oJUIClasses, DataTable.ext.oStdClasses, {
+		/* Two buttons buttons */
+		"sPagePrevEnabled": "fg-button ui-button ui-state-default ui-corner-left",
+		"sPagePrevDisabled": "fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",
+		"sPageNextEnabled": "fg-button ui-button ui-state-default ui-corner-right",
+		"sPageNextDisabled": "fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",
+		"sPageJUINext": "ui-icon ui-icon-circle-arrow-e",
+		"sPageJUIPrev": "ui-icon ui-icon-circle-arrow-w",
+		
+		/* Full numbers paging buttons */
+		"sPageButton": "fg-button ui-button ui-state-default",
+		"sPageButtonActive": "fg-button ui-button ui-state-default ui-state-disabled",
+		"sPageButtonStaticDisabled": "fg-button ui-button ui-state-default ui-state-disabled",
+		"sPageFirst": "first ui-corner-tl ui-corner-bl",
+		"sPageLast": "last ui-corner-tr ui-corner-br",
+		
+		/* Features */
+		"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
+			"ui-buttonset-multi paging_", /* Note that the type is postfixed */
+		
+		/* Sorting */
+		"sSortAsc": "ui-state-default",
+		"sSortDesc": "ui-state-default",
+		"sSortable": "ui-state-default",
+		"sSortableAsc": "ui-state-default",
+		"sSortableDesc": "ui-state-default",
+		"sSortableNone": "ui-state-default",
+		"sSortJUIAsc": "css_right ui-icon ui-icon-triangle-1-n",
+		"sSortJUIDesc": "css_right ui-icon ui-icon-triangle-1-s",
+		"sSortJUI": "css_right ui-icon ui-icon-carat-2-n-s",
+		"sSortJUIAscAllowed": "css_right ui-icon ui-icon-carat-1-n",
+		"sSortJUIDescAllowed": "css_right ui-icon ui-icon-carat-1-s",
+		"sSortJUIWrapper": "DataTables_sort_wrapper",
+		"sSortIcon": "DataTables_sort_icon",
+		
+		/* Scrolling */
+		"sScrollHead": "dataTables_scrollHead ui-state-default",
+		"sScrollFoot": "dataTables_scrollFoot ui-state-default",
+		
+		/* Misc */
+		"sFooterTH": "ui-state-default"
+	} );
+	
+	
+	/*
+	 * Variable: oPagination
+	 * Purpose:  
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	$.extend( DataTable.ext.oPagination, {
+		/*
+		 * Variable: two_button
+		 * Purpose:  Standard two button (forward/back) pagination
+		 * Scope:    jQuery.fn.dataTableExt.oPagination
+		 */
+		"two_button": {
+			/*
+			 * Function: oPagination.two_button.fnInit
+			 * Purpose:  Initialise dom elements required for pagination with forward/back buttons only
+			 * Returns:  -
+			 * Inputs:   object:oSettings - dataTables settings object
+			 *           node:nPaging - the DIV which contains this pagination control
+			 *           function:fnCallbackDraw - draw function which must be called on update
+			 */
+			"fnInit": function ( oSettings, nPaging, fnCallbackDraw )
+			{
+				var oLang = oSettings.oLanguage.oPaginate;
+				var oClasses = oSettings.oClasses;
+				var fnClickHandler = function ( e ) {
+					if ( oSettings.oApi._fnPageChange( oSettings, e.data.action ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				};
+	
+				var sAppend = (!oSettings.bJUI) ?
+					'<a class="'+oSettings.oClasses.sPagePrevDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button">'+oLang.sPrevious+'</a>'+
+					'<a class="'+oSettings.oClasses.sPageNextDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button">'+oLang.sNext+'</a>'
+					:
+					'<a class="'+oSettings.oClasses.sPagePrevDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button"><span class="'+oSettings.oClasses.sPageJUIPrev+'"></span></a>'+
+					'<a class="'+oSettings.oClasses.sPageNextDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button"><span class="'+oSettings.oClasses.sPageJUINext+'"></span></a>';
+				$(nPaging).append( sAppend );
+				
+				var els = $('a', nPaging);
+				var nPrevious = els[0],
+					nNext = els[1];
+				
+				oSettings.oApi._fnBindAction( nPrevious, {action: "previous"}, fnClickHandler );
+				oSettings.oApi._fnBindAction( nNext,     {action: "next"},     fnClickHandler );
+				
+				/* ID the first elements only */
+				if ( !oSettings.aanFeatures.p )
+				{
+					nPaging.id = oSettings.sTableId+'_paginate';
+					nPrevious.id = oSettings.sTableId+'_previous';
+					nNext.id = oSettings.sTableId+'_next';
+	
+					nPrevious.setAttribute('aria-controls', oSettings.sTableId);
+					nNext.setAttribute('aria-controls', oSettings.sTableId);
+				}
+			},
+			
+			/*
+			 * Function: oPagination.two_button.fnUpdate
+			 * Purpose:  Update the two button pagination at the end of the draw
+			 * Returns:  -
+			 * Inputs:   object:oSettings - dataTables settings object
+			 *           function:fnCallbackDraw - draw function to call on page change
+			 */
+			"fnUpdate": function ( oSettings, fnCallbackDraw )
+			{
+				if ( !oSettings.aanFeatures.p )
+				{
+					return;
+				}
+				
+				var oClasses = oSettings.oClasses;
+				var an = oSettings.aanFeatures.p;
+	
+				/* Loop over each instance of the pager */
+				for ( var i=0, iLen=an.length ; i<iLen ; i++ )
+				{
+					if ( an[i].childNodes.length !== 0 )
+					{
+						an[i].childNodes[0].className = ( oSettings._iDisplayStart === 0 ) ? 
+							oClasses.sPagePrevDisabled : oClasses.sPagePrevEnabled;
+						
+						an[i].childNodes[1].className = ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) ? 
+							oClasses.sPageNextDisabled : oClasses.sPageNextEnabled;
+					}
+				}
+			}
+		},
+		
+		
+		/*
+		 * Variable: iFullNumbersShowPages
+		 * Purpose:  Change the number of pages which can be seen
+		 * Scope:    jQuery.fn.dataTableExt.oPagination
+		 */
+		"iFullNumbersShowPages": 5,
+		
+		/*
+		 * Variable: full_numbers
+		 * Purpose:  Full numbers pagination
+		 * Scope:    jQuery.fn.dataTableExt.oPagination
+		 */
+		"full_numbers": {
+			/*
+			 * Function: oPagination.full_numbers.fnInit
+			 * Purpose:  Initialise dom elements required for pagination with a list of the pages
+			 * Returns:  -
+			 * Inputs:   object:oSettings - dataTables settings object
+			 *           node:nPaging - the DIV which contains this pagination control
+			 *           function:fnCallbackDraw - draw function which must be called on update
+			 */
+			"fnInit": function ( oSettings, nPaging, fnCallbackDraw )
+			{
+				var oLang = oSettings.oLanguage.oPaginate;
+				var oClasses = oSettings.oClasses;
+				var fnClickHandler = function ( e ) {
+					if ( oSettings.oApi._fnPageChange( oSettings, e.data.action ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				};
+	
+				$(nPaging).append(
+					'<a  tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageFirst+'">'+oLang.sFirst+'</a>'+
+					'<a  tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPagePrevious+'">'+oLang.sPrevious+'</a>'+
+					'<span></span>'+
+					'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageNext+'">'+oLang.sNext+'</a>'+
+					'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageLast+'">'+oLang.sLast+'</a>'
+				);
+				var els = $('a', nPaging);
+				var nFirst = els[0],
+					nPrev = els[1],
+					nNext = els[2],
+					nLast = els[3];
+				
+				oSettings.oApi._fnBindAction( nFirst, {action: "first"},    fnClickHandler );
+				oSettings.oApi._fnBindAction( nPrev,  {action: "previous"}, fnClickHandler );
+				oSettings.oApi._fnBindAction( nNext,  {action: "next"},     fnClickHandler );
+				oSettings.oApi._fnBindAction( nLast,  {action: "last"},     fnClickHandler );
+				
+				/* ID the first elements only */
+				if ( !oSettings.aanFeatures.p )
+				{
+					nPaging.id = oSettings.sTableId+'_paginate';
+					nFirst.id =oSettings.sTableId+'_first';
+					nPrev.id =oSettings.sTableId+'_previous';
+					nNext.id =oSettings.sTableId+'_next';
+					nLast.id =oSettings.sTableId+'_last';
+				}
+			},
+			
+			/*
+			 * Function: oPagination.full_numbers.fnUpdate
+			 * Purpose:  Update the list of page buttons shows
+			 * Returns:  -
+			 * Inputs:   object:oSettings - dataTables settings object
+			 *           function:fnCallbackDraw - draw function to call on page change
+			 */
+			"fnUpdate": function ( oSettings, fnCallbackDraw )
+			{
+				if ( !oSettings.aanFeatures.p )
+				{
+					return;
+				}
+				
+				var iPageCount = DataTable.ext.oPagination.iFullNumbersShowPages;
+				var iPageCountHalf = Math.floor(iPageCount / 2);
+				var iPages = Math.ceil((oSettings.fnRecordsDisplay()) / oSettings._iDisplayLength);
+				var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
+				var sList = "";
+				var iStartButton, iEndButton, i, iLen;
+				var oClasses = oSettings.oClasses;
+				var anButtons, anStatic, nPaginateList;
+				var an = oSettings.aanFeatures.p;
+				var fnBind = function (j) {
+					oSettings.oApi._fnBindAction( this, {"page": j+iStartButton-1}, function(e) {
+						/* Use the information in the element to jump to the required page */
+						oSettings.oApi._fnPageChange( oSettings, e.data.page );
+						fnCallbackDraw( oSettings );
+						e.preventDefault();
+					} );
+				};
+				
+				/* Pages calculation */
+				if (iPages < iPageCount)
+				{
+					iStartButton = 1;
+					iEndButton = iPages;
+				}
+				else if (iCurrentPage <= iPageCountHalf)
+				{
+					iStartButton = 1;
+					iEndButton = iPageCount;
+				}
+				else if (iCurrentPage >= (iPages - iPageCountHalf))
+				{
+					iStartButton = iPages - iPageCount + 1;
+					iEndButton = iPages;
+				}
+				else
+				{
+					iStartButton = iCurrentPage - Math.ceil(iPageCount / 2) + 1;
+					iEndButton = iStartButton + iPageCount - 1;
+				}
+				
+				/* Build the dynamic list */
+				for ( i=iStartButton ; i<=iEndButton ; i++ )
+				{
+					sList += (iCurrentPage !== i) ?
+						'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+'">'+oSettings.fnFormatNumber(i)+'</a>' :
+						'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButtonActive+'">'+oSettings.fnFormatNumber(i)+'</a>';
+				}
+				
+				/* Loop over each instance of the pager */
+				for ( i=0, iLen=an.length ; i<iLen ; i++ )
+				{
+					if ( an[i].childNodes.length === 0 )
+					{
+						continue;
+					}
+					
+					/* Build up the dynamic list forst - html and listeners */
+					$('span:eq(0)', an[i])
+						.html( sList )
+						.children('a').each( fnBind );
+					
+					/* Update the premanent botton's classes */
+					anButtons = an[i].getElementsByTagName('a');
+					anStatic = [
+						anButtons[0], anButtons[1], 
+						anButtons[anButtons.length-2], anButtons[anButtons.length-1]
+					];
+	
+					$(anStatic).removeClass( oClasses.sPageButton+" "+oClasses.sPageButtonActive+" "+oClasses.sPageButtonStaticDisabled );
+					$([anStatic[0], anStatic[1]]).addClass( 
+						(iCurrentPage==1) ?
+							oClasses.sPageButtonStaticDisabled :
+							oClasses.sPageButton
+					);
+					$([anStatic[2], anStatic[3]]).addClass(
+						(iPages===0 || iCurrentPage===iPages || oSettings._iDisplayLength===-1) ?
+							oClasses.sPageButtonStaticDisabled :
+							oClasses.sPageButton
+					);
+				}
+			}
+		}
+	} );
+	
+	$.extend( DataTable.ext.oSort, {
+		/*
+		 * text sorting
+		 */
+		"string-pre": function ( a )
+		{
+			if ( typeof a != 'string' ) { a = ''; }
+			return a.toLowerCase();
+		},
+	
+		"string-asc": function ( x, y )
+		{
+			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+		},
+		
+		"string-desc": function ( x, y )
+		{
+			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+		},
+		
+		
+		/*
+		 * html sorting (ignore html tags)
+		 */
+		"html-pre": function ( a )
+		{
+			return a.replace( /<.*?>/g, "" ).toLowerCase();
+		},
+		
+		"html-asc": function ( x, y )
+		{
+			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+		},
+		
+		"html-desc": function ( x, y )
+		{
+			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+		},
+		
+		
+		/*
+		 * date sorting
+		 */
+		"date-pre": function ( a )
+		{
+			var x = Date.parse( a );
+			
+			if ( isNaN(x) || x==="" )
+			{
+				x = Date.parse( "01/01/1970 00:00:00" );
+			}
+			return x;
+		},
+	
+		"date-asc": function ( x, y )
+		{
+			return x - y;
+		},
+		
+		"date-desc": function ( x, y )
+		{
+			return y - x;
+		},
+		
+		
+		/*
+		 * numerical sorting
+		 */
+		"numeric-pre": function ( a )
+		{
+			return (a=="-" || a==="") ? 0 : a*1;
+		},
+	
+		"numeric-asc": function ( x, y )
+		{
+			return x - y;
+		},
+		
+		"numeric-desc": function ( x, y )
+		{
+			return y - x;
+		}
+	} );
+	
+	
+	$.extend( DataTable.ext.aTypes, [
+		/*
+		 * Function: -
+		 * Purpose:  Check to see if a string is numeric
+		 * Returns:  string:'numeric' or null
+		 * Inputs:   mixed:sText - string to check
+		 */
+		function ( sData )
+		{
+			/* Allow zero length strings as a number */
+			if ( typeof sData === 'number' )
+			{
+				return 'numeric';
+			}
+			else if ( typeof sData !== 'string' )
+			{
+				return null;
+			}
+			
+			var sValidFirstChars = "0123456789-";
+			var sValidChars = "0123456789.";
+			var Char;
+			var bDecimal = false;
+			
+			/* Check for a valid first char (no period and allow negatives) */
+			Char = sData.charAt(0); 
+			if (sValidFirstChars.indexOf(Char) == -1) 
+			{
+				return null;
+			}
+			
+			/* Check all the other characters are valid */
+			for ( var i=1 ; i<sData.length ; i++ ) 
+			{
+				Char = sData.charAt(i); 
+				if (sValidChars.indexOf(Char) == -1) 
+				{
+					return null;
+				}
+				
+				/* Only allowed one decimal place... */
+				if ( Char == "." )
+				{
+					if ( bDecimal )
+					{
+						return null;
+					}
+					bDecimal = true;
+				}
+			}
+			
+			return 'numeric';
+		},
+		
+		/*
+		 * Function: -
+		 * Purpose:  Check to see if a string is actually a formatted date
+		 * Returns:  string:'date' or null
+		 * Inputs:   string:sText - string to check
+		 */
+		function ( sData )
+		{
+			var iParse = Date.parse(sData);
+			if ( (iParse !== null && !isNaN(iParse)) || (typeof sData === 'string' && sData.length === 0) )
+			{
+				return 'date';
+			}
+			return null;
+		},
+		
+		/*
+		 * Function: -
+		 * Purpose:  Check to see if a string should be treated as an HTML string
+		 * Returns:  string:'html' or null
+		 * Inputs:   string:sText - string to check
+		 */
+		function ( sData )
+		{
+			if ( typeof sData === 'string' && sData.indexOf('<') != -1 && sData.indexOf('>') != -1 )
+			{
+				return 'html';
+			}
+			return null;
+		}
+	] );
+	
+
+	// jQuery aliases
+	$.fn.DataTable = DataTable;
+	$.fn.dataTable = DataTable;
+	$.fn.dataTableSettings = DataTable.settings;
+	$.fn.dataTableExt = DataTable.ext;
+
+
+	// Information about events fired by DataTables - for documentation.
+	/**
+	 * Draw event, fired whenever the table is redrawn on the page, at the same point as
+	 * fnDrawCallback. This may be useful for binding events or performing calculations when
+	 * the table is altered at all.
+	 *  @name DataTable#draw
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Filter event, fired when the filtering applied to the table (using the build in global
+	 * global filter, or column filters) is altered.
+	 *  @name DataTable#filter
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Page change event, fired when the paging of the table is altered.
+	 *  @name DataTable#page
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Sort event, fired when the sorting applied to the table is altered.
+	 *  @name DataTable#sort
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * DataTables initialisation complete event, fired when the table is fully drawn,
+	 * including Ajax data loaded, if Ajax data is required.
+	 *  @name DataTable#init
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The JSON object request from the server - only
+	 *    present if client-side Ajax sourced data is used</li></ol>
+	 */
+
+	/**
+	 * State save event, fired when the table has changed state a new state save is required.
+	 * This method allows modification of the state saving object prior to actually doing the
+	 * save, including addition or other state properties (for plug-ins) or modification
+	 * of a DataTables core property.
+	 *  @name DataTable#stateSaveParams
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The state information to be saved
+	 */
+
+	/**
+	 * State load event, fired when the table is loading state from the stored data, but
+	 * prior to the settings object being modified by the saved state - allowing modification
+	 * of the saved state is required or loading of state for a plug-in.
+	 *  @name DataTable#stateLoadParams
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The saved state information
+	 */
+
+	/**
+	 * State loaded event, fired when state has been loaded from stored data and the settings
+	 * object has been modified by the loaded data.
+	 *  @name DataTable#stateLoaded
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The saved state information
+	 */
+
+	/**
+	 * Processing event, fired when DataTables is doing some kind of processing (be it,
+	 * sort, filter or anything else). Can be used to indicate to the end user that
+	 * there is something happening, or that something has finished.
+	 *  @name DataTable#processing
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {boolean} bShow Flag for if DataTables is doing processing or not
+	 */
+
+	/**
+	 * Ajax (XHR) event, fired whenever an Ajax request is completed from a request to 
+	 * made to the server for new data (note that this trigger is called in fnServerData,
+	 * if you override fnServerData and which to use this event, you need to trigger it in
+	 * you success function).
+	 *  @name DataTable#xhr
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+}(jQuery, window, document, undefined));
diff --git a/public/stylesheets/datatable.css b/public/stylesheets/datatable.css
new file mode 100644
index 000000000..c450cc40b
--- /dev/null
+++ b/public/stylesheets/datatable.css
@@ -0,0 +1,550 @@
+/*
+ *  File:         demo_table.css
+ *  CVS:          $Id$
+ *  Description:  CSS descriptions for DataTables demo pages
+ *  Author:       Allan Jardine
+ *  Created:      Tue May 12 06:47:22 BST 2009
+ *  Modified:     $Date$ by $Author$
+ *  Language:     CSS
+ *  Project:      DataTables
+ *
+ *  Copyright 2009 Allan Jardine. All Rights Reserved.
+ *
+ * ***************************************************************************
+ * DESCRIPTION
+ *
+ * The styles given here are suitable for the demos that are used with the standard DataTables
+ * distribution (see www.datatables.net). You will most likely wish to modify these styles to
+ * meet the layout requirements of your site.
+ *
+ * Common issues:
+ *   'full_numbers' pagination - I use an extra selector on the body tag to ensure that there is
+ *     no conflict between the two pagination types. If you want to use full_numbers pagination
+ *     ensure that you either have "example_alt_pagination" as a body class name, or better yet,
+ *     modify that selector.
+ *   Note that the path used for Images is relative. All images are by default located in
+ *     ../images/ - relative to this CSS file.
+ */
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables features
+ */
+
+.dataTables_wrapper {
+	position: relative;
+	min-height: 302px;
+	clear: both;
+	_height: 302px;
+	zoom: 1; /* Feeling sorry for IE */
+}
+
+.dataTables_processing {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 250px;
+	height: 30px;
+	margin-left: -125px;
+	margin-top: -15px;
+	padding: 14px 0 2px 0;
+	border: 1px solid #ddd;
+	text-align: center;
+	color: #999;
+	font-size: 14px;
+	background-color: white;
+}
+
+.dataTables_length {
+	width: 40%;
+	float: left;
+}
+
+.dataTables_filter {
+	width: 50%;
+	float: right;
+	text-align: right;
+    margin-bottom: 10px;
+}
+
+.dataTables_info {
+	width: 40%;
+    height: 30px;
+	float: left;
+}
+
+.dataTables_paginate {
+	width: 44px;
+	* width: 50px;
+	float: right;
+	text-align: right;
+}
+
+/* Pagination nested */
+.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
+	height: 19px;
+	width: 19px;
+	margin-left: 3px;
+	float: left;
+}
+
+.paginate_disabled_previous {
+	background-image: url('/images/datatables/back_disabled.jpg');
+}
+
+.paginate_enabled_previous {
+	background-image: url('/images/datatables/back_enabled.jpg');
+}
+
+.paginate_disabled_next {
+	background-image: url('/images/datatables/forward_disabled.jpg');
+}
+
+.paginate_enabled_next {
+	background-image: url('/images/datatables/forward_enabled.jpg');
+}
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables display
+ */
+table.datatable.display {
+	margin: 0 auto;
+	clear: both;
+	width: 100%;
+	
+	/* Note Firefox 3.5 and before have a bug with border-collapse
+	 * ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 ) 
+	 * border-spacing: 0; is one possible option. Conditional-css.com is
+	 * useful for this kind of thing
+	 *
+	 * Further note IE 6/7 has problems when calculating widths with border width.
+	 * It subtracts one px relative to the other browsers from the first column, and
+	 * adds one to the end...
+	 *
+	 * If you want that effect I'd suggest setting a border-top/left on th/td's and 
+	 * then filling in the gaps with other borders.
+	 */
+}
+
+table.datatable.display thead th {
+	padding: 3px 18px 3px 10px;
+	border-bottom: 1px solid black;
+	font-weight: bold;
+	cursor: pointer;
+	* cursor: hand;
+}
+
+table.datatable.display tfoot th {
+	padding: 3px 18px 3px 10px;
+	border-top: 1px solid black;
+	font-weight: bold;
+}
+
+table.datatable.display tr.heading2 td {
+	border-bottom: 1px solid #aaa;
+}
+
+table.datatable.display td {
+	padding: 3px 10px;
+}
+
+table.datatable.display td.center {
+	text-align: center;
+}
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables sorting
+ */
+
+.datatable .sorting_asc {
+	background: url('/images/datatables/sort_asc.png') no-repeat center right #EAEAEA;
+}
+
+.datatable .sorting_desc {
+	background: url('/images/datatables/sort_desc.png') no-repeat center right #EAEAEA;
+}
+
+.datatable .sorting {
+	background: url('/images/datatables/sort_both.png') no-repeat center right #EAEAEA;
+}
+
+.datatable .sorting_asc_disabled {
+	background: url('/images/datatables/sort_asc_disabled.png') no-repeat center right #EAEAEA;
+}
+
+.datatable .sorting_desc_disabled {
+	background: url('/images/datatables/sort_desc_disabled.png') no-repeat center right #EAEAEA;
+}
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables row classes
+ */
+table.datatable.display tr.odd.gradeA {
+	background-color: #ddffdd;
+}
+
+table.datatable.display tr.even.gradeA {
+	background-color: #eeffee;
+}
+
+table.datatable.display tr.odd.gradeC {
+	background-color: #ddddff;
+}
+
+table.datatable.display tr.even.gradeC {
+	background-color: #eeeeff;
+}
+
+table.datatable.display tr.odd.gradeX {
+	background-color: #ffdddd;
+}
+
+table.datatable.display tr.even.gradeX {
+	background-color: #ffeeee;
+}
+
+table.datatable.display tr.odd.gradeU {
+	background-color: #ddd;
+}
+
+table.datatable.display tr.even.gradeU {
+	background-color: #eee;
+}
+
+/*
+tr.odd {
+	background-color: #E2E4FF;
+}
+
+tr.even {
+	background-color: white;
+}
+*/
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Misc
+ */
+.dataTables_scroll {
+	clear: both;
+}
+
+.dataTables_scrollBody {
+	*margin-top: -1px;
+}
+
+.top, .bottom {
+	padding: 15px;
+	background-color: #F5F5F5;
+	border: 1px solid #CCCCCC;
+}
+
+.top .dataTables_info {
+	float: none;
+}
+
+.clear {
+	clear: both;
+}
+
+.dataTables_empty {
+	text-align: center;
+}
+
+tfoot input {
+	margin: 0.5em 0;
+	width: 100%;
+	color: #444;
+}
+
+tfoot input.search_init {
+	color: #999;
+}
+
+td.group {
+	background-color: #d1cfd0;
+	border-bottom: 2px solid #A19B9E;
+	border-top: 2px solid #A19B9E;
+}
+
+td.details {
+	background-color: #d1cfd0;
+	border: 2px solid #A19B9E;
+}
+
+
+.example_alt_pagination div.dataTables_info {
+	width: 40%;
+}
+
+.paging_full_numbers {
+	width: 400px;
+	height: 22px;
+	line-height: 22px;
+}
+
+.paging_full_numbers span.paginate_button,
+.paging_full_numbers span.paginate_active {
+    border-radius: 2px 2px 2px 2px;
+    background-color: #F4F4F4;
+    background-image: url("/stylesheets/web-app-theme/themes/default/images/button-background.png");
+    border: 1px solid #C3C4BA;
+    color: #111111;
+    margin-right: 5px;
+    min-width: 15px;
+    padding: 6px 10px;
+    text-align: center;
+    cursor: pointer;
+}
+
+.paging_full_numbers span.paginate_button:hover{
+    border: 1px solid #818171;
+    box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+}
+
+.paging_full_numbers span.paginate_button_disabled:hover{
+    border: 1px solid #C3C4BA;
+    box-shadow: 0 0 0;
+}
+
+.paging_full_numbers span.paginate_active {
+	background: none repeat scroll 0 0 #261F1F;
+    border: 1px solid #261F1F;
+    color: white;
+}
+
+table.display tr.even.row_selected td {
+	background-color: #B0BED9;
+}
+
+table.display tr.odd.row_selected td {
+	background-color: #9FAFD1;
+}
+
+
+/*
+ * Sorting classes for columns
+ */
+/* For the standard odd/even */
+/*
+tr.odd td.sorting_1 {
+	background-color: #D3D6FF;
+}
+
+tr.odd td.sorting_2 {
+	background-color: #DADCFF;
+}
+
+tr.odd td.sorting_3 {
+	background-color: #E0E2FF;
+}
+
+tr.even td.sorting_1 {
+	background-color: #EAEBFF;
+}
+
+tr.even td.sorting_2 {
+	background-color: #F2F3FF;
+}
+
+tr.even td.sorting_3 {
+	background-color: #F9F9FF;
+}
+*/
+
+
+/* For the Conditional-CSS grading rows */
+/*
+ 	Colour calculations (based off the main row colours)
+  Level 1:
+		dd > c4
+		ee > d5
+	Level 2:
+	  dd > d1
+	  ee > e2
+ */
+tr.odd.gradeA td.sorting_1 {
+	background-color: #c4ffc4;
+}
+
+tr.odd.gradeA td.sorting_2 {
+	background-color: #d1ffd1;
+}
+
+tr.odd.gradeA td.sorting_3 {
+	background-color: #d1ffd1;
+}
+
+tr.even.gradeA td.sorting_1 {
+	background-color: #d5ffd5;
+}
+
+tr.even.gradeA td.sorting_2 {
+	background-color: #e2ffe2;
+}
+
+tr.even.gradeA td.sorting_3 {
+	background-color: #e2ffe2;
+}
+
+tr.odd.gradeC td.sorting_1 {
+	background-color: #c4c4ff;
+}
+
+tr.odd.gradeC td.sorting_2 {
+	background-color: #d1d1ff;
+}
+
+tr.odd.gradeC td.sorting_3 {
+	background-color: #d1d1ff;
+}
+
+tr.even.gradeC td.sorting_1 {
+	background-color: #d5d5ff;
+}
+
+tr.even.gradeC td.sorting_2 {
+	background-color: #e2e2ff;
+}
+
+tr.even.gradeC td.sorting_3 {
+	background-color: #e2e2ff;
+}
+
+tr.odd.gradeX td.sorting_1 {
+	background-color: #ffc4c4;
+}
+
+tr.odd.gradeX td.sorting_2 {
+	background-color: #ffd1d1;
+}
+
+tr.odd.gradeX td.sorting_3 {
+	background-color: #ffd1d1;
+}
+
+tr.even.gradeX td.sorting_1 {
+	background-color: #ffd5d5;
+}
+
+tr.even.gradeX td.sorting_2 {
+	background-color: #ffe2e2;
+}
+
+tr.even.gradeX td.sorting_3 {
+	background-color: #ffe2e2;
+}
+
+tr.odd.gradeU td.sorting_1 {
+	background-color: #c4c4c4;
+}
+
+tr.odd.gradeU td.sorting_2 {
+	background-color: #d1d1d1;
+}
+
+tr.odd.gradeU td.sorting_3 {
+	background-color: #d1d1d1;
+}
+
+tr.even.gradeU td.sorting_1 {
+	background-color: #d5d5d5;
+}
+
+tr.even.gradeU td.sorting_2 {
+	background-color: #e2e2e2;
+}
+
+tr.even.gradeU td.sorting_3 {
+	background-color: #e2e2e2;
+}
+
+
+/*
+ * Row highlighting example
+ */
+.ex_highlight #example tbody tr.even:hover, #example tbody tr.even td.highlighted {
+	background-color: #ECFFB3;
+}
+
+.ex_highlight #example tbody tr.odd:hover, #example tbody tr.odd td.highlighted {
+	background-color: #E6FF99;
+}
+
+.ex_highlight_row #example tr.even:hover {
+	background-color: #ECFFB3;
+}
+
+.ex_highlight_row #example tr.even:hover td.sorting_1 {
+	background-color: #DDFF75;
+}
+
+.ex_highlight_row #example tr.even:hover td.sorting_2 {
+	background-color: #E7FF9E;
+}
+
+.ex_highlight_row #example tr.even:hover td.sorting_3 {
+	background-color: #E2FF89;
+}
+
+.ex_highlight_row #example tr.odd:hover {
+	background-color: #E6FF99;
+}
+
+.ex_highlight_row #example tr.odd:hover td.sorting_1 {
+	background-color: #D6FF5C;
+}
+
+.ex_highlight_row #example tr.odd:hover td.sorting_2 {
+	background-color: #E0FF84;
+}
+
+.ex_highlight_row #example tr.odd:hover td.sorting_3 {
+	background-color: #DBFF70;
+}
+
+
+/*
+ * KeyTable
+ */
+table.KeyTable td {
+	border: 3px solid transparent;
+}
+
+table.KeyTable td.focus {
+	border: 3px solid #3366FF;
+}
+
+table.display tr.gradeA {
+	background-color: #eeffee;
+}
+
+table.display tr.gradeC {
+	background-color: #ddddff;
+}
+
+table.display tr.gradeX {
+	background-color: #ffdddd;
+}
+
+table.display tr.gradeU {
+	background-color: #ddd;
+}
+
+div.box {
+	height: 100px;
+	padding: 10px;
+	overflow: auto;
+	border: 1px solid #8080FF;
+	background-color: #E5E5FF;
+}