Download as
Browse Code »

Commit 99b49d6e545471340ef0f7c09e515663c81b19df

Authored by Larissa Reis
1 parent 1de55ac6
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

[media-panel-improvements] Fixes article form css

Showing 1 changed file with 4 additions and 2 deletions   Show diff stats
app/views/cms/edit.html.erb
  Diff comments   View file @99b49d6
1 1 <%= error_messages_for 'article' %>
2 2  
3   -<div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
  3 +<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
  4 +
  5 +<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
4 6 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
5 7  
6 8 <%= hidden_field_tag("type", @type) if @type %>
... ... @@ -66,7 +68,7 @@
66 68 <% end %>
67 69 </div>
68 70  
69   -<% if environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
  71 +<% if show_media_panel %>
70 72 <%= render :partial => 'text_editor_sidebar' %>
71 73 <% end %>
72 74  
... ...