diff --git a/app/views/cms/_blog.rhtml b/app/views/cms/_blog.rhtml index 86ebcbf..cde25ae 100644 --- a/app/views/cms/_blog.rhtml +++ b/app/views/cms/_blog.rhtml @@ -50,7 +50,7 @@ %> -<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %> +<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10)) %> <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %> diff --git a/app/views/cms/edit.rhtml b/app/views/cms/edit.rhtml index e9dbdcc..1d2f977 100644 --- a/app/views/cms/edit.rhtml +++ b/app/views/cms/edit.rhtml @@ -1,7 +1,7 @@ <%= error_messages_for 'article' %>
'> -<% labelled_form_for 'article', @article, :html => { :multipart => true } do |f| %> +<% labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %> <%= hidden_field_tag("type", @type) if @type %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 7fab643..6741672 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2703,7 +2703,6 @@ div#activation_enterprise div { text-align: center; } - .formfieldline { padding: 3px 0px; } @@ -2740,6 +2739,9 @@ div#activation_enterprise div { .formfield textarea { padding: 2px 0px 0px 5px; } +.Blog .formfield textarea { + width: 99%; +} .formfield.type-radio input, .formfield.type-checkbox input { diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index 5da74c7..850bf8b 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -1610,4 +1610,12 @@ class CmsControllerTest < Test::Unit::TestCase assert_tag :tag => 'textarea', :attributes => { :class => 'mceEditor' } end + should 'identify form with classname of edited article' do + [Blog, TinyMceArticle, Forum].each do |klass| + a = fast_create(klass, :profile_id => profile.id) + get :edit, :profile => profile.identifier, :id => a.id + assert_tag :tag => 'form', :attributes => {:class => klass.to_s} + end + end + end -- libgit2 0.21.2