[Git][noosfero/noosfero][master] 3 commits: Makes newsletter footer links absolute URLs

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
8b3dfa1c by MatheusRich at 2018-11-12T13:49:33Z
Makes newsletter footer links absolute URLs

- - - - -
fcf8ba26 by Alax Alves at 2018-11-21T14:42:12Z
Merge branch 'master' of https://gitlab.com/noosfero/noosfero into fix-newsletter-footer-links

- - - - -
e87361a5 by Rodrigo Souto at 2018-11-26T15:38:28Z
Merge branch 'fix-newsletter-footer-links' into 'master'

Makes newsletter footer links absolute URLs

See merge request noosfero/noosfero!1642
- - - - -


2 changed files:

- app/views/shared/tiny_mce.html.erb
- plugins/newsletter/views/newsletter_plugin_admin/index.html.erb


Changes:

=====================================
app/views/shared/tiny_mce.html.erb
=====================================
@@ -3,7 +3,9 @@ extend TinymceHelper
 mode ||= false
 %>
 
+<% custom_options ||= {} %>
+
 <%= tinymce_js %>
-<%= tinymce_editor %>
+<%= tinymce_editor custom_options %>
 <%= tinymce_editor :mode => 'simple' %>
 <%= tinymce_editor :mode => 'restricted' %>


=====================================
plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
=====================================
@@ -81,6 +81,7 @@
       :id => 'newsletter-footer-field'
     ))
   %>
+  <%= render :file => 'shared/tiny_mce', :locals => { custom_options: { relative_urls: false, remove_script_host: false, branding: false } } %>    
   <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= submit_button :save, _('Save and visualize'), :name => "visualize", :cancel => {:controller => 'plugins'}  %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/509624d1735e4c75d22a5dcc3c0b3d9391d959ad...e87361a5ab2a12eb7910f668c847a7ae07ec6043

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/509624d1735e4c75d22a5dcc3c0b3d9391d959ad...e87361a5ab2a12eb7910f668c847a7ae07ec6043
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20181126/dab49ecc/attachment-0001.html>