Attachment 145072 Details for Bug 32562 – Bug 32562: (follow-up) Add markup comments

[patch] Bug 32562: (follow-up) Add markup comments

Bug-32562-follow-up-Add-markup-comments.patch (text/plain), 13.86 KB, created by Lucas Gass (lukeg) on 2023-01-05 18:54:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2023-01-05 18:54:25 UTC

Size: 13.86 KB

patch

obsolete

>From 0dc843c7605f9a5ebb7d8a471741dc600e14ab71 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <lucas@bywatersolutions.com>
>---
> .../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 cf138c1e397..816048f3495 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 @@
>                                                 <span class="bg-warning">not running</span>
>                                             [% END %]
>                                             </td>
>-                                    [% END %]
>+                                    [% END # /IF elasticsearch_fatal_config_error %]
>                                 </tr>
>                             [% END %]
>                             <tr>
>@@ -230,7 +230,7 @@
>                                 </td>
>                             </tr>
>                         </table>
>-                    </div>
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="perl">
>                         <table style="cursor:pointer">
>@@ -258,7 +258,7 @@
>                                             [% ELSE %]
>                                                 <th scope="row" style="background-color:#FF8A8A;font-weight:normal" title="Optional module missing">
>                                             [% END %]
>-                                        [% END %]
>+                                        [% END # /IF ro.current %]
>                                         [% IF ( ro.name ) %]
>                                             [% ro.name | html %]
>                                             <span style="font-weight:normal; font-size:smaller">
>@@ -276,11 +276,11 @@
>                                             <td style="font-weight:bold">Not Installed
>                                         [% END %]
>                                             </td>
>-                                    [% END %]
>+                                    [% END # /FOREACH ro %]
>                                 </tr>
>-                            [% END %]
>+                            [% END # /FOREACH tabl %]
>                         </table>
>-                    </div>
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="sysinfo">
>                         [% 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 @@
>                                 <h2>Warning regarding current user</h2>
>                                 <p>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.</p>
>                                 <p>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.</p>
>-                            [% END %]
>+                            [% END # /IF warnIsRootUser %]
> 
>                             [% IF has_ai_issues %]
>                                 <h2>Data problems</h2>
>@@ -357,13 +357,13 @@
>                                     </p>
>                                 [% END %]
>                                 <br/>
>-                            [% END %]
>+                            [% END # /IF has_ai_issues %]
> 
>                             [% IF warnRelationships %]
>                                 <h2>Patron relationship problems</h2>
>                                 [% IF bad_relationships_count %]
>                                     <p>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.</p>
>-                                [% END %]
>+                                [% END # /IF bad_relationships_count %]
> 
>                                 [% IF wrong_relationships %]
>                                     <p>The following values have been used for guarantee/guarantor relationships, but do not exist in the 'borrowerRelationship' system preference:</p>
>@@ -373,8 +373,8 @@
>                                         [% END %]
>                                     </ul>
>                                     <p>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.</p>
>-                                [% END %]
>-                            [% END %]
>+                                [% END # /IF wrong_relationships %]
>+                            [% END # /IF warnRelationships %]
> 
>                             [% IF log4perl_errors %]
>                                 <h2>Logging system does not behave correctly</h2>
>@@ -386,8 +386,8 @@
>                                         [% CASE 'cannot_init_module' %]<span>The Koha::Logger module cannot be initiated correctly (check the log file).</span>
>                                         [% CASE %]<span>Unknown error '[% e | html %]'.</span>
>                                     [% END %]
>-                                [% END %]
>-                            [% END %]
>+                                [% END # /FOR e %]
>+                            [% END # /IF log4perl_errors %]
> 
>                             [% IF warnConnectBroker %]
>                                 <h2>Impossible to connect to the message broker</h2>
>@@ -396,7 +396,7 @@
>                                 Maybe it is not installed and configured correctly?
>                                 <br/>
>                                 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 %]
>                                 <h2>Warnings regarding the system configuration</h2>
>@@ -579,7 +579,7 @@
>                                         </tr>
>                                     [% END %]
>                                 </table>
>-                            [% END %]
>+                            [% END # /IF warnPrefRequireChoosingExistingAuthority %]
> 
>                             [% IF xml_config_warnings.size %]
>                                 <table>
>@@ -669,10 +669,10 @@
>                                                     Please generate a key. We recommend one of at least 32 bytes. (You might use 'pwgen 32' to do so.)
>                                                 </td>
>                                             </tr>
>-                                        [% END %]
>-                                    [% END %]
>+                                        [% END # /IF config_entry.error %]
>+                                    [% END # /FOREACH config_entry %]
>                                 </table>
>-                            [% END %]
>+                            [% END # /IF xml_config_warnings.size %]
> 
>                             [% IF warnIssuingRules %]
>                                 <table>
>@@ -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 %].
>                                             </td>
>                                         </tr>
>-                                    [% END %]
>+                                    [% END # /FOREACH unit %]
>                                 </table>
>-                            [% END %]
>+                            [% END # /IF warnIssuingRules %]
> 
>                             [% IF elasticsearch_has_missing %]
>                                 <table>
>@@ -702,12 +702,12 @@
>                                         [% END %]
>                                     [% END %]
>                                 </table>
>-                            [% END %]
>+                            [% END # /IF elasticsearch_has_missing %]
> 
>                         [% ELSE %]
>                             <p>No warnings.</p>
>-                        [% END %]
>-                    </div>
>+                        [% END # /IF warnRequireChoosingExistingAuthority... %]
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="team">
>                         <h2>Special thanks to the following organizations</h2>
>@@ -763,7 +763,7 @@
>                             <div class="dialog alert">
>                                 Could not read the teams.yaml file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
>                             </div>
>-                        [% END %]
>+                        [% END # /maintenance_team %]
> 
>                         <h2>Koha development team</h2>
>                         [% IF contributors.size %]
>@@ -776,7 +776,7 @@
>                             <div class="dialog alert">
>                                 Could not read the contributors.yaml file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
>                             </div>
>-                        [% END %]
>+                        [% END # /IF contributors.size %]
>                         <hr>
> 
>                         <h2>Contributing companies and institutions</h2>
>@@ -894,7 +894,7 @@
>                             <li>Nicholas Rosasco (Documentation Compiler)</li>
>                             <li>Regula Sebastiao</li>
>                         </ul>
>-                    </div>
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="licenses">
>                         <h2>Koha</h2>
>@@ -1107,7 +1107,7 @@
>                             <a href="https://wicky.nillia.ms/enquire.js">Enquire.js</a> licensed under the <a href="https://github.com/WickyNilliams/enquire.js/blob/master/LICENSE">MIT license</a>.
>                         </p>
> 
>-                    </div>
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="translations">
>                         <h2>Translation</h2>
>@@ -1159,7 +1159,7 @@
>                             <li>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian) Victor Titarchuk and Serhij Dubyk</li>
>                         </ul>
> 
>-                    </div>
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="history">
>                         <h2>Koha history timeline</h2>
>@@ -1185,7 +1185,7 @@
>                                 Could not read the history.txt file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
>                             </div>
>                         [% END %]
>-                    </div>
>+                    </div> 
> 
>                     <div role="tabpanel" class="tab-pane" id="dedications">
>                         <h2>22.11</h2>
>@@ -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.
>                         </p>
>-                    </div>
>-                 </div>
>-            </div>
>-        </div>
>-    </div>
>+                    </div> 
>+                 </div> 
>+            </div> 
>+        </div> 
>+    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     <script>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32562: 145055 | 145056 | 145071 | 145072 | 145088 | 145089