Download as
Browse Code »

Commit e2108aed0756797ce8a65febc70073067b4f7b56

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 230ff308
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fix width of Blog description field in CSS 

(ActionItem1949)
Showing 4 changed files with 13 additions and 3 deletions   Show diff stats
app/views/cms/_blog.rhtml
  Diff comments   View file @e2108ae
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 %> 50 %>
51 </div> 51 </div>
52 52
53 -<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %> 53 +<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10)) %>
54 54
55 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %> 55 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %>
56 56
app/views/cms/edit.rhtml
  Diff comments   View file @e2108ae
1 <%= error_messages_for 'article' %> 1 <%= error_messages_for 'article' %>
2 2
3 <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'> 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 +<% labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
5 5
6 <%= hidden_field_tag("type", @type) if @type %> 6 <%= hidden_field_tag("type", @type) if @type %>
7 7
public/stylesheets/application.css
  Diff comments   View file @e2108ae
@@ -2703,7 +2703,6 @@ div#activation_enterprise div { @@ -2703,7 +2703,6 @@ div#activation_enterprise div {
2703 text-align: center; 2703 text-align: center;
2704 } 2704 }
2705 2705
2706 -  
2707 .formfieldline { 2706 .formfieldline {
2708 padding: 3px 0px; 2707 padding: 3px 0px;
2709 } 2708 }
@@ -2740,6 +2739,9 @@ div#activation_enterprise div { @@ -2740,6 +2739,9 @@ div#activation_enterprise div {
2740 .formfield textarea { 2739 .formfield textarea {
2741 padding: 2px 0px 0px 5px; 2740 padding: 2px 0px 0px 5px;
2742 } 2741 }
  2742 +.Blog .formfield textarea {
  2743 + width: 99%;
  2744 +}
2743 2745
2744 .formfield.type-radio input, 2746 .formfield.type-radio input,
2745 .formfield.type-checkbox input { 2747 .formfield.type-checkbox input {
test/functional/cms_controller_test.rb
  Diff comments   View file @e2108ae
@@ -1610,4 +1610,12 @@ class CmsControllerTest &lt; Test::Unit::TestCase @@ -1610,4 +1610,12 @@ class CmsControllerTest &lt; Test::Unit::TestCase
1610 assert_tag :tag => 'textarea', :attributes => { :class => 'mceEditor' } 1610 assert_tag :tag => 'textarea', :attributes => { :class => 'mceEditor' }
1611 end 1611 end
1612 1612
  1613 + should 'identify form with classname of edited article' do
  1614 + [Blog, TinyMceArticle, Forum].each do |klass|
  1615 + a = fast_create(klass, :profile_id => profile.id)
  1616 + get :edit, :profile => profile.identifier, :id => a.id
  1617 + assert_tag :tag => 'form', :attributes => {:class => klass.to_s}
  1618 + end
  1619 + end
  1620 +
1613 end 1621 end