Download as
Browse Code »

Commit b74d554ff266d440dacc324da40689ad3832cf34

Authored by Antonio Terceiro
1 parent b825d717
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

ActionItem928: disabling media_panel reasonably

Showing 3 changed files with 14 additions and 2 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @b74d554
... ... @@ -44,6 +44,7 @@ class Environment < ActiveRecord::Base
44 44 'enterprise_activation' => _('Enable activation of enterprises'),
45 45 'warn_obsolete_browser' => _('Enable warning of obsolete browser'),
46 46 'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
  47 + 'media_panel' => _('Media panel in WYSIWYG editor'),
47 48 }
48 49 end
49 50  
... ...
app/views/cms/edit.rhtml
  Diff comments   View file @b74d554
1 1 <%= error_messages_for 'article' %>
2 2  
3   -<% labelled_form_for 'article', @article, :html => { :multipart => true, :style => 'width:57%;float:left;' } do |f| %>
  3 +<div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
  4 +<% labelled_form_for 'article', @article, :html => { :multipart => true } do |f| %>
4 5  
5 6 <%= hidden_field_tag("type", @type) if @type %>
6 7  
... ... @@ -38,7 +39,8 @@
38 39 <% end %>
39 40 <% end %>
40 41 <% end %>
  42 +</div>
41 43  
42   -<% if [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
  44 +<% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
43 45 <%= render :partial => 'media_listing' %>
44 46 <% end %>
... ...
public/stylesheets/controller_cms.css
  Diff comments   View file @b74d554
... ... @@ -161,3 +161,12 @@ div.file-manager-button a:hover {
161 161 .msie #media-listing-iframe {
162 162 height: 610px;
163 163 }
  164 +
  165 +div.with_media_panel {
  166 + width: 57%;
  167 + float: left;
  168 +}
  169 +div.no_media_panel {
  170 + margin-left: 200px;
  171 + margin-right: 200px;
  172 +}
... ...