Bugzilla – Attachment 137747 Details for
Bug 31162
Add a clear cataloguing module home page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31162: Add a cataloging module home page
Bug-31162-Add-a-cataloging-module-home-page.patch (text/plain), 16.13 KB, created by
Martin Renvoize (ashimema)
on 2022-07-15 11:39:05 UTC
(
hide
)
Description:
Bug 31162: Add a cataloging module home page
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-07-15 11:39:05 UTC
Size:
16.13 KB
patch
obsolete
>From 09abaaac9eeba41552e4c2bb875e0d9cc1392169 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 15 Jul 2022 12:37:03 +0100 >Subject: [PATCH] Bug 31162: Add a cataloging module home page > >This patch adds a new cataloging-home template and controller and >replaces most cases of links to addbooks. This servers to provide a new >cataloging home page for the cataloging module and keeps it distinct >from the current addbooks page it partially replaces as a stating point >for cataloging. >--- > cataloguing/cataloging-home.pl | 52 +++++++ > .../prog/en/modules/cataloguing/addbiblio.tt | 4 +- > .../prog/en/modules/cataloguing/addbooks.tt | 2 +- > .../prog/en/modules/cataloguing/additem.tt | 2 +- > .../en/modules/cataloguing/cataloging-home.tt | 144 ++++++++++++++++++ > .../prog/en/modules/cataloguing/editor.tt | 2 +- > .../prog/en/modules/cataloguing/linkitem.tt | 2 +- > .../prog/en/modules/cataloguing/merge.tt | 2 +- > .../prog/en/modules/intranet-main.tt | 2 +- > 9 files changed, 204 insertions(+), 8 deletions(-) > create mode 100755 cataloguing/cataloging-home.pl > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt > >diff --git a/cataloguing/cataloging-home.pl b/cataloguing/cataloging-home.pl >new file mode 100755 >index 0000000000..0796993e71 >--- /dev/null >+++ b/cataloguing/cataloging-home.pl >@@ -0,0 +1,52 @@ >+#!/usr/bin/perl >+ >+# This file is part of Koha. >+# >+# 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 C4::Context; >+ >+use Koha::BiblioFrameworks; >+use Koha::Z3950Servers; >+ >+my $query = CGI->new; >+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( >+ { >+ template_name => "cataloguing/cataloging-home.tt", >+ query => $query, >+ type => "intranet", >+ flagsrequired => { editcatalogue => '*' }, >+ } >+); >+ >+my $servers = Koha::Z3950Servers->search( >+ { >+ recordtype => 'biblio', >+ servertype => ['zed','sru'], >+ } >+); >+ >+my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); >+ >+$template->param( >+ servers => $servers, >+ frameworks => $frameworks >+); >+ >+output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index cb6a16f905..bc9fd0fddf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -794,7 +794,7 @@ function PopupMARCFieldDoc(field) { > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > </li> > <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -943,7 +943,7 @@ function PopupMARCFieldDoc(field) { > </div> > [% ELSE %] > <div class="btn-group"> >- <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> >+ <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cancel</a> > </div> > [% END %] > <div id="show-errors" class="btn-group"></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index 126e49e524..fce568220a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -19,7 +19,7 @@ > </li> > [% IF ( total || breeding_loop ) %] > <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > </li> > <li> > <a href="#" aria-current="page">Search results</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 31eaf8e3bd..b965875227 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -38,7 +38,7 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > </li> > <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > </li> > <li> > <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblio.biblionumber | uri %]">Edit <em>[% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</em></a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >new file mode 100644 >index 0000000000..a04cbe8547 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >@@ -0,0 +1,144 @@ >+[% USE raw %] >+[% USE Koha %] >+[% USE Branches %] >+[% INCLUDE 'doc-head-open.inc' %] >+<title>Cataloging › Koha</title> >+[% INCLUDE 'doc-head-close.inc' %] >+</head> >+ >+<body id="cat_cataloging-home" class="cat"> >+ [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'cataloging-search.inc' %] >+ >+ <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ </li> >+ <li> >+ <a href="#" aria-current="page">Cataloging</a> >+ </li> >+ </ol> >+ </nav> >+ >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >+ <div id="toolbar" class="btn-toolbar"> >+ [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] >+ <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-default"><i class="fa fa-pencil"></i> Advanced editor</a> >+ [% END %] >+ <div class="btn-group"> >+ <button class="btn btn-default" id="newRecord"><i class="fa fa-plus"></i> New record</button> >+ <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >+ <ul class="dropdown-menu"> >+ <li><a id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> >+ [% FOREACH framework IN frameworks %] >+ <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% IF servers.count > 0 %] >+ <div class="btn-group"> >+ <button class="btn btn-default" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >+ <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >+ <ul class="dropdown-menu"> >+ <li id="Default" class="z3950searchFw"><a href="#">Default framework</a></li> >+ [% FOREACH framework IN frameworks %] >+ <li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a href="#">[% framework.frameworktext | html %]</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% END # /IF servers.count %] >+ </div> <!-- /#toolbar --> >+ [% END # /IF CAN_user_editcatalogue_edit_catalogue %] >+ >+ <h1>Cataloging</h1> >+ >+ <div class="row"> >+ <div class="col-sm-5 col-md-4"> >+ <h3>Import</h3> >+ >+ <ul class="buttons-list"> >+ [% IF ( CAN_user_tools_stage_marc_import ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/stage-marc-import.pl"><i class="fa fa-download"></i> Stage records for import</a> >+ </li> >+ [% END %] >+ >+ [% IF ( CAN_user_tools_manage_staged_marc ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/manage-marc-import.pl"><i class="fa fa-tasks"></i> Manage staged records</a> >+ </li> >+ [% END %] >+ </ul> >+ >+ <h3>Export</h3> >+ >+ <ul class="buttons-list"> >+ [% IF ( CAN_user_tools_export_catalog ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/export.pl"><i class="fa fa-upload"></i> Export catalog data</a> >+ </li> >+ [% END %] >+ </ul> >+ >+ </div> >+ >+ <div class="col-sm-5 col-md-4"> >+ <h3>Batch editing</h3> >+ >+ <ul class="buttons-list"> >+ [% IF ( CAN_user_tools_items_batchmod ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-hand-grab-o"></i> Batch item modification</a> >+ </li> >+ [% END %] >+ [% IF ( CAN_user_tools_items_batchdel ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/batchMod.pl?del=1"><i class="fa fa-trash"></i> Batch item deletion</a> >+ </li> >+ [% END %] >+ [% IF CAN_user_tools_records_batchmod %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/batch_record_modification.pl"><i class="fa fa-line-chart"></i> Batch record modification</a> >+ </li> >+ [% END %] >+ [% IF CAN_user_tools_records_batchdel %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/batch_delete_records.pl"><i class="fa fa-trash"></i> Batch record deletion</a> >+ </li> >+ [% END %] >+ </ul> >+ >+ <h3>Automations</h3> >+ >+ <ul class="buttons-list"> >+ [% IF ( CAN_user_tools_items_batchmod ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-calendar"></i> Item modifications by age</a> >+ </li> >+ [% END %] >+ </ul> >+ </div> >+ >+ <!-- Add the extra clearfix for only the required viewport --> >+ <div class="clearfix visible-sm-block"></div> >+ >+ <div class="col-sm-5 col-md-4"> >+ <h3>Reports</h3> >+ >+ <ul class="buttons-list"> >+ [% IF ( CAN_user_tools_inventory ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/inventory.pl"><i class="fa fa-line-chart"></i> Inventory</a> >+ </li> >+ [% END %] >+ </ul> >+ </div> >+ </div> >+ </div> >+ </div> >+ >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index ba6b88b95b..d5f2792a6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -24,7 +24,7 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > </li> > <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > </li> > <li> > <a href="#" aria-current="page"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >index 4b868268f6..869ca09404 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >@@ -12,7 +12,7 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > </li> > <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > </li> > <li> > <a href="#" aria-current="page"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index 84305e7b8a..3f8881c8cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -24,7 +24,7 @@ div#result { margin-top: 1em; } > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > </li> > <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> > </li> > <li> > <a href="#" aria-current="page"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 1b556f379b..fd2855188a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -120,7 +120,7 @@ > > [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %] > <li> >- <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag"></i>Cataloging</a> >+ <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/cataloging-home.pl"><i class="fa fa-fw fa-tag"></i>Cataloging</a> > </li> > [% END %] > >-- >2.20.1
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 31162
:
137747
|
137754
|
137758
|
138141
|
138167
|
138687
|
138694
|
138797
|
138798
|
138799
|
139593
|
139594
|
139595
|
139596
|
139597
|
139598
|
139650
|
139651
|
139652
|
139654
|
139900
|
139901
|
139902
|
139903
|
139904
|
139905
|
139906
|
139907
|
140578
|
140579
|
140580
|
140581
|
140582
|
140583
|
140584
|
140585
|
140586
|
141246
|
141247
|
141248
|
141249
|
141250
|
141251
|
141252
|
141253
|
141254
|
141880
|
141881
|
141882
|
141883
|
141884
|
141885
|
141886
|
141887
|
141888
|
141889
|
141890
|
141891
|
141975
|
141976
|
141977
|
142028
|
142029
|
142663
|
142664