Bugzilla – Attachment 174705 Details for
Bug 37910
Minor spacing issues in the catalog concerns page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37910: Sync fixes to detail page
Bug-37910-Sync-fixes-to-detail-page.patch (text/plain), 7.10 KB, created by
Martin Renvoize (ashimema)
on 2024-11-18 14:39:50 UTC
(
hide
)
Description:
Bug 37910: Sync fixes to detail page
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-11-18 14:39:50 UTC
Size:
7.10 KB
patch
obsolete
>From d84fd32b91aa666ff747cc9b58a16068bbf96032 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 29 Oct 2024 15:00:09 +0000 >Subject: [PATCH] Bug 37910: Sync fixes to detail page > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/catalogue/detail.tt | 35 ++++++++++++++----- > .../prog/en/modules/cataloguing/concerns.tt | 1 - > 2 files changed, 26 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 4fb8c280e10..428dfdd7f2f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1276,11 +1276,13 @@ > { > "data": "reported_date:reporter.firstname", > "render": function(data, type, row, meta) { >- let reported = '<span class="date clearfix">' + $datetime(row.reported_date) + '</span>'; >- reported += '<span class="reporter clearfix">' + $patron_to_html(row.reporter, { >+ let reported = '<div class="d-flex justify-content-between align-items-start">'; >+ reported += '<span class="reporter">' + $patron_to_html(row.reporter, { > display_cardnumber: false, > url: true > }) + '</span>'; >+ reported += '<span class="date text-muted">' + $datetime(row.reported_date) + '</span>'; >+ reported += '</div>'; > return reported; > }, > "searchable": true, >@@ -1289,13 +1291,20 @@ > { > "data": "title:body", > "render": function(data, type, row, meta) { >- let resolved = ( row.resolved_date ) ? true : false; >- let result = '<a class="btn btn-link" role="button" href="#" data-bs-toggle="modal" data-bs-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="' + resolved + '" data-assignee="'+$patron_to_html(row.assignee, { display_cardnumber: false, url: false })+'">' + row.title; >+ let result = '<div class="d-flex justify-content-between align-items-start">'; >+ >+ // Title link on the left >+ result += '<a id="title_' + row.ticket_id + '" role="button" href="#" class="detail-trigger">' + row.title + '</a>'; >+ >+ // Updates count on the right, if it exists > if (row.updates_count) { >- result += ' <i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count; >+ result += '<span><a role="button" href="#" class="detail-trigger"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>'; > } >- result += '</a>'; >+ >+ // Hidden detail content >+ result += '</div>'; > result += '<div id="detail_' + row.ticket_id + '" style="display:none">' + row.body + '</div>'; >+ > return result; > }, > "searchable": true, >@@ -1316,26 +1325,34 @@ > "render": function(data, type, row, meta) { > let result = ''; > if (row.resolved_date) { >- result += _("Resolved by:") + ' <span>' + $patron_to_html(row.resolver, { >+ result += "<div>"; >+ result += _("Resolved by") + ' <span>' + $patron_to_html(row.resolver, { > display_cardnumber: false, > url: true > }) + '</span>'; >+ result += "</div>"; > if (row.status) { >+ result += '<div>'; > result += ' ' + _("as") + ' '; > result += row._strings.status ? escape_str(row._strings.status.str) : ""; >+ result += '</div>'; > } >- result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>'; >+ result += '<div>' + $datetime(row.resolved_date) + '</div>'; > } else { >+ result += '<div>'; > if (row.status) { > result += row._strings.status ? escape_str(row._strings.status.str) : ""; > } else { > result += _("Open"); > } >+ result += '</div>'; > if (row.assignee) { >- result += '<span class="clearfix">' + _("Assigned to: ") + $patron_to_html(row.assignee, { >+ result += '<div>'; >+ result += _("Assigned to: ") + ' <span>' + $patron_to_html(row.assignee, { > display_cardnumber: false, > url: true > }) + '</span>'; >+ result += '</div>'; > } > } > return result; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >index 668558921dc..ab01dab6e5e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >@@ -142,7 +142,6 @@ > { > "data": "title:body", > "render": function(data, type, row, meta) { >- let resolved = ( row.resolved_date ) ? true : false; > let result = '<div class="d-flex justify-content-between align-items-start">'; > > // Title link on the left >-- >2.47.0
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 37910
:
173650
|
173651
|
173652
|
173653
|
173659
|
173660
|
173661
|
173692
|
173693
|
173694
|
174056
|
174057
|
174058
|
174703
|
174704
| 174705