From bdf23b8c78ca471b5a038e2fe391d6ada44ea4eb Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 Nov 2011 14:14:51 -0400 Subject: [PATCH] [SIGNED OFF] Bug 7127 - Templates must be valid XHTML Replaces & with & on several template pages Signed-off-by: Ian Walls --- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../modules/authorities/searchresultlist-auth.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/cataloguing/additem.tt | 4 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 4 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../rotating_collections/editCollections.tt | 4 +- koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 72 ++++++++++---------- 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 18c0552..d4a7bf3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -78,7 +78,7 @@ [% INCLUDE 'sysprefs-admin-search.inc' %] +[% IF ( delete_confirm ) %] System Preferences[% searchfield %] › Confirm Deletion of Parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System Preferences › Parameter Deleted[% END %][% IF ( else ) %]System Preferences[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt index ba22e9c..7a118c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt @@ -99,7 +99,7 @@ function jumpfull(page) [% END %] [% END %] [% IF ( displaynext ) %] - + >> [% END %]
[% END %] 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 80e04a9..162b12a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -417,11 +417,11 @@ function verify_images() { [% END %] [% IF ( analyze ) %] [% IF ( itemloo.countanalytics ) %] - [% itemloo.countanalytics %] analytics + [% itemloo.countanalytics %] analytics [% END %] [% END %] [% IF ( analyze ) %] - Create Analytics + Create Analytics [% END %] @@ -429,7 +429,7 @@ function verify_images() { [% END %] [% IF ( hiddencount ) %] -

Show all items ([% hiddencount %] hidden) +

Show all items ([% hiddencount %] hidden) [% END %] [% IF ( debug_display ) %]

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 673b08b..91c2d48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -190,7 +190,7 @@ function set_to_today(id, force) { [% IF ( book_on_loan ) %]

Cannot Delete: item is checked out.
[% END %] [% IF ( book_reserved ) %]
Cannot Delete: item has a waiting hold.
[% END %] [% IF ( not_same_branch ) %]
Cannot Delete: The items do not belong to your branch.
[% END %] -[% IF ( linked_analytics ) %]
Cannot Delete: item has linked analytics..
[% END %] +[% IF ( linked_analytics ) %]
Cannot Delete: item has linked analytics..
[% END %]
[% IF ( item_loop ) %] @@ -209,7 +209,7 @@ function set_to_today(id, force) { [% IF ( item_loo.nomod ) %]  [% ELSE %][% IF ( item_loo.hostitemflag ) %]Edit in Host Delink [% ELSE %]Edit - [% IF ( item_loo.countanalytics ) %]view analytics[% ELSE %]Delete[% END %][% END %][% END %] + [% IF ( item_loo.countanalytics ) %]view analytics[% ELSE %]Delete[% END %][% END %][% END %] [% FOREACH item_valu IN item_loo.item_value %] [% item_valu.field |html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt index fa94187..35fbfec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt @@ -1,6 +1,6 @@ [% INCLUDE 'help-top.inc' %] -

Claims & Late Orders

+

Claims & Late Orders

If you have entered in an email address for the vendors in your system you can send them claim emails when an order is late. Before you can send claims you will need to set up an acquisitions claim notice.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt index 550d783..ef3eb1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt @@ -26,7 +26,7 @@
  • To be able to order from a vendor you must make them 'Active'
  • For List Prices and Invoice Prices choose the currency
      -
    • Currencies are assigned in the Currencies & Exchange Rates admin area
    • +
    • Currencies are assigned in the Currencies & Exchange Rates admin area
  • If the vendor offers a consistent blank discount, enter that in the 'Discount' field diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt index 973e2af..69e1dd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt @@ -1,6 +1,6 @@ [% INCLUDE 'help-top.inc' %] -

    Libraries & Groups

    +

    Libraries & Groups

    When setting up your Koha system you will want to add information for every library that will be sharing your system. This data is used in several areas of Koha.

    @@ -47,6 +47,6 @@

    Properties are then applied to libraries via the add or edit library form.

    -

    See the full documentation for Libraries & Groups in the manual (online).

    +

    See the full documentation for Libraries & Groups in the manual (online).

    [% INCLUDE 'help-bottom.inc' %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt index fd8cc7f..8d26aea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt @@ -9,8 +9,8 @@

    Most fees and fines will be charged automatically if the fines cron job is running:

      -
    • Fines will be charged based on your Circulation & Fines Rules
    • -
    • Hold fees will be charged based on the rules you set in the Patron Types & Categories administration area
    • +
    • Fines will be charged based on your Circulation & Fines Rules
    • +
    • Hold fees will be charged based on the rules you set in the Patron Types & Categories administration area
    • Rental fees will be charged based on the settings in your Item Types administration area
    • Marking an item 'Lost' via the cataloging module will automatically charge the patron the replacement cost for that item
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt index 7a50b4f..6c63cfb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt @@ -56,8 +56,8 @@ [% collectionsLoo.colTitle %] [% collectionsLoo.colDesc %] [% collectionsLoo.colBranchcode %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt index 8ee8b7b..219dc41 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt @@ -37,8 +37,8 @@
    requests a particular format or set of formats in reporting availability

    Example Call

    - - ilsdi.pl?service=GetAvailability&id=1+2+99999&id_type=item + + ilsdi.pl?service=GetAvailability&id=1+2+99999&id_type=item

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -110,8 +110,8 @@
                         
                     
                     

    Example Call

    - - ilsdi.pl?service=GetRecords&id=1+2+99999 + + ilsdi.pl?service=GetRecords&id=1+2+99999

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -314,8 +314,8 @@
                         
                     
                     

    Example Call

    - - ilsdi.pl?service=GetAuthorityRecords&id=1+2+99999 + + ilsdi.pl?service=GetAuthorityRecords&id=1+2+99999

    Example Response

    <xml version="1.0" encoding="UTF-8">;
    @@ -372,8 +372,8 @@
                         
                     
                     

    Example Call

    - - ilsdi.pl?service=LookupPatron&id=815&id_type=cardnumber + + ilsdi.pl?service=LookupPatron&id=815&id_type=cardnumber

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -393,8 +393,8 @@
                         
    user's password

    Example Call

    - - ilsdi.pl?service=AuthenticatePatron&username=john9&password=soul + + ilsdi.pl?service=AuthenticatePatron&username=john9&password=soul

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -423,8 +423,8 @@
                         
    whether or not to return loan information in the response

    Example Call

    - - ilsdi.pl?service=GetPatronInfo&patron_id=1&show_contact=0&show_loans=1 + + ilsdi.pl?service=GetPatronInfo&patron_id=1&show_contact=0&show_loans=1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -542,8 +542,8 @@
                         
    the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron

    Example Call

    - - ilsdi.pl?service=GetPatronStatus&patron_id=1 + + ilsdi.pl?service=GetPatronStatus&patron_id=1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -565,8 +565,8 @@
                         
    system item identifier

    Example Call

    - - ilsdi.pl?service=GetServices&patron_id=1&item_id=1 + + ilsdi.pl?service=GetServices&patron_id=1&item_id=1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -589,8 +589,8 @@
                         
    the date the patron would like the item returned by

    Example Call

    - - ilsdi.pl?service=RenewLoan&patron_id=1&item_id=1 + + ilsdi.pl?service=RenewLoan&patron_id=1&item_id=1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -620,8 +620,8 @@
                         
    date after which item returned to shelf if item is not picked up

    Example Call

    - - ilsdi.pl?service=HoldTitle&patron_id=1&bib_id=1&request_location=127.0.0.1 + + ilsdi.pl?service=HoldTitle&patron_id=1&bib_id=1&request_location=127.0.0.1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -651,8 +651,8 @@
                         
    date after which item returned to shelf if item is not picked up

    Example Call

    - - ilsdi.pl?service=HoldItem&patron_id=1&bib_id=1&item_id=1 + + ilsdi.pl?service=HoldItem&patron_id=1&bib_id=1&item_id=1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -674,8 +674,8 @@
                         
    system item identifier

    Example Call

    - - ilsdi.pl?service=CancelHold&patron_id=1&item_id=1 + + ilsdi.pl?service=CancelHold&patron_id=1&item_id=1

    Example Response

    <?xml version="1.0" encoding="ISO-8859-1" ?>
    @@ -689,31 +689,31 @@
                     
    • HarvestBibliographicRecords (Use OAI-PMH instead)
    • HarvestExpandedRecords (Use OAI-PMH instead)
    • -
    • GetAvailability
    • +
    • GetAvailability
    • GoToBibliographicRequestPage (Use OPAC instead)

    Level 2: Elementary OPAC supplement

    • HarvestAuthorityRecords (Use OAI-PMH instead)
    • HarvestHoldingsRecords (Use OAI-PMH instead)
    • -
    • GetRecords
    • +
    • GetRecords
    • Search (Use SRU instead)
    • Scan (Use SRU instead)
    • -
    • GetAuthorityRecords
    • +
    • GetAuthorityRecords
    • OutputRewritablePage (Not supported yet)
    • OutputIntermediateFormat (Not supported yet)

    Level 3: Elementary OPAC alternative

    -- 1.7.4.1