From f913ebe49fa7d861f214508bffc5fa43f8a523dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9rick?= Date: Mon, 13 Aug 2012 12:29:35 -0400 Subject: [PATCH] Bug 8597: Add system preferences to configure the mobile view. This patch adds the following system preferences: * OpacMainUserBlockMobile - alternate content for the MainUserBlock for mobile * OPACMobileUserCSS - custom CSS for mobile views only * OpacShowFiltersPulldownMobile - whether or not to show the index dropdown on the mobile view * OpacShowLibrariesPulldownMobile - whether or not to show the library dropdown on the mobile view Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack Signed-off-by: Jared Camins-Esakov --- C4/Auth.pm | 4 ++ installer/data/mysql/sysprefs.sql | 4 ++ installer/data/mysql/updatedatabase.pl | 11 +++++ .../en/modules/admin/preferences/opac.pref | 22 +++++++++ koha-tmpl/opac-tmpl/ccsr/en/css/mobile.css | 30 ++++++------ koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 4 ++ .../ccsr/en/includes/doc-head-close.inc | 1 + .../opac-tmpl/ccsr/en/includes/masthead.inc | 47 +++++++++++++++---- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 ++ .../prog/en/includes/doc-head-close.inc | 1 + .../opac-tmpl/prog/en/modules/opac-main.tt | 1 + 11 files changed, 107 insertions(+), 22 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 59c99551d7..d4ad292894 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -402,6 +402,7 @@ sub get_template_and_user { OpacShowRecentComments => C4::Context->preference("OpacShowRecentComments"), OPACURLOpenInNewWindow => "" . C4::Context->preference("OPACURLOpenInNewWindow"), OPACUserCSS => "". C4::Context->preference("OPACUserCSS"), + OPACMobileUserCSS => "". C4::Context->preference("OPACMobileUserCSS"), OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"), OpacAuthorities => C4::Context->preference("OpacAuthorities"), OPACBaseURL => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} . @@ -413,6 +414,9 @@ sub get_template_and_user { OpacCloud => C4::Context->preference("OpacCloud"), OpacKohaUrl => C4::Context->preference("OpacKohaUrl"), OpacMainUserBlock => "" . C4::Context->preference("OpacMainUserBlock"), + OpacMainUserBlockMobile => "" . C4::Context->preference("OpacMainUserBlockMobile"), + OpacShowFiltersPulldownMobile => C4::Context->preference("OpacShowFiltersPulldownMobile"), + OpacShowLibrariesPulldownMobile => C4::Context->preference("OpacShowLibrariesPulldownMobile"), OpacNav => "" . C4::Context->preference("OpacNav"), OpacNavRight => "" . C4::Context->preference("OpacNavRight"), OpacNavBottom => "" . C4::Context->preference("OpacNavBottom"), diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index d1d2ab5e70..4b4bf777f3 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -375,3 +375,7 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age restriction.',NULL,'YesNo'); INSERT INTO systempreferences (variable,value,explanation,type) VALUES('DidYouMeanFromAuthorities','0','Suggest searches based on authority file.','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACMobileUserCSS','','Include the following CSS for the mobile view on all pages in the OPAC:',NULL,'free'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacMainUserBlockMobile','','Show the following HTML in its own column on the main page of the OPAC (mobile version):',NULL,'free'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowLibrariesPulldownMobile','1','Show the libraries pulldown on the mobile version of the OPAC.',NULL,'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowFiltersPulldownMobile','1','Show the search filters pulldown on the mobile version of the OPAC.',NULL,'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a25469e90d..7c9d93658b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5681,6 +5681,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { "INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free'); "); print "Upgrade to $DBversion done (Adding PrefillItem and SubfieldsToUseWhenPrefill sysprefs)\n"; + SetVersion ($DBversion); } $DBversion = "3.09.00.036"; @@ -5693,6 +5694,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age restriction.',NULL,'YesNo')"); print "Upgrade to $DBversion done (Add colum agerestriction to biblioitems and deletedbiblioitems, add system preferences AgeRestrictionMarker and AgeRestrictionOverride)\n"; + SetVersion ($DBversion); +} + +$DBversion ="XXX"; +if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACMobileUserCSS','','Include the following CSS for the mobile view on all pages in the OPAC:',NULL,'free');"); + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacMainUserBlockMobile','','Show the following HTML in its own column on the main page of the OPAC (mobile version):',NULL,'free');"); + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowLibrariesPulldownMobile','1','Show the libraries pulldown on the mobile version of the OPAC.',NULL,'YesNo');"); + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowFiltersPulldownMobile','1','Show the search filters pulldown on the mobile version of the OPAC.',NULL,'YesNo');"); + print "Upgrade to $DBversion done (Add OPACMobileUserCSS, OpacMainUserBlockMobile, OpacShowLibrariesPulldownMobile and OpacShowFiltersPulldownMobile sysprefs)\n"; SetVersion($DBversion); } 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 4df81b4cc8..e6457857fc 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 @@ -162,11 +162,33 @@ OPAC: - pref: OPACUserCSS type: textarea class: code + - + - "Include the following CSS for the mobile view on all pages in the OPAC:" + - pref: OPACMobileUserCSS + type: textarea + class: code - - "Show the following HTML in its own column on the main page of the OPAC:" - pref: OpacMainUserBlock type: textarea class: code + - + - "Show the following HTML in its own column on the main page of the OPAC (mobile version):" + - pref: OpacMainUserBlockMobile + type: textarea + class: code + - + - pref: OpacShowLibrariesPulldownMobile + choices: + yes: Show + no: "Don't show" + - the libraries pulldown on the mobile version of the OPAC. + - + - pref: OpacShowFiltersPulldownMobile + choices: + yes: Show + no: "Don't show" + - the search filters pulldown on the mobile version of the OPAC. - - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):" - pref: OpacNav diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/mobile.css b/koha-tmpl/opac-tmpl/ccsr/en/css/mobile.css index 7917e77c5a..58da8bdc6c 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/mobile.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/mobile.css @@ -5,9 +5,11 @@ /* Hidden elements */ +.mobile-hidden, body#opac-main #login, body#opac-main #login~div, body#opac-main #opacnav, +body#opac-main #opacmainuserblock, body#opac-main #news, body#results #facetcontainer, body#opac-detail #ulactioncontainer>:not(#action), @@ -99,14 +101,15 @@ body#results #breadcrumbs>*{ /* Main */ -body#opac-main #opacmainuserblock { - padding: 0 -} - body#opac-main #container #ctn_lt{ padding: 15px; } +body#opac-main #opacmainuserblockmobile { + display: block; +} + + /* Results */ @@ -257,30 +260,29 @@ form#searchform { padding-top: 50px; } -form.single-library #filters .jqTransformSelectWrapper { +form#searchform #filters .jqTransformSelectWrapper, +form#searchform #libraries .jqTransformSelectWrapper { position: relative; - width: 100% !important; left: 0; top: 0; border-radius: 3px; } form.multi-libraries #filters .jqTransformSelectWrapper{ - position: relative; width: 49% !important; float: left; - top: 0px; - left: 0px; - border-radius: 3px; } form.multi-libraries #libraries .jqTransformSelectWrapper{ - position: relative; width: 49% !important; float: right; - top: 0px; - left: 0px; - border-radius: 3px; +} + +form.single-library #filters .jqTransformSelectWrapper, +form.multi-libraries.single-field-mobile #filters .jqTransformSelectWrapper, +form.multi-libraries.single-field-mobile #libraries .jqTransformSelectWrapper{ + width: 100% !important; + float:left; } form.multi-libraries .input-wrapper{ diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css index 413d547386..d23558427f 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css @@ -2620,6 +2620,10 @@ ul.ui-tabs-nav li { box-shadow: 1px 1px 3px 0 #666; } +body#opac-main #opacmainuserblockmobile { + display: none; +} + .mobile_only { display : none; } diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc index e733dbda98..5b6981d6c4 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc @@ -22,6 +22,7 @@ +[% IF ( OPACMobileUserCSS ) %][% END %] [% IF ( OPACUserCSS ) %][% END %] diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc index 6eec70ca85..79a1219883 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc @@ -84,14 +84,26 @@ [% IF ( OpacPublic ) %]
-[% UNLESS ( advsearch ) %]
+[% UNLESS ( advsearch ) %] +[% IF ( OpacAddMastheadLibraryPulldown ) %] + [% IF ( OpacShowFiltersPulldownMobile and not OpacShowLibrariesPulldownMobile ) or ( not OpacShowFiltersPulldownMobile and OpacShowLibrariesPulldownMobile ) %] + + [% ELSE %] + + [% END %] +[% ELSE %] + +[% END %] - -
+ [% IF ( OpacShowFiltersPulldownMobile ) %] +
+ [% ELSE %] +
+ [% END %] [% FOREACH BranchesLoo IN BranchesLoop %] @@ -168,14 +184,25 @@ [% ELSE %] -
+ [% IF ( OpacAddMastheadLibraryPulldown ) %] + [% IF ( OpacShowFiltersPulldownMobile and not OpacShowLibrariesPulldownMobile ) or ( not OpacShowFiltersPulldownMobile and OpacShowLibrariesPulldownMobile ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + + [% END %] - -
+ [% IF ( OpacShowFiltersPulldownMobile ) %] +
+ [% ELSE %] +
+ [% END %] @@ -186,7 +213,11 @@
[% IF ( OpacAddMastheadLibraryPulldown ) %] -
+ [% IF ( OpacShowLibrariesPulldownMobile ) %] +
+ [% ELSE %] +
+ [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 9611ff7c30..2c756e843a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -2747,6 +2747,10 @@ ul.ui-tabs-nav li { display: inline; } +body#opac-main #opacmainuserblockmobile { + display: none; +} + .mobile_only { display : none; } diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 1ea41be687..f032b20ed0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -22,6 +22,7 @@ [% END %] +[% IF ( OPACMobileUserCSS ) %][% END %] [% IF ( OPACUserCSS ) %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt index d291b2a226..cc67ff2b18 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt @@ -37,6 +37,7 @@ [% END %] [% IF ( OpacMainUserBlock ) %]
[% OpacMainUserBlock %]
[% END %] + [% IF ( OpacMainUserBlockMobile ) %]
[% OpacMainUserBlockMobile %]
[% END %]
-- 2.20.1