Bugzilla – Attachment 128585 Details for
Bug 15326
Add CMS feature
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15326: WIP: Using AdditionalContents for custom pages on OPAC
Bug-15326-WIP-Using-AdditionalContents-for-custom-.patch (text/plain), 8.33 KB, created by
Aleisha Amohia
on 2021-12-16 04:18:06 UTC
(
hide
)
Description:
Bug 15326: WIP: Using AdditionalContents for custom pages on OPAC
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2021-12-16 04:18:06 UTC
Size:
8.33 KB
patch
obsolete
>From 1b490c2908a0741183dd2b6d59f3574870875ac7 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Thu, 16 Dec 2021 17:16:46 +1300 >Subject: [PATCH] Bug 15326: WIP: Using AdditionalContents for custom pages on > OPAC > >--- > Koha/AdditionalContents.pm | 1 + > .../prog/en/modules/tools/additional-contents.tt | 2 +- > .../opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++ > .../bootstrap/en/modules/opac-custompage.tt | 45 ++++++++++++ > opac/opac-custompage.pl | 81 ++++++++++++++++++++++ > 5 files changed, 138 insertions(+), 1 deletion(-) > create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-custompage.tt > create mode 100755 opac/opac-custompage.pl > >diff --git a/Koha/AdditionalContents.pm b/Koha/AdditionalContents.pm >index 711b187ad3..7b072c9ebc 100644 >--- a/Koha/AdditionalContents.pm >+++ b/Koha/AdditionalContents.pm >@@ -63,6 +63,7 @@ location is one of this: > - OpacLoginInstructions > - OpacSuggestionInstructions > - ArticleRequestsDisclaimerText >+- CustomPage > > =cut > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >index c1a5a01a1c..8027d82317 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >@@ -424,7 +424,7 @@ > <option value="slip">Slip</option> > [% END %] > [% ELSE %] >- [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %] >+ [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'CustomPage' ] %] > [% IF l == location %] > <option value="[% l | html %]" selected="selected">[% l | html %]</option> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index c2cf93a090..8281dcb1aa 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -352,6 +352,16 @@ > [% END %] > </a> > </li> >+ [% SET pages = AdditionalContents.get( category => 'html_customizations', location => 'CustomPage', lang => lang, library => branchcode ) %] >+ [% FOREACH page IN pages %] >+ [% USE Dumper %] >+ [% Dumper.dump_html(page) %] >+ <li class="nav-item"> >+ <a href="/cgi-bin/koha/opac-custompage.pl?code=[% page.code | uri %]"> >+ [% page.title | html %] >+ </a> >+ </li> >+ [% END %] > [% Koha.Preference('OpacMoreSearches') | $raw %] > </ul> <!-- /.nav#moresearches --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-custompage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-custompage.tt >new file mode 100644 >index 0000000000..f486e9fcbc >--- /dev/null >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-custompage.tt >@@ -0,0 +1,45 @@ >+[% USE Koha %] >+[% USE AdditionalContents %] >+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] >+[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] >+[% INCLUDE 'doc-head-open.inc' %] >+<title>Authority search › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> >+[% INCLUDE 'doc-head-close.inc' %] >+[% BLOCK cssinclude %][% END %] >+</head> >+[% INCLUDE 'bodytag.inc' bodyid='opac-custompage' bodyclass='scrollto' %] >+[% INCLUDE 'masthead.inc' %] >+ >+ <div class="main"> >+ <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs"> >+ <ol class="breadcrumb"> >+ <li class="breadcrumb-item"> >+ <a href="/cgi-bin/koha/opac-main.pl">Home</a> >+ </li> >+ <li class="breadcrumb-item active"> >+ <a href="#" aria-current="page">Authority search</a> >+ </li> >+ </ol> >+ </nav> <!-- /#breadcrumbs --> >+ >+ <div class="container-fluid"> >+ <div class="row"> >+ [% IF ( OpacNav || OpacNavBottom ) %] >+ <div class="col-lg-2"> >+ <div id="navigation"> >+ [% INCLUDE 'navigation.inc' %] >+ </div> >+ </div> >+ <div class="col-10 order-first order-md-first order-lg-2"> >+ [% ELSE %] >+ <div class="col order-first order-md-first order-lg-2"> >+ [% END %] >+ <div id="userauthhome" class="maincontent"> >+ </div> <!-- / #userauthhome --> >+ </div> <!-- / .col-lg-10/12 --> >+ </div> <!-- / .row --> >+ </div> <!-- / .container-fluid --> >+ </div> <!-- / .main --> >+ >+[% INCLUDE 'opac-bottom.inc' %] >+[% BLOCK jsinclude %][% END %] >diff --git a/opac/opac-custompage.pl b/opac/opac-custompage.pl >new file mode 100755 >index 0000000000..f74f3b63a2 >--- /dev/null >+++ b/opac/opac-custompage.pl >@@ -0,0 +1,81 @@ >+#!/usr/bin/perl >+ >+# This file is part of Koha. >+# >+# Copyright 2021 Aleisha Amohia <aleisha@catalyst.net.nz> >+# >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. >+# >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. >+# >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. >+ >+use Modern::Perl; >+use CGI qw ( -utf8 ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use Koha::AdditionalContents; >+ >+my $input = CGI->new; >+my $dbh = C4::Context->dbh; >+ >+my ( $template, $borrowernumber, $cookie ) = get_template_and_user( >+ { >+ template_name => "opac-custompages.tt", >+ type => "opac", >+ query => $input, >+ authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), >+ } >+); >+ >+my $casAuthentication = C4::Context->preference('casAuthentication'); >+$template->param( >+ casAuthentication => $casAuthentication, >+); >+ >+my $homebranch; >+if (C4::Context->userenv) { >+ $homebranch = C4::Context->userenv->{'branch'}; >+} >+if (defined $input->param('branch') and length $input->param('branch')) { >+ $homebranch = $input->param('branch'); >+} >+elsif (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){ >+ $homebranch = ""; >+} >+ >+my $news_id = $input->param('news_id'); >+my $koha_news; >+ >+if (defined $news_id){ >+ $koha_news = Koha::AdditionalContents->search({ idnew => $news_id, location => ['opac_only', 'staff_and_opac'] }); # get news that is not staff-only news >+ if ( $koha_news->count > 0){ >+ $template->param( news_item => $koha_news->next ); >+ } else { >+ $template->param( single_news_error => 1 ); >+ } >+} else { >+ $koha_news = Koha::AdditionalContents->search_for_display( >+ { >+ category => 'news', >+ location => ['opac_only', 'staff_and_opac'], >+ lang => $template->lang, >+ library_id => $homebranch, >+ } >+ ); >+} >+ >+$template->param( >+ koha_news => $koha_news, >+ branchcode => $homebranch, >+ daily_quote => Koha::Quotes->get_daily_quote(), >+); >+ >+output_html_with_http_headers $input, $cookie, $template->output; >-- >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 15326
:
45621
|
58272
|
58607
|
58608
|
58609
|
58787
|
63904
|
63905
|
64241
|
64941
|
64942
|
66255
|
70866
|
70867
|
70868
|
70869
|
70870
|
70871
|
76387
|
76388
|
76389
|
76390
|
76391
|
76392
|
78232
|
78233
|
78234
|
78235
|
78236
|
78237
|
78238
|
78240
|
79269
|
83318
|
83319
|
83320
|
83321
|
83322
|
83323
|
83324
|
83325
|
83326
|
83404
|
83405
|
83406
|
83407
|
83408
|
83409
|
83410
|
83411
|
83412
|
84682
|
84683
|
84684
|
84685
|
84686
|
84687
|
84688
|
84689
|
84690
|
84691
|
87494
|
87495
|
87496
|
87497
|
87498
|
87499
|
87500
|
87501
|
87502
|
87503
|
87608
|
87609
|
87610
|
87617
|
96084
|
96085
|
96086
|
96087
|
96088
|
96089
|
96090
|
96091
|
96092
|
96093
|
96094
|
96095
|
96096
|
96097
|
96098
|
97237
|
101565
|
101566
|
101567
|
101568
|
101569
|
101570
|
101571
|
101572
|
101573
|
101574
|
101575
|
101576
|
101577
|
101578
|
101579
|
101580
|
128341
|
128342
|
128343
|
128344
|
128345
|
128346
|
128347
|
128348
|
128349
|
128350
|
128351
|
128352
|
128353
|
128354
|
128355
|
128356
|
128357
|
128585
|
128642
|
136432
|
136757
|
136768
|
138489
|
138493
|
139028
|
139029
|
139030
|
139031
|
139111
|
139123
|
139124
|
139125
|
139172
|
139173
|
139174