Attachment 145822 Details for Bug 32482 – Bug 32482: (follow-up) Add markup comments

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

Bug-32482-follow-up-Add-markup-comments.patch (text/plain), 5.57 KB, created by Katrin Fischer on 2023-01-30 22:25:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-01-30 22:25:39 UTC

Size: 5.57 KB

patch

obsolete

>From 821585f222f65e07722a3620cb5bcefa7d03dd27 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 16 Dec 2022 12:23:10 +0000
>Subject: [PATCH] Bug 32482: (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/circ/waitingreserves.tt   | 34 +++++++++----------
> 1 file changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index e8d2e551f7..10c0aa5fce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -72,7 +72,7 @@
>                                             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
>                                         </form>
>                                     </div>
>-                                [% END %]
>+                                [% END # /IF messagetransfert%]
>                                 [% IF ( waiting ) %]
>                                     <div class="dialog message">
>                                         <h2>This item is on hold for pick-up at your library</h2>
>@@ -83,8 +83,8 @@
>                                             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
>                                         </form>
>                                     </div>
>-                                [% END %]
>-                            [% END %]
>+                                [% END # /IF waiting %]
>+                            [% END # /FOREACH cancel_result %]
>                         [% ELSE %]
>                             [% IF enqueued %]
>                                 <div class="dialog message">
>@@ -105,7 +105,7 @@
>                                             Holds with cancellation requests: [% cancel_reqs_count | html %]
>                                         </a>
>                                     </li>
>-                                </ul>
>+                                </ul> 
>                                 <div class="tab-content">
>                                     <div role="tabpanel" class="tab-pane active" id="holdswaiting">
>                                         [% IF ( reserveloop ) %]
>@@ -116,7 +116,7 @@
>                                         [% ELSE %]
>                                             <div class="dialog message">No holds found.</div>
>                                         [% END %]
>-                                    </div>
>+                                    </div> 
>                                     <div role="tabpanel" class="tab-pane" id="holdsover">
>                                         [% IF ( ReservesMaxPickUpDelay ) %]
>                                             <p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>
>@@ -141,18 +141,18 @@
>                                             [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
>                                         [% ELSE %]
>                                             <div class="dialog message">No holds found.</div>
>-                                        [% END %]
>-                                    </div>
>+                                        [% END # /IF( overloop ) %]
>+                                    </div> 
>                                     <div role="tabpanel" class="tab-pane" id="holdscancelled">
>                                         [% IF cancel_reqs_count %]
>                                             [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %]
>                                         [% ELSE %]
>                                             <div class="dialog message">No holds found.</div>
>                                         [% END %]
>-                                    </div>
>-                                </div>
>-                            </div>
>-                        [% END %]
>+                                    </div> 
>+                                </div> 
>+                            </div> 
>+                        [% END # /IF ( cancel_result ) %]
>                     </div> 
> 
>                     [% IF Koha.Preference('CircSidebar') %]
>@@ -190,16 +190,16 @@
>                                 [% END %]
>                             </select>
>                         [% END %]
>-                    </fieldset>
>-                </div>
>+                    </fieldset> 
>+                </div> 
> 
>                 <div class="modal-footer">
>                     <button id="cancelModalConfirmBtn" type="button" class="btn btn-danger">Confirm cancellation</button>
>                     <a href="#" data-dismiss="modal">Cancel</a>
>-                </div>
>-            </div>
>-        </div>
>-    </div>
>+                </div> 
>+            </div> 
>+        </div> 
>+    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32482: 144674 | 144675 | 144709 | 144710 | 145821 | 145822