diff --git a/app/views/cms/_tiny_mce_article.rhtml b/app/views/cms/_tiny_mce_article.rhtml index 7adb18b..26216b5 100644 --- a/app/views/cms/_tiny_mce_article.rhtml +++ b/app/views/cms/_tiny_mce_article.rhtml @@ -2,7 +2,7 @@ <%= render :file => 'shared/tiny_mce' %> -
+
<% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %>
<%= _('Title') %>: <%= @article.name %> diff --git a/app/views/cms/upload_files.rhtml b/app/views/cms/upload_files.rhtml index 2936e1a..9527971 100644 --- a/app/views/cms/upload_files.rhtml +++ b/app/views/cms/upload_files.rhtml @@ -20,5 +20,5 @@
<%= _('Uploading files to %s') % content_tag('code', @target) %>
<% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %> - <%= render :partial => 'upload_file_form', :locals => { :size => '50'} %> + <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %> <% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index aa11306..03e15d0 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2536,7 +2536,7 @@ div#activation_enterprise div { width: 40%; height: 630px; border: none; - margin: 115px 20px 0px 0px; + margin: 104px 20px 0px 0px; padding: 0px; overflow: hidden; } @@ -2546,12 +2546,11 @@ div#activation_enterprise div { } .controller-cms div.with_media_panel { - width: 57%; float: left; } -.controller-cms div.no_media_panel { - margin-left: 200px; - margin-right: 200px; + +div.with_media_panel .formfield input { + width: 100%; } /* ==> public/stylesheets/controller_contact.css <== */ -- libgit2 0.21.2