diff --git a/app/models/link_block.rb b/app/models/link_block.rb
index 27461d3..d679d78 100644
--- a/app/models/link_block.rb
+++ b/app/models/link_block.rb
@@ -1,8 +1,8 @@
class LinkBlock < Block
def to_html
- users = User.find(:all).map do |u|
- content_tag("a href='http://www.google.com.br'", u.name)
+ profiles = Profile.find(:all).map do |p|
+ content_tag("a href='http://www.google.com.br'", p.name)
end
- users.join(',')
+ profiles.join(',')
end
end
diff --git a/app/models/list_block.rb b/app/models/list_block.rb
index 7b92109..933c34b 100644
--- a/app/models/list_block.rb
+++ b/app/models/list_block.rb
@@ -1,6 +1,6 @@
class ListBlock < Block
def to_html
- content_tag(:ul, User.find(:all).map{|u| content_tag( :li, u.name ) })
+ content_tag(:ul, Profile.find(:all).map{|p| content_tag( :li, p.name ) })
end
end
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index fcebe05..b3c721d 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -7,9 +7,8 @@
<%= image_tag 'loading.gif', :id=>'spinner', :style=>"display:none; float:right;" %>
- <%= link_to _('edit layout'), params.merge({:edit_layout => true}) %>
- <%= link_to _('show layout'), params.merge({:edit_layout => false}) %>
- <%= link_to _('acao diferente'), :action => 'teste' %>
+ <%= link_to _('Show Layout'), :controller => 'home' %>
+ <%= link_to _('Edit Layout'), :controller => 'edit_template' %>
<%= display_boxes(@boxes, yield) %>
diff --git a/app/views/layouts/application.rhtml.wrong b/app/views/layouts/application.rhtml.wrong
deleted file mode 100644
index 31a1c6e..0000000
--- a/app/views/layouts/application.rhtml.wrong
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
- <%= javascript_include_tag :defaults %>
- <%= stylesheet_link_tag 'default' %>
-
-
-
- <%= image_tag 'loading.gif', :id=>'spinner', :style=>"display:none; float:right;" %>
-
- <%= link_to _('edit layout'), params.merge({:edit_layout => true}) %>
- <%= link_to _('show layout'), params.merge({:edit_layout => false}) %>
- <%= link_to _('acao diferente'), :action => 'teste' %>
-
-
- <%= show_block(@owner, 1)%>
-
-<%= update_page_tag{|page|
-#TODO this is to test
-#page.alert('leo')
-#@box_number=1
-#page.replace_html "box_1", {:partial => 'leo'};
-#page.replace_html "box_1", {:partial => 'layouts/box_template'};
-#page.sortable "leo_1", :url => {:action => 'sort_box', :box_number => 1};
-#)page.show
-}
-%>
-
-
-
- <%= show_block(@owner, 2)%>
- <%= yield %>
-
-
- <%= show_block(@owner, 3)%>
-
-
-
-
-
diff --git a/test/fixtures/blocks.yml b/test/fixtures/blocks.yml
index 6beebaa..ce96174 100644
--- a/test/fixtures/blocks.yml
+++ b/test/fixtures/blocks.yml
@@ -5,30 +5,36 @@ one:
box_id: 2
position: 1
type: 'MainBlock'
+ name: 'Main Content'
# Link Blocks
two:
id: 2
box_id: 1
position: 2
type: 'LinkBlock'
+ name: 'List of Links 1'
three:
id: 3
box_id: 1
position: 3
type: 'LinkBlock'
+ name: 'List of Link 2'
#List Blocks
four:
id: 4
box_id: 1
position: 1
type: 'ListBlock'
+ name: 'List of Names 1'
five:
id: 5
box_id: 3
position: 1
type: 'ListBlock'
+ name: 'List of Names 2'
six:
id: 6
box_id: 3
position: 2
type: 'ListBlock'
+ name: 'List of Names 3'
diff --git a/test/fixtures/boxes.yml b/test/fixtures/boxes.yml
index 4a333a3..a0f7c4d 100644
--- a/test/fixtures/boxes.yml
+++ b/test/fixtures/boxes.yml
@@ -4,13 +4,16 @@ one:
number: 1
owner_type: 'Profile'
owner_id: 1
+ name: 'Box One'
two:
id: 2
number: 2
owner_type: 'Profile'
owner_id: 1
+ name: 'Box Two'
three:
id: 3
number: 3
owner_type: 'Profile'
owner_id: 1
+ name: 'Box Three'
--
libgit2 0.21.2