merging with next

Leandro Santos
2 parents 00db7a12 bdf5c9f7
Showing 22 changed files with 511 additions and 30 deletions Show diff stats
app/helpers/box_organizer_helper.rb
app/helpers/boxes_helper.rb
app/models/block.rb
app/models/theme.rb
features/categories_block.feature
features/template_block_management.feature
lib/noosfero/plugin.rb
public/articles/0000/1155/eventos.tar.gz
public/articles/0000/1156/rankings.tar.gz
public/articles/0000/1157/propostas.csv
public/articles/0000/1158/propostas.csv
public/articles/0000/1159/rankings.tar.gz
public/articles/0000/1160/eventos.tar.gz
public/articles/0000/1162/propostas.csv
public/articles/0000/1163/rankings.tar.gz
public/articles/0000/1164/eventos.tar.gz
public/javascripts/application.js
public/stylesheets/application.scss
public/stylesheets/block-store.scss
test/functional/profile_design_controller_test.rb
@@ -5,14 +5,14 @@ module BoxOrganizerHelper
     plugin = @plugins.fetch_first_plugin(:has_block?, block)
     theme = Theme.new(environment.theme) # remove this
-    if File.exists?(File.join(theme.filesystem_path, 'images', block.icon_path))
-      image_path = File.join(theme.public_path, 'images', block.icon_path)
-    elsif plugin && File.exists?(File.join(Rails.root, 'public', plugin.public_path, 'images', block.icon_path))
-      image_path = File.join('/', plugin.public_path, 'images', block.icon_path)
-    elsif File.exists?(File.join(Rails.root, 'public', 'images', block.icon_path))
-      image_path = File.join('images', block.icon_path)
+    if File.exists?(File.join(theme.filesystem_path, block.icon_path))
+      image_path = File.join(theme.public_path, block.icon_path)
+    elsif plugin && File.exists?(File.join(Rails.root, 'public', plugin.public_path, block.icon_path))
+      image_path = File.join('/', plugin.public_path, block.icon_path)
+    elsif File.exists?(File.join(Rails.root, 'public', block.icon_path))
+      image_path = block.icon_path
     else
-      image_path = File.join('images', block.default_icon_path)
+      image_path = block.default_icon_path
     end
     image_tag(image_path, height: '48', width: '48', class: 'block-type-icon', alt: '' )
@@ -33,7 +33,7 @@ module BoxOrganizerHelper
     images_path = Dir.glob(File.join(Rails.root, 'public', 'images', block.preview_path, '*')) if images_path.empty?
     images_path = images_path.map{|path| path.gsub(File.join(Rails.root, 'public'), '') } unless images_path.empty?
-    images_path = 1.upto(3).map{File.join('images', block.default_preview_path)} if images_path.empty?
+    images_path = 1.upto(3).map{block.default_preview_path} if images_path.empty?
     content_tag(:ul,
       images_path.map do |preview|
@@ -190,7 +190,7 @@ module BoxesHelper
       else
         "before-block-#{block.id}"
       end
-    if block.nil? || movable?(block)
+    if block.nil? or movable?(block)
       url = url_for(:action => 'move_block', :target => id)
       content_tag('div', _('Drop Here'), :id => id, :class => 'block-target' ) + drop_receiving_element(id, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover', :activeClass => 'block-target-active', :tolerance => 'pointer', :onDrop => "function(ev, ui) { dropBlock('#{url}', '#{_('loading...')}', ev, ui);}")
     else
@@ -151,7 +151,7 @@ class Block &lt; ActiveRecord::Base
   def self.icon_path
     basename = self.name.split('::').last.underscore
-    File.join('blocks', basename, 'icon.png')
+    File.join('images', 'blocks', basename, 'icon.png')
   end
   def self.pretty_name
@@ -159,7 +159,7 @@ class Block &lt; ActiveRecord::Base
   end
   def self.default_icon_path
-    'icon_block.png'
+    '/images/icon_block.png'
   end
   def self.preview_path
@@ -168,7 +168,7 @@ class Block &lt; ActiveRecord::Base
   end
   def self.default_preview_path
-    "block_preview.png"
+    "/images/block_preview.png"
   end
   # Returns the content to be used for this block.
@@ -18,7 +18,6 @@ class Theme
       Rails.root.join('public', relative_themes_dir)
     end
-    #FIXME make this test
     def relative_themes_dir
       File.join('designs', 'themes')
     end
@@ -99,12 +98,10 @@ class Theme
     config['public'] = value
   end
-  #FIXME make this test
   def public_path
     File.join('/', self.class.relative_themes_dir, self.id)
   end
-  #FIXME make this test
   def filesystem_path
     File.join(self.class.system_themes_dir, self.id)
   end
@@ -29,7 +29,7 @@ Feature: categories_block
   @selenium
   Scenario: List just product categories
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -41,7 +41,7 @@ Feature: categories_block
   @selenium
   Scenario: Show submenu if it exists
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -59,7 +59,7 @@ Feature: categories_block
   @selenium
   Scenario: Show only one submenu per time
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -70,7 +70,7 @@ Feature: categories_block
   @selenium
   Scenario: List just general categories
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
@@ -78,7 +78,7 @@ Feature: categories_block
   @selenium
   Scenario: List just regions
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
@@ -26,7 +26,7 @@ Feature: user template
     Given I am on person's control panel
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    And I follow "Edit" within ".article-block"
+    And I follow "Edit" within ".block-outer .article-block"
     And I fill in "Custom title for this block:" with "Mirror"
     And I press "Save"
     And I go to /profile/mario
@@ -37,7 +37,7 @@ Feature: user template
     Given I am on person's control panel
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    And I follow "Edit" within ".raw-html-block"
+    And I follow "Edit" within ".block-outer .raw-html-block"
     And I fill in "Custom title for this block:" with "Raw HTML Block"
     And I press "Save"
     And I go to /profile/mario
@@ -48,7 +48,7 @@ Feature: user template
     Given I am on person's control panel
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    And I follow "Edit" within ".article-block"
+    And I follow "Edit" within ".block-outer .article-block"
     And I select "Cannot be moved" from "Move options:"
     And I select "Cannot be modified" from "Edit options:"
     And I press "Save"
@@ -61,4 +61,4 @@ Feature: user template
     And I go to /myprofile/mario
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    Then I should not see "Edit" within ".article-block"
+    Then I should not see "Edit" within ".block-outer .article-block"
@@ -216,6 +216,10 @@ class Noosfero::Plugin
     self.class.extra_blocks.keys.include?(block)
   end
+  def has_block?(block)
+    self.class.extra_blocks.keys.include?(block)
+  end
+
   def expanded_template(file_path, locals = {})
     views_path = Rails.root.join('plugins', "#{self.class.public_name}", 'views')
     ERB.new(File.read("#{views_path}/#{file_path}")).result(binding)
@@ -0,0 +1,95 @@
+Origem,Status,Criada em,Moderado por,Data de Moderado,Validado por,Data de Validado,Autor,Proposta,Categorias
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste1,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste2,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste3,""
+,Rejeitada,30/06/15 10:19,"","",adminuser,29/06/15 21:00,ze,test2,""
+,Aprovada,30/06/15 10:20,"","",adminuser,29/06/15 21:00,ze,test2,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste0,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste4,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste5,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste6,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste7,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste8,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste9<iframe>test</iframe>,""
+,Pendente de Moderacao,30/06/15 10:37,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Discussão,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 11:22,adminuser,06/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 10:56,adminuser,06/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:25,ze,teste adadd,category
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:24,ze,teste adadd,category
+,Rejeitada,30/07/15 15:21,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Discussão,Pre Aprovada,30/07/15 17:41,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
+Tópico 1,Pre Aprovada,30/07/15 17:44,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
@@ -0,0 +1,95 @@
+Origem,Status,Criada em,Moderado por,Data de Moderado,Validado por,Data de Validado,Autor,Proposta,Categorias
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste1,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste2,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste3,""
+,Rejeitada,30/06/15 10:19,"","",adminuser,29/06/15 21:00,ze,test2,""
+,Aprovada,30/06/15 10:20,"","",adminuser,29/06/15 21:00,ze,test2,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste0,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste4,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste5,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste6,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste7,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste8,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste9<iframe>test</iframe>,""
+,Pendente de Moderacao,30/06/15 10:37,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Discussão,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 11:22,adminuser,06/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 10:56,adminuser,06/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:25,ze,teste adadd,category
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:24,ze,teste adadd,category
+,Rejeitada,30/07/15 15:21,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Discussão,Pre Aprovada,30/07/15 17:41,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
+Tópico 1,Pre Aprovada,30/07/15 17:44,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
@@ -0,0 +1,95 @@
+Origem,Status,Criada em,Moderado por,Data de Moderado,Validado por,Data de Validado,Autor,Proposta,Categorias
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste1,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste2,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste3,""
+,Rejeitada,30/06/15 10:19,"","",adminuser,29/06/15 21:00,ze,test2,""
+,Aprovada,30/06/15 10:20,"","",adminuser,29/06/15 21:00,ze,test2,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste0,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste4,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste5,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste6,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste7,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste8,""
+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste9<iframe>test</iframe>,""
+,Pendente de Moderacao,30/06/15 10:37,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Discussão,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 11:22,adminuser,06/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 10:56,adminuser,06/07/15 21:00,ze,teste adadd,""
+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:25,ze,teste adadd,category
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:24,ze,teste adadd,category
+,Rejeitada,30/07/15 15:21,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
+,Rejeitada,30/07/15 15:22,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
+Discussão,Pre Aprovada,30/07/15 17:41,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
+Tópico 1,Pre Aprovada,30/07/15 17:44,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
@@ -35,6 +35,8 @@
 *= require jquery.typewatch.js
 *= require require_login.js
 *= require email_templates.js
+*= require slick.js
+*= require block-store.js
 */
 // lodash configuration
@@ -79,3 +79,4 @@
 @import 'api-playground';
 // Also avoid generic and prefer class over id selectors
+@import 'block-store';
@@ -0,0 +1,164 @@
+/************************************************
+ * the handles to where you can drag the blocks *
+ ************************************************/
+
+.block-target {
+  padding: 2px;
+  background: #81FF9B;
+  margin-bottom: 5px;
+  opacity: 0.8;
+  visibility: hidden;
+  height: 0;
+  font-size: 20px;
+  font-weight: bold;
+  color: white;
+  text-align: center;
+}
+.block-target-hover {
+  border: 1px solid #000;
+  box-shadow: 0 0 15px #888 inset;
+  opacity: 1;
+}
+.shadow .block-target-hover, .shadow .block-target-active {
+  visibility: visible;
+  height: 30px;
+}
+
+/************************************************
+ * block store styles
+ ************************************************/
+#block-store #block-store-filter {
+  float: right;
+  margin-bottom: 8px;
+}
+#block-store #block-types {
+  clear: both;
+}
+#block-store {
+  display: none;
+}
+#content #block-store .block-type {
+  position: relative;
+  border: 0px solid #AAA;
+  margin: 4px 0;
+  padding: 0;
+  text-align: center;
+  height: auto;
+  float: none;
+  display: inline-block;
+  overflow: hidden;
+  width: 112px;
+  cursor: move;
+  vertical-align: top;
+}
+#block-store .block-type:hover {
+  box-shadow: 0px 0px 0px 2px #FFF, 0px 0px 0px 2px #FFF, 0px 0px 10px rgba(0,0,0,0.6);
+  outline: none;
+}
+#block-store .block-type:hover .button-bar {
+  display: inline;
+}
+#block-store .button-bar {
+  margin: 0;
+  display: none;
+  position: absolute;
+  right: 0%;
+  border: 0px solid #AAA;
+  margin: 0px;
+  padding: 0px;
+}
+#block-store .button-bar .icon-help {
+  font-size: 0;
+  width: 0;
+}
+
+#block-store .block-type .block-type-icon {
+  margin-right: auto;
+  margin-left: auto;
+}
+#block-store-draggables .block-type, #block-store-draggables .block, #block-store-draggables .block-type-icon, #block-store-draggables .ui-draggable-dragging {
+  display: inline-block;
+  height: auto;
+  z-index: 100;
+}
+#block-store-draggables .block-type .button-bar {
+  visibility: hidden;
+}
+#box-organizer.shadow .block {
+  opacity: 0.2;
+}
+#box-organizer.shadow .ui-draggable-dragging {
+  opacity: 1;
+  border: 5px solid red;
+  box-shadow: 0px 0px 10px 2px red, inset 0px 0px 10px 2px red;
+}
+#box-organizer .block {
+  transition: opacity 0.3s ease-in-out;
+}
+
+/************************************************
+ * block info styles
+ ************************************************/
+#block-info-container {
+  width: 770px;
+  padding: 15px;
+	color: #444;
+}
+
+#block-info-container #block-info-icon {
+  float: left;
+  padding-right: 10px;
+}
+
+#block-info-container #block-info-header {
+  float: left;
+}
+
+#block-info-container #block-info-header .block-type-icon{
+  float: left;
+}
+
+#block-info-container #block-info-header h1 {
+  margin: 0;
+  font-weight: normal;
+  font-family: "Arial Black", Liberation Sans, Arial, sans-serif;
+  margin-left: 5px;
+  white-space: nowrap;
+}
+
+#block-info-container #block-info-header p{
+  margin-left: 55px;
+}
+
+
+#block-info-container h2 {
+  margin: 0;
+  margin-top: 10px;
+	font-weight: normal;
+	font-family: "Arial Black", Liberation Sans, Arial, sans-serif;
+}
+
+#block-info-container p {
+  margin: 0;
+}
+
+#block-info-images {
+  clear: both;
+  overflow-x: auto;
+  padding-top: 15px;
+}
+
+#block-info-images ul{
+  margin: 0px;
+  padding: 0px;
+}
+#block-info-images li{
+  list-style: none;
+  display: inline;
+
+}
+
+
+#block-info-description {
+  margin-top: 20px;
+}
@@ -670,7 +670,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     end
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new])
-    refute @controller.available_blocks.include?(CustomBlock1)
+    assert !@controller.available_blocks.include?(CustomBlock1)
   end
   should 'clone a block' do
@@ -702,8 +702,8 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'guarantee main block is always visible to everybody' do
     get :edit, :profile => 'designtestuser', :id => @b4.id
     %w[logged not_logged followers].each do |option|
-    assert_no_tag :select, :attributes => {:name => 'block[display_user]'},
-     :descendant => {:tag => 'option', :attributes => {:value => option}}
+      assert_no_tag :select, :attributes => {:name => 'block[display_user]'},
+        :descendant => {:tag => 'option', :attributes => {:value => option}}
     end
   end
@@ -0,0 +1,28 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class UserTest < ActionDispatch::PerformanceTest
+
+  attr_reader :environment
+
+  def setup
+    @environment = Environment.default
+    @environment.disable('skip_new_user_email_confirmation')
+
+    @environment.person_templates.destroy_all
+    user = User.create!(:login => SecureRandom.uuid, :email => 'test@test.com', :password => 'test', :password_confirmation => 'test')
+    user.person.update_attribute(:is_template, true)
+    user.person.articles.destroy_all
+    user.person.boxes.destroy_all
+
+    @environment.person_default_template = user.person
+    @environment.save!
+  end
+
+  def test_user_creation_without_confirmation
+    User.benchmark("Creating user") do
+      user = User.create!(:login => 'changetest', :password => 'test', :password_confirmation => 'test', :email => 'changetest@example.com', :environment => environment)
+    end
+  end
+
+end
@@ -135,9 +135,9 @@ class BoxOrganizerHelperTest &lt; ActionView::TestCase
     doc = HTML::Document.new display_previews(block)
     assert_select doc.root, 'li' do |elements|
-      assert_match /\/images\/block_preview.png.*"/, elements[0].to_s
-      assert_match /\/images\/block_preview.png.*"/, elements[1].to_s
-      assert_match /\/images\/block_preview.png.*"/, elements[2].to_s
+      assert_match /img.* src="\/images\/block_preview.png.*"/, elements[0].to_s
+      assert_match /img.* src="\/images\/block_preview.png.*"/, elements[1].to_s
+      assert_match /img.* src="\/images\/block_preview.png.*"/, elements[2].to_s
     end
   end
	@@ -190,7 +190,7 @@ module BoxesHelper		@@ -190,7 +190,7 @@ module BoxesHelper
190	else	190	else
191	"before-block-#{block.id}"	191	"before-block-#{block.id}"
192	end	192	end
193	- if block.nil? \|\| movable?(block)	193	+ if block.nil? or movable?(block)
194	url = url_for(:action => 'move_block', :target => id)	194	url = url_for(:action => 'move_block', :target => id)
195	content_tag('div', _('Drop Here'), :id => id, :class => 'block-target' ) + drop_receiving_element(id, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover', :activeClass => 'block-target-active', :tolerance => 'pointer', :onDrop => "function(ev, ui) { dropBlock('#{url}', '#{_('loading...')}', ev, ui);}")	195	content_tag('div', _('Drop Here'), :id => id, :class => 'block-target' ) + drop_receiving_element(id, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover', :activeClass => 'block-target-active', :tolerance => 'pointer', :onDrop => "function(ev, ui) { dropBlock('#{url}', '#{_('loading...')}', ev, ui);}")
196	else	196	else
	@@ -151,7 +151,7 @@ class Block < ActiveRecord::Base		@@ -151,7 +151,7 @@ class Block < ActiveRecord::Base
151		151
152	def self.icon_path	152	def self.icon_path
153	basename = self.name.split('::').last.underscore	153	basename = self.name.split('::').last.underscore
154	- File.join('blocks', basename, 'icon.png')	154	+ File.join('images', 'blocks', basename, 'icon.png')
155	end	155	end
156		156
157	def self.pretty_name	157	def self.pretty_name
	@@ -159,7 +159,7 @@ class Block < ActiveRecord::Base		@@ -159,7 +159,7 @@ class Block < ActiveRecord::Base
159	end	159	end
160		160
161	def self.default_icon_path	161	def self.default_icon_path
162	- 'icon_block.png'	162	+ '/images/icon_block.png'
163	end	163	end
164		164
165	def self.preview_path	165	def self.preview_path
	@@ -168,7 +168,7 @@ class Block < ActiveRecord::Base		@@ -168,7 +168,7 @@ class Block < ActiveRecord::Base
168	end	168	end
169		169
170	def self.default_preview_path	170	def self.default_preview_path
171	- "block_preview.png"	171	+ "/images/block_preview.png"
172	end	172	end
173		173
174	# Returns the content to be used for this block.	174	# Returns the content to be used for this block.
	@@ -29,7 +29,7 @@ Feature: categories_block		@@ -29,7 +29,7 @@ Feature: categories_block
29	@selenium	29	@selenium
30	Scenario: List just product categories	30	Scenario: List just product categories
31	Given display ".button-bar"	31	Given display ".button-bar"
32	- And I follow "Edit" within ".categories-block"	32	+ And I follow "Edit" within ".block-outer .categories-block"
33	And I check "Product"	33	And I check "Product"
34	When I press "Save"	34	When I press "Save"
35	Then I should see "Food"	35	Then I should see "Food"
	@@ -41,7 +41,7 @@ Feature: categories_block		@@ -41,7 +41,7 @@ Feature: categories_block
41	@selenium	41	@selenium
42	Scenario: Show submenu if it exists	42	Scenario: Show submenu if it exists
43	Given display ".button-bar"	43	Given display ".button-bar"
44	- And I follow "Edit" within ".categories-block"	44	+ And I follow "Edit" within ".block-outer .categories-block"
45	And I check "Product"	45	And I check "Product"
46	And I press "Save"	46	And I press "Save"
47	Then I should see "Food"	47	Then I should see "Food"
	@@ -59,7 +59,7 @@ Feature: categories_block		@@ -59,7 +59,7 @@ Feature: categories_block
59	@selenium	59	@selenium
60	Scenario: Show only one submenu per time	60	Scenario: Show only one submenu per time
61	Given display ".button-bar"	61	Given display ".button-bar"
62	- And I follow "Edit" within ".categories-block"	62	+ And I follow "Edit" within ".block-outer .categories-block"
63	And I check "Product"	63	And I check "Product"
64	And I press "Save"	64	And I press "Save"
65	Then I should see "Book"	65	Then I should see "Book"
	@@ -70,7 +70,7 @@ Feature: categories_block		@@ -70,7 +70,7 @@ Feature: categories_block
70	@selenium	70	@selenium
71	Scenario: List just general categories	71	Scenario: List just general categories
72	Given display ".button-bar"	72	Given display ".button-bar"
73	- And I follow "Edit" within ".categories-block"	73	+ And I follow "Edit" within ".block-outer .categories-block"
74	And I check "Generic category"	74	And I check "Generic category"
75	When I press "Save"	75	When I press "Save"
76	Then I should see "Wood"	76	Then I should see "Wood"
	@@ -78,7 +78,7 @@ Feature: categories_block		@@ -78,7 +78,7 @@ Feature: categories_block
78	@selenium	78	@selenium
79	Scenario: List just regions	79	Scenario: List just regions
80	Given display ".button-bar"	80	Given display ".button-bar"
81	- And I follow "Edit" within ".categories-block"	81	+ And I follow "Edit" within ".block-outer .categories-block"
82	And I check "Region"	82	And I check "Region"
83	When I press "Save"	83	When I press "Save"
84	Then I should see "Bahia"	84	Then I should see "Bahia"
	@@ -26,7 +26,7 @@ Feature: user template		@@ -26,7 +26,7 @@ Feature: user template
26	Given I am on person's control panel	26	Given I am on person's control panel
27	And I follow "Edit sideboxes"	27	And I follow "Edit sideboxes"
28	And display ".button-bar"	28	And display ".button-bar"
29	- And I follow "Edit" within ".article-block"	29	+ And I follow "Edit" within ".block-outer .article-block"
30	And I fill in "Custom title for this block:" with "Mirror"	30	And I fill in "Custom title for this block:" with "Mirror"
31	And I press "Save"	31	And I press "Save"
32	And I go to /profile/mario	32	And I go to /profile/mario
	@@ -37,7 +37,7 @@ Feature: user template		@@ -37,7 +37,7 @@ Feature: user template
37	Given I am on person's control panel	37	Given I am on person's control panel
38	And I follow "Edit sideboxes"	38	And I follow "Edit sideboxes"
39	And display ".button-bar"	39	And display ".button-bar"
40	- And I follow "Edit" within ".raw-html-block"	40	+ And I follow "Edit" within ".block-outer .raw-html-block"
41	And I fill in "Custom title for this block:" with "Raw HTML Block"	41	And I fill in "Custom title for this block:" with "Raw HTML Block"
42	And I press "Save"	42	And I press "Save"
43	And I go to /profile/mario	43	And I go to /profile/mario
	@@ -48,7 +48,7 @@ Feature: user template		@@ -48,7 +48,7 @@ Feature: user template
48	Given I am on person's control panel	48	Given I am on person's control panel
49	And I follow "Edit sideboxes"	49	And I follow "Edit sideboxes"
50	And display ".button-bar"	50	And display ".button-bar"
51	- And I follow "Edit" within ".article-block"	51	+ And I follow "Edit" within ".block-outer .article-block"
52	And I select "Cannot be moved" from "Move options:"	52	And I select "Cannot be moved" from "Move options:"
53	And I select "Cannot be modified" from "Edit options:"	53	And I select "Cannot be modified" from "Edit options:"
54	And I press "Save"	54	And I press "Save"
	@@ -61,4 +61,4 @@ Feature: user template		@@ -61,4 +61,4 @@ Feature: user template
61	And I go to /myprofile/mario	61	And I go to /myprofile/mario
62	And I follow "Edit sideboxes"	62	And I follow "Edit sideboxes"
63	And display ".button-bar"	63	And display ".button-bar"
64	- Then I should not see "Edit" within ".article-block"	64	+ Then I should not see "Edit" within ".block-outer .article-block"
@@ -0,0 +1,95 @@		@@ -0,0 +1,95 @@
	1	+Origem,Status,Criada em,Moderado por,Data de Moderado,Validado por,Data de Validado,Autor,Proposta,Categorias
	2	+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste1,""
	3	+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste2,""
	4	+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste3,""
	5	+,Rejeitada,30/06/15 10:19,"","",adminuser,29/06/15 21:00,ze,test2,""
	6	+,Aprovada,30/06/15 10:20,"","",adminuser,29/06/15 21:00,ze,test2,""
	7	+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste0,""
	8	+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste4,""
	9	+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste5,""
	10	+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste6,""
	11	+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
	12	+,Aprovada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste7,""
	13	+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste8,""
	14	+,Rejeitada,30/06/15 10:21,"","",adminuser,29/06/15 21:00,ze,teste9<iframe>test</iframe>,""
	15	+,Pendente de Moderacao,30/06/15 10:37,"","","","",ze,teste adadd,""
	16	+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
	17	+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
	18	+,Pendente de Moderacao,06/07/15 14:42,"","","","",ze,teste adadd,""
	19	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	20	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	21	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	22	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	23	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	24	+Discussão,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	25	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	26	+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	27	+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	28	+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	29	+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	30	+,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	31	+Tópico 1,Aprovada,06/07/15 14:42,"","",adminuser,05/07/15 21:00,ze,teste adadd,""
	32	+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 11:22,adminuser,06/07/15 21:00,ze,teste adadd,""
	33	+,Rejeitada,06/07/15 14:42,adminuser,07/07/15 10:56,adminuser,06/07/15 21:00,ze,teste adadd,""
	34	+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:25,ze,teste adadd,category
	35	+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
	36	+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
	37	+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:25,ze,teste nova proposta,category
	38	+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
	39	+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
	40	+,Pendente de Moderacao,30/07/15 15:21,"","","","",ze,teste nova proposta,""
	41	+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
	42	+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
	43	+,Pendente de Moderacao,30/07/15 15:22,"","","","",ze,teste nova proposta,""
	44	+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
	45	+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
	46	+,Rejeitada,30/07/15 15:21,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
	47	+,Rejeitada,06/07/15 14:42,adminuser,13/07/15 19:18,adminuser,30/07/15 15:24,ze,teste adadd,category
	48	+,Rejeitada,30/07/15 15:21,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
	49	+,Rejeitada,30/07/15 15:22,ze,30/07/15 15:24,adminuser,30/07/15 15:24,ze,teste nova proposta,category
	50	+,Rejeitada,30/07/15 15:22,adminuser,30/07/15 15:22,adminuser,30/07/15 15:25,ze,teste nova proposta,category
	51	+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
	52	+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
	53	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	54	+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
	55	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	56	+,Pre Rejeitada,30/07/15 15:21,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
	57	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	58	+,Pre Rejeitada,30/07/15 15:22,ze,30/07/15 15:25,"","",ze,teste nova proposta,category
	59	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	60	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	61	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	62	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	63	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	64	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	65	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	66	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	67	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	68	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	69	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	70	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	71	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	72	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	73	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	74	+Discussão,Pendente de Moderacao,30/07/15 17:41,"","","","",ze,teste nova proposta,""
	75	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	76	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	77	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	78	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	79	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	80	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	81	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	82	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	83	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	84	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	85	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	86	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	87	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	88	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	89	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	90	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	91	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	92	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	93	+Tópico 1,Pendente de Moderacao,30/07/15 17:44,"","","","",ze,teste nova proposta,""
	94	+Discussão,Pre Aprovada,30/07/15 17:41,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
	95	+Tópico 1,Pre Aprovada,30/07/15 17:44,adminuser,30/07/15 17:44,"","",ze,teste nova proposta,category
	@@ -79,3 +79,4 @@		@@ -79,3 +79,4 @@
79	@import 'api-playground';	79	@import 'api-playground';
80		80
81	// Also avoid generic and prefer class over id selectors	81	// Also avoid generic and prefer class over id selectors
		82	+@import 'block-store';
@@ -0,0 +1,164 @@		@@ -0,0 +1,164 @@
	1	+/************************************************
	2	+ * the handles to where you can drag the blocks *
	3	+ ************************************************/
	4	+
	5	+.block-target {
	6	+ padding: 2px;
	7	+ background: #81FF9B;
	8	+ margin-bottom: 5px;
	9	+ opacity: 0.8;
	10	+ visibility: hidden;
	11	+ height: 0;
	12	+ font-size: 20px;
	13	+ font-weight: bold;
	14	+ color: white;
	15	+ text-align: center;
	16	+}
	17	+.block-target-hover {
	18	+ border: 1px solid #000;
	19	+ box-shadow: 0 0 15px #888 inset;
	20	+ opacity: 1;
	21	+}
	22	+.shadow .block-target-hover, .shadow .block-target-active {
	23	+ visibility: visible;
	24	+ height: 30px;
	25	+}
	26	+
	27	+/************************************************
	28	+ * block store styles
	29	+ ************************************************/
	30	+#block-store #block-store-filter {
	31	+ float: right;
	32	+ margin-bottom: 8px;
	33	+}
	34	+#block-store #block-types {
	35	+ clear: both;
	36	+}
	37	+#block-store {
	38	+ display: none;
	39	+}
	40	+#content #block-store .block-type {
	41	+ position: relative;
	42	+ border: 0px solid #AAA;
	43	+ margin: 4px 0;
	44	+ padding: 0;
	45	+ text-align: center;
	46	+ height: auto;
	47	+ float: none;
	48	+ display: inline-block;
	49	+ overflow: hidden;
	50	+ width: 112px;
	51	+ cursor: move;
	52	+ vertical-align: top;
	53	+}
	54	+#block-store .block-type:hover {
	55	+ box-shadow: 0px 0px 0px 2px #FFF, 0px 0px 0px 2px #FFF, 0px 0px 10px rgba(0,0,0,0.6);
	56	+ outline: none;
	57	+}
	58	+#block-store .block-type:hover .button-bar {
	59	+ display: inline;
	60	+}
	61	+#block-store .button-bar {
	62	+ margin: 0;
	63	+ display: none;
	64	+ position: absolute;
	65	+ right: 0%;
	66	+ border: 0px solid #AAA;
	67	+ margin: 0px;
	68	+ padding: 0px;
	69	+}
	70	+#block-store .button-bar .icon-help {
	71	+ font-size: 0;
	72	+ width: 0;
	73	+}
	74	+
	75	+#block-store .block-type .block-type-icon {
	76	+ margin-right: auto;
	77	+ margin-left: auto;
	78	+}
	79	+#block-store-draggables .block-type, #block-store-draggables .block, #block-store-draggables .block-type-icon, #block-store-draggables .ui-draggable-dragging {
	80	+ display: inline-block;
	81	+ height: auto;
	82	+ z-index: 100;
	83	+}
	84	+#block-store-draggables .block-type .button-bar {
	85	+ visibility: hidden;
	86	+}
	87	+#box-organizer.shadow .block {
	88	+ opacity: 0.2;
	89	+}
	90	+#box-organizer.shadow .ui-draggable-dragging {
	91	+ opacity: 1;
	92	+ border: 5px solid red;
	93	+ box-shadow: 0px 0px 10px 2px red, inset 0px 0px 10px 2px red;
	94	+}
	95	+#box-organizer .block {
	96	+ transition: opacity 0.3s ease-in-out;
	97	+}
	98	+
	99	+/************************************************
	100	+ * block info styles
	101	+ ************************************************/
	102	+#block-info-container {
	103	+ width: 770px;
	104	+ padding: 15px;
	105	+ color: #444;
	106	+}
	107	+
	108	+#block-info-container #block-info-icon {
	109	+ float: left;
	110	+ padding-right: 10px;
	111	+}
	112	+
	113	+#block-info-container #block-info-header {
	114	+ float: left;
	115	+}
	116	+
	117	+#block-info-container #block-info-header .block-type-icon{
	118	+ float: left;
	119	+}
	120	+
	121	+#block-info-container #block-info-header h1 {
	122	+ margin: 0;
	123	+ font-weight: normal;
	124	+ font-family: "Arial Black", Liberation Sans, Arial, sans-serif;
	125	+ margin-left: 5px;
	126	+ white-space: nowrap;
	127	+}
	128	+
	129	+#block-info-container #block-info-header p{
	130	+ margin-left: 55px;
	131	+}
	132	+
	133	+
	134	+#block-info-container h2 {
	135	+ margin: 0;
	136	+ margin-top: 10px;
	137	+ font-weight: normal;
	138	+ font-family: "Arial Black", Liberation Sans, Arial, sans-serif;
	139	+}
	140	+
	141	+#block-info-container p {
	142	+ margin: 0;
	143	+}
	144	+
	145	+#block-info-images {
	146	+ clear: both;
	147	+ overflow-x: auto;
	148	+ padding-top: 15px;
	149	+}
	150	+
	151	+#block-info-images ul{
	152	+ margin: 0px;
	153	+ padding: 0px;
	154	+}
	155	+#block-info-images li{
	156	+ list-style: none;
	157	+ display: inline;
	158	+
	159	+}
	160	+
	161	+
	162	+#block-info-description {
	163	+ margin-top: 20px;
	164	+}
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+require 'test_helper'
	2	+require 'rails/performance_test_help'
	3	+
	4	+class UserTest < ActionDispatch::PerformanceTest
	5	+
	6	+ attr_reader :environment
	7	+
	8	+ def setup
	9	+ @environment = Environment.default
	10	+ @environment.disable('skip_new_user_email_confirmation')
	11	+
	12	+ @environment.person_templates.destroy_all
	13	+ user = User.create!(:login => SecureRandom.uuid, :email => 'test@test.com', :password => 'test', :password_confirmation => 'test')
	14	+ user.person.update_attribute(:is_template, true)
	15	+ user.person.articles.destroy_all
	16	+ user.person.boxes.destroy_all
	17	+
	18	+ @environment.person_default_template = user.person
	19	+ @environment.save!
	20	+ end
	21	+
	22	+ def test_user_creation_without_confirmation
	23	+ User.benchmark("Creating user") do
	24	+ user = User.create!(:login => 'changetest', :password => 'test', :password_confirmation => 'test', :email => 'changetest@example.com', :environment => environment)
	25	+ end
	26	+ end
	27	+
	28	+end