Attachment 117416 Details for Bug 26959 – Bug 26959: (follow-up) Add markup comments

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

Bug-26959-follow-up-Add-markup-comments.patch (text/plain), 7.05 KB, created by Katrin Fischer on 2021-02-28 17:21:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2021-02-28 17:21:06 UTC

Size: 7.05 KB

patch

obsolete

>From ee5018eeb625693b8badcc21edd3802fa0af275c Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 6 Nov 2020 18:29:56 +0000
>Subject: [PATCH] Bug 26959: (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: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/tools/batchMod-edit.tt         | 44 +++++++++++-----------
> 1 file changed, 22 insertions(+), 22 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>index 4b42789a3d..34ce11735c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>@@ -96,9 +96,9 @@
>                     [% ELSE %]
>                         <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a>
>                     [% END %]
>-              </fieldset>
>-            </div>
>-        [% END %]
>+                </fieldset>
>+            </div> 
>+        [% END # /IF show %]
> 
>         [% IF ( barcode_not_unique ) %]
>             <div class="dialog alert">
>@@ -132,7 +132,7 @@
>                     <h4>The following barcodes were found: </h4>
>                 [% END %]
>             [% END %]
>-        [% END %] 
>+        [% END # /IF notfoundbarcodes.size %]
> 
>         [% IF ( notfounditemnumbers.size ) %]
>             <div class="dialog alert">
>@@ -154,7 +154,7 @@
>                     <h4>The following itemnumbers were found: </h4>
>                 [% END %]
>             [% END %]
>-        [% END %] 
>+        [% END # /IF notfounditemnumbers.size %]
> 
> 
>         <form name="f" action="batchMod.pl" method="post">
>@@ -194,7 +194,7 @@
>                                 <label for="checkheader[% loop.count | html %]">[% item_header_loo.header_value | html %]</label>
>                             </span>
>                         [% END %]
>-                    </p>
>+                    </p> 
> 
>                     <table id="itemst">
>                         <thead>
>@@ -242,7 +242,7 @@
>                                             [% ELSE %]
>                                                 <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% item_loo.biblionumber | uri %]" title="No holds on this record" >
>                                             [% END %]
>-                                        [% END %]
>+                                        [% END # /IF item_loo.holds %]
>                                         [% IF item_loo.holds %]
>                                             [% item_loo.item_holds | html %]/[% item_loo.holds | html %]
>                                         [% ELSE %]
>@@ -256,11 +256,11 @@
>                                         </td>
>                                     [% END %]
>                                 </tr>
>-                            [% END %]
>+                            [% END # /FOREACH item_loo %]
>                         </tbody>
>-                    </table>
>-                </div>
>-            [% END %]
>+                    </table> 
>+                </div> 
>+            [% END # /IF item_loop %]
> 
>             [% IF ( simple_items_display || job_completed ) %]
>                 [% IF ( too_many_items_display ) %]
>@@ -274,8 +274,8 @@
>                             </li>
>                         [% END %]
>                     </ul>
>-                [% END %]
>-            [% END %]
>+                [% END # /IF too_many_items_display %]
>+            [% END # /IF simple_items_display %]
> 
>             [% IF ( show ) %]
> 
>@@ -286,7 +286,7 @@
>                     [% FOREACH itemnumber IN itemnumbers_array %]
>                         <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
>                     [% END %]
>-                [% END %]
>+                [% END # /IF too_many_items_process %]
> 
>                 [% UNLESS (too_many_items_process) %]
>                     <div id="cataloguing_additem_newitem">
>@@ -334,7 +334,7 @@
>                                                 <input type="hidden" tabindex="1" id="[%- mv.id | html -%]" name="field_value" class="input_marceditor" size="50" maxlength="255" value="[%- mv.value | html -%]" />
>                                             [% ELSIF ( mv.type == 'textarea' ) %]
>                                                 <textarea tabindex="1" id="[%- mv.id | html -%]" name="field_value" class="input_marceditor" size="50" maxlength="255">[%- mv.value | html -%]"</textarea>
>-                                            [%- END -%]
>+                                            [%- END # /IF mv.type == ... -%]
> 
>                                             <span name="regex_fields" style="display: none;">
>                                                 s/<input type="text" id="[% mv.id | html %]" name="regex_search" placeholder="regex pattern" />/
>@@ -361,9 +361,9 @@
>                                                 </a>
>                                             [% END %]
>                                             <span class="hint" id="hint[% ite.tag | html %][% ite.subfield | html %][% ite.random | html %]"></span>
>-                                        </div>
>+                                        </div> 
>                                     </li>
>-                                [% END %]
>+                                [% END # /FOREACH ite %]
>                             </ol>
>                         </fieldset>
> 
>@@ -391,11 +391,11 @@
>                             <input type="submit" id="mainformsubmit" value="Save" />
>                             <a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel">Cancel</a>
>                         </fieldset>
>-                    </div>
>+                    </div> 
>                 [% ELSE %]
>                     <p><a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p>
>-                [% END %]
>-            [% ELSE %] 
>+                [% END # /UNLESS too_many_items_process %]
>+            [% ELSE # IF show %]
>                 <fieldset class="action">
>                     [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
>                         [% IF searchid %]
>@@ -408,7 +408,7 @@
>                     [% ELSE %]
>                         <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a>
>                     [% END %]
>-                </fieldset>
>-            [% END %]
>+                </fieldset> 
>+            [% END #/IF show %]
>         </form>
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26959: 113263 | 113264 | 116264 | 116265 | 117286 | 117287 | 117415 | 117416 | 117622