View | Details | Raw Unified | Return to bug 37910
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-9 / +26 lines)
Lines 1276-1286 Link Here
1276
                        {
1276
                        {
1277
                            "data": "reported_date:reporter.firstname",
1277
                            "data": "reported_date:reporter.firstname",
1278
                            "render": function(data, type, row, meta) {
1278
                            "render": function(data, type, row, meta) {
1279
                                let reported = '<span class="date clearfix">' + $datetime(row.reported_date) + '</span>';
1279
                                let reported = '<div class="d-flex justify-content-between align-items-start">';
1280
                                reported += '<span class="reporter clearfix">' + $patron_to_html(row.reporter, {
1280
                                reported += '<span class="reporter">' + $patron_to_html(row.reporter, {
1281
                                    display_cardnumber: false,
1281
                                    display_cardnumber: false,
1282
                                    url: true
1282
                                    url: true
1283
                                }) + '</span>';
1283
                                }) + '</span>';
1284
                                reported += '<span class="date text-muted">' + $datetime(row.reported_date) + '</span>';
1285
                                reported += '</div>';
1284
                                return reported;
1286
                                return reported;
1285
                            },
1287
                            },
1286
                            "searchable": true,
1288
                            "searchable": true,
Lines 1289-1301 Link Here
1289
                        {
1291
                        {
1290
                            "data": "title:body",
1292
                            "data": "title:body",
1291
                            "render": function(data, type, row, meta) {
1293
                            "render": function(data, type, row, meta) {
1292
                                let resolved = ( row.resolved_date ) ? true : false;
1294
                                let result = '<div class="d-flex justify-content-between align-items-start">';
1293
                                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;
1295
                                
1296
                                // Title link on the left
1297
                                result += '<a id="title_' + row.ticket_id + '" role="button" href="#" class="detail-trigger">' + row.title + '</a>';
1298
                                
1299
                                // Updates count on the right, if it exists
1294
                                if (row.updates_count) {
1300
                                if (row.updates_count) {
1295
                                    result += ' <i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count;
1301
                                    result += '<span><a role="button" href="#" class="detail-trigger"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
1296
                                }
1302
                                }
1297
                                result += '</a>';
1303
                                
1304
                                // Hidden detail content
1305
                                result += '</div>';
1298
                                result += '<div id="detail_' + row.ticket_id + '" style="display:none">' + row.body + '</div>';
1306
                                result += '<div id="detail_' + row.ticket_id + '" style="display:none">' + row.body + '</div>';
1307
                                
1299
                                return result;
1308
                                return result;
1300
                            },
1309
                            },
1301
                            "searchable": true,
1310
                            "searchable": true,
Lines 1316-1341 Link Here
1316
                            "render": function(data, type, row, meta) {
1325
                            "render": function(data, type, row, meta) {
1317
                                let result = '';
1326
                                let result = '';
1318
                                if (row.resolved_date) {
1327
                                if (row.resolved_date) {
1319
                                    result += _("Resolved by:") + ' <span>' + $patron_to_html(row.resolver, {
1328
                                    result += "<div>";
1329
                                    result += _("Resolved by") + ' <span>' + $patron_to_html(row.resolver, {
1320
                                        display_cardnumber: false,
1330
                                        display_cardnumber: false,
1321
                                        url: true
1331
                                        url: true
1322
                                    }) + '</span>';
1332
                                    }) + '</span>';
1333
                                    result += "</div>";
1323
                                    if (row.status) {
1334
                                    if (row.status) {
1335
                                        result += '<div>';
1324
                                        result += ' ' + _("as") + ' ';
1336
                                        result += ' ' + _("as") + ' ';
1325
                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
1337
                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
1338
                                        result += '</div>';
1326
                                    }
1339
                                    }
1327
                                    result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
1340
                                    result += '<div>' + $datetime(row.resolved_date) + '</div>';
1328
                                } else {
1341
                                } else {
1342
                                    result += '<div>';
1329
                                    if (row.status) {
1343
                                    if (row.status) {
1330
                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
1344
                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
1331
                                    } else {
1345
                                    } else {
1332
                                        result += _("Open");
1346
                                        result += _("Open");
1333
                                    }
1347
                                    }
1348
                                    result += '</div>';
1334
                                    if (row.assignee) {
1349
                                    if (row.assignee) {
1335
                                        result += '<span class="clearfix">' + _("Assigned to: ") + $patron_to_html(row.assignee, {
1350
                                        result += '<div>';
1351
                                        result += _("Assigned to: ") + ' <span>' + $patron_to_html(row.assignee, {
1336
                                            display_cardnumber: false,
1352
                                            display_cardnumber: false,
1337
                                            url: true
1353
                                            url: true
1338
                                        }) + '</span>';
1354
                                        }) + '</span>';
1355
                                        result += '</div>';
1339
                                    }
1356
                                    }
1340
                                }
1357
                                }
1341
                                return result;
1358
                                return result;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt (-2 lines)
Lines 142-148 Link Here
142
                    {
142
                    {
143
                        "data": "title:body",
143
                        "data": "title:body",
144
                        "render": function(data, type, row, meta) {
144
                        "render": function(data, type, row, meta) {
145
                            let resolved = ( row.resolved_date ) ? true : false;
146
                            let result = '<div class="d-flex justify-content-between align-items-start">';
145
                            let result = '<div class="d-flex justify-content-between align-items-start">';
147
                            
146
                            
148
                            // Title link on the left
147
                            // Title link on the left
149
- 

Return to bug 37910