From 1b3b942409fc87c828491275e7e866eb02d4671a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 25 Mar 2013 16:08:04 -0400 Subject: [PATCH] Bug 2835 - Inconsistent use of colon at the end of sentences Labels which precede a text input or select typically have a colon before them: Name: [____] This patch cleans up templates where labels in this context lack a colon. Exceptions to this rule include radio buttons, checkboxes, and labels inside tables. To test, view the affected pages and confirm that labels look consistent. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Patch adds more consistency. Work for translators could be made easier using CSS instead of whitespace after colon. Signed-off-by: Jared Camins-Esakov --- .../prog/en/includes/auth-finder-search.inc | 12 +-- .../prog/en/modules/acqui/basketheader.tt | 10 +-- .../prog/en/modules/acqui/supplier.tt | 40 +++++----- .../prog/en/modules/acqui/z3950_search.tt | 4 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 16 ++-- .../prog/en/modules/admin/aqcontract.tt | 8 +- .../en/modules/admin/auth_tag_structure.tt | 12 +-- .../en/modules/admin/authorised_values.tt | 14 ++-- .../prog/en/modules/admin/biblio_framework.tt | 6 +- .../prog/en/modules/admin/branches.tt | 38 +++++----- .../prog/en/modules/admin/categorie.tt | 6 +- .../prog/en/modules/admin/itemtypes.tt | 10 +-- .../prog/en/modules/catalogue/advsearch.tt | 4 +- .../en/modules/cataloguing/z3950_search.tt | 4 +- .../en/modules/labels/label-edit-layout.tt | 16 ++-- .../prog/en/modules/labels/search.tt | 4 +- .../en/modules/patroncards/edit-layout.tt | 74 +++++++++---------- .../en/modules/patroncards/members-search.tt | 6 +- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../prog/en/modules/reports/borrowers_out.tt | 2 +- .../en/modules/reports/borrowers_stats.tt | 2 +- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../prog/en/modules/reports/catalogue_out.tt | 2 +- .../en/modules/reports/catalogue_stats.tt | 2 +- .../en/modules/reports/issues_avg_stats.tt | 2 +- .../prog/en/modules/reports/issues_stats.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 2 +- .../en/modules/serials/subscription-add.tt | 12 +-- .../en/modules/serials/subscription-detail.tt | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../prog/en/modules/tools/batchMod.tt | 4 +- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 12 +-- .../prog/en/modules/tools/koha-news.tt | 10 +-- 34 files changed, 176 insertions(+), 172 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 17d1138ede..d54cf648d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -113,12 +113,12 @@ function finderjumpfull(page)
Search options
  1. - Authority type + Authority type: [% authtypecode %]
  2. - + @@ -132,7 +132,7 @@ function finderjumpfull(page)
  3. - + @@ -146,7 +146,7 @@ function finderjumpfull(page)
  4. - + @@ -159,7 +159,7 @@ function finderjumpfull(page)
  5. - + @@ -171,7 +171,7 @@ function finderjumpfull(page)
  6. - +
  7. @@ -99,7 +99,7 @@ function Check(ff) {
  8. -   +  
  9. -   +  
  10. -   +  
    11. [% IF ( contractloop ) %] -
  11. +
  12. Company details -
    1. +
        2. -
      2. +
        4. -
      4. +
        6. -
      6. +
        8. -
      8. +
        10. -
      10. +
        12. -
      12. +
    Contact details -
    1. +
        2. -
      2. +
        4. -
      4. +
        6. -
      6. +
        8. -
      8. +
        10. -
      10. +
        12. -
      12. +
    @@ -113,7 +113,7 @@ if (f.company.value == "") { [% END %]
    -
  1. +
    3. -
  3. +
  4. [% FOREACH gst IN gst_values %] [% IF ( gstrate == gst.option ) %] @@ -177,13 +177,13 @@ if (f.company.value == "") { [% END %]
      -
    1. +
    2. %
    3. - + days
      4. -
    4. +
[% IF ( booksellerid ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 483bf654cc..7ce0222fdc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -100,7 +100,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
-
    2. +
    +
      +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 244f92fe6f..d86a5ab484 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -187,13 +187,13 @@
    1. - +
      [% INCLUDE 'date-format.inc' %]
    2. - +
      [% INCLUDE 'date-format.inc' %]
      3. @@ -226,13 +226,13 @@
      1. - +
        [% INCLUDE 'date-format.inc' %]
      2. - +
        [% INCLUDE 'date-format.inc' %]
        3. @@ -240,7 +240,7 @@
      3. - +
        4. @@ -248,7 +248,7 @@
      4. - +
        5. @@ -256,14 +256,14 @@
      5. - + [% IF ( budget_period_active ) %][% ELSE %] [% END %]
      6. - + [% IF ( budget_period_locked ) %][% ELSE %] [% END %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index 969869ca54..34040bda05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -108,17 +108,17 @@ function Check(ff) { [% END %] -
    3.   +
    4.  
      5. -
    5.   +
    6.  
      7. -
    7.   +
    8.  
      [% INCLUDE 'date-format.inc' %]
      9. -
    9.   +
    10.  
      [% INCLUDE 'date-format.inc' %]
      11. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index d35d37e9a7..fc617893c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -137,24 +137,24 @@ return false; [% IF ( heading_modify_tag_p ) %][% END %]
        -
      1. Tag[% searchfield %]
        2. -
        3. -
        4. -
      4. +
      5. Tag: [% searchfield %]
        6. +
        7. +
        8. +
      8. [% IF ( repeatable ) %] [% ELSE %] [% END %]
        9. -
      9. +
      10. [% IF ( mandatory ) %] [% ELSE %] [% END %]
        11. -
      11. [% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)
        12. +
      12. [% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 44906a90f1..5ba307278d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -80,14 +80,14 @@ $(document).ready(function() {
      1. - [% IF ( action_add_category ) %] + [% IF ( action_add_category ) %] [% ELSE %]Category [% category %] [% END %]
      2. - + [% IF ( action_modify ) %][% END %] [% IF ( action_add_category ) %] @@ -96,16 +96,16 @@ $(document).ready(function() { [% END %]
      3. - +
      4. - +
        5. -
      5. +
      6. - Select All if this authorised value must to be displayed all the time. Otherwise select librairies you want to associate with this value. + Select All if this authorised value must to be displayed all the time. Otherwise select libraries you want to associate with this value.
        7. 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 1458d10598..c4fee12d6b 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 @@ -149,13 +149,13 @@ function Check(f) {
          [% IF ( frameworkcode ) %] -
        1. Framework code[% frameworkcode %] +
        2. Framework code: [% frameworkcode %]
          3. [% ELSE %] -
          4. +
          5. [% END %] -
        5. +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index e2103971d8..aa1dcd3022 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -91,16 +91,16 @@ tinyMCE.init({ [% END %]
        1. [% IF ( heading_branches_add_branch_p ) %] - + Required [% ELSE %] - + [% branchcode %] [% END %]
        2. - + Required
        @@ -108,7 +108,7 @@ tinyMCE.init({ [% IF ( categoryloop ) %]
        Group(s):
          [% FOREACH categoryloo IN categoryloop %] -
        1. +
        2. [% IF ( categoryloo.checked ) %] [% ELSE %] @@ -121,21 +121,21 @@ tinyMCE.init({
        [% END %]
          -
          2. -
          3. -
          4. -
          5. -
          6. -
          7. -
          8. -
          9. -
          10. -
          11. -
          12. -
          13. -
        13. Can be entered as a single IP, or a subnet such as 192.168.1.*
          14. +
          15. +
          16. +
          17. +
          18. +
          19. +
          20. +
          21. +
          22. +
          23. +
          24. +
          25. +
          26. +
        26. Can be entered as a single IP, or a subnet such as 192.168.1.*
          27. -
          28. +
        Cancel
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index ad573152f9..98e09ff4b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -140,10 +140,10 @@ [% END %]
          [% IF ( categorycode ) %] -
        1. Category code[% categorycode |html %] +
        2. Category code: [% categorycode |html %]
          3. [% ELSE %] -
          4. +
          5. [% END %]
        6. @@ -171,7 +171,7 @@ [% END %]
          7. -
        7. [% IF ( hidelostitems ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index f8ead731df..210b57551e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -147,19 +147,19 @@ Item types administration
            [% IF ( itemtype ) %]
          1. - Item type + Item type: [% itemtype %]
            2. [% ELSE %]
          2. - +
            3. [% END %]
          3. [% IF ( itemtype ) %] -
            4. + [% ELSE %] - + [% END %] [% IF ( noItemTypeImages ) %]
          4. Image: Item type images are disabled. To enable them, turn off the noItemTypeImages system preference
          @@ -216,7 +216,7 @@ Item types administration
  1. - [% IF ( notforloan ) %] + [% IF ( notforloan ) %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 43560d0352..c982eb4d27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -248,7 +248,7 @@ [% IF ( searchdomainloop ) %]

    OR

    -

    [% FOREACH searchdomainloo IN searchdomainloop %] @@ -262,7 +262,7 @@

    Sorting

    - [% INCLUDE 'resort_form.inc' %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index c30d23b872..7e5b0af340 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -116,7 +116,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    -
      2. +
      +
        +
        5. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt index 45a084de59..583f6f0eb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -38,11 +38,11 @@ [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Label layout
        1. - +
        2. - +
        3. - + [% ELSE %] @@ -120,7 +120,7 @@ [% END %]
        4. - + [% IF ( callnum_split ) %] [% ELSE %] @@ -128,7 +128,7 @@ [% END %]
        5. - +
        6. - +
        7. - +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt index 04170ac8c5..748d5ac704 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -90,12 +90,12 @@ to add to Batch [% batch_id %]
        1. - +
          [% INCLUDE 'date-format.inc' %]
        2. - +
          [% INCLUDE 'date-format.inc' %]
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index 0a96568ddb..798ad48f74 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -131,11 +131,11 @@
        General settings
      5. - +
      6. - +
      7. - + [% IF ( page_side ) %] Front Back @@ -182,11 +182,11 @@ [% END %]
      8. - +
      9. - +
      10. - + pt
      11. - +
      12. - +
      13. - +
    @@ -234,11 +234,11 @@ [% END %]
  2. - +
  3. - +
  4. - + pt
  5. - +
  6. - +
  7. - +
    8. @@ -286,11 +286,11 @@ [% END %] @@ -345,7 +345,7 @@