Commit 4a5cdce6f6ba08fc64d62e3c3d608437e360276d

Authored by Rodrigo Souto
2 parents e8904ed7 5a3ec3b1

Merge branch 'ai3055' into 'stable'

Use https for addthis

http://noosfero.org/Development/ActionItem3055
app/helpers/layout_helper.rb
@@ -86,7 +86,7 @@ module LayoutHelper @@ -86,7 +86,7 @@ module LayoutHelper
86 86
87 def addthis_javascript 87 def addthis_javascript
88 if NOOSFERO_CONF['addthis_enabled'] 88 if NOOSFERO_CONF['addthis_enabled']
89 - '<script src="http://s7.addthis.com/js/152/addthis_widget.js"></script>' 89 + '<script src="https://s7.addthis.com/js/152/addthis_widget.js"></script>'
90 end 90 end
91 end 91 end
92 92
app/views/content_viewer/view_page.rhtml
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 }; 66 };
67 addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>'; 67 addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
68 </script> 68 </script>
69 -<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a> 69 +<a href="https://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
70 </div> 70 </div>
71 <% end %> 71 <% end %>
72 72