Bugzilla – Attachment 146193 Details for
Bug 32743
Reindent the invoice details page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32743: (follow-up) Add markup comments
Bug-32743-follow-up-Add-markup-comments.patch (text/plain), 8.08 KB, created by
Katrin Fischer
on 2023-02-05 12:03:31 UTC
(
hide
)
Description:
Bug 32743: (follow-up) Add markup comments
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-02-05 12:03:31 UTC
Size:
8.08 KB
patch
obsolete
>From c3a76245f77a7b949f7699af3064ca37d0fb42a9 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 30 Jan 2023 12:28:03 +0000 >Subject: [PATCH] Bug 32743: (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> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/acqui/invoice.tt | 44 +++++++++---------- > 1 file changed, 22 insertions(+), 22 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 2f3484387b..b3d0e7d6ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -127,7 +127,7 @@ > <input type="checkbox" name="close" id="close" /> > </li> > [% END %] >- [% END %] >+ [% END # /IF ( invoiceclosedate ) %] > </ol> > > <fieldset class="rows"> >@@ -200,8 +200,8 @@ > [% ELSE %] > <p title="Define values in authorised value category ADJ_REASON to enable">None</p> > <input type="hidden" name="reason" id="reason_[% adjustment.adjustment_id | html %]" value="" /> >- [% END %] >- [% END %] >+ [% END # /IF reasons.0 %] >+ [% END # /IF readonly %] > </td> > <td> > [% IF readonly %] >@@ -229,16 +229,16 @@ > <input type="checkbox" name="encumber_open" id="encumber_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment_id | html %]" /> > [% END %] > </td> >- [% END %] >+ [% END # /IF adjustment.encumber_open %] > [% UNLESS readonly %] > <td> > <a class="btn btn-default btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% END %] > </tr> >- [% END %] >- </table> >- [% END %] >+ [% END # /FOREACH adjustment %] >+ </table> <!-- /#invoice_adj_table --> >+ [% END # /IF adjustments %] > > [% UNLESS readonly %] > <p> >@@ -272,7 +272,7 @@ > <span>None</span> > <div class="hint">Define values in authorised value category ADJ_REASON to enable</div> > </li> >- [% END %] >+ [% END # /IF reasons.0 %] > <li> > <label for="note_new">Note: </label> > <input type="text" name="note" id="note_new" value=""/> >@@ -290,12 +290,12 @@ > <a href="#" id="cancel_invoice_adjustment" class="toggle_invoice_adjustment" style="display:none"><i class="fa fa-remove"></i> Cancel</a> > </li> > </ol> >- </fieldset> >+ </fieldset> <!-- /#add_invoice_adjustment --> > <fieldset class="action"> > <input type="hidden" name="op" value="mod_adj" /> > <input type="submit" class="btn btn-primary" value="Update adjustments" /> > </fieldset> >- [% END %] >+ [% END #/UNLESS readonly %] > </fieldset> > </form> > >@@ -382,7 +382,7 @@ > <a href="#" class="modify_fund" data-order_id="[% order.ordernumber | html %]" data-budget_id="[% order.budget_id | html %]" data-sort_1="[% order.sort1 | html %]" data-sort_2="[% order.sort2 | html %]" data-sort1="[% order.sort1 | html %]" data-sort2="[% order.sort2 | html %]">Modify fund</a> > </td> > </tr> >- [% END %] >+ [% END # /FOREACH order %] > </tbody> > <tfoot> > [% FOR tf IN foot_loop %] >@@ -398,7 +398,7 @@ > <th>[% tf.tax_value | $Price %]</th> > <th> </th> > </tr> >- [% END %] >+ [% END # /FOR tf %] > <tr> > <th colspan="2">Total ([% currency.symbol | html %])</th> > <th class="tax_excluded"></th> >@@ -424,7 +424,7 @@ > <th> </th> > </tr> > </tfoot> >- </table> >+ </table> <!-- /#orderst --> > [% ELSE %] > <div class="dialog message"> > <p>No orders yet</p> >@@ -432,7 +432,7 @@ > <p>Adjustments plus shipping: [% total_adj + shipmentcost | $Price %]</p> > [% END %] > </div> >- [% END %] >+ [% END # /IF orders_loop.size %] > [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %] > <br /> > <h2>Files attached to invoice</h2> >@@ -459,8 +459,8 @@ > </tr> > [% END %] > </tbody> >- </table> >- [% END %] >+ </table> <!-- /#invoice_files_table --> >+ [% END # /IF AcqEnableFiles %] > </fieldset> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >@@ -500,10 +500,10 @@ > </div> > <div class="modal-footer"> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >- </div> >- </div> >- </div> >-</div> >+ </div> <!-- /.modal-footer --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+</div> <!-- /#updateFund.modal --> > > <span style="display:none;" id="all_fund_dropdown"> > [% FOREACH budget IN budgets %] >@@ -512,8 +512,8 @@ > [% ELSE %] > <option value="[% budget.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat |html %]">[% budget.b_txt | html %] (inactive)</option> > [% END %] >- [% END %] >-</span> >+ [% END # /FOREACH budget %] >+</span> <!-- /#all_fund_dropdown --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32743
:
145797
|
145798
|
145833
|
145885
|
145886
|
146043
|
146044
|
146192
| 146193