Download as
Browse Code »

Commit 7b1dae3cdc4d4dcd2ff587d131b9e8e7064e2a9f

Authored by Daniela Feitosa
2 parents c1fce26e e7f9035c
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

Merge commit 'refs/merge-requests/398' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/398

Conflicts:
	app/views/content_viewer/view_page.rhtml
Showing 1 changed file with 7 additions and 8 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @7b1dae3
@@ -40,14 +40,6 @@ @@ -40,14 +40,6 @@
40 </div> 40 </div>
41 <% end %> 41 <% end %>
42 42
43 -<% if !@page.tags.empty? %>  
44 - <div id="article-tags">  
45 - <%= _("This article's tags:") %>  
46 - <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>  
47 - </div>  
48 -<% end %>  
49 -  
50 -  
51 <%= render :partial => 'shared/disabled_enterprise' %> 43 <%= render :partial => 'shared/disabled_enterprise' %>
52 44
53 <% if NOOSFERO_CONF['addthis_enabled'] %> 45 <% if NOOSFERO_CONF['addthis_enabled'] %>
@@ -83,6 +75,13 @@ @@ -83,6 +75,13 @@
83 </div> 75 </div>
84 <% end %> 76 <% end %>
85 77
  78 +<% if !@page.tags.empty? %>
  79 + <div id="article-tags">
  80 + <%= _("This article's tags:") %>
  81 + <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
  82 + </div>
  83 +<% end %>
  84 +
86 <%= display_source_info(@page) %> 85 <%= display_source_info(@page) %>
87 86
88 <div class="comments" id="comments_list"> 87 <div class="comments" id="comments_list">