Attachment 136813 Details for Bug 30952 – Bug 30952: Cataloguing Module

[patch] Bug 30952: Cataloguing Module

Bug-30952-Cataloguing-Module.patch (text/plain), 7.49 KB, created by Solene D on 2022-07-01 12:06:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Solene D

Created: 2022-07-01 12:06:21 UTC

Size: 7.49 KB

patch

obsolete

>From a4bb371199fec73e69aecb480637d8caa17e8d40 Mon Sep 17 00:00:00 2001
>From: Solene Desvaux <sdesvaux@biblibre.com>
>Date: Thu, 31 Mar 2022 11:19:52 +0200
>Subject: [PATCH] Bug 30952: Cataloguing Module
>
>---
> .../prog/en/modules/cataloguing/addbooks.tt   | 24 +++++++++++++------
> .../prog/en/modules/cataloguing/additem.tt    |  1 -
> .../prog/en/modules/cataloguing/linkitem.tt   |  1 -
> .../prog/en/modules/cataloguing/merge.tt      |  1 -
> .../prog/en/modules/cataloguing/moveitem.tt   |  1 -
> .../en/modules/cataloguing/z3950_search.tt    |  4 ++--
> 6 files changed, 19 insertions(+), 13 deletions(-)
>
>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 adf125d512..e47a2906d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -3,14 +3,16 @@
> [% USE KohaDates %]
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'cataloging-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Cataloging [% IF ( total || breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="cat_addbooks" class="cat">
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cataloging-search.inc' %]
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -39,6 +41,14 @@
>             </li>
>         [% END %]
>     </ol>
>+
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
>     <div class="main container-fluid">
>@@ -48,11 +58,11 @@
>                 [% 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>
>+                            <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="pat"><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">
>+                            <button class="pat mot"><i class="fa fa-plus"></i> New record</button>
>+                            <button class="pat fleche" data-toggle="dropdown">
>                                 <span class="caret"></span>
>                             </button>
>                             <ul class="dropdown-menu">
>@@ -64,8 +74,8 @@
>                         </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">
>+                                <button class="pat mot" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button>
>+                                <button class="pat fleche" data-toggle="dropdown">
>                                     <span class="caret"></span>
>                                 </button>
>                                 <ul class="dropdown-menu">
>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 aa02320f52..75b4ab13bf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>@@ -27,7 +27,6 @@
> 
> <body id="cat_additem" class="cat">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cataloging-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>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..9bf940cf38 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
>@@ -4,7 +4,6 @@
> </head>
> <body id="catalog_linkitem" class="catalog">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>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..7d682f78f5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>@@ -16,7 +16,6 @@ div#result { margin-top: 1em; }
> 
> <body id="cat_merge" class="cat">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cataloging-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>index 4f42c73856..742fb77fa9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>@@ -5,7 +5,6 @@
> </head>
> <body id="catalog_moveitem" class="catalog">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
>index d0c1195cb2..120e4ac03f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
>@@ -77,7 +77,7 @@
>                                     <label for="stdid">Standard ID: </label> <input type="text" id="stdid" name="stdid" value="[% stdid | html %]" />
>                                 </li>
>                                 <li>
>-                                    <a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a>
>+                                    <a id="resetZ3950Search" href="#">Clear search form</a>
>                                 </li>
>                             </ol>
>                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
>@@ -108,7 +108,7 @@
> 
>                 <nav class="navbar navbar-default navbar-fixed-bottom">
>                     <div class="container-fluid">
>-                        <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
>+                        <fieldset class="action"><input type="submit" id="principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
>                     </div>
>                 </nav>
>             </form> 
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605