Download as
Browse Code »

Commit d225958c0514ade414dd3e81b01fdf564f75a203

Authored by Daniela Feitosa
1 parent dd567596
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, 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 @d225958
... ... @@ -8,8 +8,8 @@
8 8  
9 9  
10 10 <div<%= " class='logged-in'" if user %>>
11   - <div id="article-actions">
12 11 <% if @page.allow_post_content?(user) || @page.allow_publish_content?(user) %>
  12 + <div id="article-actions">
13 13 <% if @page.allow_post_content?(user) %>
14 14 <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
15 15 profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
... ... @@ -49,10 +49,12 @@
49 49 <% if profile.kind_of?(Enterprise) && @page.gallery? %>
50 50 <%= button('upload-file', _('Upload files'), :controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent)) %>
51 51 <% end %>
  52 + </div>
52 53 <% elsif profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
  54 + <div id="article-actions">
53 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 57 <% end %>
55   - </div>
56 58 <div id="article-header">
57 59 <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
58 60 <%= article_title(@page, :no_link => true) %>
... ...