[Git][noosfero/noosfero][stable-1.6] 2 commits: Merge branch 'block-help-menu' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.6 at Noosfero / noosfero


Commits:
e47ade9f by Rodrigo Souto at 2016-10-28T17:54:32+00:00
Merge branch 'block-help-menu' into 'master'

block-design: remove redundant close button on block help

See merge request !1036
- - - - -
9011835a by Rodrigo Souto at 2016-10-28T18:58:15+00:00
Merge branch 'cherry-pick-9e05ff83' into 'stable-1.6'

Merge branch 'block-help-menu' into 'master'

block-design: remove redundant close button on block help

See merge request !1036

See merge request !1038
- - - - -


1 changed file:

- app/helpers/boxes_helper.rb


Changes:

=====================================
app/helpers/boxes_helper.rb
=====================================
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -285,7 +285,7 @@ module BoxesHelper
     end
 
     if block.respond_to?(:help)
-      buttons << modal_inline_icon(:help, _('Help on this block'), {}, "#help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help.html_safe, :style => 'margin-bottom: 1em;') + modal_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
+      buttons << modal_inline_icon(:help, _('Help on this block'), {}, "#help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help.html_safe, :style => 'margin-bottom: 1em;'), :style => 'display: none;', :id => "help-on-box-#{block.id}")
     end
 
     if block.embedable?



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/6beaf0d6059d48fe09043a202fa7c6eb5ddb32cc...9011835ac5efc57e2af1cd338e4053556008d9f2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20161028/d6682dea/attachment.html>