Bugzilla – Attachment 132481 Details for
Bug 30398
Reindent invoices template
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30398: (follow-up) Add markup comments
Bug-30398-follow-up-Add-markup-comments.patch (text/plain), 7.60 KB, created by
Owen Leonard
on 2022-03-29 16:47:43 UTC
(
hide
)
Description:
Bug 30398: (follow-up) Add markup comments
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2022-03-29 16:47:43 UTC
Size:
7.60 KB
patch
obsolete
>From a29fe6d66f6e820c08204e03c8a407b8b897f799 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 29 Mar 2022 16:37:22 +0000 >Subject: [PATCH] Bug 30398: (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. >--- > .../prog/en/modules/acqui/invoices.tt | 32 +++++++++---------- > 1 file changed, 16 insertions(+), 16 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 0edb5427cb..f57a9ca11a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -105,19 +105,19 @@ > [% IF CAN_user_acquisition_edit_invoices %] > <li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li> > [% END %] >- [% END %] >+ [% END # /IF invoice.closedate %] > [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] > [% IF CAN_user_acquisition_delete_invoices %] > <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] > [% END %] > </ul> >- </div> >+ </div> <!-- /.btn-group dropup --> > </td> > </tr> >- [% END %] >+ [% END # /FOREACH invoice %] > </tbody> >- </table> >+ </table> <!-- /#[% tab | html %]resultst --> > > [% IF CAN_user_acquisition_merge_invoices %] > [% IF tab == 'closed' %] >@@ -126,9 +126,9 @@ > [% ELSE %] > <a class="btn btn-default merge" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a> > <a class="btn btn-default" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a> >- [% END %] >- [% END %] <!-- invoices_table --> >- [% END %] >+ [% END # /IF tab == 'closed' %] >+ [% END # /IF CAN_user_acquisition_merge_invoices %] >+ [% END # /BLOCK invoices_table %] > > <div id="invoicestabs" class="toptabs" style="clear:both;"> > <ul class="ui-tabs-nav"> >@@ -143,7 +143,7 @@ > <p>Your search returned no open invoices.</p> > </div> > [% END %] >- </div> <!-- opened --> >+ </div> <!-- /#opened --> > <div id="closed"> > [% IF closedinvoices %] > [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %] >@@ -152,8 +152,8 @@ > <p>Your search returned no closed invoices.</p> > </div> > [% END %] >- </div> <!-- closed --> >- </div> <!-- invoicestabs --> >+ </div> <!-- /#closed --> >+ </div> <!-- /#invoicestabs --> > > > <div id="merge_invoices"> >@@ -217,10 +217,10 @@ > </ol> > <input type="hidden" name="op" value="mod" /> > <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" /> >- </fieldset> >- </form> >- </div> >- [% ELSE %] >+ </fieldset> <!-- /.rows --> >+ </form> <!-- /#merge_invoice_form --> >+ </div> <!-- /#merge_invoices --> >+ [% ELSE # IF invoices %] > <p>Sorry, but there are no results for your search.</p> > <p>Search was: > <ul> >@@ -286,7 +286,7 @@ > [% END %] > </ul> > </p> >- [% END %]<!-- invoices --> >+ [% END # /IF invoices %] > [% ELSE %] > <p>Use the search form on the left to find invoices.</p> > [% END %]<!-- do_search --> >@@ -383,7 +383,7 @@ > <fieldset class="action"> > <input type="submit" value="Search" /> > </fieldset> >- </fieldset> >+ </fieldset> <!-- /.sidebar.brief --> > <input type="hidden" name="op" id="op" value="do_search" /> > </form> > [% INCLUDE 'acquisitions-menu.inc' %] >-- >2.20.1
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 30398
:
132480
|
132481
|
132788
|
132789
|
132859
|
132860