Download as
Browse Code »

Commit 9b5026be7c57a536c317eeaba940c9b4c1f6ee62

Authored by Daniela Feitosa
2 parents dca118d8 3ae186b5
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 remote branch 'unb-gama-mes/ActionItem2838-BackButtonOutsideArticle'

Showing 1 changed file with 6 additions and 5 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @9b5026b
@@ -14,6 +14,12 @@ @@ -14,6 +14,12 @@
14 window.NO_COMMENT_YET = "<%= _('No comments yet') %>"; 14 window.NO_COMMENT_YET = "<%= _('No comments yet') %>";
15 </script> 15 </script>
16 16
  17 +<% if @page.parent && !@page.parent.path.blank? %>
  18 +<div id="article-parent">
  19 + <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
  20 +</div>
  21 +<% end %>
  22 +
17 <div id="article-toolbar"></div> 23 <div id="article-toolbar"></div>
18 24
19 <script type="text/javascript"> 25 <script type="text/javascript">
@@ -43,11 +49,6 @@ @@ -43,11 +49,6 @@
43 </div> 49 </div>
44 <% end %> 50 <% end %>
45 51
46 -<% if @page.parent && !@page.parent.path.blank? %>  
47 -<div id="article-parent">  
48 - <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>  
49 -</div>  
50 -<% end %>  
51 52
52 <%= render :partial => 'shared/disabled_enterprise' %> 53 <%= render :partial => 'shared/disabled_enterprise' %>
53 54