From 3f2f6cce8e650a2028d5902f9e079ed84c61a3c4 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 29 Dec 2022 11:33:47 +0000 Subject: [PATCH] Bug 32503: (follow-up) Move data-order attributes It looks like the data-order attributes were at the wrong level to me, i.e. not part of the 'td' but instead part of the cell content. This patch moves those data-order attributes where possible and drops the data-type definitions on the headers. However, for the cancellation case, this isn't as clear cut as we may well display more than one cancellation request date in the same cell. For this case I've left Katrins data-type="@data-order" trick. Signed-off-by: Lucas Gass Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d76a6cb1049107af77efc4f642f754d98c9821d8) Signed-off-by: Matt Blenkinsop --- .../intranet-tmpl/prog/en/includes/waiting_holds.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index b08540f131..8440476f68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -5,12 +5,12 @@ - Waiting since - Date hold placed + Waiting since + Date hold placed [% IF table_name == 'holdscr' %] Date cancellation requested [% END %] - Expiration date + Expiration date Title Patron Home library @@ -26,8 +26,8 @@ [% FOREACH reserveloo IN reserveloop %] - [% reserveloo.waitingdate | $KohaDates %] - [% reserveloo.reservedate | $KohaDates %] + [% reserveloo.waitingdate | $KohaDates %] + [% reserveloo.reservedate | $KohaDates %] [% IF table_name == 'holdscr' %] [% FOREACH cancellation_request IN reserveloo.cancellation_requests %] @@ -35,7 +35,7 @@ [% END %] [% END %] - [% reserveloo.expirationdate | $KohaDates %] + [% reserveloo.expirationdate | $KohaDates %] [% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio link = 1 %] [% UNLESS ( item_level_itypes ) %] -- 2.39.5