ActionItem1050: moving some features from layout to helper method

Antonio Terceiro
1 parent bf9032a1
Showing 5 changed files with 21 additions and 9 deletions Show diff stats
app/helpers/application_helper.rb
app/models/theme.rb
app/views/layouts/application-ng.rhtml
app/views/layouts/application.rhtml
app/views/shared/noosfero_layout_features.rhtml
@@ -873,4 +873,8 @@ module ApplicationHelper
     stylesheet_import pngfix_stylesheet_path()
   end
+  def noosfero_layout_features
+    render :file => 'shared/noosfero_layout_features'
+  end
+
 end
@@ -64,6 +64,7 @@ class Theme
       self.send("#{k}=", v)
     end
     config['id'] = id
+    config['layout'] = 'application-ng'
   end
   def name
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
   <head>
     <title><%= page_title %></title>
     <%= meta_tags_for_article(@page) %>
@@ -79,7 +80,7 @@
         </div><!-- end id="user" -->
         <h1 id="site-title">
-          <a href="http://softwarelivre.org"><span> Title of the Site </span></a>
+          <%= link_to content_tag('span', environment.name), environment.top_url %>
         </h1>
         <div id="navigation">
           <ul>
@@ -101,5 +102,8 @@
     <div id="theme-footer">
       <%= theme_footer %>
     </div><!-- end id="theme-footer" -->
+
+    <%= noosfero_layout_features %>
+
   </body>
 </html>
@@ -167,13 +167,9 @@
     <% end %>
     <%= javascript_include_tag 'better-browser-promotion' %>
-    <% if is_testing_theme %>
-      <%= render :file => 'shared/theme_test_panel' %>
-    <% end %>
-
-    <% if ask_to_join? %>
-      <%= render :file => 'shared/join_community_popup' %>
-    <% end %>
+    <%# if you need to add HTML stuff to the layout, include it in
+    app/views/shared/noosfero_layout_features.rhtml! %>
+    <%= noosfero_layout_features %>
   </body>
 </html>
@@ -0,0 +1,7 @@
+    <% if is_testing_theme %>
+      <%= render :file => 'shared/theme_test_panel' %>
+    <% end %>
+
+    <% if ask_to_join? %>
+      <%= render :file => 'shared/join_community_popup' %>
+    <% end %>
	@@ -873,4 +873,8 @@ module ApplicationHelper		@@ -873,4 +873,8 @@ module ApplicationHelper
873	stylesheet_import pngfix_stylesheet_path()	873	stylesheet_import pngfix_stylesheet_path()
874	end	874	end
875		875
		876	+ def noosfero_layout_features
		877	+ render :file => 'shared/noosfero_layout_features'
		878	+ end
		879	+
876	end	880	end
	@@ -64,6 +64,7 @@ class Theme		@@ -64,6 +64,7 @@ class Theme
64	self.send("#{k}=", v)	64	self.send("#{k}=", v)
65	end	65	end
66	config['id'] = id	66	config['id'] = id
		67	+ config['layout'] = 'application-ng'
67	end	68	end
68		69
69	def name	70	def name
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+ <% if is_testing_theme %>
	2	+ <%= render :file => 'shared/theme_test_panel' %>
	3	+ <% end %>
	4	+
	5	+ <% if ask_to_join? %>
	6	+ <%= render :file => 'shared/join_community_popup' %>
	7	+ <% end %>