From 094871ffa2755717c089e806c12e05c2e6a0725f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 3 Jan 2023 20:25:31 +0000 Subject: [PATCH] Bug 32562: (follow-up) Add markup comments This patch adds comments to the template to highlight the markup structure. This patch should have no effect on the page's appearance or functionality. Signed-off-by: Lucas Gass Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 61b1b12dda1c7d60d092ccb2a97a3108b1058b86) Signed-off-by: Matt Blenkinsop --- .../intranet-tmpl/prog/en/modules/about.tt | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index cf138c1e39..816048f349 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -129,7 +129,7 @@ not running [% END %] - [% END %] + [% END # /IF elasticsearch_fatal_config_error %] [% END %] @@ -230,7 +230,7 @@ - +
@@ -258,7 +258,7 @@ [% ELSE %] - [% END %] + [% END # /FOREACH ro %] - [% END %] + [% END # /FOREACH tabl %]
[% END %] - [% END %] + [% END # /IF ro.current %] [% IF ( ro.name ) %] [% ro.name | html %] @@ -276,11 +276,11 @@ Not Installed [% END %]
-
+
[% IF warnRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues || oauth2_missing_deps || bad_yaml_prefs || warnRelationships || log4perl_errors || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnConnectBroker || elasticsearch_has_missing %] @@ -288,7 +288,7 @@

Warning regarding current user

You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.

Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.

- [% END %] + [% END # /IF warnIsRootUser %] [% IF has_ai_issues %]

Data problems

@@ -357,13 +357,13 @@

[% END %]
- [% END %] + [% END # /IF has_ai_issues %] [% IF warnRelationships %]

Patron relationship problems

[% IF bad_relationships_count %]

Your database contained guarantee/guarantor pairs with no defined relationship. They have been set the value '_bad_data' in the [% "borrowers.relationship" | $HtmlTags tag="strong" %] and/or [% "borrower_relationships.relationship" | $HtmlTags tag="strong" %] columns. Fix them manually by recreating those relationships, or have your system's administrator correct the values.

- [% END %] + [% END # /IF bad_relationships_count %] [% IF wrong_relationships %]

The following values have been used for guarantee/guarantor relationships, but do not exist in the 'borrowerRelationship' system preference:

@@ -373,8 +373,8 @@ [% END %]

If the relationship is one you want, please add it to the 'borrowerRelationship' system preference, otherwise have your system's administrator correct the values in [% "borrowers.relationship" | $HtmlTags tag="strong" %] and/or [% "borrower_relationships.relationship" | $HtmlTags tag="strong" %] in the database.

- [% END %] - [% END %] + [% END # /IF wrong_relationships %] + [% END # /IF warnRelationships %] [% IF log4perl_errors %]

Logging system does not behave correctly

@@ -386,8 +386,8 @@ [% CASE 'cannot_init_module' %]The Koha::Logger module cannot be initiated correctly (check the log file). [% CASE %]Unknown error '[% e | html %]'. [% END %] - [% END %] - [% END %] + [% END # /FOR e %] + [% END # /IF log4perl_errors %] [% IF warnConnectBroker %]

Impossible to connect to the message broker

@@ -396,7 +396,7 @@ Maybe it is not installed and configured correctly?
Contact your system administrator. - [% END %] + [% END # /IF warnConnectBroker %] [% IF warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || invalid_yesno.count || warnNoActiveCurrency || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || warnXSLT || oauth2_missing_deps || bad_yaml_prefs || warnIssuingRules || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size %]

Warnings regarding the system configuration

@@ -579,7 +579,7 @@ [% END %] - [% END %] + [% END # /IF warnPrefRequireChoosingExistingAuthority %] [% IF xml_config_warnings.size %] @@ -669,10 +669,10 @@ Please generate a key. We recommend one of at least 32 bytes. (You might use 'pwgen 32' to do so.) - [% END %] - [% END %] + [% END # /IF config_entry.error %] + [% END # /FOREACH config_entry %]
- [% END %] + [% END # /IF xml_config_warnings.size %] [% IF warnIssuingRules %] @@ -684,9 +684,9 @@ The [% unit.branchcode || 'branchcode=default' | html %], [% unit.categorycode || 'categorycode=default' | html %], [% unit.itemtype || 'itemtype=default' | html %]issuingrule will fallback to 'days' for 'lengthunit' as it is incorrectly defined as [% unit.rule_value | html %]. - [% END %] + [% END # /FOREACH unit %]
- [% END %] + [% END # /IF warnIssuingRules %] [% IF elasticsearch_has_missing %] @@ -702,12 +702,12 @@ [% END %] [% END %]
- [% END %] + [% END # /IF elasticsearch_has_missing %] [% ELSE %]

No warnings.

- [% END %] -
+ [% END # /IF warnRequireChoosingExistingAuthority... %] +

Special thanks to the following organizations

@@ -763,7 +763,7 @@
Could not read the teams.yaml file. Please make sure <docdir> is correctly defined in koha-conf.xml.
- [% END %] + [% END # /maintenance_team %]

Koha development team

[% IF contributors.size %] @@ -776,7 +776,7 @@
Could not read the contributors.yaml file. Please make sure <docdir> is correctly defined in koha-conf.xml.
- [% END %] + [% END # /IF contributors.size %]

Contributing companies and institutions

@@ -894,7 +894,7 @@
  • Nicholas Rosasco (Documentation Compiler)
  • Regula Sebastiao
    • -
    +

    Koha

    @@ -1107,7 +1107,7 @@ Enquire.js licensed under the MIT license.

    -
    +

    Translation

    @@ -1159,7 +1159,7 @@
  • Українська (Ukrainian) Victor Titarchuk and Serhij Dubyk
    • -
    +

    Koha history timeline

    @@ -1185,7 +1185,7 @@ Could not read the history.txt file. Please make sure <docdir> is correctly defined in koha-conf.xml.
    [% END %] - +

    22.11

    @@ -1202,11 +1202,11 @@ She was also a practicing Justice of the Peace, a stalwart of the Levin Pottery Club and much loved mother of Simon and Jeremy, and grandmother of Ben, Toby, Anna, Charlotte and Billy.

    -
    - - - - + + + + + [% MACRO jsinclude BLOCK %]