Download as
Browse Code »

Commit 2429ca316d8a1738e07ad098c0893ee84183582e

Authored by AntonioTerceiro
1 parent 92937ed6
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem8: not displaying the help message by default. 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@127 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @2429ca3
@@ -128,7 +128,7 @@ module ApplicationHelper @@ -128,7 +128,7 @@ module ApplicationHelper
128 # message DIV 128 # message DIV
129 button = link_to_function(_('Help'), "alert('change me, Leandro!')") 129 button = link_to_function(_('Help'), "alert('change me, Leandro!')")
130 130
131 - text = content_tag('div', button + content_tag('div', content, :class => 'help_message'), :class => 'help_box') 131 + text = content_tag('div', button + content_tag('div', content, :class => 'help_message', :style => 'display: none;'), :class => 'help_box')
132 132
133 unless block.nil? 133 unless block.nil?
134 concat(text, block.binding) 134 concat(text, block.binding)
test/functional/application_controller_test.rb
  Diff comments   View file @2429ca3
@@ -61,7 +61,7 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -61,7 +61,7 @@ class ApplicationControllerTest < Test::Unit::TestCase
61 :descendant => { 61 :descendant => {
62 :tag => 'div', 62 :tag => 'div',
63 :content => /my_help_message/, 63 :content => /my_help_message/,
64 - :attributes => { :class => 'help_message'} 64 + :attributes => { :class => 'help_message', :style => /display:\s+none/}
65 } 65 }
66 }) 66 })
67 end 67 end
@@ -74,7 +74,7 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -74,7 +74,7 @@ class ApplicationControllerTest < Test::Unit::TestCase
74 :descendant => { 74 :descendant => {
75 :tag => 'div', 75 :tag => 'div',
76 :content => /my_help_message/, 76 :content => /my_help_message/,
77 - :attributes => { :class => 'help_message'} 77 + :attributes => { :class => 'help_message', :style => /display:\s+none/}
78 } 78 }
79 }) 79 })
80 end 80 end
@@ -86,7 +86,7 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -86,7 +86,7 @@ class ApplicationControllerTest < Test::Unit::TestCase
86 :attributes => { :class => 'help_box'}, 86 :attributes => { :class => 'help_box'},
87 :descendant => { 87 :descendant => {
88 :tag => 'div', 88 :tag => 'div',
89 - :attributes => { :class => 'help_message'}, 89 + :attributes => { :class => 'help_message', :style => /display:\s+none/},
90 :descendant => { 90 :descendant => {
91 :tag => 'strong', 91 :tag => 'strong',
92 :content => /my_bold_help_message/ 92 :content => /my_bold_help_message/
@@ -102,7 +102,7 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -102,7 +102,7 @@ class ApplicationControllerTest < Test::Unit::TestCase
102 :attributes => { :class => 'help_box'}, 102 :attributes => { :class => 'help_box'},
103 :descendant => { 103 :descendant => {
104 :tag => 'div', 104 :tag => 'div',
105 - :attributes => { :class => 'help_message'}, 105 + :attributes => { :class => 'help_message', :style => /display:\s+none/},
106 :descendant => { 106 :descendant => {
107 :tag => 'strong', 107 :tag => 'strong',
108 :content => /my_bold_help_message/ 108 :content => /my_bold_help_message/