Bugzilla – Attachment 94031 Details for
Bug 23791
Allow granular control of social networks enabled by SocialNetworks syspref
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23791: Allow granular control of social networks enabled by SocialNetworks syspref
Bug-23791-Allow-granular-control-of-social-network.patch (text/plain), 9.87 KB, created by
Owen Leonard
on 2019-10-11 19:18:42 UTC
(
hide
)
Description:
Bug 23791: Allow granular control of social networks enabled by SocialNetworks syspref
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2019-10-11 19:18:42 UTC
Size:
9.87 KB
patch
obsolete
>From 251c95f998b7ddd5b49cc658a43acec5eafdef39 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 11 Oct 2019 18:32:19 +0000 >Subject: [PATCH] Bug 23791: Allow granular control of social networks enabled > by SocialNetworks syspref > >This patch updates the SocialNetworks system preference so that it >offers a choice of social networks (and email) which can be enabled in >the OPAC. > >This patch also replaces the social network images with Font Awesome >icons styled so that the colors match the social networks' current >branding. The old social networks sprite image is removed. > >To test, apply the patch and run the database update. Rebuild the OPAC >CSS: >https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client > > - Go to Administration -> Global system preferences -> OPAC -> Features > and find the SocialNetworks preference. > - If your SocialNetworks preference was enabled, all choices should > be selected. Otherwise none should be selected. > - If none are selected, select them all and save. > - Locate a record in the OPAC and view the details page. > - The social network icons should appear as expected and function as > before. > - Return to system preferences in the staff client and try enabling and > disabling different options, verifying each time that the OPAC > reflects your choices. >--- > .../bug_23791-opac-social-network-selection.perl | 14 ++++++++++++++ > .../prog/en/modules/admin/preferences/opac.pref | 11 +++++++---- > .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 21 +++++++++++++++------ > .../opac-tmpl/bootstrap/images/social-sprite.png | Bin 2802 -> 0 bytes > 4 files changed, 36 insertions(+), 10 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_23791-opac-social-network-selection.perl > delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/images/social-sprite.png > >diff --git a/installer/data/mysql/atomicupdate/bug_23791-opac-social-network-selection.perl b/installer/data/mysql/atomicupdate/bug_23791-opac-social-network-selection.perl >new file mode 100644 >index 0000000000..46d6a04d7d >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_23791-opac-social-network-selection.perl >@@ -0,0 +1,14 @@ >+$DBversion = 'XXX'; # will be replaced by the RM >+if( CheckVersion( $DBversion ) ) { >+ my ($socialnetworks) = $dbh->selectrow_array( q| >+ SELECT value FROM systempreferences WHERE variable='socialnetworks'; >+ |); >+ if( $socialnetworks ){ >+ # If the socialnetworks preference is enabled, enable all social networks >+ $dbh->do("UPDATE systempreferences SET value = 'email,facebook,linkedin,twitter', explanation = 'email|facebook|linkedin|twitter', type = 'multiple' WHERE variable = 'SocialNetworks'"); >+ } else { >+ $dbh->do("UPDATE systempreferences SET value = '', explanation = 'email|facebook|linkedin|twitter', type = 'multiple' WHERE variable = 'SocialNetworks'"); >+ } >+ SetVersion ($DBversion); >+ print "Upgrade to $DBversion done (Bug 22880: Move contents of socialnetworks preference to Koha news system)\n"; >+} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index 0ffe05b44d..8d00e78155 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -487,11 +487,14 @@ OPAC: > class: long > - search results in the RSS feed. > - >+ - Show > - pref: SocialNetworks >- default: 0 >- choices: >- yes: Enable >- no: Disable >+ multiple: >+ facebook: Facebook >+ linkedin: LinkedIn >+ email: Email >+ twitter: Twitter >+ > - social network links in opac detail pages > - > - pref: OpacBrowseResults >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index ca0f5f3f2d..08b1c1d936 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1152,15 +1152,24 @@ > </div> > [% END %] > >- [% IF ( SocialNetworks ) %] >+ [% IF ( Koha.Preference('SocialNetworks') ) %] > <div id="social_networks" class="clearfix"> > <span>Share</span> >- <div><a id="facebook" href="http://www.facebook.com/sharer.php?u=[% current_url |url %]&t=[% title |url %]" title="Share on Facebook">Facebook</a></div> >- <div><a id="linkedin" href="http://www.linkedin.com/shareArticle?mini=true&url=[% current_url |url %]&title=[% title |url %]" title="Share on LinkedIn">LinkedIn</a></div> >- <div><a id="email" href="mailto:?subject=[% title |url %]&body=[% title |url %]%20([% current_url |url %])" title="Share by email">Email</a></div> >- <div><a id="twitter" href="https://twitter.com/share" class="twitter-share-button" data-count="none" data-text="[% title |url %]" data-lang="[% lang | html %]">Tweet</a></div> >+ [% SET SocialNetworks = Koha.Preference('SocialNetworks') %] >+ [% FOREACH network IN SocialNetworks.split(",") %] >+ [% SWITCH network -%] >+ [% CASE "facebook" -%] >+ <div><a id="facebook" href="https://www.facebook.com/sharer.php?u=[% current_url |url %]&t=[% title |url %]" title="Share on Facebook"><i class="fa fa-facebook"></i></a></div> >+ [% CASE "linkedin" -%] >+ <div><a id="linkedin" href="https://www.linkedin.com/shareArticle?mini=true&url=[% current_url |url %]&title=[% title |url %]" title="Share on LinkedIn"><i class="fa fa-linkedin"></i></a></div> >+ [% CASE "email" -%] >+ <div><a id="email" href="mailto:?subject=[% title |url %]&body=[% title |url %]%20([% current_url |url %])" title="Share by email"><i class="fa fa-envelope-o"></i></a></div> >+ [% CASE "twitter" -%] >+ <div><a id="twitter" href="https://twitter.com/share" class="twitter-share-button" data-count="none" data-text="[% title |url %]" data-lang="[% lang | html %]"><i class="fa fa-twitter"></i></a></div> >+ [% END -%] >+ [% END %] > </div> >- [% END %] >+ [% END # /IF SocialNetworks %] > </div> <!-- / .ulactioncontainer --> > </div> <!-- / .span4 --> > </div> <!-- / .row-fluid --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/images/social-sprite.png b/koha-tmpl/opac-tmpl/bootstrap/images/social-sprite.png >deleted file mode 100644 >index 63d6b74b31cd5d37dfced08b0e918e65c48a5402..0000000000000000000000000000000000000000 >GIT binary patch >literal 0 >HcmV?d00001 > >literal 2802 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 >M2q&8YYtP7k0K&X`^Z)<= > >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23791
:
94031
|
94107
|
94375
|
94379
|
94380
|
94381
|
94382