From e428ff001d7e877b4f666444add9236fcb491d38 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Tue, 22 Dec 2015 23:16:31 +0000 Subject: [PATCH] Bug 15413: Adding colons where appropriate To test: Apply patch and go to pretty much every page on the Intranet - look out for labels on forms etc where there should be colons but aren't. If you see any that I've missed but I'm 99% sure I got all of them! Make sure to click through some forms where creating a new thing involves continuing the submission on multiple pages. Signed-off-by: Owen Leonard Rebased on current master and checked all changed pages. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/categories.tt | 2 +- .../prog/en/modules/catalogue/advsearch.tt | 4 ++-- .../prog/en/modules/labels/label-edit-batch.tt | 4 ++-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 12 ++++++------ .../prog/en/modules/reports/borrowers_out.tt | 2 +- .../prog/en/modules/reports/borrowers_stats.tt | 2 +- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../prog/en/modules/reports/dictionary.tt | 2 +- .../prog/en/modules/reports/guided_reports_start.tt | 4 ++-- .../prog/en/modules/reports/issues_stats.tt | 6 +++--- .../prog/en/modules/reports/itemtypes.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 6 +++--- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../prog/en/modules/serials/subscription-add.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tags/review.tt | 6 +++--- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 12 ++++++------ .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 9fedd039e9..c50629c038 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -16,14 +16,14 @@
    • -
  • +
  • [% IF contact.acqprimary %] [% ELSE %] [% END %] -
  • +
  • [% IF contact.serialsprimary %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 0e3db4ff26..fc227477a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -664,7 +664,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
  • - + [% IF ( show_mine ) %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index d4d01309d0..1c2bf2360d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -252,7 +252,7 @@ Select All branches if this category type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
    • -
  • +
  • + [% END %] [% END %] @@ -232,7 +232,7 @@
    Location and availability
    -

    +

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 355cfa4df8..53e5854747 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -203,9 +203,9 @@
  • -
    +
    - +
  • [% IF ( dateformat == "metric" ) %] [% UNLESS ( opadd ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index a03b05898e..04c09e897f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -282,19 +282,19 @@ Cell value
    1. - +
    2. - +
    3. - +
    4. - +
    5. - +
    @@ -308,7 +308,7 @@
  • - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt index 5f7f701853..f9c5aa0194 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -97,7 +97,7 @@ $(document).ready(function(){
  • - + - + - + - [%- FOREACH area IN areas -%] [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 0a7d80ffbe..dee52edade 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -414,7 +414,7 @@ canned reports and writing custom SQL reports.

    Build a report

    -Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and Choose report visibility +Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and choose report visibility
    1. @@ -1086,7 +1086,7 @@ $("#column_submit").submit(function() { [% END %] - +
      2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index 789ae512c3..1bc8c23e40 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -245,8 +245,8 @@
    -
    Cell value
      2. -
    +
    Cell value
      2. +
    Output @@ -257,7 +257,7 @@
  • - + [%- FOREACH branchloo IN branchloop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt index ac19ed7e50..8ef7b22d41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -323,8 +323,8 @@
    • -
    Cell value
      2. -
    +
    Cell value
      2. +
    Output @@ -335,7 +335,7 @@
  • - + - + [% ELSE %] @@ -550,7 +550,7 @@ $(document).ready(function() { [% END %]
  • - +
  • @@ -722,7 +722,7 @@ $(document).ready(function() {
  • - + +
    • -
  • +
    • -
  • +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt index 785d853008..35b7b46132 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -373,7 +373,7 @@ function reloadPage(p) {
    • -
  • +
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt index 83bc50a533..5362fa9851 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -106,21 +106,21 @@ $(document).ready(function() {
    1. File containing a list of biblio numbers with one biblio number per line. This list works as a filter: it is compatible with other parameters.
      2. -
      3. +
    Options
    1. - +
    2. - +
    3. - + separate by a blank. (e.g., 100a 200 606)
    @@ -185,14 +185,14 @@ $(document).ready(function() {
    1. File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters.
      2. -
      3. +
    Options
    1. - + separate by a blank. (e.g., 100a 200 606)
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index 38a3598f76..ca4588a9cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -79,7 +79,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]
    OPAC and Koha news
    1. - +