diff --git a/plugins/mark_comment_as_read/public/public b/plugins/mark_comment_as_read/public/public
new file mode 120000
index 0000000..358dfec
--- /dev/null
+++ b/plugins/mark_comment_as_read/public/public
@@ -0,0 +1 @@
+/root/noosfero/config/plugins/mark_comment_as_read/public
\ No newline at end of file
diff --git a/plugins/pairwise/Gemfile b/plugins/pairwise/Gemfile
new file mode 100644
index 0000000..707bb89
--- /dev/null
+++ b/plugins/pairwise/Gemfile
@@ -0,0 +1,5 @@
+gem 'vcr'
+
+group :test do
+  gem 'webmock'
+end
diff --git a/plugins/pairwise/controllers/profile/pairwise_plugin_profile_controller.rb b/plugins/pairwise/controllers/profile/pairwise_plugin_profile_controller.rb
index d9b9ddd..fa94072 100644
--- a/plugins/pairwise/controllers/profile/pairwise_plugin_profile_controller.rb
+++ b/plugins/pairwise/controllers/profile/pairwise_plugin_profile_controller.rb
@@ -8,9 +8,9 @@ class PairwisePluginProfileController < ProfileController
     source = params[:source]
     locals = {:source => source, :pairwise_content => @pairwise_content, :embeded => embeded, :source => source, :prompt_id => prompt_id }
     if embeded
-      render 'content_viewer/prompt.rhtml', :layout => "embeded", :locals => locals
+      render 'content_viewer/prompt', :layout => "embeded", :locals => locals
     else
-      render 'content_viewer/prompt.rhtml', :locals => locals
+      render 'content_viewer/prompt', :locals => locals
     end
   end
 
@@ -18,7 +18,7 @@ class PairwisePluginProfileController < ProfileController
   def load_prompt
     @pairwise_content = find_content(params)
     if request.xhr?
-      render 'content_viewer/prompt.rjs'
+      render 'content_viewer/load_prompt.rjs'
     else
       redirect_to after_action_url
     end
@@ -28,7 +28,7 @@ class PairwisePluginProfileController < ProfileController
     @pairwise_content = find_content(params)
     vote = @pairwise_content.vote_to(params[:prompt_id], params[:direction], user_identifier, params[:appearance_id])
     if request.xhr? 
-      render 'content_viewer/prompt.rjs'
+      render 'content_viewer/load_prompt.rjs'
     else
       redirect_to after_action_url 
     end
@@ -41,7 +41,7 @@ class PairwisePluginProfileController < ProfileController
     reason = params[:reason]
     skip = @pairwise_content.skip_prompt(params[:prompt_id], user_identifier, params[:appearance_id], reason)
     if request.xhr? 
-      render 'content_viewer/prompt.rjs'
+      render 'content_viewer/load_prompt.rjs'
     else
       redirect_to after_action_url  
     end
@@ -53,7 +53,7 @@ class PairwisePluginProfileController < ProfileController
     @page = @pairwise_content = find_content(params)
 
     if request.xhr?
-      render 'content_viewer/result'
+      render 'content_viewer/load_result.rjs'
     else
       render 'pairwise_plugin_profile/result'
     end
diff --git a/plugins/pairwise/lib/pairwise/choice.rb b/plugins/pairwise/lib/pairwise/choice.rb
index b24d5cd..e7cbd11 100644
--- a/plugins/pairwise/lib/pairwise/choice.rb
+++ b/plugins/pairwise/lib/pairwise/choice.rb
@@ -1,5 +1,7 @@
 class Pairwise::Choice < ActiveResource::Base
   extend Pairwise::Resource
+
   self.element_name = "choice"
+  self.format = :xml
 
-end
\ No newline at end of file
+end
diff --git a/plugins/pairwise/lib/pairwise/prompt.rb b/plugins/pairwise/lib/pairwise/prompt.rb
index 9fae179..e973d9a 100644
--- a/plugins/pairwise/lib/pairwise/prompt.rb
+++ b/plugins/pairwise/lib/pairwise/prompt.rb
@@ -1,6 +1,9 @@
 class Pairwise::Prompt < ActiveResource::Base
   extend Pairwise::Resource
+
   self.element_name = "prompt"
+  self.format = :xml
+
   # extend Resource
   # self.site  = self.site + "questions/:question_id/"
   #attr_accessor :name, :question_text, :question_ideas
diff --git a/plugins/pairwise/lib/pairwise/question.rb b/plugins/pairwise/lib/pairwise/question.rb
index 8eda11e..972ca8e 100644
--- a/plugins/pairwise/lib/pairwise/question.rb
+++ b/plugins/pairwise/lib/pairwise/question.rb
@@ -2,6 +2,7 @@ class Pairwise::Question < ActiveResource::Base
   extend Pairwise::Resource
 
   self.element_name = "question"
+  self.format = :xml
 
   def get_choices(filter=nil, order=nil)
     Pairwise::Choice.find(
diff --git a/plugins/pairwise/lib/pairwise/visitor.rb b/plugins/pairwise/lib/pairwise/visitor.rb
index be4d217..3578fae 100644
--- a/plugins/pairwise/lib/pairwise/visitor.rb
+++ b/plugins/pairwise/lib/pairwise/visitor.rb
@@ -1,5 +1,7 @@
 class Pairwise::Visitor < ActiveResource::Base
   extend Pairwise::Resource
+
   self.element_name = "visitor"
-  
+  self.format = :xml
+
 end
diff --git a/plugins/pairwise/lib/pairwise_plugin/choices_related.rb b/plugins/pairwise/lib/pairwise_plugin/choices_related.rb
index ff5688a..18130fd 100644
--- a/plugins/pairwise/lib/pairwise_plugin/choices_related.rb
+++ b/plugins/pairwise/lib/pairwise_plugin/choices_related.rb
@@ -1,10 +1,12 @@
-class PairwisePlugin::ChoicesRelated < Noosfero::Plugin::ActiveRecord
+class PairwisePlugin::ChoicesRelated < ActiveRecord::Base
   set_table_name "pairwise_plugin_choices_related"
   belongs_to :question, :class_name => 'PairwisePlugin::PairwiseContent'
   belongs_to :user
 
   validates_presence_of :question, :choice_id, :parent_choice_id
 
+  attr_accessible :question, :choice_id, :parent_choice_id
+
   def self.related_choices_for choice_id
      PairwisePlugin::ChoicesRelated.find_all_by_choice_id(choice_id) + PairwisePlugin::ChoicesRelated.find_all_by_parent_choice_id(choice_id)
   end
diff --git a/plugins/pairwise/lib/pairwise_plugin/helpers/viewer_helper.rb b/plugins/pairwise/lib/pairwise_plugin/helpers/viewer_helper.rb
index 59b9719..525bcbf 100644
--- a/plugins/pairwise/lib/pairwise_plugin/helpers/viewer_helper.rb
+++ b/plugins/pairwise/lib/pairwise_plugin/helpers/viewer_helper.rb
@@ -17,7 +17,7 @@ module PairwisePlugin::Helpers::ViewerHelper
   end
 
   def skip_vote_open_function(pairwise_content)
-    link_to_function _('Skip vote'), "jQuery(\"#skip_vote_reasons_#{pairwise_content.id}\").slideToggle()"
+    link_to_function _('Skip vote'), "jQuery('#skip_vote_reasons_#{pairwise_content.id}').slideToggle()"
   end
 
   def skip_vote_link(pairwise_content, question, prompt, embeded = false, source = nil, appearance_id = nil, reason = nil)
diff --git a/plugins/pairwise/lib/pairwise_plugin/pairwise_content.rb b/plugins/pairwise/lib/pairwise_plugin/pairwise_content.rb
index c774c30..250100b 100644
--- a/plugins/pairwise/lib/pairwise_plugin/pairwise_content.rb
+++ b/plugins/pairwise/lib/pairwise_plugin/pairwise_content.rb
@@ -5,7 +5,9 @@ class PairwisePlugin::PairwiseContent < Article
 
   before_save :send_question_to_service
 
-  validate_on_create :validate_choices
+  validate :validate_choices, :on => :create
+
+  attr_accessible :pairwise_question_id, :allow_new_ideas, :choices, :choices_saved
 
   REASONS_ARRAY = [
      {:text => _("I like both ideas"), :compare => false},
@@ -59,7 +61,7 @@ class PairwisePlugin::PairwiseContent < Article
     pairwise_content = self
     lambda do
       locals = {:pairwise_content =>  pairwise_content, :source => source, :embeded => embeded, :prompt_id => prompt_id }
-      render :file => 'content_viewer/prompt.rhtml', :locals => locals
+      render :file => 'content_viewer/prompt', :locals => locals
     end
   end
 
@@ -83,7 +85,7 @@ class PairwisePlugin::PairwiseContent < Article
     begin
       @question ||= pairwise_client.find_question_by_id(pairwise_question_id)
     rescue Exception => error
-      errors.add_to_base(error.message)
+      errors.add(:base, error.message)
     end
     @question
   end
@@ -135,7 +137,7 @@ class PairwisePlugin::PairwiseContent < Article
       @choices = []
     else
       begin
-        @choices ||= question.get_choices.map {|q| { q.id.to_s, q.data } }
+        @choices ||= question.get_choices.map {|q| { q.id.to_s => q.data } }
       rescue
        @choices = []
       end
@@ -182,12 +184,12 @@ class PairwisePlugin::PairwiseContent < Article
   end
 
    def validate_choices
-    errors.add_to_base(_("Choices empty")) if choices.nil?
-    errors.add_to_base(_("Choices invalid format")) unless choices.is_a?(Array)
-    errors.add_to_base(_("Choices invalid")) if choices.size == 0
+    errors.add(:base, _("Choices empty")) if choices.nil?
+    errors.add(:base, _("Choices invalid format")) unless choices.is_a?(Array)
+    errors.add(:base, _("Choices invalid")) if choices.size == 0
     choices.each do | choice |
       if choice.empty?
-        errors.add_to_base(_("Choice empty"))
+        errors.add(:base, _("Choice empty"))
         break
       end
     end
@@ -197,7 +199,7 @@ class PairwisePlugin::PairwiseContent < Article
     begin
       return pairwise_client.update_choice(question, choice_id, choice_text, active)
     rescue Exception => e
-      errors.add_to_base(N_("Choices:") + " " + N_(e.message))
+      errors.add(:base, N_("Choices:") + " " + N_(e.message))
       return false
     end
   end
@@ -206,7 +208,7 @@ class PairwisePlugin::PairwiseContent < Article
     begin
       return pairwise_client.approve_choice(question, choice_id)
     rescue Exception => e
-      errors.add_to_base(N_("Choices:") + " " + N_(e.message))
+      errors.add(:base, N_("Choices:") + " " + N_(e.message))
       return false
     end
   end
@@ -239,7 +241,7 @@ class PairwisePlugin::PairwiseContent < Article
               pairwise_client.approve_choice(question, choice.id)
             end
           rescue Exception => e
-            errors.add_to_base(N_("Choices: Error adding new choice to question") + N_(e.message))
+            errors.add(:base, N_("Choices: Error adding new choice to question") + N_(e.message))
             return false
           end
         end
@@ -250,7 +252,7 @@ class PairwisePlugin::PairwiseContent < Article
           begin
             pairwise_client.update_choice(question, id, data, true)
           rescue Exception => e
-            errors.add_to_base(N_("Choices:") + " " + N_(e.message))
+            errors.add(:base, (N_("Choices:") + " " + N_(e.message)))
             return false
           end
         end
@@ -258,7 +260,7 @@ class PairwisePlugin::PairwiseContent < Article
       begin
         pairwise_client.update_question(pairwise_question_id, name)
       rescue Exception => e
-        errors.add_to_base(N_("Question not saved:  ") + N_(e.message))
+        errors.add(:base, (N_("Question not saved:  ") + N_(e.message)))
         return false
       end
     end
@@ -304,7 +306,7 @@ class PairwisePlugin::PairwiseContent < Article
     obj.pairwise_question_id = self.pairwise_question_id
     obj.allow_new_ideas = self.allow_new_ideas
     id = obj.send(:create_without_callbacks)
-    raise "Objeto não gravado" unless id
+    raise "object not saved" unless id
   end
 
   def copy!(options = {})
@@ -315,7 +317,7 @@ class PairwisePlugin::PairwiseContent < Article
     obj.pairwise_question_id = self.pairwise_question_id
     obj.allow_new_ideas = self.allow_new_ideas
     id = obj.send(:create_without_callbacks)
-    raise "Objeto não gravado" unless id
+    raise "object not saved" unless id
   end
 
   def page_size
diff --git a/plugins/pairwise/lib/pairwise_plugin/questions_group_list_block.rb b/plugins/pairwise/lib/pairwise_plugin/questions_group_list_block.rb
index a36fc65..b05fcfb 100644
--- a/plugins/pairwise/lib/pairwise_plugin/questions_group_list_block.rb
+++ b/plugins/pairwise/lib/pairwise_plugin/questions_group_list_block.rb
@@ -18,7 +18,7 @@ class PairwisePlugin::QuestionsGroupListBlock < Block
     #  content += ( question ? article_to_html(question,:gallery_view => false, :format => 'full').html_safe : _('No Question selected yet.') )
     #end
      lambda do
-       render :file => 'blocks/questions_group_list.rhtml', :locals => {:block => block}
+       render :file => 'blocks/questions_group_list', :locals => {:block => block}
      end
   end
 
diff --git a/plugins/pairwise/test/fixtures/http_stub_fixtures.rb b/plugins/pairwise/test/fixtures/http_stub_fixtures.rb
index a1c5183..20a71aa 100644
--- a/plugins/pairwise/test/fixtures/http_stub_fixtures.rb
+++ b/plugins/pairwise/test/fixtures/http_stub_fixtures.rb
@@ -1,7 +1,7 @@
 require 'vcr'
 
 VCR.configure do |c|
-  c.cassette_library_dir = "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/vcr_cassettes"
+  c.cassette_library_dir = "#{Rails.root}/plugins/pairwise/test/fixtures/vcr_cassettes"
   c.hook_into :webmock
 end
 
@@ -19,4 +19,4 @@ class HttpStubFixtures
       @client.create_question(name, choices)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/plugins/pairwise/test/fixtures/pairwise_content_fixtures.rb b/plugins/pairwise/test/fixtures/pairwise_content_fixtures.rb
index e5b0ba6..356ba2a 100644
--- a/plugins/pairwise/test/fixtures/pairwise_content_fixtures.rb
+++ b/plugins/pairwise/test/fixtures/pairwise_content_fixtures.rb
@@ -77,4 +77,4 @@ class PairwiseContentFixtures
     choices << Pairwise::Choice.new(:id => 2, :data => "Choice2", :wins => 0, :losses => 0, :score => 0.0)
     choices << Pairwise::Choice.new(:id => 3, :data => "Choice3", :wins => 0, :losses => 0, :score => 0.0)
   end
-end
\ No newline at end of file
+end
diff --git a/plugins/pairwise/test/functional/profile/pairwise_plugin_profile_controller_test.rb b/plugins/pairwise/test/functional/profile/pairwise_plugin_profile_controller_test.rb
index d5741d5..24371b2 100644
--- a/plugins/pairwise/test/functional/profile/pairwise_plugin_profile_controller_test.rb
+++ b/plugins/pairwise/test/functional/profile/pairwise_plugin_profile_controller_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-require "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
+require "#{Rails.root}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
 
 class PairwisePluginProfileControllerTest < ActionController::TestCase
 
@@ -35,10 +35,10 @@ class PairwisePluginProfileControllerTest < ActionController::TestCase
     login_as(@user.user.login)
     PairwisePluginProfileController.any_instance.expects(:find_content).returns(@content)
     @content.expects(:question_with_prompt_for_visitor).with(@user.identifier, nil).returns(@question)
-    get :prompt, 
-                  :profile => @profile.identifier, 
+    get :prompt,
+                  :profile => @profile.identifier,
                   :id => @content.id,
-                  :question_id => @question.id         
+                  :question_id => @question.id
     assert_not_nil  assigns(:pairwise_content)
     assert_match /#{@question.name}/, @response.body
     assert_match /#{@question.prompt.left_choice_text}/, @response.body
@@ -49,14 +49,14 @@ class PairwisePluginProfileControllerTest < ActionController::TestCase
     login_as(@user.user.login)
     PairwisePluginProfileController.any_instance.expects(:find_content).returns(@content)
     @content.expects(:question_with_prompt_for_visitor).with(@user.identifier, @question.prompt.id.to_s).returns(@question)
-    get :prompt, 
-                  :profile => @profile.identifier, 
+    get :prompt,
+                  :profile => @profile.identifier,
                   :id => @content.id,
                   :question_id => @question.id,
-                  :prompt_id => @question.prompt.id         
-    
+                  :prompt_id => @question.prompt.id
+
     assert_not_nil  assigns(:pairwise_content)
-    
+
     assert_match /#{@question.name}/, @response.body
     assert_match /#{@question.prompt.left_choice_text}/, @response.body
     assert_match /#{@question.prompt.right_choice_text}/, @response.body
diff --git a/plugins/pairwise/test/unit/pairwise/client_test.rb b/plugins/pairwise/test/unit/pairwise/client_test.rb
index 016ebd7..00ce778 100644
--- a/plugins/pairwise/test/unit/pairwise/client_test.rb
+++ b/plugins/pairwise/test/unit/pairwise/client_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 require 'vcr'
 
 VCR.configure do |c|
-  c.cassette_library_dir = "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/vcr_cassettes"
+  c.cassette_library_dir = "#{Rails.root}/plugins/pairwise/test/fixtures/vcr_cassettes"
   c.hook_into :webmock
 end
 
diff --git a/plugins/pairwise/test/unit/pairwise_plugin/choices_related_test.rb b/plugins/pairwise/test/unit/pairwise_plugin/choices_related_test.rb
index 83f3c33..5a0a529 100644
--- a/plugins/pairwise/test/unit/pairwise_plugin/choices_related_test.rb
+++ b/plugins/pairwise/test/unit/pairwise_plugin/choices_related_test.rb
@@ -1,5 +1,5 @@
 require "test_helper"
-require "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
+require "#{Rails.root}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
 
 class PairwisePlugin::ChoicesRelatedTest < ActiveSupport::TestCase
 
@@ -10,31 +10,31 @@ class PairwisePlugin::ChoicesRelatedTest < ActiveSupport::TestCase
   should 'have choice id' do
     choices_related = PairwisePlugin::ChoicesRelated.new
     choices_related.valid?
-    assert choices_related.errors.invalid?(:choice_id)
+    assert choices_related.errors.include?(:choice_id)
 
     choices_related.choice_id = 1
     choices_related.valid?
-    assert !choices_related.errors.invalid?(:choice_id)
+    assert !choices_related.errors.include?(:choice_id)
   end
 
   should 'have parent choice id' do
     choices_related = PairwisePlugin::ChoicesRelated.new
     choices_related.valid?
-    assert choices_related.errors.invalid?(:parent_choice_id)
+    assert choices_related.errors.include?(:parent_choice_id)
 
     choices_related.parent_choice_id = 1
     choices_related.valid?
-    assert !choices_related.errors.invalid?(:parent_choice_id)
+    assert !choices_related.errors.include?(:parent_choice_id)
   end
 
   should 'belongs to a question' do
     choices_related = PairwisePlugin::ChoicesRelated.new
     choices_related.valid?
-    assert choices_related.errors.invalid?(:question)
+    assert choices_related.errors.include?(:question)
 
     choices_related.question = @pairwise_content
     choices_related.valid?
-    assert !choices_related.errors.invalid?(:question)
+    assert !choices_related.errors.include?(:question)
   end
 
   should 'optionally have an user' do
@@ -50,4 +50,4 @@ class PairwisePlugin::ChoicesRelatedTest < ActiveSupport::TestCase
     assert_equal 1, PairwisePlugin::ChoicesRelated.related_choices_for(1).size
     assert_equal 1, PairwisePlugin::ChoicesRelated.related_choices_for(2).size
   end
-end
\ No newline at end of file
+end
diff --git a/plugins/pairwise/test/unit/pairwise_plugin/pairwise_content_test.rb b/plugins/pairwise/test/unit/pairwise_plugin/pairwise_content_test.rb
index 35be4ab..0ca6de6 100644
--- a/plugins/pairwise/test/unit/pairwise_plugin/pairwise_content_test.rb
+++ b/plugins/pairwise/test/unit/pairwise_plugin/pairwise_content_test.rb
@@ -1,11 +1,11 @@
 require "test_helper"
-require "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
-require "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/http_stub_fixtures"
+require "#{Rails.root}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
+require "#{Rails.root}/plugins/pairwise/test/fixtures/http_stub_fixtures"
 
 # require 'vcr'
 
 # VCR.configure do |c|
-#   c.cassette_library_dir = "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/vcr_cassettes"
+#   c.cassette_library_dir = "#{Rails.root}/plugins/pairwise/test/fixtures/vcr_cassettes"
 #   c.hook_into :webmock
 #   c.before_playback do |i|
 #     puts "I in PLAYBACK: #{i.inspect}"
@@ -70,7 +70,7 @@ class PairwisePlugin::PairwiseContentTest < ActiveSupport::TestCase
 
   should 'prepare prompt' do
     @question = Pairwise::Question.new(:id => @pairwise_content.pairwise_question_id, :name => 'Question 1')
-    @pairwise_content.expects(:pairwise_client).returns(@pairwise_client)
+    @pairwise_content.expects(:pairwise_client).returns(@pairwise_client).at_least_once
     @pairwise_client.expects(:question_with_prompt).with(@question.id,'any_user', nil).returns(@question)
     prompt = @pairwise_content.prepare_prompt('any_user')
     assert_not_nil prompt
@@ -84,11 +84,12 @@ class PairwisePlugin::PairwiseContentTest < ActiveSupport::TestCase
     @pairwise_client.expects(:find_question_by_id).with(@pairwise_content.pairwise_question_id).raises(ActiveResource::ResourceNotFound.new(@response))
 
     @pairwise_content.expects(:pairwise_client).returns(@pairwise_client)
-    assert_nil @pairwise_content.errors[:base]
+    assert @pairwise_content.errors[:base].blank?
     @pairwise_content.question
 
-    assert_not_nil @pairwise_content.errors[:base]
-    assert_equal 'Failed with 422 Any error', @pairwise_content.errors[:base]
+    assert !@pairwise_content.errors[:base].blank?
+    assert_match /Any error/, @pairwise_content.errors[:base].first
+    assert_match /422/, @pairwise_content.errors[:base].first
   end
 
   should 'send question to pairwise service' do
@@ -146,7 +147,7 @@ class PairwisePlugin::PairwiseContentTest < ActiveSupport::TestCase
     assert_equal true, @pairwise_content.allow_new_ideas?
     @question = Pairwise::Question.new(:id => @pairwise_content.pairwise_question_id, :name => 'Question 1', :active => false)
     @pairwise_content.expects(:pairwise_client).returns(@pairwise_client).at_least_once
-    @pairwise_client.expects(:add_new_idea).with(@question.id, "New idea").returns(true)
+    @pairwise_client.expects(:add_new_idea).with(@question.id, "New idea", nil).returns(true)
     assert_equal true, @pairwise_content.add_new_idea("New idea")
   end
 
diff --git a/plugins/pairwise/test/unit/pairwise_plugin/questions_group_block_test.rb b/plugins/pairwise/test/unit/pairwise_plugin/questions_group_block_test.rb
index 7229561..619e497 100644
--- a/plugins/pairwise/test/unit/pairwise_plugin/questions_group_block_test.rb
+++ b/plugins/pairwise/test/unit/pairwise_plugin/questions_group_block_test.rb
@@ -1,5 +1,5 @@
 require 'test_helper'
-require "#{RAILS_ROOT}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
+require "#{Rails.root}/plugins/pairwise/test/fixtures/pairwise_content_fixtures"
 
 class PairwisePlugin::QuestionsGroupBlockTest < ActiveSupport::TestCase
 
@@ -25,7 +25,7 @@ class PairwisePlugin::QuestionsGroupBlockTest < ActiveSupport::TestCase
   end
 
   should 'have available question' do
-    assert_equal [@question1, @question2], @block.available_questions
+    assert_equivalent [@question1, @question2], @block.available_questions
   end
 
   should 'add multiple questions to block' do
diff --git a/plugins/pairwise/views/blocks/questions_group_list.html.erb b/plugins/pairwise/views/blocks/questions_group_list.html.erb
new file mode 100644
index 0000000..359a356
--- /dev/null
+++ b/plugins/pairwise/views/blocks/questions_group_list.html.erb
@@ -0,0 +1,46 @@
+<% extend PairwisePlugin::Helpers::ViewerHelper %>
+
+<%= block_title(block.title) %>
+
+<div id='pairwise_group_list_block_<%= block.id %>' class='pairwise_group_list_container' data-open-prompt="0">
+  <div class="description">
+    <%= block.group_description %>
+  </div>
+	<div class="question container">
+	<% if block.questions.nil?  || block.questions.empty? %>
+		<span><%= _("Empty") %></span>
+	<% else 
+	  block.questions_for_view.each_with_index do |pairwise_content, index| 
+	 %>
+		<div class='<%= pairwise_group_row_classes(index) %>'>
+          <div class="number"><p><%= index + 1 %></p></div>
+          <div class="title"><p><%= pairwise_content.title %></p></div>
+			<div class="arrow" ><%= pairwise_span_arrow(index) %></div>
+		</div>
+		<%= pairwise_group_content_body(index, pairwise_content) %>
+		<% end %>
+	<% end %>
+	</div>
+</div>
+
+<script type="text/javascript">
+jQuery(document).ready(function($){
+	var block_id = '#pairwise_group_list_block_<%= block.id %>';
+	var block_element = $(block_id);
+	var questions_arrows = $(block_id + ' .arrow');
+	var questions_rows = $(block_id + ' .row');
+	var questions_bodies = $(block_id + ' .pairwise_inner_body');
+	questions_rows.click(function(){
+		var current_open =  parseInt(block_element.attr('data-open-prompt'));
+		var index_clicked = questions_rows.index(this);
+		if(index_clicked != current_open){
+			block_element.attr('data-open-prompt', index_clicked);
+			$(questions_bodies[current_open]).slideToggle();
+			$(questions_rows[current_open]).toggleClass("secondary");
+
+			$(questions_bodies[index_clicked]).slideToggle();
+			$(questions_rows[index_clicked]).toggleClass("secondary");
+		}
+	});
+});
+</script>
diff --git a/plugins/pairwise/views/blocks/questions_group_list.rhtml b/plugins/pairwise/views/blocks/questions_group_list.rhtml
deleted file mode 100644
index 359a356..0000000
--- a/plugins/pairwise/views/blocks/questions_group_list.rhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<% extend PairwisePlugin::Helpers::ViewerHelper %>
-
-<%= block_title(block.title) %>
-
-<div id='pairwise_group_list_block_<%= block.id %>' class='pairwise_group_list_container' data-open-prompt="0">
-  <div class="description">
-    <%= block.group_description %>
-  </div>
-	<div class="question container">
-	<% if block.questions.nil?  || block.questions.empty? %>
-		<span><%= _("Empty") %></span>
-	<% else 
-	  block.questions_for_view.each_with_index do |pairwise_content, index| 
-	 %>
-		<div class='<%= pairwise_group_row_classes(index) %>'>
-          <div class="number"><p><%= index + 1 %></p></div>
-          <div class="title"><p><%= pairwise_content.title %></p></div>
-			<div class="arrow" ><%= pairwise_span_arrow(index) %></div>
-		</div>
-		<%= pairwise_group_content_body(index, pairwise_content) %>
-		<% end %>
-	<% end %>
-	</div>
-</div>
-
-<script type="text/javascript">
-jQuery(document).ready(function($){
-	var block_id = '#pairwise_group_list_block_<%= block.id %>';
-	var block_element = $(block_id);
-	var questions_arrows = $(block_id + ' .arrow');
-	var questions_rows = $(block_id + ' .row');
-	var questions_bodies = $(block_id + ' .pairwise_inner_body');
-	questions_rows.click(function(){
-		var current_open =  parseInt(block_element.attr('data-open-prompt'));
-		var index_clicked = questions_rows.index(this);
-		if(index_clicked != current_open){
-			block_element.attr('data-open-prompt', index_clicked);
-			$(questions_bodies[current_open]).slideToggle();
-			$(questions_rows[current_open]).toggleClass("secondary");
-
-			$(questions_bodies[index_clicked]).slideToggle();
-			$(questions_rows[index_clicked]).toggleClass("secondary");
-		}
-	});
-});
-</script>
diff --git a/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_block.html.erb b/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_block.html.erb
new file mode 100644
index 0000000..41b9fea
--- /dev/null
+++ b/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_block.html.erb
@@ -0,0 +1,19 @@
+<div class="article-block-edition">
+<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
+  <p id="no_portal_community">
+  <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
+  </p>
+<% else %>
+  <%
+    questions = @block.available_questions
+  %>
+  <div id="questions_content" %>
+    <ul>
+      <% questions.each do |question| %>
+        <li>
+          <%= labelled_check_box(question.name, "block[questions_ids][]", question.id, @block.settings[:questions_ids] !=null && @block.settings[:questions_ids].include?(question.id.to_s) ) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_block.rhtml b/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_block.rhtml
deleted file mode 100644
index 41b9fea..0000000
--- a/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_block.rhtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="article-block-edition">
-<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
-  <p id="no_portal_community">
-  <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
-  </p>
-<% else %>
-  <%
-    questions = @block.available_questions
-  %>
-  <div id="questions_content" %>
-    <ul>
-      <% questions.each do |question| %>
-        <li>
-          <%= labelled_check_box(question.name, "block[questions_ids][]", question.id, @block.settings[:questions_ids] !=null && @block.settings[:questions_ids].include?(question.id.to_s) ) %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
\ No newline at end of file
diff --git a/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_list_block.html.erb b/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_list_block.html.erb
new file mode 100644
index 0000000..b5e8975
--- /dev/null
+++ b/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_list_block.html.erb
@@ -0,0 +1,34 @@
+<div class="article-block-edition">
+<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
+  <p id="no_portal_community">
+  <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
+  </p>
+<% else %>
+  <%
+    questions = @block.available_questions
+  %>
+  <div class="group_description">
+    <h3> <%= _('Description:') %> </h3>
+    <%= text_area(:block, :group_description, :rows => 6, :cols => 50) %>
+  </div>
+  <div id="questions_content" %>
+    <h3> <%= _('Choose which attributes should be displayed and drag to reorder them:') %> </h3>
+    <ul id="pairwise_questions_list">
+      <% questions.each do |question| %>
+        <li>
+          <%=  
+            check_box_tag( "block[questions_ids][]", question.id, @block.settings[:questions_ids] && @block.settings[:questions_ids].include?(question.id.to_s), :id => "pairwise_question_#{question.id}" ) +
+            content_tag( 'label', question.name, :for => "pairwise_question_#{question.id}" )
+          %>
+        </li>
+      <% end %>
+    </ul>
+   <div class="random_sort">
+      <%= labelled_form_field check_box(:block, :random_sort) + _('Show items in a random order'), '' %>
+  </div>
+  </div>
+<% end %>
+
+<script type="text/javascript">
+  jQuery( "#pairwise_questions_list" ).sortable();
+</script>
diff --git a/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_list_block.rhtml b/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_list_block.rhtml
deleted file mode 100644
index b5e8975..0000000
--- a/plugins/pairwise/views/box_organizer/pairwise_plugin/_questions_group_list_block.rhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="article-block-edition">
-<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
-  <p id="no_portal_community">
-  <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
-  </p>
-<% else %>
-  <%
-    questions = @block.available_questions
-  %>
-  <div class="group_description">
-    <h3> <%= _('Description:') %> </h3>
-    <%= text_area(:block, :group_description, :rows => 6, :cols => 50) %>
-  </div>
-  <div id="questions_content" %>
-    <h3> <%= _('Choose which attributes should be displayed and drag to reorder them:') %> </h3>
-    <ul id="pairwise_questions_list">
-      <% questions.each do |question| %>
-        <li>
-          <%=  
-            check_box_tag( "block[questions_ids][]", question.id, @block.settings[:questions_ids] && @block.settings[:questions_ids].include?(question.id.to_s), :id => "pairwise_question_#{question.id}" ) +
-            content_tag( 'label', question.name, :for => "pairwise_question_#{question.id}" )
-          %>
-        </li>
-      <% end %>
-    </ul>
-   <div class="random_sort">
-      <%= labelled_form_field check_box(:block, :random_sort) + _('Show items in a random order'), '' %>
-  </div>
-  </div>
-<% end %>
-
-<script type="text/javascript">
-  jQuery( "#pairwise_questions_list" ).sortable();
-</script>
diff --git a/plugins/pairwise/views/content_viewer/_menu.html.erb b/plugins/pairwise/views/content_viewer/_menu.html.erb
new file mode 100644
index 0000000..d1c979d
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/_menu.html.erb
@@ -0,0 +1,12 @@
+<% extend PairwisePlugin::Helpers::ViewerHelper %>
+
+<ul class="pairwise_menu">
+   <li>
+    <%=  pairwise_tab_remote_link _('Pairwise Vote'), pairwise_content.prompt_url, pairwise_content, embeded, :class => active_tab == :prompt ? 'active' : ''  %>
+   </li>
+   <li><%=  pairwise_tab_remote_link _('Results'), pairwise_content.result_url, pairwise_content, embeded, :class => active_tab == :results ? 'active' : ''  %></li>
+    <% if !embeded && pairwise_content.allow_edit?(user) %>
+      <li><%= pairwise_edit_link _('Edit'), pairwise_content %></li>
+      <li><%= ideas_management_link _('Manage Ideas'), pairwise_content, user %></li>
+    <% end %>
+</ul>
diff --git a/plugins/pairwise/views/content_viewer/_menu.rhtml b/plugins/pairwise/views/content_viewer/_menu.rhtml
deleted file mode 100644
index d1c979d..0000000
--- a/plugins/pairwise/views/content_viewer/_menu.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% extend PairwisePlugin::Helpers::ViewerHelper %>
-
-<ul class="pairwise_menu">
-   <li>
-    <%=  pairwise_tab_remote_link _('Pairwise Vote'), pairwise_content.prompt_url, pairwise_content, embeded, :class => active_tab == :prompt ? 'active' : ''  %>
-   </li>
-   <li><%=  pairwise_tab_remote_link _('Results'), pairwise_content.result_url, pairwise_content, embeded, :class => active_tab == :results ? 'active' : ''  %></li>
-    <% if !embeded && pairwise_content.allow_edit?(user) %>
-      <li><%= pairwise_edit_link _('Edit'), pairwise_content %></li>
-      <li><%= ideas_management_link _('Manage Ideas'), pairwise_content, user %></li>
-    <% end %>
-</ul>
diff --git a/plugins/pairwise/views/content_viewer/_pairwise_prompts.html.erb b/plugins/pairwise/views/content_viewer/_pairwise_prompts.html.erb
new file mode 100644
index 0000000..91ec8f2
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/_pairwise_prompts.html.erb
@@ -0,0 +1,17 @@
+<div id="pairwise_prompts_<%= pairwise_content.id %>">
+  <%= pairwise_spinner(pairwise_content) %>
+  <% unless question %>
+    <div style="height: 190px"></div>
+    <script>
+     <%= pairwise_spinner_show_function_call(pairwise_content) %>
+     jQuery.ajax({
+       url: "<%= url_for :controller=>'pairwise_plugin_profile', :action=>'load_prompt', :profile => pairwise_content.profile.identifier, :id => pairwise_content.id %>",
+       dataType: 'script'
+     });
+    </script>
+  <% else %>
+      <div class="prompt left"><%= choose_left_link(pairwise_content, question, question.prompt, embeded, source, question.appearance_id) %></div>
+      <div class="separator"></div>
+     <div class="prompt right"><%= choose_right_link(pairwise_content, question, question.prompt, embeded, source, question.appearance_id  ) %></div>
+  <% end %>
+</div>
diff --git a/plugins/pairwise/views/content_viewer/_pairwise_prompts.rhtml b/plugins/pairwise/views/content_viewer/_pairwise_prompts.rhtml
deleted file mode 100644
index 91ec8f2..0000000
--- a/plugins/pairwise/views/content_viewer/_pairwise_prompts.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="pairwise_prompts_<%= pairwise_content.id %>">
-  <%= pairwise_spinner(pairwise_content) %>
-  <% unless question %>
-    <div style="height: 190px"></div>
-    <script>
-     <%= pairwise_spinner_show_function_call(pairwise_content) %>
-     jQuery.ajax({
-       url: "<%= url_for :controller=>'pairwise_plugin_profile', :action=>'load_prompt', :profile => pairwise_content.profile.identifier, :id => pairwise_content.id %>",
-       dataType: 'script'
-     });
-    </script>
-  <% else %>
-      <div class="prompt left"><%= choose_left_link(pairwise_content, question, question.prompt, embeded, source, question.appearance_id) %></div>
-      <div class="separator"></div>
-     <div class="prompt right"><%= choose_right_link(pairwise_content, question, question.prompt, embeded, source, question.appearance_id  ) %></div>
-  <% end %>
-</div>
diff --git a/plugins/pairwise/views/content_viewer/_pairwise_skips.html.erb b/plugins/pairwise/views/content_viewer/_pairwise_skips.html.erb
new file mode 100644
index 0000000..38d6c0a
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/_pairwise_skips.html.erb
@@ -0,0 +1,5 @@
+<ul>
+	<% pairwise_content.ask_skip_reasons(question.prompt).each do |reason| %>
+	  <%= skip_vote_link(pairwise_content, question, question.prompt, embeded, source, question.appearance_id, reason ) %>
+	<% end %>
+</ul>
\ No newline at end of file
diff --git a/plugins/pairwise/views/content_viewer/_pairwise_skips.rhtml b/plugins/pairwise/views/content_viewer/_pairwise_skips.rhtml
deleted file mode 100644
index 38d6c0a..0000000
--- a/plugins/pairwise/views/content_viewer/_pairwise_skips.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul>
-	<% pairwise_content.ask_skip_reasons(question.prompt).each do |reason| %>
-	  <%= skip_vote_link(pairwise_content, question, question.prompt, embeded, source, question.appearance_id, reason ) %>
-	<% end %>
-</ul>
\ No newline at end of file
diff --git a/plugins/pairwise/views/content_viewer/_prompt_body.html.erb b/plugins/pairwise/views/content_viewer/_prompt_body.html.erb
new file mode 100644
index 0000000..23aaaf9
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/_prompt_body.html.erb
@@ -0,0 +1,37 @@
+<div id="pairwise_<%= pairwise_content.id %>">
+<div id="pairwise_main" class="pairwise_main">
+  <%= render :partial => 'content_viewer/menu', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :active_tab => :prompt} %>
+  <div class="pairwise_content">
+      <div class="pairwise_body"><%= pairwise_content.title %></div>
+      <div class="pairwise_call_for_action"><%= pairwise_content.body %></div>
+      <%= render :partial => 'content_viewer/pairwise_prompts', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
+      <% if embeded %>
+       	<div class="footer"><%= _('Powered by') + ' ' + pairwise_content.environment.name%></div>
+      <% end %>
+  </div>
+	<div class="skip_vote">
+			<%= skip_vote_open_function(pairwise_content) %>
+	</div>
+  <div id="skip_vote_reasons_<%= pairwise_content.id %>" class="skip_vote_reasons">
+  <% if question %>
+    <%= render :partial => 'content_viewer/pairwise_skips', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
+  <% end %>
+  </div>
+
+	<% if pairwise_content.allow_new_ideas? %>
+    <% if user %>
+      <div id="suggestions_box">
+        <span>Gostaria de sugerir uma ideia?</span>
+        <div class="suggestion_form">
+        <%= render :partial => "pairwise_plugin_profile/suggestion_form",
+            :locals => {:pairwise_content => pairwise_content, :embeded => embeded, :source => source} %>
+        </div>
+      </div>
+    <% else %>
+      <div id="suggestions_box_not_logged">
+        <%= link_to(_("Add new idea"), '#', :id => 'new_idea_button_not_logged', :class => 'require-login-popup') %>
+      </div>
+    <% end %>
+  <% end %>
+</div>
+</div>
diff --git a/plugins/pairwise/views/content_viewer/_prompt_body.rhtml b/plugins/pairwise/views/content_viewer/_prompt_body.rhtml
deleted file mode 100644
index 23aaaf9..0000000
--- a/plugins/pairwise/views/content_viewer/_prompt_body.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="pairwise_<%= pairwise_content.id %>">
-<div id="pairwise_main" class="pairwise_main">
-  <%= render :partial => 'content_viewer/menu', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :active_tab => :prompt} %>
-  <div class="pairwise_content">
-      <div class="pairwise_body"><%= pairwise_content.title %></div>
-      <div class="pairwise_call_for_action"><%= pairwise_content.body %></div>
-      <%= render :partial => 'content_viewer/pairwise_prompts', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
-      <% if embeded %>
-       	<div class="footer"><%= _('Powered by') + ' ' + pairwise_content.environment.name%></div>
-      <% end %>
-  </div>
-	<div class="skip_vote">
-			<%= skip_vote_open_function(pairwise_content) %>
-	</div>
-  <div id="skip_vote_reasons_<%= pairwise_content.id %>" class="skip_vote_reasons">
-  <% if question %>
-    <%= render :partial => 'content_viewer/pairwise_skips', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
-  <% end %>
-  </div>
-
-	<% if pairwise_content.allow_new_ideas? %>
-    <% if user %>
-      <div id="suggestions_box">
-        <span>Gostaria de sugerir uma ideia?</span>
-        <div class="suggestion_form">
-        <%= render :partial => "pairwise_plugin_profile/suggestion_form",
-            :locals => {:pairwise_content => pairwise_content, :embeded => embeded, :source => source} %>
-        </div>
-      </div>
-    <% else %>
-      <div id="suggestions_box_not_logged">
-        <%= link_to(_("Add new idea"), '#', :id => 'new_idea_button_not_logged', :class => 'require-login-popup') %>
-      </div>
-    <% end %>
-  <% end %>
-</div>
-</div>
diff --git a/plugins/pairwise/views/content_viewer/_result.html.erb b/plugins/pairwise/views/content_viewer/_result.html.erb
new file mode 100644
index 0000000..dd95d5d
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/_result.html.erb
@@ -0,0 +1,63 @@
+<div id="pairwise_<%= pairwise_content.id %>">
+<div id="pairwise_main" class="pairwise_main">
+
+<%
+  @question = @page.question
+ %>
+
+<% extend PairwisePlugin::Helpers::ViewerHelper %>
+
+<% unless @page.errors[:base].blank? %>
+    <h3><%= _('Pairwise Integration Error') %></h3>
+    <p> <%= _('Please contact the administrator') %></p>
+    <pre>
+    <%= @page.errors[:base] %>
+    </pre>
+<% else %>
+
+  <%= render :partial => 'content_viewer/menu', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :active_tab => :results} %>
+
+  <% cache_timeout("pairwise-result-#{pairwise_content.id}", 1.hours) do %>
+  <div class="pairwise_content">
+<%= pairwise_spinner(pairwise_content) %>
+
+    <div class="total_votes">
+      <span class="label"><%= _('Total votes:') %></span>
+      <span class="value"><%= @page.question.votes_count %></span>
+    </div>
+    <table>
+      <thead>
+      <tr>
+        <th><%= _('Choice Text') %></th>
+        <th title="<%= _('The ideia is better than the other ideas') %>" ><%= _('Choice Wins') %></th>
+        <th title="<%= _('The other ideas were chosen') %>" ><%= _('Choice Losses') %></th>
+        <th title="<%= _('Rank of the ideias') %>" ><%= _('Choice Score') %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @page.question.get_choices.each do |choice| %>
+      <tr>
+          <td><%= choice.data %></td>
+          <td><%= choice.wins %></td>
+          <td><%= choice.losses %></td>
+          <td><%= choice.score.round.to_s %></td>
+    	</tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+  <% if @page.allow_edit?(user) %>
+    <div class="embeded_code">
+      <span class="embeded_code_link"><a href="javascript:;"><%= _("Show/Hide Embeded Code") %></a></span>
+      <div id="pairwise_embeded_box" style="display:none">
+        <%= pairwise_embeded_code(@page) %>
+      </div>
+    </div>
+  <% end %>
+  <%#= link_to _('Vote'), @page.url, :class=>"button with-text icon-edit" %>
+<% end %>
+<% end %>
+
+</div>
+</div>
+
diff --git a/plugins/pairwise/views/content_viewer/_result.rhtml b/plugins/pairwise/views/content_viewer/_result.rhtml
deleted file mode 100644
index f3133bb..0000000
--- a/plugins/pairwise/views/content_viewer/_result.rhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<div id="pairwise_<%= pairwise_content.id %>">
-<div id="pairwise_main" class="pairwise_main">
-
-<%
-  @question = @page.question
- %>
-
-<% extend PairwisePlugin::Helpers::ViewerHelper %>
-
-<% unless @page.errors[:base].nil? %>
-    <h3><%= _('Pairwise Integration Error') %></h3>
-    <p> <%= _('Please contact the administrator') %></p>
-    <pre>
-    <%= @page.errors[:base] %>
-    </pre>
-<% else %>
-
-  <%= render :partial => 'content_viewer/menu', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :active_tab => :results} %>
-
-  <% cache_timeout("pairwise-result-#{pairwise_content.id}", 1.hours) do %>
-  <div class="pairwise_content">
-<%= pairwise_spinner(pairwise_content) %>
-
-    <div class="total_votes">
-      <span class="label"><%= _('Total votes:') %></span>
-      <span class="value"><%= @page.question.votes_count %></span>
-    </div>
-    <table>
-      <thead>
-      <tr>
-        <th><%= _('Choice Text') %></th>
-        <th title="<%= _('The ideia is better than the other ideas') %>" ><%= _('Choice Wins') %></th>
-        <th title="<%= _('The other ideas were chosen') %>" ><%= _('Choice Losses') %></th>
-        <th title="<%= _('Rank of the ideias') %>" ><%= _('Choice Score') %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @page.question.get_choices.each do |choice| %>
-      <tr>
-          <td><%= choice.data %></td>
-          <td><%= choice.wins %></td>
-          <td><%= choice.losses %></td>
-          <td><%= choice.score.round.to_s %></td>
-    	</tr>
-      <% end %>
-      </tbody>
-    </table>
-  </div>
-  <% if @page.allow_edit?(user) %>
-    <div class="embeded_code">
-      <span class="embeded_code_link"><a href="javascript:;"><%= _("Show/Hide Embeded Code") %></a></span>
-      <div id="pairwise_embeded_box" style="display:none">
-        <%= pairwise_embeded_code(@page) %>
-      </div>
-    </div>
-  <% end %>
-  <%#= link_to _('Vote'), @page.url, :class=>"button with-text icon-edit" %>
-<% end %>
-<% end %>
-
-</div>
-</div>
-
diff --git a/plugins/pairwise/views/content_viewer/load_prompt.rjs b/plugins/pairwise/views/content_viewer/load_prompt.rjs
new file mode 100644
index 0000000..f22e80e
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/load_prompt.rjs
@@ -0,0 +1,25 @@
+extend PairwisePlugin::Helpers::ViewerHelper
+
+question = @pairwise_content.prepare_prompt(pairwise_user_identifier(user), nil)
+
+spinner = "pairwise_spinner#{@pairwise_content.id}"
+
+div_id = "pairwise_prompts_#{@pairwise_content.id}"
+
+skip_div_id = "skip_vote_reasons_#{@pairwise_content.id}"
+
+page.replace div_id, :partial => 'content_viewer/pairwise_prompts', :locals => {
+                    :embeded => params[:embeded], 
+                    :source => params[:source], 
+                    :pairwise_content => @pairwise_content,
+                    :question => question
+                  }
+
+page.replace_html skip_div_id, :partial => 'content_viewer/pairwise_skips', :locals  => {
+                    :embeded => params[:embeded], 
+                    :source => params[:source], 
+                    :pairwise_content => @pairwise_content,
+                    :question => question
+                  }                  
+
+page.call pairwise_spinner_hide_function_name(@pairwise_content)
diff --git a/plugins/pairwise/views/content_viewer/load_result.rjs b/plugins/pairwise/views/content_viewer/load_result.rjs
new file mode 100644
index 0000000..e595239
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/load_result.rjs
@@ -0,0 +1,10 @@
+extend PairwisePlugin::Helpers::ViewerHelper
+
+div_id = "pairwise_#{@pairwise_content.id}"
+
+page.replace div_id, :partial => 'content_viewer/result', :locals => {
+                    :embeded => params[:embeded],
+                    :pairwise_content => @pairwise_content,
+                  }
+
+page.call pairwise_spinner_hide_function_name(@pairwise_content)
diff --git a/plugins/pairwise/views/content_viewer/prompt.html.erb b/plugins/pairwise/views/content_viewer/prompt.html.erb
new file mode 100644
index 0000000..514ec6e
--- /dev/null
+++ b/plugins/pairwise/views/content_viewer/prompt.html.erb
@@ -0,0 +1,14 @@
+<% extend PairwisePlugin::Helpers::ViewerHelper %>
+
+<%= pairwise_plugin_stylesheet  %>
+
+<% if embeded %>
+  <%= javascript_include_tag :defaults, 'jquery-latest.js',
+  'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
+  'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
+  'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
+  'add-and-join', 'report-abuse', 'catalog', 'manage-products',
+  'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
+<% end %>
+
+<%= render :partial => 'content_viewer/prompt_body', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => nil, :source => (defined?(source) ? source : '') }%>
diff --git a/plugins/pairwise/views/content_viewer/prompt.rhtml b/plugins/pairwise/views/content_viewer/prompt.rhtml
deleted file mode 100644
index 514ec6e..0000000
--- a/plugins/pairwise/views/content_viewer/prompt.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<% extend PairwisePlugin::Helpers::ViewerHelper %>
-
-<%= pairwise_plugin_stylesheet  %>
-
-<% if embeded %>
-  <%= javascript_include_tag :defaults, 'jquery-latest.js',
-  'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
-  'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-  'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-  'add-and-join', 'report-abuse', 'catalog', 'manage-products',
-  'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
-<% end %>
-
-<%= render :partial => 'content_viewer/prompt_body', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => nil, :source => (defined?(source) ? source : '') }%>
diff --git a/plugins/pairwise/views/content_viewer/prompt.rjs b/plugins/pairwise/views/content_viewer/prompt.rjs
deleted file mode 100644
index f22e80e..0000000
--- a/plugins/pairwise/views/content_viewer/prompt.rjs
+++ /dev/null
@@ -1,25 +0,0 @@
-extend PairwisePlugin::Helpers::ViewerHelper
-
-question = @pairwise_content.prepare_prompt(pairwise_user_identifier(user), nil)
-
-spinner = "pairwise_spinner#{@pairwise_content.id}"
-
-div_id = "pairwise_prompts_#{@pairwise_content.id}"
-
-skip_div_id = "skip_vote_reasons_#{@pairwise_content.id}"
-
-page.replace div_id, :partial => 'content_viewer/pairwise_prompts', :locals => {
-                    :embeded => params[:embeded], 
-                    :source => params[:source], 
-                    :pairwise_content => @pairwise_content,
-                    :question => question
-                  }
-
-page.replace_html skip_div_id, :partial => 'content_viewer/pairwise_skips', :locals  => {
-                    :embeded => params[:embeded], 
-                    :source => params[:source], 
-                    :pairwise_content => @pairwise_content,
-                    :question => question
-                  }                  
-
-page.call pairwise_spinner_hide_function_name(@pairwise_content)
diff --git a/plugins/pairwise/views/content_viewer/result.rjs b/plugins/pairwise/views/content_viewer/result.rjs
deleted file mode 100644
index e595239..0000000
--- a/plugins/pairwise/views/content_viewer/result.rjs
+++ /dev/null
@@ -1,10 +0,0 @@
-extend PairwisePlugin::Helpers::ViewerHelper
-
-div_id = "pairwise_#{@pairwise_content.id}"
-
-page.replace div_id, :partial => 'content_viewer/result', :locals => {
-                    :embeded => params[:embeded],
-                    :pairwise_content => @pairwise_content,
-                  }
-
-page.call pairwise_spinner_hide_function_name(@pairwise_content)
diff --git a/plugins/pairwise/views/pairwise_plugin_admin/index.html.erb b/plugins/pairwise/views/pairwise_plugin_admin/index.html.erb
new file mode 100644
index 0000000..c3b6c68
--- /dev/null
+++ b/plugins/pairwise/views/pairwise_plugin_admin/index.html.erb
@@ -0,0 +1,17 @@
+<h1><%= _('Pairwise settings')%></h1>
+
+<%= form_for(:settings) do |f| %>
+
+  <div id="pairwise-config-fields">
+    <%= labelled_form_field _('Pairwise api host'), f.text_field(:api_host) %>
+    <%= labelled_form_field _('Pairwise username'), f.text_field(:username) %>
+    <%= labelled_form_field _('Pairwise password'), f.text_field(:password) %>
+
+
+
+    <% button_bar do %>
+      <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+    <% end %>
+  </div>
+<% end %>
+
diff --git a/plugins/pairwise/views/pairwise_plugin_admin/index.rhtml b/plugins/pairwise/views/pairwise_plugin_admin/index.rhtml
deleted file mode 100644
index 8070e67..0000000
--- a/plugins/pairwise/views/pairwise_plugin_admin/index.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1><%= _('Pairwise settings')%></h1>
-
-<% form_for(:settings) do |f| %>
-
-  <div id="pairwise-config-fields">
-    <%= labelled_form_field _('Pairwise api host'), f.text_field(:api_host) %>
-    <%= labelled_form_field _('Pairwise username'), f.text_field(:username) %>
-    <%= labelled_form_field _('Pairwise password'), f.text_field(:password) %>
-
-
-
-    <% button_bar do %>
-      <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
-    <% end %>
-  </div>
-<% end %>
-
diff --git a/plugins/pairwise/views/pairwise_plugin_profile/_suggestion_form.html.erb b/plugins/pairwise/views/pairwise_plugin_profile/_suggestion_form.html.erb
new file mode 100644
index 0000000..d77607a
--- /dev/null
+++ b/plugins/pairwise/views/pairwise_plugin_profile/_suggestion_form.html.erb
@@ -0,0 +1,28 @@
+	<%= remote_form_for('idea', :url => pairwise_suggestion_url(pairwise_content, embeded, source),
+	    :html => {:id => "pairwise_suggestion_form_#{pairwise_content.id}"}, :loading => "jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_fields').hide();jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_loading').show();", :loaded => "jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_fields').show();jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_loading').hide();") do  |f| %>
+	  <div class="suggestion_box_fields">
+		<div class="error">
+	       <%= flash[:error] %>
+	    </div>
+	    <div class="notice">
+	       <%= flash[:notice] %>
+	    </div>
+	    <div class="div_text_input_container"> 
+			<div id="text_idea_content_<%= pairwise_content.id %>" class="div_text_input">
+			    <%= text_area :idea, :text, :maxlenght => 160, :rows => 4, :placeholder => _('Type your idea here') %>
+	    	</div> 
+	    	<div class="suggest_idea_btn">
+			    <%= submit_button('', '', :id => 'new_idea_button', :class => user ? '':'require-login-popup') %>
+			</div>
+		</div>
+	  </div>
+	  <div class="suggestion_box_loading" style="display: none;">
+	    <span>Processando...</span>
+	  </div>
+	  <script type='text/javascript'>
+		jQuery(document).ready(function($){
+			var pairwise_id = '<%=pairwise_content.id %>';
+		  	$('#text_idea_content_' + pairwise_id).find('textarea').jqEasyCounter();
+	  	});
+	  </script>
+	<% end %>
diff --git a/plugins/pairwise/views/pairwise_plugin_profile/_suggestion_form.rhtml b/plugins/pairwise/views/pairwise_plugin_profile/_suggestion_form.rhtml
deleted file mode 100644
index 9a99087..0000000
--- a/plugins/pairwise/views/pairwise_plugin_profile/_suggestion_form.rhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-	<% remote_form_for('idea', :url => pairwise_suggestion_url(pairwise_content, embeded, source),
-	    :html => {:id => "pairwise_suggestion_form_#{pairwise_content.id}"}, :loading => "jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_fields').hide();jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_loading').show();", :loaded => "jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_fields').show();jQuery('#pairwise_suggestion_form_#{pairwise_content.id} .suggestion_box_loading').hide();") do  |f| %>
-	  <div class="suggestion_box_fields">
-		<div class="error">
-	       <%= flash[:error] %>
-	    </div>
-	    <div class="notice">
-	       <%= flash[:notice] %>
-	    </div>
-	    <div class="div_text_input_container"> 
-			<div id="text_idea_content_<%= pairwise_content.id %>" class="div_text_input">
-			    <%= f.text_area 'text', :maxlenght => 160, :rows => 4, :placeholder => _('Type your idea here') %>
-	    	</div> 
-	    	<div class="suggest_idea_btn">
-			    <%= submit_button('', '', :id => 'new_idea_button', :class => user ? '':'require-login-popup') %>
-			</div>
-		</div>
-	  </div>
-	  <div class="suggestion_box_loading" style="display: none;">
-	    <span>Processando...</span>
-	  </div>
-	  <script type='text/javascript'>
-		jQuery(document).ready(function($){
-			var pairwise_id = '<%=pairwise_content.id %>';
-		  	$('#text_idea_content_' + pairwise_id).find('textarea').jqEasyCounter();
-	  	});
-	  </script>
-	<% end %>
diff --git a/plugins/pairwise/views/pairwise_plugin_profile/result.html.erb b/plugins/pairwise/views/pairwise_plugin_profile/result.html.erb
new file mode 100644
index 0000000..25b14f2
--- /dev/null
+++ b/plugins/pairwise/views/pairwise_plugin_profile/result.html.erb
@@ -0,0 +1,10 @@
+<% extend PairwisePlugin::Helpers::ViewerHelper %>
+
+<%= pairwise_plugin_stylesheet  %>
+
+<h1 class="title"><%= @page.name %></h1>
+
+<%= render :partial => "content_viewer/result", :locals => {
+                    :embeded => @embeded,
+                    :pairwise_content => @pairwise_content,
+        } %>
diff --git a/plugins/pairwise/views/pairwise_plugin_profile/result.rhtml b/plugins/pairwise/views/pairwise_plugin_profile/result.rhtml
deleted file mode 100644
index 25b14f2..0000000
--- a/plugins/pairwise/views/pairwise_plugin_profile/result.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% extend PairwisePlugin::Helpers::ViewerHelper %>
-
-<%= pairwise_plugin_stylesheet  %>
-
-<h1 class="title"><%= @page.name %></h1>
-
-<%= render :partial => "content_viewer/result", :locals => {
-                    :embeded => @embeded,
-                    :pairwise_content => @pairwise_content,
-        } %>
diff --git a/plugins/pairwise/views/pairwise_plugin_suggestions/edit.html.erb b/plugins/pairwise/views/pairwise_plugin_suggestions/edit.html.erb
new file mode 100644
index 0000000..abcf16d
--- /dev/null
+++ b/plugins/pairwise/views/pairwise_plugin_suggestions/edit.html.erb
@@ -0,0 +1,16 @@
+<h1><%= _("Edit Pairwise Question Choice") %> </h1>
+
+<h4><%= @pairwise_content.name %></h4>
+
+<%= form_for 'choice', 
+		:url => { 
+			:controller => 'pairwise_plugin_suggestions',
+			:action => 'update', 
+			:id => @pairwise_content.id
+		} do |f| %>
+	<%= f.hidden_field 'id' %>
+	<%= f.text_area 'data', :rows => 4, :style => "width:100%" %>
+	<%= f.check_box 'active' %> <%= f.label _('Active') %>
+	<br class="clear">
+	<%= submit_button('save', _('Update'), :id => 'update_choice_button') %>
+<% end %>
diff --git a/plugins/pairwise/views/pairwise_plugin_suggestions/edit.rhtml b/plugins/pairwise/views/pairwise_plugin_suggestions/edit.rhtml
deleted file mode 100644
index 015a294..0000000
--- a/plugins/pairwise/views/pairwise_plugin_suggestions/edit.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1><%= _("Edit Pairwise Question Choice") %> </h1>
-
-<h4><%= @pairwise_content.name %></h4>
-
-<% form_for 'choice', 
-		:url => { 
-			:controller => 'pairwise_plugin_suggestions',
-			:action => 'update', 
-			:id => @pairwise_content.id
-		} do |f| %>
-	<%= f.hidden_field 'id' %>
-	<%= f.text_area 'data', :rows => 4, :style => "width:100%" %>
-	<%= f.check_box 'active' %> <%= f.label _('Active') %>
-	<br class="clear">
-	<%= submit_button('save', _('Update'), :id => 'update_choice_button') %>
-<% end %>
diff --git a/plugins/pairwise/views/pairwise_plugin_suggestions/index.html.erb b/plugins/pairwise/views/pairwise_plugin_suggestions/index.html.erb
new file mode 100644
index 0000000..483778e
--- /dev/null
+++ b/plugins/pairwise/views/pairwise_plugin_suggestions/index.html.erb
@@ -0,0 +1,154 @@
+<% extend PairwisePlugin::Helpers::ViewerHelper %>
+<% extend PairwisePlugin::Helpers::SuggestionsHelper %>
+
+<%= pairwise_plugin_stylesheet  %>
+
+<h1><%= _("Pairwise Question") %></h1>
+<h4><%= _("Question text" ) %>: </h4><span><%= @pairwise_content.name %></span>
+<div class="result_label">
+	<%= pairwise_result_link _("Results"), @pairwise_content %>
+</div>
+<% if flash[:error] %>
+	<div class="error">
+	   <%= flash[:error] %>
+	</div>
+<% end %>
+<% if  flash[:notice] %>
+	<div class="notice">
+	   <%= flash[:notice] %>
+	</div>
+<% end %>
+
+<br />
+
+<style type="text/css" media="all">
+
+	#tab_ideas_suggestions td.selected_tab {
+		background-color: #f0f0f0;
+	}
+
+	#tab_ideas_suggestions td.not_selected_tab {
+		background-color: white;
+	}
+
+	#tab_ideas_suggestions td.not_used_tab {
+		background-color: white;
+		border-bottom: 0px;
+	}
+
+	#tab_ideas_suggestions {
+		background-color: #f0f0f0;
+	}
+
+	#tab_ideas_suggestions tr {
+		border-bottom: 1px solid #c0c0c0;
+	}
+
+	#pairwise_search tr {
+		background-color: white;
+	}
+
+	.pairwise_search_field {
+		border: 1px solid #c0c0c0;
+		background-color:white;
+		width: 100%;
+		height: 25px;
+	}
+
+	.selected_column {
+		background-color: #f0f0f0;
+	}
+
+	.not_selected_column {
+		background-color: #ffffff;
+	}
+
+	.soAscending {
+	    background:url(/designs/icons/default/outras/16x16/actions/go-up.gif) no-repeat 99% 60% #f0f0f0;
+	}
+	.soDescending {
+	    background:url(/designs/icons/default/outras/16x16/actions/go-down.gif) no-repeat 99% 60% #f0f0f0;
+	}
+
+</style>
+
+<table border="0" id="tab_ideas_suggestions">
+	<tr>
+		<td align="center" width="50%" class="<%= ! has_param_pending_choices? ? "selected_tab" : "not_selected_tab" %>">
+  		<h5><%= link_to_if  has_param_pending_choices?, _('Ideas'), :pending => '' %></h5>
+  	</td>
+		<td align="center" width="50%" colspan="2" class="<%= has_param_pending_choices? ? "selected_tab" : "not_selected_tab" %>">
+  		<h5><%= link_to_if ! has_param_pending_choices?, _('Suggestions'), :pending => '1', :reproved => '' %></h5>
+  	</td>
+  </tr>
+  <% if params[:pending] == '1' %>
+	<tr>
+		<td align="center" class="not_used_tab">&nbsp;</td>
+		<td align="center" width="25%" class="<%= ! has_param_reproved_choices? ? "selected_tab" : "not_selected_tab" %>">
+			<%= link_to_if has_param_reproved_choices?, _('Pending'), :pending => '1', :reproved => '' %>
+		</td>
+		<td align="center" width="25%" class="<%= has_param_reproved_choices? ? "selected_tab" : "not_selected_tab" %>">
+			<%= link_to_if ! has_param_reproved_choices?, _('Reproved'), :pending => '1', :reproved => '1' %>
+		</td>
+  </tr>
+  <% end %>
+</table>
+
+<br />
+
+<%= form_for(
+		:filter, {
+			:action => :index,
+			:controller => 'pairwise_plugin_suggestions',
+			:profile => profile.identifier
+		}) do %>
+<table border="0" id="pairwise_search">
+	<tr>
+		<td>
+			<%= hidden_field_tag 'pending', params[:pending] %>
+			<%= hidden_field_tag 'reproved', params[:reproved] %>
+	    <%= text_field_tag(
+	    			'filter[data]',
+	    			params[:filter] ? params[:filter][:data]:'',
+	    			:placeholder => _('Type words about ideas/suggestions you\'re looking for'),
+	    			:class => "pairwise_search_field"
+	    		) %>
+		</td>
+		<td width="40px"><%= submit_button :search, _('Search') %></td>
+	</tr>
+</table>
+<% end %>
+
+<br />
+
+<table class="pairwise_choices_table">
+	<tr>
+		<th class="<%= class_to_order_column("data", params[:order]) %>">
+			<%= link_to_sort_choices(@pairwise_content, _("Text"), "data") %>
+		</th>
+		<th class="<%= class_to_order_column("created_date", params[:order]) %>">
+			<%= link_to_sort_choices(@pairwise_content, _("Date"), "created_date") %>
+		</th>
+    <th class="<%= class_to_order_column("visitor_identifier", params[:order]) %>">
+    	<%= link_to_sort_choices(@pairwise_content, _("Author"), "visitor_identifier") %>
+    </th>
+    <th></th>
+	</tr>
+
+	<% @choices.each do |choice| %>
+		<tr>
+      <td width="270px"><%= choice.data %></td>
+      <td><%= show_date choice.created_at %></td>
+      <td width="105px" ><%= choice.user_created ? choice.creator_identifier : profile.identifier %></td>
+			<td width="50px">
+				<%= link_to_edit_choice(@pairwise_content, choice) unless choice.reproved %>
+				<% unless choice.active || choice.reproved %>
+					|
+					<%= link_to_approve_choice(@pairwise_content, choice, params)%>
+					| <%= link_to_reprove_idea @pairwise_content, choice, 'reprove', params %>
+				<% end %>
+			</td>
+		</tr>
+	<% end %>
+</table>
+<%= pagination_for_choices(@choices) %>
diff --git a/plugins/pairwise/views/pairwise_plugin_suggestions/index.rhtml b/plugins/pairwise/views/pairwise_plugin_suggestions/index.rhtml
deleted file mode 100644
index 21538ed..0000000
--- a/plugins/pairwise/views/pairwise_plugin_suggestions/index.rhtml
+++ /dev/null
@@ -1,154 +0,0 @@
-<% extend PairwisePlugin::Helpers::ViewerHelper %>
-<% extend PairwisePlugin::Helpers::SuggestionsHelper %>
-
-<%= pairwise_plugin_stylesheet  %>
-
-<h1><%= _("Pairwise Question") %></h1>
-<h4><%= _("Question text" ) %>: </h4><span><%= @pairwise_content.name %></span>
-<div class="result_label">
-	<%= pairwise_result_link _("Results"), @pairwise_content %>
-</div>
-<% if flash[:error] %>
-	<div class="error">
-	   <%= flash[:error] %>
-	</div>
-<% end %>
-<% if  flash[:notice] %>
-	<div class="notice">
-	   <%= flash[:notice] %>
-	</div>
-<% end %>
-
-<br />
-
-<style type="text/css" media="all">
-
-	#tab_ideas_suggestions td.selected_tab {
-		background-color: #f0f0f0;
-	}
-
-	#tab_ideas_suggestions td.not_selected_tab {
-		background-color: white;
-	}
-
-	#tab_ideas_suggestions td.not_used_tab {
-		background-color: white;
-		border-bottom: 0px;
-	}
-
-	#tab_ideas_suggestions {
-		background-color: #f0f0f0;
-	}
-
-	#tab_ideas_suggestions tr {
-		border-bottom: 1px solid #c0c0c0;
-	}
-
-	#pairwise_search tr {
-		background-color: white;
-	}
-
-	.pairwise_search_field {
-		border: 1px solid #c0c0c0;
-		background-color:white;
-		width: 100%;
-		height: 25px;
-	}
-
-	.selected_column {
-		background-color: #f0f0f0;
-	}
-
-	.not_selected_column {
-		background-color: #ffffff;
-	}
-
-	.soAscending {
-	    background:url(/designs/icons/default/outras/16x16/actions/go-up.gif) no-repeat 99% 60% #f0f0f0;
-	}
-	.soDescending {
-	    background:url(/designs/icons/default/outras/16x16/actions/go-down.gif) no-repeat 99% 60% #f0f0f0;
-	}
-
-</style>
-
-<table border="0" id="tab_ideas_suggestions">
-	<tr>
-		<td align="center" width="50%" class="<%= ! has_param_pending_choices? ? "selected_tab" : "not_selected_tab" %>">
-  		<h5><%= link_to_if  has_param_pending_choices?, _('Ideas'), :pending => '' %></h5>
-  	</td>
-		<td align="center" width="50%" colspan="2" class="<%= has_param_pending_choices? ? "selected_tab" : "not_selected_tab" %>">
-  		<h5><%= link_to_if ! has_param_pending_choices?, _('Suggestions'), :pending => '1', :reproved => '' %></h5>
-  	</td>
-  </tr>
-  <% if params[:pending] == '1' %>
-	<tr>
-		<td align="center" class="not_used_tab">&nbsp;</td>
-		<td align="center" width="25%" class="<%= ! has_param_reproved_choices? ? "selected_tab" : "not_selected_tab" %>">
-			<%= link_to_if has_param_reproved_choices?, _('Pending'), :pending => '1', :reproved => '' %>
-		</td>
-		<td align="center" width="25%" class="<%= has_param_reproved_choices? ? "selected_tab" : "not_selected_tab" %>">
-			<%= link_to_if ! has_param_reproved_choices?, _('Reproved'), :pending => '1', :reproved => '1' %>
-		</td>
-  </tr>
-  <% end %>
-</table>
-
-<br />
-
-<% form_for(
-		:filter, {
-			:action => :index,
-			:controller => 'pairwise_plugin_suggestions',
-			:profile => profile.identifier
-		}) do %>
-<table border="0" id="pairwise_search">
-	<tr>
-		<td>
-			<%= hidden_field_tag 'pending', params[:pending] %>
-			<%= hidden_field_tag 'reproved', params[:reproved] %>
-	    <%= text_field_tag(
-	    			'filter[data]',
-	    			params[:filter] ? params[:filter][:data]:'',
-	    			:placeholder => _('Type words about ideas/suggestions you\'re looking for'),
-	    			:class => "pairwise_search_field"
-	    		) %>
-		</td>
-		<td width="40px"><%= submit_button :search, _('Search') %></td>
-	</tr>
-</table>
-<% end %>
-
-<br />
-
-<table class="pairwise_choices_table">
-	<tr>
-		<th class="<%= class_to_order_column("data", params[:order]) %>">
-			<%= link_to_sort_choices(@pairwise_content, _("Text"), "data") %>
-		</th>
-		<th class="<%= class_to_order_column("created_date", params[:order]) %>">
-			<%= link_to_sort_choices(@pairwise_content, _("Date"), "created_date") %>
-		</th>
-    <th class="<%= class_to_order_column("visitor_identifier", params[:order]) %>">
-    	<%= link_to_sort_choices(@pairwise_content, _("Author"), "visitor_identifier") %>
-    </th>
-    <th></th>
-	</tr>
-
-	<% @choices.each do |choice| %>
-		<tr>
-      <td width="270px"><%= choice.data %></td>
-      <td><%= show_date choice.created_at %></td>
-      <td width="105px" ><%= choice.user_created ? choice.creator_identifier : profile.identifier %></td>
-			<td width="50px">
-				<%= link_to_edit_choice(@pairwise_content, choice) unless choice.reproved %>
-				<% unless choice.active || choice.reproved %>
-					|
-					<%= link_to_approve_choice(@pairwise_content, choice, params)%>
-					| <%= link_to_reprove_idea @pairwise_content, choice, 'reprove', params %>
-				<% end %>
-			</td>
-		</tr>
-	<% end %>
-</table>
-<%= pagination_for_choices(@choices) %>
--
libgit2 0.21.2