gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Owen Leonard 2023-01-13 12:12:30 +00:00 committed by Tomas Cohen Arazi
parent 0c1fbffbe4
commit b88ec7daeb
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
4 changed files with 71 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
View File

@ -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 %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
View File

@ -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>

4
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
View File

@ -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>&nbsp;</th>
@ -202,7 +201,6 @@
[% END %]
[% END %]
[% END # /IF total %]
</div>
[% IF ( query ) %]

134
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
View File

@ -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">&nbsp;</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 %]
[% UNLESS can_be_edited %]
<tr id="row[% item.itemnumber | html %]">
[% ELSE %]
<tr id="row[% item.itemnumber | html %]" class="editable">
[% END %]
<div class="page-section">
<table id="itemst">
<thead>
<tr>
<th class="NoSort">&nbsp;</th>
[% FOREACH item_header IN item_header_loop %]
<th data-colname="[% item_header.attribute | html %]">
[% item_header.header_value | html %]
</th>
[% END %]
[% UNLESS can_be_edited %]
<td>&nbsp;</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 %]">
[% IF item.biblionumber != biblio.biblionumber %] [%# Host item %]
<li><a href="additem.pl?op=edititem&amp;biblionumber=[% item.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]#edititem">Edit in host</a> &nbsp; <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&amp;biblionumber=[% biblio.biblionumber | html %]&amp;hostitemnumber=[% item.itemnumber | html %]&amp;searchid=[% searchid | html %]">Delink</a></li>
[% ELSE %]
<li><a href="additem.pl?op=edititem&amp;biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#edititem">Edit</a></li>
<li><a href="additem.pl?op=dupeitem&amp;biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#additema">Duplicate</a></li>
<li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&amp;number_type=itemnumber&amp;number_list=[% item.itemnumber | uri %]" target="_blank" >Print label</a></li>
<li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% item.biblionumber | html %]&amp;itemnumber=[% item.itemnumber | html %]&amp;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 %]
<td>[% item.$attribute | html %]</td>
[% END %]
[% END %]
</tr>
[% END %]
</tbody>
</table>
</div>
</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 %]
[% UNLESS can_be_edited %]
<tr id="row[% item.itemnumber | html %]">
[% ELSE %]
<tr id="row[% item.itemnumber | html %]" class="editable">
[% END %]
[% END %]
[% UNLESS can_be_edited %]
<td>&nbsp;</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 %]">
[% IF item.biblionumber != biblio.biblionumber %] [%# Host item %]
<li><a href="additem.pl?op=edititem&amp;biblionumber=[% item.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]#edititem">Edit in host</a> &nbsp; <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&amp;biblionumber=[% biblio.biblionumber | html %]&amp;hostitemnumber=[% item.itemnumber | html %]&amp;searchid=[% searchid | html %]">Delink</a></li>
[% ELSE %]
<li><a href="additem.pl?op=edititem&amp;biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#edititem">Edit</a></li>
<li><a href="additem.pl?op=dupeitem&amp;biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#additema">Duplicate</a></li>
<li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&amp;number_type=itemnumber&amp;number_list=[% item.itemnumber | uri %]" target="_blank" >Print label</a></li>
<li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% item.biblionumber | html %]&amp;itemnumber=[% item.itemnumber | html %]&amp;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 %]
<td>[% item.$attribute | html %]</td>
[% END %]
[% END %]
</tr>
[% END %]
</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) %]