diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 2bed635..1066902 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -3,20 +3,25 @@
class ApplicationController < ActionController::Base
before_filter :detect_stuff_by_domain
+ attr_reader :virtual_community
+
+ # TODO: this methods don't belong here
#TODO See a better way to do this. The layout need a owner to work
before_filter :load_owner
def load_owner
@owner = User.find(1)
end
- #TODO See a better way to do this. We need that something say to us when is the time to edit the layout.
+ # TODO: this methods don't belong here
+ # TODO See a better way to do this. We need that something say to us when is the time to edit the layout.
#I think the better way is set a different render class to the visualization and to edit a layout.
before_filter :detect_edit_layout
def detect_edit_layout
@edit_layout = true unless params[:edit_layout].nil?
end
+ # TODO: this methods don't belong here
# This method changes a block content to a different box place and
# updates all boxes at the ends
def change_box
@@ -32,6 +37,7 @@ class ApplicationController < ActionController::Base
end
end
+ # TODO: this methods don't belong here
def sort_box
blocks = Array.new
box_number = params[:box_number]
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
deleted file mode 100644
index 31a1c6e..0000000
--- a/app/views/layouts/application.rhtml
+++ /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/app/views/layouts/application.rhtml.wrong b/app/views/layouts/application.rhtml.wrong
new file mode 100644
index 0000000..31a1c6e
--- /dev/null
+++ b/app/views/layouts/application.rhtml.wrong
@@ -0,0 +1,39 @@
+
+
+ <%= 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)%>
+
+
+
+
+
--
libgit2 0.21.2