Bugzilla – Attachment 69006 Details for
Bug 7317
Add an Interlibrary Loan Module to Circulation and OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7317: (QA followup) Fix capitalization and terminology issues
Bug-7317-QA-followup-Fix-capitalization-and-termin.patch (text/plain), 8.73 KB, created by
Tomás Cohen Arazi (tcohen)
on 2017-11-07 19:13:12 UTC
(
hide
)
Description:
Bug 7317: (QA followup) Fix capitalization and terminology issues
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2017-11-07 19:13:12 UTC
Size:
8.73 KB
patch
obsolete
>From 7e42c67ecccb4204b852663354e260fcbad5db7c Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Mon, 6 Nov 2017 16:15:32 -0300 >Subject: [PATCH] Bug 7317: (QA followup) Fix capitalization and terminology > issues > >This patch fixed terminology issues on the UI, and removes CSS-based >case forcing for column names. > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > Koha/Illrequest/Config.pm | 2 +- > koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 --- > .../prog/en/modules/ill/ill-requests.tt | 39 +++++++++++----------- > 3 files changed, 21 insertions(+), 24 deletions(-) > >diff --git a/Koha/Illrequest/Config.pm b/Koha/Illrequest/Config.pm >index 5c78e80976..776cb99f33 100644 >--- a/Koha/Illrequest/Config.pm >+++ b/Koha/Illrequest/Config.pm >@@ -19,7 +19,7 @@ package Koha::Illrequest::Config; > > use Modern::Perl; > >-use File::Basename; >+use File::Basename qw/basename/; > > use C4::Context; > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >index 020d6e7570..9a18b097c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -3137,7 +3137,3 @@ fieldset.rows + fieldset.action { > table#ill-requests { > width: 100% !important; > } >- >-table#ill-requests th { >- text-transform: capitalize; >-} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 0c41d02eb5..86a93a3533 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -1,5 +1,6 @@ > [% USE Branches %] > [% USE Koha %] >+[% USE KohaDates %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › ILL requests ›</title> >@@ -113,7 +114,7 @@ > null : > row[thisCol]; > }); >- } >+ }; > > // Strip the expand prefix if it exists, we do this for display > var stripPrefix = function(value) { >@@ -125,7 +126,7 @@ > }; > > // Our 'render' function for borrowerlink >- var createBorrowerLink = function(data, type, row) { >+ var createPatronLink = function(data, type, row) { > return '<a title="View borrower details" ' + > 'href="/cgi-bin/koha/members/moremember.pl?' + > 'borrowernumber='+row.borrowernumber+'">' + >@@ -157,7 +158,7 @@ > 'method=illview&illrequest_id=' + > row.illrequest_id + > '">Manage request</a>' + >- '</div>' >+ '</div>'; > }; > > // Columns that require special treatment >@@ -167,8 +168,8 @@ > func: createActionLink > }, > borrowername: { >- name: 'Borrower', >- func: createBorrowerLink >+ name: 'Patron', >+ func: createPatronLink > }, > illrequest_id: { > name: 'Request number', >@@ -179,10 +180,10 @@ > func: createStatus > }, > biblio_id: { >- name: 'Biblio number' >+ name: 'Biblio ID' > }, > branchcode: { >- name: 'Branch code' >+ name: 'Library' > } > }; > >@@ -192,7 +193,7 @@ > .replace(/^filter/, '') > .replace(/([A-Z])/g, "_$1") > .replace(/^_/,'').toLowerCase(); >- }; >+ } > > // Toggle request attributes in Illview > $('#toggle_requestattributes').click(function() { >@@ -238,7 +239,7 @@ > extra.forEach(function(thisExtra) { > allCols[thisExtra] = 1; > }); >- }; >+ } > // Different requests will have different columns, > // make sure they all have the same > $.each(dataCopy, function(k, row) { >@@ -272,7 +273,7 @@ > ) { > colObj.render = specialCols[thisCol].func; > } else { >- colObj.data = thisCol >+ colObj.data = thisCol; > } > colData.push(colObj); > }); >@@ -492,15 +493,15 @@ > <legend>Request details</legend> > <ol> > <li class="borrowernumber"> >- <label for="borrowernumber">Borrower number:</label> >+ <label for="borrowernumber">Patron ID:</label> > <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber %]"> > </li> > <li class="biblio_id"> >- <label for="biblio_id" class="biblio_id">Biblio number:</label> >+ <label for="biblio_id" class="biblio_id">Biblio ID:</label> > <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id %]"> > </li> > <li class="branchcode"> >- <label for="branchcode" class="branchcode">Branch:</label> >+ <label for="branchcode" class="branchcode">Library:</label> > <select name="branchcode" id="branch"> > [% FOREACH branch IN branches %] > [% IF ( branch.branchcode == request.branchcode ) %] >@@ -522,7 +523,7 @@ > </li> > <li class="updated"> > <label class="updated">Last updated:</label> >- [% request.updated %] >+ [% request.updated | $KohaDates with_hours => 1 %] > </li> > <li class="medium"> > <label class="medium">Request type:</label> >@@ -530,7 +531,7 @@ > </li> > <li class="cost"> > <label class="cost">Cost:</label> >- [% request.cost %] >+ [% request.cost || 'N/A' %] > </li> > <li class="req_id"> > <label class="req_id">Request number:</label> >@@ -597,7 +598,7 @@ > [% request.orderid || "N/A" %] > </div> > <div class="borrowernumber"> >- <span class="label borrowernumber">Borrower:</span> >+ <span class="label borrowernumber">Patron:</span> > [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] > <a href="[% borrowerlink %]" title="View borrower details"> > [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" %] >@@ -605,11 +606,11 @@ > </div> > > <div class="biblio_id"> >- <span class="label biblio_id">Biblio number:</span> >+ <span class="label biblio_id">Biblio ID:</span> > [% request.biblio_id || "N/A" %] > </div> > <div class="branchcode"> >- <span class="label branchcode">Branch:</span> >+ <span class="label branchcode">Library:</span> > [% Branches.GetName(request.branchcode) %] > </div> > <div class="status"> >@@ -618,7 +619,7 @@ > </div> > <div class="updated"> > <span class="label updated">Last updated:</span> >- [% request.updated %] >+ [% request.updated | $KohaDates with_hours => 1 %] > </div> > <div class="medium"> > <span class="label medium">Request type:</span> >-- >2.15.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 7317
:
59893
|
59894
|
59895
|
59920
|
60485
|
60486
|
60487
|
60488
|
63081
|
63082
|
63083
|
63084
|
63085
|
63086
|
63087
|
63088
|
63089
|
63090
|
63113
|
63175
|
63176
|
63354
|
63421
|
63472
|
63475
|
65469
|
65470
|
65471
|
65472
|
65473
|
65474
|
65475
|
65476
|
66266
|
67242
|
67243
|
67244
|
67245
|
67246
|
67247
|
67248
|
67249
|
67250
|
67251
|
67252
|
67253
|
67254
|
67255
|
67256
|
67257
|
67258
|
67259
|
67260
|
67261
|
67262
|
67263
|
67264
|
67281
|
67282
|
67283
|
67284
|
67285
|
67286
|
67287
|
67288
|
67289
|
67290
|
67291
|
67292
|
67293
|
67294
|
67295
|
67296
|
67297
|
67298
|
67299
|
67300
|
67301
|
67302
|
67303
|
68185
|
68186
|
68328
|
68391
|
68406
|
68407
|
68408
|
68409
|
68418
|
68444
|
68445
|
68483
|
68484
|
68485
|
68487
|
68516
|
68517
|
68518
|
68519
|
68520
|
68521
|
68522
|
68523
|
68524
|
68525
|
68542
|
68543
|
68544
|
68545
|
68546
|
68547
|
68548
|
68549
|
68550
|
68551
|
68552
|
68558
|
68559
|
68560
|
68561
|
68562
|
68563
|
68564
|
68565
|
68566
|
68567
|
68858
|
68874
|
68877
|
68878
|
68885
|
68886
|
68921
|
68922
|
68926
|
68927
|
68928
|
68929
|
68931
|
68932
|
68933
|
68988
|
68989
|
68999
|
69000
| 69006 |
69008
|
69009
|
69012
|
69014
|
69044
|
69045
|
69046
|
69056
|
69059
|
69060
|
69061
|
69063
|
69064
|
69065
|
69066
|
69069
|
69070
|
69071
|
69074