From bfe6dc88d208e3622e3637665c62dcabf4e1d892 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 25 Mar 2013 12:21:24 -0400 Subject: [PATCH] Bug 2774 - Path to theme is hard-coded in many places Many templates have instances where the path to the prog template is hard-coded. Now that interface and theme template variables are available everywhere these paths should be corrected to use them. Image paths corrected: - 'Patron image missing' image on circulation pages - 'Locked' icon on fund planning page - Tag and subfield edit icons on the authority, biblio editor, and batch item modification pages (Clone tag, delete tag, clone subfield, delete subfield, move subfield) - 'Loading' icon when importing frameworks Audio file paths corrected: - Sounds for circulation.pl and returns.pl Paths to DataTables assets corrected on: - Transfers to receive report - Holds queue report - Holds awaiting pickup report - Patron detail page (moremember.pl) - Patron circulation history - Update child to adult patron page - Process offline circulations - Catalog by item type report - Serials statistics wizard - Serial claims page - Koha news - Notices - Batch patron modifications Path to progress bar assets corrected on: - Process offline circulations page - Progressbar include file - Stage MARC imports - Manage MARC imports - Local cover image upload Other image paths: - "Approved" checkmark image on tags review page - Table sort icons on lists page - Feed icon on OPAC search result page - "Loading" image for OPAC plain MARC view Path to ratings JavaScript on OPAC detail and results pages Signed-off-by: Kyle M Hall Checked all the pages modified by this patch, no problems noted Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +- .../prog/en/modules/admin/aqplan.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 6 +++--- .../prog/en/modules/authorities/authorities.tt | 12 ++++++------ .../prog/en/modules/cataloguing/addbiblio.tt | 12 ++++++------ .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 4 ++-- .../prog/en/modules/circ/returns.tt | 16 ++++++++-------- .../prog/en/modules/circ/transferstoreceive.tt | 6 +++--- .../prog/en/modules/circ/view_holdsqueue.tt | 6 +++--- .../prog/en/modules/circ/waitingreserves.tt | 6 +++--- .../prog/en/modules/members/moremember.tt | 6 +++--- .../prog/en/modules/members/readingrec.tt | 6 +++--- .../prog/en/modules/members/update-child.tt | 6 +++--- .../prog/en/modules/offline_circ/process_koc.tt | 2 +- .../prog/en/modules/reports/itemtypes.tt | 6 +++--- .../prog/en/modules/reports/serials_stats.tt | 6 +++--- .../prog/en/modules/serials/claims.tt | 6 +++--- .../prog/en/modules/serials/serials-edit.tt | 4 ++-- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/list.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/test/progressbar.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 6 +++--- .../prog/en/modules/tools/letter.tt | 6 +++--- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../prog/en/modules/tools/modborrowers.tt | 6 +++--- .../prog/en/modules/tools/stage-marc-import.tt | 2 +- .../prog/en/modules/tools/upload-images.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 12 ++++++------ .../opac-tmpl/prog/en/includes/masthead.inc | 4 ++-- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-detail.tt | 8 ++++---- .../prog/en/modules/opac-imageviewer.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-results.tt | 4 ++-- .../opac-tmpl/prog/en/modules/search/results.tt | 4 ++-- 38 files changed, 96 insertions(+), 96 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index fb283eca44..7101260082 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -9,7 +9,7 @@ [% IF ( picture ) %]
  • [% firstname %] [% surname %] ([% cardnumber %])
    • [% ELSE %] -
  • [% firstname %] [% surname %] ([% cardnumber %])
    • +
  • [% firstname %] [% surname %] ([% cardnumber %])
    • [% END %] [% END %] [% IF ( address or address2 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt index abcdccdbb2..faf34266db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt @@ -11,7 +11,7 @@ in the global namespace %] [% IF borrower.has_picture %]
  • [% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])
    • [% ELSE %] -
  • [% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])
    • +
  • [% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])
    • [% END %] [% END %] [% IF ( borrower.address or borrower.address2 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index 94261bd0c5..03c26c51ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -64,7 +64,7 @@ }); //]]> - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index c4fee12d6b..aa269ce4d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -96,7 +96,7 @@ function Check(f) { $('#importing_' + frameworkcode).find("span").html(_("Importing to framework:")+"" + frameworkcode + "
    " +_("Importing from file:")+"" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + ""); if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) { var timestamp = new Date().getTime(); - $('#importing_' + frameworkcode).find("img").attr('src', '/intranet-tmpl/prog/img/loading-small.gif' + '?' +timestamp); + $('#importing_' + frameworkcode).find("img").attr('src', '[% interface %]/[% theme %]/img/loading-small.gif' + '?' +timestamp); } $('#importing_' + frameworkcode).css('display', 'block'); if (navigator.userAgent.toLowerCase().indexOf('firefox') == -1) $("body").css("cursor", "progress"); @@ -219,7 +219,7 @@ function Check(f) {
      2. -
      3. +
    Cancel
    @@ -268,7 +268,7 @@ function Check(f) {
    • -
    Cancel
    +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index dbbb78519a..dd3d9bbefa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -260,11 +260,11 @@ function confirmnotdup(redirect){ [% IF ( innerloo.repeatable ) %] - Repeat this Tag + Repeat this Tag [% END %] - Delete this Tag + Delete this Tag @@ -283,9 +283,9 @@ function confirmnotdup(redirect){ [% UNLESS hide_marc %] [% IF ( subfield_loo.fixedfield ) %] - + [% ELSE %] - Move Up + Move Up [% END %] [% IF ( subfield_loo.repeatable ) %] - Clone + Clone - Delete + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 011b7a6a49..8d489d27e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -504,11 +504,11 @@ function Changefwk(FwkList) { [% IF ( innerloo.repeatable ) %] - Repeat this Tag + Repeat this Tag [% END %] - Delete this Tag + Delete this Tag @@ -527,9 +527,9 @@ function Changefwk(FwkList) { [% UNLESS hide_marc %] [% IF ( subfield_loo.fixedfield ) %] - + [% ELSE %] - Move Up + Move Up [% END %] [% IF ( subfield_loo.repeatable ) %] - Clone + Clone - Delete + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 1043965948..e43a2c892b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -192,7 +192,7 @@ $(document).ready(function() { [% IF ( ite.repeatable ) %] - Clone + Clone [% END %] [% IF ( ite.mandatory ) %] Required[% END %] 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 05dbefa055..42a9b27643 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -453,7 +453,7 @@ function validate1(date) { [% IF ( IMPOSSIBLE ) %] [% IF ( soundon ) %] - + [% END %]
    @@ -536,7 +536,7 @@ function validate1(date) {
    [% ELSE %] [% IF ( soundon ) %] - + [% END %] [% END %] 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 8923188ee2..98d2ae981f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -120,7 +120,7 @@ $(document).ready(function () { [% IF ( soundon ) %] - + [% END %]
    @@ -163,7 +163,7 @@ $(document).ready(function () { [% IF ( diffbranch ) %] [% IF ( soundon ) %] - + [% END %]

    Hold needing transfer found: [% title |html %]

    @@ -206,14 +206,14 @@ $(document).ready(function () {

    Please return [% title or "item" |html %] to [% homebranchname %]
    ( Print slip )

    [% IF ( soundon ) %] - + [% END %] [% END %] [% IF ( needstransfer ) %] [% IF ( soundon ) %] - + [% END %]

    This item needs to be transferred to [% homebranchname %]

    Transfer now?
    @@ -239,7 +239,7 @@ $(document).ready(function () { [% IF ( diffbranch ) %] [% IF ( soundon ) %] - + [% END %]

    Item consigned:

    @@ -267,7 +267,7 @@ $(document).ready(function () { [% IF ( soundon ) %] - + [% END %]
    @@ -352,11 +352,11 @@ $(document).ready(function () { [% END %] [% END %] [% IF ( soundon ) %] - + [% END %] [% ELSE %] [% IF ( soundon ) %] - + [% END %] [% END %]
    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 9059f94120..a335f983e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -1,10 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Transfers to your library [% INCLUDE 'doc-head-close.inc' %] - - + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt index 4f5c07c66f..acbba9d7ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -2,10 +2,10 @@ Koha › Reports › Catalog by item types [% INCLUDE 'doc-head-close.inc' %] [% IF ( do_it ) %] - - + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - +[% ELSE %] + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + + + [% INCLUDE 'datatables-strings.inc' %] - + [% END %] -[% IF ( OpacStarRatings != 'disable' ) %] -[% END %] +[% IF ( OpacStarRatings != 'disable' ) %] +[% END %] [% IF ( OpacHighlightedWords ) %][% END %] [% IF ( bidi ) %] @@ -583,7 +583,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { href="/cgi-bin/koha/opac-search.pl?q=[% FOREACH link_loo IN MARCAUTHOR_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit |url %]:[% link_loo.link |url %][% END %]">[% MARCAUTHOR_SUBFIELDS_LOO.value %] [% END %] [% IF (MARCAUTHOR.authoritylink) %] - + [% END %] [% UNLESS ( loop.last ) %]|[% END %] [% END %] @@ -688,7 +688,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% SUBFIELD.value %] [% END %] [% IF (MARCSUBJCT.authoritylink) %] - + [% END %] [% UNLESS ( loop.last ) %] | [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt index 6472f62677..1a06121d5a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt @@ -5,7 +5,7 @@ // -[% IF ( OpacStarRatings == 'all' ) %] -[% END %] +[% IF ( OpacStarRatings == 'all' ) %] +[% END %] [% IF ( OpacHighlightedWords ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt index 39b5405bfd..0322ec5235 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt @@ -7,8 +7,8 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] - - + + -- 2.39.5