Download as
Browse Code »

Commit a68c9e4006696434d406c54d6d8bbbc1fce239e2

Authored by Larissa Reis
2 parents 09d73e72 d46acfb7
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 branch 'networks-interaction' into feedback 

  Applying changes Ewout and Daniel asked.
Showing 3 changed files with 5 additions and 2 deletions   Show diff stats
app/views/content_viewer/view_page.html.erb
  Diff comments   View file @a68c9e4
... ... @@ -42,7 +42,6 @@
42 42  
43 43 <%= render :partial => 'shared/disabled_enterprise' %>
44 44  
45   -<%= @plugins.dispatch(:social_buttons_contents).collect { |content| instance_exec(&content) }.join("") %>
46 45 <% if NOOSFERO_CONF['addthis_enabled'] %>
47 46 <%= render :partial => 'addthis' %>
48 47 <% end %>
... ... @@ -71,6 +70,8 @@
71 70  
72 71 <%= display_source_info(@page) %>
73 72  
  73 +<%= @plugins.dispatch(:social_buttons_contents).collect { |content| instance_exec(&content) }.join("") %>
  74 +
74 75 <%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
75 76  
76 77 <div class="comments" id="comments_list">
... ...
plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
  Diff comments   View file @a68c9e4
... ... @@ -21,9 +21,10 @@ class SocialSharePrivacyPlugin &lt; Noosfero::Plugin
21 21 settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin)
22 22 locale = FastGettext.locale
23 23 javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') +
  24 + javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
24 25 javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) +
25 26 (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
26   - javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({perma_option: false, info_link_target: '_blank'});});") +
  27 + javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
27 28 content_tag(:div, '', :class => "social-buttons")
28 29 end
29 30 end
... ...
plugins/social_share_privacy/public/style.css
  Diff comments   View file @a68c9e4
... ... @@ -7,4 +7,5 @@
7 7 .social-buttons {
8 8 display: inline-block;
9 9 width: 100%;
  10 + margin: 10px 0;
10 11 }
... ...