Commit a68c9e4006696434d406c54d6d8bbbc1fce239e2
Exists in
master
and in
29 other branches
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
| @@ -42,7 +42,6 @@ | @@ -42,7 +42,6 @@ | ||
| 42 | 42 | ||
| 43 | <%= render :partial => 'shared/disabled_enterprise' %> | 43 | <%= render :partial => 'shared/disabled_enterprise' %> |
| 44 | 44 | ||
| 45 | -<%= @plugins.dispatch(:social_buttons_contents).collect { |content| instance_exec(&content) }.join("") %> | ||
| 46 | <% if NOOSFERO_CONF['addthis_enabled'] %> | 45 | <% if NOOSFERO_CONF['addthis_enabled'] %> |
| 47 | <%= render :partial => 'addthis' %> | 46 | <%= render :partial => 'addthis' %> |
| 48 | <% end %> | 47 | <% end %> |
| @@ -71,6 +70,8 @@ | @@ -71,6 +70,8 @@ | ||
| 71 | 70 | ||
| 72 | <%= display_source_info(@page) %> | 71 | <%= display_source_info(@page) %> |
| 73 | 72 | ||
| 73 | +<%= @plugins.dispatch(:social_buttons_contents).collect { |content| instance_exec(&content) }.join("") %> | ||
| 74 | + | ||
| 74 | <%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %> | 75 | <%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %> |
| 75 | 76 | ||
| 76 | <div class="comments" id="comments_list"> | 77 | <div class="comments" id="comments_list"> |
plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
| @@ -21,9 +21,10 @@ class SocialSharePrivacyPlugin < Noosfero::Plugin | @@ -21,9 +21,10 @@ class SocialSharePrivacyPlugin < Noosfero::Plugin | ||
| 21 | settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin) | 21 | settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin) |
| 22 | locale = FastGettext.locale | 22 | locale = FastGettext.locale |
| 23 | javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') + | 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 | javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) + | 25 | javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) + |
| 25 | (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') + | 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 | content_tag(:div, '', :class => "social-buttons") | 28 | content_tag(:div, '', :class => "social-buttons") |
| 28 | end | 29 | end |
| 29 | end | 30 | end |