Download as
Browse Code »

Commit 6425451ce85873cc6bd4a9fd48dbe6a06e9a9ea7

Authored by Rodrigo Souto
2 parents c50dc645 80071dbc
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

Merge commit 'refs/merge-requests/322' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/322
Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @6425451
@@ -60,7 +60,6 @@ @@ -60,7 +60,6 @@
60 addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>'; 60 addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
61 </script> 61 </script>
62 <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> 62 <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>
63 -<script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>  
64 </div> 63 </div>
65 <% end %> 64 <% end %>
66 65
app/views/layouts/application-ng.rhtml
  Diff comments   View file @6425451
@@ -57,5 +57,8 @@ @@ -57,5 +57,8 @@
57 </div><!-- end id="theme-footer" --> 57 </div><!-- end id="theme-footer" -->
58 <%= noosfero_layout_features %> 58 <%= noosfero_layout_features %>
59 <%= theme_javascript_ng %> 59 <%= theme_javascript_ng %>
  60 + <% if NOOSFERO_CONF['addthis_enabled'] %>
  61 + <script src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
  62 + <% end %>
60 </body> 63 </body>
61 </html> 64 </html>