From c02e4d02d5c4ebcb01d60c4515cde3b13765fb07 Mon Sep 17 00:00:00 2001 From: Christopher Hall Date: Fri, 12 Nov 2010 14:17:03 +1300 Subject: [PATCH] Bug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names Done within opac and intranet templates, still needs to be done for corresponding scripts. Signed-off-by: Colin Campbell --- .../en/includes/messaging-preference-form.inc | 18 +++++----- .../prog/en/includes/prefs-menu.inc | 10 +++--- .../admin/auth_subfields_structure.tmpl | 8 ++--- .../en/modules/admin/auth_tag_structure.tmpl | 20 +++++------ .../prog/en/modules/admin/branches.tmpl | 14 ++++---- .../prog/en/modules/admin/categorie.tmpl | 2 +- .../admin/marc_subfields_structure.tmpl | 10 +++--- .../en/modules/admin/marctagstructure.tmpl | 2 +- .../en/modules/admin/systempreferences.tmpl | 36 +++++++++---------- .../prog/en/modules/admin/z3950servers.tmpl | 4 +-- .../prog/en/modules/catalogue/advsearch.tmpl | 2 +- .../prog/en/modules/catalogue/detail.tmpl | 8 ++--- .../prog/en/modules/catalogue/moredetail.tmpl | 4 +-- .../prog/en/modules/catalogue/results.tmpl | 10 +++--- .../prog/en/modules/maint/catmaintain.tmpl | 16 ++++----- .../prog/en/modules/reserve/request.tmpl | 10 +++--- .../en/modules/virtualshelves/shelves.tmpl | 4 +-- .../prog/en/modules/opac-detail.tmpl | 10 +++--- .../prog/en/modules/opac-messaging.tmpl | 12 +++---- .../prog/en/modules/opac-reserve.tmpl | 14 +++++--- .../prog/en/modules/opac-results.tmpl | 3 +- .../prog/en/modules/opac-shelves.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-user.tmpl | 16 ++++----- opac/opac-reserve.pl | 4 +-- opac/opac-search.pl | 2 +- 25 files changed, 123 insertions(+), 118 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc index 1655afcf7a..28dc6333ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc @@ -45,36 +45,36 @@ - - + " name="" - value="sms" disabled="disabled" /> + value="sms" disabled="disabled" /> " name="" - value="sms" onclick = "$('#none'+'').attr('checked','');" /> + value="sms" onclick = "$('#none'+'').attr('checked','');" /> - - + " name="" - value="email" disabled="disabled" /> + value="email" disabled="disabled" /> " name="" - value="email" onclick = "$('#none'+'').attr('checked','');" /> + value="email" onclick = "$('#none'+'').attr('checked','');" /> @@ -99,18 +99,18 @@ - - + " name="" - value="rss" disabled="disabled" /> + value="rss" disabled="disabled" /> " name="" - value="rss" onclick = "$('#none'+'').attr('checked','');" /> + value="rss" onclick = "$('#none'+'').attr('checked','');" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc index 1fc624a29b..6def13246f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc @@ -6,15 +6,15 @@
  • Cataloging
  • Circulation
  • Creators
    • -
  • Enhanced Content
    • -
  • I18N/L10N
    • -
  • Local Use
    • +
  • Enhanced Content
    • +
  • I18N/L10N
    • +
  • Local Use
  • Logs
  • OPAC
  • Patrons
  • Searching
  • Serials
    • -
  • Staff Client
    • -
  • Web Services
    • +
  • Staff Client
    • +
  • Web Services
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl index 0dbff36524..f63fbe6b31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl @@ -32,8 +32,8 @@ function displayMoreConstraint(numlayer){ Confirm Deletion of Subfield ? Data deleted - - Edit MARC subfields constraints + + Edit MARC subfields constraints @@ -46,8 +46,8 @@ function displayMoreConstraint(numlayer){ -

    - Edit MARC subfields constraints for field authority +

    + Edit MARC subfields constraints for field authority

    " name="Aform" method="post"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl index 5752cfeacd..2449fd9a82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl @@ -1,7 +1,7 @@ -Koha › Administration › Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --> - <!-- TMPL_IF NAME="heading-modify-tag-p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Modify tag<!-- /TMPL_IF --> - <!-- TMPL_IF NAME="heading-add-tag-p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › New tag<!-- /TMPL_IF --> +<title>Koha › Administration › Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use_heading_flags_p" --> + <!-- TMPL_IF NAME="heading_modify_tag_p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Modify tag<!-- /TMPL_IF --> + <!-- TMPL_IF NAME="heading_add_tag_p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › New tag<!-- /TMPL_IF --> <!-- TMPL_ELSE -->› <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Confirm Deletion<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Data Deleted<!-- /TMPL_IF --> @@ -69,9 +69,9 @@ return false; -