Attachment 138694 Details for Bug 31162 – Bug 31162: Remove toolbar

[patch] Bug 31162: Remove toolbar

Bug-31162-Remove-toolbar.patch (text/plain), 5.21 KB, created by Martin Renvoize (ashimema) on 2022-08-05 13:13:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-08-05 13:13:20 UTC

Size: 5.21 KB

patch

obsolete

>From ac5efaf507c95e4471df400e21b5f021ab301f43 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 5 Aug 2022 13:23:02 +0100
>Subject: [PATCH] Bug 31162: Remove toolbar
>
>This patch removes the existing toolbar with 'New record' and 'New from
>Z39.50/SRU' and replaces the functionality with simple buttons on the
>page.
>
>We lose the ability to select the Framework or Z39.50/SRU server at this
>stage but one can still select these options from the resulting
>dialogues.
>---
> .../en/modules/cataloguing/cataloging-home.tt | 50 ++++++++-----------
> 1 file changed, 22 insertions(+), 28 deletions(-)
>
>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
>index 46dadac6a8..1f925ec75e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
>@@ -1,6 +1,7 @@
> [% USE raw %]
> [% USE Koha %]
> [% USE Branches %]
>+[% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Cataloging &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -24,47 +25,30 @@
>     <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">
>-                    <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> 
>-                [% END # /IF CAN_user_editcatalogue_edit_catalogue %]
>-
>                 <h1>Cataloging</h1>
> 
>                 <div class="row">
> 
>                     <div class="col-sm-5 col-md-3">
>+                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>                         <h3>New</h3>
> 
>                         <ul class="buttons-list">
>+                            <li>
>+                                <a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl" class="btn btn-default"><i class="fa fa-plus"></i> Basic editor</a>
>+                            </li>
>                             [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %]
>                             <li>
>                                 <a class="circ-button" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-default"><i class="fa fa-pencil"></i> Advanced editor</a>
>                             </li>
>                             [% END %]
>+                            [% IF servers.count > 0 %]
>+                            <li>
>+                                <a id="z3950search" class="circ-button" href="#" class="btn btn-default"><i class="fa fa-search"></i> Z39.50/SRU</a>
>+                            </li>
>+                            [% END %]
>                         </ul>
>+                        [% END %]
> 
>                         <h3>Import</h3>
> 
>@@ -94,7 +78,6 @@
> 
>                     </div>
> 
>-
>                     <div class="col-sm-5 col-md-3">
>                         <h3>Batch editing</h3>
> 
>@@ -179,4 +162,15 @@
>             </div>
>         </div>
> 
>+[% MACRO jsinclude BLOCK %]
>+<script>
>+     $(document).ready(function() {
>+         $("#z3950search").click(function(){
>+                window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?frameworkcode=Default","z3950search",'width=800,height=500,location=yes,toolbar=no,scrollbars=yes,resize=yes');
>+             return false;
>+         });
>+     });
>+</script>
>+
>+[% END %]
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.20.1

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