From 689591e3ac78817137ea69bd093370627efeb326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9rick?= Date: Thu, 9 Aug 2012 17:40:16 -0400 Subject: [PATCH] Add system preferences to configure the mobile view. OpacMainUserBlockMobile OPACMobileUserCSS OpacShowFiltersPulldownMobile OpacShowLibrariesPulldownMobile --- C4/Auth.pm | 4 ++ .../prog/en/modules/admin/preferences/opac.pref | 22 ++++++++++++++ koha-tmpl/opac-tmpl/prog/en/css/mobile.css | 30 ++++++++++--------- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 +++ .../opac-tmpl/prog/en/includes/doc-head-close.inc | 1 + koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 26 ++++++++++++----- koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt | 1 + 7 files changed, 67 insertions(+), 22 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index f9b15ef..d06dbde 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -409,6 +409,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'} . @@ -420,6 +421,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/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 0fe79d4..6a2784d 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 @@ -163,11 +163,33 @@ OPAC: 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 type: textarea diff --git a/koha-tmpl/opac-tmpl/prog/en/css/mobile.css b/koha-tmpl/opac-tmpl/prog/en/css/mobile.css index 7917e77..58da8bd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/mobile.css +++ b/koha-tmpl/opac-tmpl/prog/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/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index aeb209c..21549a0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -2388,6 +2388,7 @@ a.koha_url { .nav_results #listResults li a { color:#FFFFFF; font-weight:normal;} +<<<<<<< HEAD a.localimage img { border : 1px solid #8EB3E7; margin : 0 .5em; @@ -2620,6 +2621,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/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 5f143a6..9bfbb14 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 @@ +[% IF ( OPACMobileUserCSS ) %][% END %] [% IF ( OPACUserCSS ) %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 9a6ccaa..a30b713 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -84,14 +84,19 @@ [% IF ( OpacPublic ) %]
-[% UNLESS ( advsearch ) %]
-