Bugzilla – Attachment 145872 Details for
Bug 32633
Add 'page-section' to cataloging and authority pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32633: Add 'page-section' to cataloging and authority pages
Bug-32633-Add-page-section-to-cataloging-and-autho.patch (text/plain), 14.04 KB, created by
Martin Renvoize (ashimema)
on 2023-01-31 14:19:04 UTC
(
hide
)
Description:
Bug 32633: Add 'page-section' to cataloging and authority pages
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-01-31 14:19:04 UTC
Size:
14.04 KB
patch
obsolete
>From 737ebd6bcc305c7c1d3ba60bbd1f76232ce082b7 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 13 Jan 2023 12:12:30 +0000 >Subject: [PATCH] Bug 32633: Add 'page-section' to cataloging and authority > pages > >This patch adds a "page-section" container div around the main section >of cataloging and authority pages which lack it. > >This patch contains indentation changes, so please ignore whitespace >when looking at the diff. > >Apply the patch and view the following pages to confirm that the main >content is contained in a white box: > > - Cataloging -> Cataloging search results > - Cataloging -> Edit items: The table of items and the item edit form > should each be contained in a page-section. > - Authorities -> Search results > - Authorites -> Merge authorities: From the authorities search results > list, click "Actions -> Merge" for one result, and then "Actions -> > Merge" for another. > - Click "Next" after selecting a merge reference. > - The "Destination record" information should be contained in a > page-section. > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/includes/merge-record.inc | 6 +- > .../modules/authorities/searchresultlist.tt | 2 +- > .../prog/en/modules/cataloguing/addbooks.tt | 4 +- > .../prog/en/modules/cataloguing/additem.tt | 120 +++++++++--------- > 4 files changed, 64 insertions(+), 68 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >index 4231fc318c7..260d328fd13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >@@ -68,10 +68,8 @@ > [% END %] > > [% BLOCK mergetarget %] >-<div id="result"> > <h2>Destination record</h2> >- <div style="border:1px solid #E8E8E8;padding:1em;margin-top:2em;"> >+ <div id="result" class="page-section"> > <ul id="resultul"></ul> >- </div> >-</div> <!-- // #result --> >+ </div> <!-- // #result --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index 30ff7a67210..3e7e074874f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -56,7 +56,7 @@ > Results [% from | html %] to [% to | html %] of [% total | html %] > </p> > >-<div id="authorities_searchresultlist_results"> >+<div id="authorities_searchresultlist_results" class="page-section"> > <table> > <tr> > <th>Summary</th> >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 df35be76aed..0b34c3ffe5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -93,7 +93,6 @@ > > [%# display the search results %] > >- <div class="page-section"> > [% IF ( total ) %] > <h2>Records found in the catalog</h2> > <div> >@@ -101,7 +100,7 @@ > <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a> > </div> > <div class="pages">[% pagination_bar | $raw %]</div> >- <div class="searchresults"> >+ <div class="searchresults page-section"> > <table> > <tr> > <th> </th> >@@ -202,7 +201,6 @@ > [% END %] > [% END %] > [% END # /IF total %] >- </div> > > [% IF ( query ) %] > >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 e9a512c60e8..6d3450fc0b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -74,74 +74,74 @@ > <div id="cataloguing_additem_itemlist"> > [% IF items %] > [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %] >- <div> >- <table id="itemst"> >- <thead> >- <tr> >- <th class="NoSort"> </th> >- [% FOREACH item_header IN item_header_loop %] >- <th data-colname="[% item_header.attribute | html %]"> >- [% item_header.header_value | html %] >- </th> >- [% END %] >- </tr> >- </thead> >- <tbody> >- [% FOREACH item IN items %] >- [% SET can_be_edited = ! ( Koha.Preference('IndependentBranches') && ! logged_in_user.is_superlibrarian && item.homebranch != Branches.GetLoggedInBranchname() ) %] >- [% IF item.itemnumber == itemnumber%] >- [% UNLESS can_be_edited %] >- <tr id="row[% item.itemnumber | html %]" class="active"> >+ <div class="page-section"> >+ <table id="itemst"> >+ <thead> >+ <tr> >+ <th class="NoSort"> </th> >+ [% FOREACH item_header IN item_header_loop %] >+ <th data-colname="[% item_header.attribute | html %]"> >+ [% item_header.header_value | html %] >+ </th> >+ [% END %] >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH item IN items %] >+ [% SET can_be_edited = ! ( Koha.Preference('IndependentBranches') && ! logged_in_user.is_superlibrarian && item.homebranch != Branches.GetLoggedInBranchname() ) %] >+ [% IF item.itemnumber == itemnumber%] >+ [% UNLESS can_be_edited %] >+ <tr id="row[% item.itemnumber | html %]" class="active"> >+ [% ELSE %] >+ <tr id="row[% item.itemnumber | html %]" class="active editable"> >+ [% END %] > [% ELSE %] >- <tr id="row[% item.itemnumber | html %]" class="active editable"> >+ [% UNLESS can_be_edited %] >+ <tr id="row[% item.itemnumber | html %]"> >+ [% ELSE %] >+ <tr id="row[% item.itemnumber | html %]" class="editable"> >+ [% END %] > [% END %] >- [% ELSE %] > [% UNLESS can_be_edited %] >- <tr id="row[% item.itemnumber | html %]"> >+ <td> </td> > [% ELSE %] >- <tr id="row[% item.itemnumber | html %]" class="editable"> >- [% END %] >- [% END %] >- [% UNLESS can_be_edited %] >- <td> </td> >- [% ELSE %] >- <td> >- <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#"> >- Actions <b class="caret"></b> >- </a> >- <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]"> >+ <td> >+ <div class="btn-group dropup"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#"> >+ Actions <b class="caret"></b> >+ </a> >+ <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]"> > >- [% IF item.biblionumber != biblio.biblionumber %] [%# Host item %] >- <li><a href="additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]#edititem">Edit in host</a> <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblio.biblionumber | html %]&hostitemnumber=[% item.itemnumber | html %]&searchid=[% searchid | html %]">Delink</a></li> >+ [% IF item.biblionumber != biblio.biblionumber %] [%# Host item %] >+ <li><a href="additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]#edititem">Edit in host</a> <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblio.biblionumber | html %]&hostitemnumber=[% item.itemnumber | html %]&searchid=[% searchid | html %]">Delink</a></li> >+ [% ELSE %] >+ <li><a href="additem.pl?op=edititem&biblionumber=[% biblio.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]&searchid=[% searchid | uri %]#edititem">Edit</a></li> >+ <li><a href="additem.pl?op=dupeitem&biblionumber=[% biblio.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]&searchid=[% searchid | uri %]#additema">Duplicate</a></li> >+ <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&number_type=itemnumber&number_list=[% item.itemnumber | uri %]" target="_blank" >Print label</a></li> >+ <li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]&searchid=[% searchid | html %]" onclick="return confirm_deletion();">Delete</a></li> >+ [% END %] >+ [% IF ( OPACBaseURL ) %] >+ <li class="view-in-opac"><a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]">OPAC view</a></li> >+ [% END %] >+ </ul> >+ </div> >+ </td> >+ [% END %] >+ [% FOREACH header IN item_header_loop %] >+ [% SET attribute = header.attribute %] >+ [% IF header.attribute AND date_fields.grep('^' _ attribute _ '$').size %] >+ <td data-order="[% item.$attribute | html %]">[% item.$attribute | $KohaDates %]</td> >+ [% ELSIF ( item.$attribute && ( attribute == 'price' || attribute == 'replacementprice' ) ) %] >+ <td data-order="[% item.$attribute | html %]">[% item.$attribute | $Price %]</td> > [% ELSE %] >- <li><a href="additem.pl?op=edititem&biblionumber=[% biblio.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]&searchid=[% searchid | uri %]#edititem">Edit</a></li> >- <li><a href="additem.pl?op=dupeitem&biblionumber=[% biblio.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]&searchid=[% searchid | uri %]#additema">Duplicate</a></li> >- <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&number_type=itemnumber&number_list=[% item.itemnumber | uri %]" target="_blank" >Print label</a></li> >- <li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]&searchid=[% searchid | html %]" onclick="return confirm_deletion();">Delete</a></li> >+ <td>[% item.$attribute | html %]</td> > [% END %] >- [% IF ( OPACBaseURL ) %] >- <li class="view-in-opac"><a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]">OPAC view</a></li> >- [% END %] >- </ul> >- </div> >- </td> > [% END %] >- [% FOREACH header IN item_header_loop %] >- [% SET attribute = header.attribute %] >- [% IF header.attribute AND date_fields.grep('^' _ attribute _ '$').size %] >- <td data-order="[% item.$attribute | html %]">[% item.$attribute | $KohaDates %]</td> >- [% ELSIF ( item.$attribute && ( attribute == 'price' || attribute == 'replacementprice' ) ) %] >- <td data-order="[% item.$attribute | html %]">[% item.$attribute | $Price %]</td> >- [% ELSE %] >- <td>[% item.$attribute | html %]</td> >+ </tr> > [% END %] >- [% END %] >- </tr> >- [% END %] >- </tbody> >- </table> >- </div> >+ </tbody> >+ </table> >+ </div> <!-- /.page-section --> > [% END %] > > <div class="row"> >@@ -150,7 +150,7 @@ > </div> > <div class="col-sm-10"> > >-<div id="cataloguing_additem_newitem" class="item_edit_form"> >+<div id="cataloguing_additem_newitem" class="item_edit_form page-section"> > <form id="f" method="post" action="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblio.biblionumber | html %]" name="f"> > <input type="hidden" name="op" value="[% op | html %]" /> > [% IF (popup) %] >-- >2.39.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 32633
:
145302
|
145340
| 145872 |
145873
|
145874