Bugzilla – Attachment 92336 Details for
Bug 23448
Clean up subscription detail template
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23448: (follow-up) Add comments on markup structure
Bug-23448-follow-up-Add-comments-on-markup-structu.patch (text/plain), 13.21 KB, created by
Katrin Fischer
on 2019-08-17 19:12:32 UTC
(
hide
)
Description:
Bug 23448: (follow-up) Add comments on markup structure
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2019-08-17 19:12:32 UTC
Size:
13.21 KB
patch
obsolete
>From 109a23edf9227323d9808ac3695b5ace9b84d9d0 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 12 Aug 2019 18:08:37 +0000 >Subject: [PATCH] Bug 23448: (follow-up) Add comments on markup structure > >This patch adds comments to the markup in order to highlight the >structure of the page. > >Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/serials/subscription-detail.tt | 131 +++++++++++---------- > 1 file changed, 66 insertions(+), 65 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index 55684b2860..03a7bc9592 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -61,7 +61,7 @@ > <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't delete (N)</button> > </form> > </div> >- [% END %] <!-- NEEDSCONFIRMATION --> >+ [% END # /IF NEEDSCONFIRMATION %] > > [% IF mana_code.defined %] > <div id="alert-community" class="dialog message"> >@@ -117,8 +117,8 @@ > </li> > <li><span class="label">Grace period:</span> [% graceperiod | html %]</li> > </ol> >- </div> >- </div> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-6 --> > <div class="col-sm-6"> > <div class="rows"> > <ol> >@@ -134,9 +134,9 @@ > [% END %] > [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %] > </ol> >- </div> >- </div> >- </div> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-6 --> >+ </div> <!-- /.row --> > > [% IF available_additional_fields %] > <hr> >@@ -147,11 +147,11 @@ > <ol> > [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] > </ol> >- </div> >- </div> >- </div> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-6 --> >+ </div> <!-- /.row --> > [% END %] >- </div> >+ </div> <!-- /#subscription_info --> > > <div id="subscription_planning"> > <div class="row"> >@@ -229,10 +229,10 @@ > [% monthlength | html %]</li> > [% END %] > </ol> >- </div> >- </div> >- </div> >- </div> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sd-12 --> >+ </div> <!-- /.row --> >+ </div> <!-- /#subscription_planning --> > > <div id="subscription_numbering" style="display:none;"> > <h3>Numbering calculation</h3> >@@ -294,7 +294,8 @@ > <td>[% lastvalue3 | html %]</td> > </tr> > </table> >- </div> >+ </div> <!-- /#subscription_numbering --> >+ > <div id="subscription_issues"> > <table> > <tr> >@@ -346,9 +347,9 @@ > [% IF ( serialslis.status8 ) %]Stopped[% END %] > </td> > </tr> >- [% END %] >+ [% END # /FOREACH serialslist %] > </table> >- </div> >+ </div> <!-- /#subscription_issues --> > > <div id="subscription_summary"> > <div class="row"> >@@ -366,10 +367,10 @@ > <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li> > <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li> > </ol> >- </div> >- </div> >- </div> >- </div> >+ </div> <!-- /.rows --> >+ </div> <!-- /.col-sm-12 --> >+ </div> <!-- /.row --> >+ </div> <!-- /#subscription_summary --> > > [% IF orders_grouped.size %] > <div id="acquisition_details"> >@@ -433,52 +434,52 @@ > </tr> > [% FOR order IN parent_order.orders %] > <tr data-tt-id="0" data-tt-parent-id="[% parent_tree_id | html %]"> >- <td> >- [% IF order.invoice %] >- [% IF CAN_user_acquisition %] >- <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page"> >- [% order.invoice.invoicenumber | html %]</a> >- [% ELSE %] >- [% order.invoice.invoicenumber | html %] >- [% END %] >- [% END %] >- </td> >- <td></td> [%# basket %] >- <td>[% order.ordernumber | html %]</td> >- <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td> >- <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td> >- <td> >- [% SWITCH order.orderstatus %] >- [% CASE 'new' %]<span title="status_1">New</span> >- [% CASE 'ordered' %]<span title="status_2">Ordered</span> >- [% CASE 'partial' %]<span title="status_3">Partial</span> >- [% CASE 'complete' %]<span title="status_4">Complete</span> >- [% CASE 'cancelled' %]<span title="status_5">Cancelled</span> >- [% END %] >- </td> >- <td>[% order.order_internalnote | html %]</td> >- <td>[% order.order_vendornote | html %]</td> >- <td>[% order.fund.budget_name | html %]</td> >- <td>[% order.quantity | html %]</td> >- <td> >- [% UNLESS order.datereceived %] >- [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] >- [% END %] >- </td> >- <td> >- [% IF order.datereceived %] >- [%# FIXME What if unitprice has not been filled? %] >- [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] >+ <td> >+ [% IF order.invoice %] >+ [% IF CAN_user_acquisition %] >+ <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page"> >+ [% order.invoice.invoicenumber | html %]</a> >+ [% ELSE %] >+ [% order.invoice.invoicenumber | html %] >+ [% END %] > [% END %] >- </td> >- </tr> >- [% END %] >- [% END %] >+ </td> >+ <td></td> [%# basket %] >+ <td>[% order.ordernumber | html %]</td> >+ <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td> >+ <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td> >+ <td> >+ [% SWITCH order.orderstatus %] >+ [% CASE 'new' %]<span title="status_1">New</span> >+ [% CASE 'ordered' %]<span title="status_2">Ordered</span> >+ [% CASE 'partial' %]<span title="status_3">Partial</span> >+ [% CASE 'complete' %]<span title="status_4">Complete</span> >+ [% CASE 'cancelled' %]<span title="status_5">Cancelled</span> >+ [% END %] >+ </td> >+ <td>[% order.order_internalnote | html %]</td> >+ <td>[% order.order_vendornote | html %]</td> >+ <td>[% order.fund.budget_name | html %]</td> >+ <td>[% order.quantity | html %]</td> >+ <td> >+ [% UNLESS order.datereceived %] >+ [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] >+ [% END %] >+ </td> >+ <td> >+ [% IF order.datereceived %] >+ [%# FIXME What if unitprice has not been filled? %] >+ [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] >+ [% END %] >+ </td> >+ </tr> >+ [% END # /FOR order %] >+ [% END # /FOR ordernumber %] > </tbody> >- </table> >- </div> >- [% END %] >- </div> >+ </table> <!-- /#orders --> >+ </div> <!-- /#acquisition_details --> >+ [% END # IF orders_grouped.size %] >+ </div> <!-- /#subscription_description --> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=92336">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23448
:
92155
|
92156
|
92326
|
92327
|
92335
| 92336