Download as
Browse Code »

Commit 3a88903e7277712e83a2cc0359f11d80aa79121a

Authored by LeandroNunes
1 parent 08b7ed84
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem0: clean up the system 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@188 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 15 additions and 30 deletions   Show diff stats
app/views/home/_leo.rhtml
View file @08b7ed8
@@ -1,9 +0,0 @@ @@ -1,9 +0,0 @@
1 -  
2 -<ul id="leo_1" >  
3 -<!-- TODO this is to test -->  
4 -teste qual foi  
5 - <li class="block_item_box_1" id="block_1" > teste 1</li>  
6 -<%= draggable('block_1') %>  
7 - <li class="block_item_box_1" id="block_2" > teste 2</li>  
8 -</ul>  
9 -  
app/views/home/index.rhtml
  Diff comments   View file @3a88903
1 <%= flash[:notice] %> 1 <%= flash[:notice] %>
2 Start page of Virtual Community <%= @virtual_community.name %> 2 Start page of Virtual Community <%= @virtual_community.name %>
3 3
4 -  
5 -Teste:  
6 -<%= @ft_config[:template].inspect %>  
7 -<%= @ft_config[:owner].template %>  
8 -caralho  
9 -  
db/migrate/002_create_profiles.rb
  Diff comments   View file @3a88903
@@ -6,9 +6,9 @@ class CreateProfiles &lt; ActiveRecord::Migration @@ -6,9 +6,9 @@ class CreateProfiles &lt; ActiveRecord::Migration
6 t.column :virtual_community_id, :integer 6 t.column :virtual_community_id, :integer
7 t.column :profile_owner_id, :integer 7 t.column :profile_owner_id, :integer
8 t.column :profile_owner_type, :string 8 t.column :profile_owner_type, :string
9 - t.column :template, :string, :default => "default"  
10 - t.column :theme, :string, :default => "default"  
11 - t.column :icon_theme, :string, :default => "default" 9 + t.column :flexible_template_template, :string, :default => "default"
  10 + t.column :flexible_template_theme, :string, :default => "default"
  11 + t.column :flexible_template_icon_theme, :string, :default => "default"
12 end 12 end
13 end 13 end
14 14
test/fixtures/profiles.yml
  Diff comments   View file @3a88903
@@ -6,9 +6,9 @@ johndoe: @@ -6,9 +6,9 @@ johndoe:
6 virtual_community_id: 1 6 virtual_community_id: 1
7 profile_owner_id: 1 7 profile_owner_id: 1
8 profile_owner_type: 'User' 8 profile_owner_type: 'User'
9 - template: 'default'  
10 - icon_theme: 'default'  
11 - theme: 'default' 9 + flexible_template_template: 'default'
  10 + flexible_template_icon_theme: 'default'
  11 + flexible_template_theme: 'default'
12 joerandomhacker: 12 joerandomhacker:
13 id: 2 13 id: 2
14 name: 'Joe Random Hacker' 14 name: 'Joe Random Hacker'
@@ -16,22 +16,22 @@ joerandomhacker: @@ -16,22 +16,22 @@ joerandomhacker:
16 virtual_community_id: 1 16 virtual_community_id: 1
17 profile_owner_id: 2 17 profile_owner_id: 2
18 profile_owner_type: 'User' 18 profile_owner_type: 'User'
19 - template: 'simple'  
20 - icon_theme: 'simple'  
21 - theme: 'simple' 19 + flexible_template_template: 'simple'
  20 + flexible_template_icon_theme: 'simple'
  21 + flexible_template_theme: 'simple'
22 john_and_joe: 22 john_and_joe:
23 id: 3 23 id: 3
24 name: "John and Joe's Production Cooperative" 24 name: "John and Joe's Production Cooperative"
25 identifier: john_and_joe 25 identifier: john_and_joe
26 virtual_community_id: 1 26 virtual_community_id: 1
27 - template: 'simple'  
28 - icon_theme: 'simple'  
29 - theme: 'simple' 27 + flexible_template_template: 'simple'
  28 + flexible_template_icon_theme: 'simple'
  29 + flexible_template_theme: 'simple'
30 ze: 30 ze:
31 id: 4 31 id: 4
32 name: "Zé" 32 name: "Zé"
33 identifier: ze 33 identifier: ze
34 virtual_community_id: 1 34 virtual_community_id: 1
35 - template: 'default'  
36 - icon_theme: 'default'  
37 - theme: 'default' 35 + flexible_template_template: 'default'
  36 + flexible_template_icon_theme: 'default'
  37 + flexible_template_theme: 'default'