Download as
Browse Code »

Commit e0a87b2f3c01666ede6a408e01327c761c4f9b61

Authored by Leandro Santos
2 parents 00db7a12 bdf5c9f7
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

merging with next

Showing 22 changed files with 511 additions and 30 deletions   Show diff stats
app/helpers/box_organizer_helper.rb
  Diff comments   View file @e0a87b2
... ... @@ -5,14 +5,14 @@ module BoxOrganizerHelper
5 5 plugin = @plugins.fetch_first_plugin(:has_block?, block)
6 6  
7 7 theme = Theme.new(environment.theme) # remove this
8   - if File.exists?(File.join(theme.filesystem_path, 'images', block.icon_path))
9   - image_path = File.join(theme.public_path, 'images', block.icon_path)
10   - elsif plugin && File.exists?(File.join(Rails.root, 'public', plugin.public_path, 'images', block.icon_path))
11   - image_path = File.join('/', plugin.public_path, 'images', block.icon_path)
12   - elsif File.exists?(File.join(Rails.root, 'public', 'images', block.icon_path))
13   - image_path = File.join('images', block.icon_path)
  8 + if File.exists?(File.join(theme.filesystem_path, block.icon_path))
  9 + image_path = File.join(theme.public_path, block.icon_path)
  10 + elsif plugin && File.exists?(File.join(Rails.root, 'public', plugin.public_path, block.icon_path))
  11 + image_path = File.join('/', plugin.public_path, block.icon_path)
  12 + elsif File.exists?(File.join(Rails.root, 'public', block.icon_path))
  13 + image_path = block.icon_path
14 14 else
15   - image_path = File.join('images', block.default_icon_path)
  15 + image_path = block.default_icon_path
16 16 end
17 17  
18 18 image_tag(image_path, height: '48', width: '48', class: 'block-type-icon', alt: '' )
... ... @@ -33,7 +33,7 @@ module BoxOrganizerHelper
33 33 images_path = Dir.glob(File.join(Rails.root, 'public', 'images', block.preview_path, '*')) if images_path.empty?
34 34 images_path = images_path.map{|path| path.gsub(File.join(Rails.root, 'public'), '') } unless images_path.empty?
35 35  
36   - images_path = 1.upto(3).map{File.join('images', block.default_preview_path)} if images_path.empty?
  36 + images_path = 1.upto(3).map{block.default_preview_path} if images_path.empty?
37 37  
38 38 content_tag(:ul,
39 39 images_path.map do |preview|
... ...
app/helpers/boxes_helper.rb
  Diff comments   View file @e0a87b2
... ... @@ -190,7 +190,7 @@ module BoxesHelper
190 190 else
191 191 "before-block-#{block.id}"
192 192 end
193   - if block.nil? || movable?(block)
  193 + if block.nil? or movable?(block)
194 194 url = url_for(:action => 'move_block', :target => id)
195 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 196 else
... ...
app/models/block.rb
  Diff comments   View file @e0a87b2
... ... @@ -151,7 +151,7 @@ class Block < ActiveRecord::Base
151 151  
152 152 def self.icon_path
153 153 basename = self.name.split('::').last.underscore
154   - File.join('blocks', basename, 'icon.png')
  154 + File.join('images', 'blocks', basename, 'icon.png')
155 155 end
156 156  
157 157 def self.pretty_name
... ... @@ -159,7 +159,7 @@ class Block < ActiveRecord::Base
159 159 end
160 160  
161 161 def self.default_icon_path
162   - 'icon_block.png'
  162 + '/images/icon_block.png'
163 163 end
164 164  
165 165 def self.preview_path
... ... @@ -168,7 +168,7 @@ class Block < ActiveRecord::Base
168 168 end
169 169  
170 170 def self.default_preview_path
171   - "block_preview.png"
  171 + "/images/block_preview.png"
172 172 end
173 173  
174 174 # Returns the content to be used for this block.
... ...
app/models/theme.rb
  Diff comments   View file @e0a87b2
... ... @@ -18,7 +18,6 @@ class Theme
18 18 Rails.root.join('public', relative_themes_dir)
19 19 end
20 20  
21   - #FIXME make this test
22 21 def relative_themes_dir
23 22 File.join('designs', 'themes')
24 23 end
... ... @@ -99,12 +98,10 @@ class Theme
99 98 config['public'] = value
100 99 end
101 100  
102   - #FIXME make this test
103 101 def public_path
104 102 File.join('/', self.class.relative_themes_dir, self.id)
105 103 end
106 104  
107   - #FIXME make this test
108 105 def filesystem_path
109 106 File.join(self.class.system_themes_dir, self.id)
110 107 end
... ...
features/categories_block.feature
  Diff comments   View file @e0a87b2
... ... @@ -29,7 +29,7 @@ Feature: categories_block
29 29 @selenium
30 30 Scenario: List just product categories
31 31 Given display ".button-bar"
32   - And I follow "Edit" within ".categories-block"
  32 + And I follow "Edit" within ".block-outer .categories-block"
33 33 And I check "Product"
34 34 When I press "Save"
35 35 Then I should see "Food"
... ... @@ -41,7 +41,7 @@ Feature: categories_block
41 41 @selenium
42 42 Scenario: Show submenu if it exists
43 43 Given display ".button-bar"
44   - And I follow "Edit" within ".categories-block"
  44 + And I follow "Edit" within ".block-outer .categories-block"
45 45 And I check "Product"
46 46 And I press "Save"
47 47 Then I should see "Food"
... ... @@ -59,7 +59,7 @@ Feature: categories_block
59 59 @selenium
60 60 Scenario: Show only one submenu per time
61 61 Given display ".button-bar"
62   - And I follow "Edit" within ".categories-block"
  62 + And I follow "Edit" within ".block-outer .categories-block"
63 63 And I check "Product"
64 64 And I press "Save"
65 65 Then I should see "Book"
... ... @@ -70,7 +70,7 @@ Feature: categories_block
70 70 @selenium
71 71 Scenario: List just general categories
72 72 Given display ".button-bar"
73   - And I follow "Edit" within ".categories-block"
  73 + And I follow "Edit" within ".block-outer .categories-block"
74 74 And I check "Generic category"
75 75 When I press "Save"
76 76 Then I should see "Wood"
... ... @@ -78,7 +78,7 @@ Feature: categories_block
78 78 @selenium
79 79 Scenario: List just regions
80 80 Given display ".button-bar"
81   - And I follow "Edit" within ".categories-block"
  81 + And I follow "Edit" within ".block-outer .categories-block"
82 82 And I check "Region"
83 83 When I press "Save"
84 84 Then I should see "Bahia"
... ...
features/template_block_management.feature
  Diff comments   View file @e0a87b2
... ... @@ -26,7 +26,7 @@ Feature: user template
26 26 Given I am on person's control panel
27 27 And I follow "Edit sideboxes"
28 28 And display ".button-bar"
29   - And I follow "Edit" within ".article-block"
  29 + And I follow "Edit" within ".block-outer .article-block"
30 30 And I fill in "Custom title for this block:" with "Mirror"
31 31 And I press "Save"
32 32 And I go to /profile/mario
... ... @@ -37,7 +37,7 @@ Feature: user template
37 37 Given I am on person's control panel
38 38 And I follow "Edit sideboxes"
39 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 41 And I fill in "Custom title for this block:" with "Raw HTML Block"
42 42 And I press "Save"
43 43 And I go to /profile/mario
... ... @@ -48,7 +48,7 @@ Feature: user template
48 48 Given I am on person's control panel
49 49 And I follow "Edit sideboxes"
50 50 And display ".button-bar"
51   - And I follow "Edit" within ".article-block"
  51 + And I follow "Edit" within ".block-outer .article-block"
52 52 And I select "Cannot be moved" from "Move options:"
53 53 And I select "Cannot be modified" from "Edit options:"
54 54 And I press "Save"
... ... @@ -61,4 +61,4 @@ Feature: user template
61 61 And I go to /myprofile/mario
62 62 And I follow "Edit sideboxes"
63 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"
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @e0a87b2
... ... @@ -216,6 +216,10 @@ class Noosfero::Plugin
216 216 self.class.extra_blocks.keys.include?(block)
217 217 end
218 218  
  219 + def has_block?(block)
  220 + self.class.extra_blocks.keys.include?(block)
  221 + end
  222 +
219 223 def expanded_template(file_path, locals = {})
220 224 views_path = Rails.root.join('plugins', "#{self.class.public_name}", 'views')
221 225 ERB.new(File.read("#{views_path}/#{file_path}")).result(binding)
... ...
public/articles/0000/1155/eventos.tar.gz 0 → 100644
View file @e0a87b2
No preview for this file type
public/articles/0000/1156/rankings.tar.gz 0 → 100644
View file @e0a87b2
No preview for this file type
public/articles/0000/1157/propostas.csv 0 → 100644
  Diff comments   View file @e0a87b2
... ... @@ -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
... ...
public/articles/0000/1158/propostas.csv 0 → 100644
  Diff comments   View file @e0a87b2
... ... @@ -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
... ...
public/articles/0000/1159/rankings.tar.gz 0 → 100644
View file @e0a87b2
No preview for this file type
public/articles/0000/1160/eventos.tar.gz 0 → 100644
View file @e0a87b2
No preview for this file type
public/articles/0000/1162/propostas.csv 0 → 100644
  Diff comments   View file @e0a87b2
... ... @@ -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
... ...
public/articles/0000/1163/rankings.tar.gz 0 → 100644
View file @e0a87b2
No preview for this file type
public/articles/0000/1164/eventos.tar.gz 0 → 100644
View file @e0a87b2
No preview for this file type
public/javascripts/application.js
  Diff comments   View file @e0a87b2
... ... @@ -35,6 +35,8 @@
35 35 *= require jquery.typewatch.js
36 36 *= require require_login.js
37 37 *= require email_templates.js
  38 +*= require slick.js
  39 +*= require block-store.js
38 40 */
39 41  
40 42 // lodash configuration
... ...
public/stylesheets/application.scss
  Diff comments   View file @e0a87b2
... ... @@ -79,3 +79,4 @@
79 79 @import 'api-playground';
80 80  
81 81 // Also avoid generic and prefer class over id selectors
  82 +@import 'block-store';
... ...
public/stylesheets/block-store.scss 0 → 100644
  Diff comments   View file @e0a87b2
... ... @@ -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 +}
... ...
test/functional/profile_design_controller_test.rb
  Diff comments   View file @e0a87b2
... ... @@ -670,7 +670,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
670 670 end
671 671  
672 672 Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestBlockPlugin.new])
673   - refute @controller.available_blocks.include?(CustomBlock1)
  673 + assert !@controller.available_blocks.include?(CustomBlock1)
674 674 end
675 675  
676 676 should 'clone a block' do
... ... @@ -702,8 +702,8 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
702 702 should 'guarantee main block is always visible to everybody' do
703 703 get :edit, :profile => 'designtestuser', :id => @b4.id
704 704 %w[logged not_logged followers].each do |option|
705   - assert_no_tag :select, :attributes => {:name => 'block[display_user]'},
706   - :descendant => {:tag => 'option', :attributes => {:value => option}}
  705 + assert_no_tag :select, :attributes => {:name => 'block[display_user]'},
  706 + :descendant => {:tag => 'option', :attributes => {:value => option}}
707 707 end
708 708 end
709 709  
... ...
test/performance/user_test.rb 0 → 100644
  Diff comments   View file @e0a87b2
... ... @@ -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
... ...
test/unit/box_organizer_helper_test.rb
  Diff comments   View file @e0a87b2
... ... @@ -135,9 +135,9 @@ class BoxOrganizerHelperTest &lt; ActionView::TestCase
135 135  
136 136 doc = HTML::Document.new display_previews(block)
137 137 assert_select doc.root, 'li' do |elements|
138   - assert_match /\/images\/block_preview.png.*"/, elements[0].to_s
139   - assert_match /\/images\/block_preview.png.*"/, elements[1].to_s
140   - assert_match /\/images\/block_preview.png.*"/, elements[2].to_s
  138 + assert_match /img.* src="\/images\/block_preview.png.*"/, elements[0].to_s
  139 + assert_match /img.* src="\/images\/block_preview.png.*"/, elements[1].to_s
  140 + assert_match /img.* src="\/images\/block_preview.png.*"/, elements[2].to_s
141 141 end
142 142 end
143 143  
... ...