Attachment 141186 Details for Bug 31625 – Bug 31625: (follow-up) Markup comments

[patch] Bug 31625: (follow-up) Markup comments

Bug-31625-follow-up-Markup-comments.patch (text/plain), 4.98 KB, created by Katrin Fischer on 2022-10-01 19:55:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-10-01 19:55:09 UTC

Size: 4.98 KB

patch

obsolete

>From 42a6364b6cacaab8b33130bad3c5109fbf4b8466 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 26 Sep 2022 15:02:25 +0000
>Subject: [PATCH] Bug 31625: (follow-up) Markup comments
>
>This patch adds comments to the templates to highlight the markup
>structure.
>
>This patch should have no effect on the pages' appearance or
>functionality.
>
>Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../intranet-tmpl/prog/en/includes/tools-menu.inc      | 10 +++++-----
> .../intranet-tmpl/prog/en/modules/tools/tools-home.tt  | 10 +++++-----
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>index e9a983df88..849b17120c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>@@ -45,7 +45,7 @@
>                     <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
>                 [% END %]
>             </ul>
>-        [% END %]
>+        [% END # /IF ( CAN_user_tools_manage_patron_lists... %]
> 
>         [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel  || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory  || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections  || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') )  || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import  || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %]
>             <h5>Catalog</h5>
>@@ -95,7 +95,7 @@
>                     <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li>
>                 [% END %]
>             </ul>
>-        [% END %]
>+        [% END # /IF ( CAN_user_tools_items_batchdel... %]
> 
>         [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( plugins_enabled && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
>             <h5>Additional tools</h5>
>@@ -133,6 +133,6 @@
>                     <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li>
>                 [% END %]
>             </ul>
>-        [% END %]
>-    </div>
>-</div>
>+        [% END # /IF ( CAN_user_tools_edit_calendar... %]
>+    </div> 
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>index f84dea7e64..5aee6ec6f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>@@ -101,7 +101,7 @@
>                     <dd>Upload patron images in a batch or one at a time</dd>
>                 [% END %]
>             </dl>
>-        </div>
>+        </div> 
> 
>         <div class="col-sm-4 col-sm-push-4">
>             [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( plugins_enabled && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
>@@ -158,7 +158,7 @@
>                             [% END %]
>                         </ul>
>                     </dd>
>-                [% END %]
>+                [% END # /IF ( plugins_enabled... %]
> 
>                 [% IF ( CAN_user_tools_upload_general_files ) %]
>                     <dt><a href="/cgi-bin/koha/tools/upload.pl">Upload</a></dt>
>@@ -187,7 +187,7 @@
>                     <dd>View transaction history for the current cash register</dd>
>                 </dl>
>             [% END %]
>-        </div>
>+        </div> 
> 
>         <div class="col-sm-4 col-sm-pull-4">
>             [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel  || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory  || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections  || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') )  || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import  || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %]
>@@ -274,7 +274,7 @@
>                     <dd>Utility to upload scanned cover images for display in OPAC</dd>
>                 [% END %]
>             </dl>
>-        </div>
>-    </div>
>+        </div> 
>+    </div> 
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31625: 140990 | 140991 | 141002 | 141003 | 141185 | 141186