Download as
Browse Code »

Commit 7d11a564bf3d5d2708940fe1b8b3c8135f2707b5

Authored by Antonio Terceiro
1 parent bf9032a1
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1050: moving some features from layout to helper method

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