Download as
Browse Code »

Commit 37699d6fec3bcc84da9fd8231c63935c8479a21d

Authored by Daniela Feitosa
Committed by Joenio Costa
1 parent a45ffb4b
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

Duplicating article-actions to avoid empty div 

(ActionItem1911)
Showing 1 changed file with 4 additions and 2 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @37699d6
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 8
9 9
10 <div<%= " class='logged-in'" if user %>> 10 <div<%= " class='logged-in'" if user %>>
11 - <div id="article-actions">  
12 <% if @page.allow_post_content?(user) || @page.allow_publish_content?(user) %> 11 <% if @page.allow_post_content?(user) || @page.allow_publish_content?(user) %>
  12 + <div id="article-actions">
13 <% if @page.allow_post_content?(user) %> 13 <% if @page.allow_post_content?(user) %>
14 <%= link_to content_tag( 'span', label_for_edit_article(@page) ), 14 <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
15 profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }), 15 profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
@@ -49,10 +49,12 @@ @@ -49,10 +49,12 @@
49 <% if profile.kind_of?(Enterprise) && @page.gallery? %> 49 <% if profile.kind_of?(Enterprise) && @page.gallery? %>
50 <%= button('upload-file', _('Upload files'), :controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent)) %> 50 <%= button('upload-file', _('Upload files'), :controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent)) %>
51 <% end %> 51 <% end %>
  52 + </div>
52 <% elsif profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %> 53 <% elsif profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
  54 + <div id="article-actions">
53 <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %> 55 <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
  56 + </div>
54 <% end %> 57 <% end %>
55 - </div>  
56 <div id="article-header"> 58 <div id="article-header">
57 <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %> 59 <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
58 <%= article_title(@page, :no_link => true) %> 60 <%= article_title(@page, :no_link => true) %>