Bugzilla – Attachment 119878 Details for
Bug 26703
Modify the "title" elements to contain unique information first
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26703: circ folder
Bug-26703-circ-folder.patch (text/plain), 16.40 KB, created by
Henry Bolshaw
on 2021-04-20 08:53:57 UTC
(
hide
)
Description:
Bug 26703: circ folder
Filename:
MIME Type:
Creator:
Henry Bolshaw
Created:
2021-04-20 08:53:57 UTC
Size:
16.40 KB
patch
obsolete
>From 35f1ebd6deafbf7cd0bfb7c2e3ab3affa09fd984 Mon Sep 17 00:00:00 2001 >From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> >Date: Mon, 1 Mar 2021 02:15:26 +0000 >Subject: [PATCH] Bug 26703: circ folder > >Swapped the order of the page titles to have the unique information >first, i.e. the name of the specific page displays first, and the name of the website (e.g. Koha) displays at the end. > >To test: >1) Apply patch >2) Ensure each of the files in the circ folder are swapped around >to display the most unique information first, and the website name is at the end >3) Ensure the pages displayed on the Staff Client that correspond to >these files also display the changes > >Sponsored-by: Catalyst IT >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Henry Bolshaw <bolshawh@parliament.uk> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- > .../prog/en/modules/circ/circulation_batch_checkouts.tt | 9 +++++---- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 8 ++++---- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 2 +- > 21 files changed, 31 insertions(+), 30 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index b69e1b9c03..286db72985 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -6,7 +6,7 @@ > [% USE raw %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Article requests</title> >+<title>Article requests › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>p { margin-top: 0; } [id^="article-menu-"] { display: none; } [id^="article-menu-"]:before { content: "|"; } .starthidden { display:none; }</style> > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >index ed01ed489d..9b4503627a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >@@ -3,7 +3,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Circulation statistics for [% title | html %]</title> >+<title>Circulation statistics for [% title | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >index 39e5128126..849dedf04f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >@@ -1,7 +1,7 @@ > [% USE Branches %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Overdues at [% Branches.GetLoggedInBranchname | html %]</title> >+<title>Overdues at [% Branches.GetLoggedInBranchname | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="circ_branchoverdues" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >index 921dd1a811..e27f7d4b5e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -3,7 +3,7 @@ > [% USE ItemTypes %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Transfers</title> >+<title>Transfers › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="circ_branchtransfers" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >index 1484b9cc7b..dcfc6ac4df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Checkout notes</title> >+<title>Checkout notes › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index 5c100a9044..d4391f1a86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -2,7 +2,7 @@ > [% USE Koha %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation</title> >+<title>Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="circ_circulation-home" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 7fcde8578d..78d562371e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -13,10 +13,10 @@ > [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] > [% SET destination = "circ" %] > <title> >- Koha › Circulation > [% IF patron %] >- › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] >- [% END %] >+ Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › [% END %] >+ >+ Circulation › Koha > </title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 967ee8495a..bf535aa725 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -8,10 +8,11 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > [% SET destination = "circ" %] >-<title>Koha › Circulation >-[% IF patron %] >- › Batch check out › Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] >-[% END %] >+<title> >+ [% IF patron %] >+ Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › Batch check out › [% END %] >+ >+ Circulation › Koha > </title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index f6b282bbc2..270e2f6055 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >@@ -11,7 +11,7 @@ > [% ELSIF ( AllowOfflineCirculation ) %]<html lang="[% lang | html %]" manifest="/cgi-bin/koha/circ/offline-mf.pl"> > [% ELSE %]<html lang="[% lang | html %]">[% END %] > <head> >-<title>Koha › Circulation</title> >+<title>Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 6f2bcebfee..906b9d46d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -6,7 +6,7 @@ > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Pending on-site checkouts</title> >+<title>Pending on-site checkouts › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 92d088b446..b6c72e88c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -8,7 +8,7 @@ > [%- USE TablesSettings -%] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Items overdue as of [% todaysdate | html %]</title> >+<title>Items overdue as of [% todaysdate | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql {display:none;} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index b3c30b33dd..0f02419d6b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -8,7 +8,7 @@ > [%- USE ItemTypes -%] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Holds to pull</title> >+<title>Holds to pull › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index 78f74fd4c1..2b0299fdb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -3,13 +3,13 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF ( caller == 'hold-transfer' ) %] >-<title>Koha › Circulation › Hold transfer print receipt</title> >+<title>Hold transfer print receipt › Circulation › Koha</title> > [% ELSIF ( caller == 'transfer' ) %] >-<title>Koha › Circulation › Transfers print receipt</title> >+<title>Transfers print receipt › Circulation › Koha</title> > [% ELSIF ( caller == 'members' ) %] >-<title>Koha › Patrons › Print receipt for [% borrowernumber | html %]</title> >+<title>Print receipt for [% borrowernumber | html %] › Patrons › Koha</title> > [% ELSIF ( title ) %][%# FIXME title is never defined %] >-<title>Koha › Patrons › [% title | html %]</title> >+<title>[% title | html %] › Patrons › Koha</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 82b34fd02b..4e8d312d8c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -5,7 +5,7 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > >-<title>Koha › Circulation › Renew [% title | html %]</title> >+<title>Renew [% title | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index d0973a1bbd..e59703482e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -7,7 +7,7 @@ > [% SET article_requests_view = 1 %] > [% SET biblionumber = biblio.biblionumber %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Request article</title> >+<title>Request article › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index c5249dfa17..3d89e82fe2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -7,7 +7,7 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Hold ratios</title> >+<title>Hold ratios › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql { display: none; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 6c8eab60e0..888c00e3e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -28,7 +28,7 @@ > [% END %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Check in [% title | html %]</title> >+<title>Check in [% title | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >index c6843c4ad9..040ff1de17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >@@ -7,9 +7,9 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF Koha.Preference('UseCirculationDesks') %] >-<title>Koha › Circulation › Set library and desk</title> >+<title>Set library and desk › Circulation › Koha</title> > [% ELSE %] >-<title>Koha › Circulation › Set library</title> >+<title>Set library › Circulation › Koha</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] > <style> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index bd56a3cc9b..11ed6dfe86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Transfers to receive</title> >+<title>Transfers to receive › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index 10c36a1e9d..564ab5f54f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -9,7 +9,7 @@ > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Holds queue</title> >+<title>Holds queue › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> p { margin-top: 0; }</style> > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 6c44a5334f..abee77bf56 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -6,7 +6,7 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Holds awaiting pickup</title> >+<title>Holds awaiting pickup › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=119878">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26703
:
117894
|
117895
|
117896
|
117897
|
117898
|
117899
|
117900
|
117901
|
117902
|
117903
|
117904
|
117905
|
117906
|
117907
|
117908
|
117909
|
117910
|
117911
|
117912
|
117997
|
117998
|
117999
|
118000
|
118001
|
118002
|
118003
|
118004
|
118005
|
118006
|
118007
|
118008
|
118009
|
118010
|
118011
|
118012
|
118013
|
118014
|
118015
|
118034
|
118035
|
118036
|
118037
|
118038
|
118039
|
118040
|
118041
|
118042
|
118043
|
118044
|
118045
|
118046
|
118047
|
118048
|
118049
|
118050
|
118051
|
118052
|
118053
|
119652
|
119653
|
119654
|
119655
|
119656
|
119657
|
119658
|
119659
|
119660
|
119661
|
119662
|
119663
|
119664
|
119665
|
119666
|
119667
|
119668
|
119669
|
119670
|
119671
|
119820
|
119824
|
119873
|
119874
|
119875
|
119876
|
119877
| 119878 |
119879
|
119880
|
119881
|
119882
|
119883
|
119884
|
119885
|
119886
|
119887
|
119888
|
119889
|
119890
|
119891
|
119892
|
119893
|
119894
|
119895
|
119897
|
119940
|
119982
|
119983