Bugzilla – Attachment 145693 Details for
Bug 32733
Add more page-sections to basket summary page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32733: (follow-up) Reorganize classification of information
Bug-32733-follow-up-Reorganize-classification-of-i.patch (text/plain), 11.03 KB, created by
Martin Renvoize (ashimema)
on 2023-01-26 13:38:20 UTC
(
hide
)
Description:
Bug 32733: (follow-up) Reorganize classification of information
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-01-26 13:38:20 UTC
Size:
11.03 KB
patch
obsolete
>From 768836b81f8395a9fef461040aa54464d4f00cb7 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 26 Jan 2023 12:12:34 +0000 >Subject: [PATCH] Bug 32733: (follow-up) Reorganize classification of > information > >If we're dividing the sections into labeled "Information" and >"Settings," I propose that we try to put under "Information" lines >which are just for display, and under "Settings" lines which allow the >user to change things: Managed by, managing library, basket group, etc. > >This patch moves a few lines to accomplish this. The only other change >is to remove a "float:left" inline style from the "Change library" form >to make it display better. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/acqui/basket.tt | 98 ++++++++++--------- > 1 file changed, 51 insertions(+), 47 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 0899eff886c..bab491b95b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -261,6 +261,55 @@ > [% IF ( authorisedbyname ) %] > <li><span class="label">[% tp('basket created by', 'Created by:') | html %]</span> [% authorisedbyname | html %]</li> > [% END %] >+ >+ [% IF ( creationdate ) %] >+ <li><span class="label">Opened on:</span> [% creationdate | $KohaDates %]</li> >+ [% END %] >+ [% IF ( closedate ) %] >+ <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li> >+ [% END %] >+ >+ [% IF ( ediaccount ) %] >+ [%- BLOCK edi_status -%] >+ [%- SWITCH edi_order.status -%] >+ [%- CASE 'Pending' -%]<span>Pending</span> >+ [%- CASE 'Sent' -%]<span>Sent</span> >+ [%- CASE 'Processed' -%]<span>Processed</span> >+ [%- END -%] >+ [%- END -%] >+ [% IF ( edi_order ) %] >+ <li><span class="label">EDI status:</span> [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])</li> >+ [% ELSE %] >+ <li><span class="label">EDI status:</span> Not ordered</li> >+ [% END %] >+ [% END %] >+ [% IF ( estimateddeliverydate ) %] >+ <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li> >+ [% END %] >+ <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li> >+ >+ [% IF basket.create_items %] >+ <li> >+ <span class="label">Create items when:</span> >+ [% SWITCH basket.create_items %] >+ [% CASE 'receiving' %]<span>Receiving items</span> >+ [% CASE 'cataloguing' %]<span>Cataloguing items</span> >+ [% CASE %]<span>Placing orders</span> >+ [% END %] >+ </li> >+ [% END %] >+ >+ [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] >+ >+ </ol> >+ </div> <!-- /.page-section --> >+ </div> <!-- /.col-sm-6 --> >+ >+ <div class="col-sm-6"> >+ <div class="page-section"> >+ <h2>Settings</h2> >+ >+ <ol> > <li id="managedby"> > <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> > <span class="label">Managed by:</span> >@@ -299,7 +348,7 @@ > [% IF branches_loop.size %] > <li id="managing_library_entry" style="display:none;"> > <span class="label"> </span> >- <div style="float:left"> >+ <div> > <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> > <select id="select_managing_library" name="branch"> > <option value="">(no library)</option> >@@ -318,54 +367,9 @@ > </div> > </li> <!-- #/managing_library_entry --> > [% END # /IF branches_loop.size %] >- >- [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] >- >- </ol> >- </div> <!-- /.page-section --> >- </div> <!-- /.col-sm-6 --> > >- <div class="col-sm-6"> >- <div class="page-section"> >- <h2>Settings</h2> >- <ol> >- [% IF ( creationdate ) %] >- <li><span class="label">Opened on:</span> [% creationdate | $KohaDates %]</li> >- [% END %] >- [% IF ( closedate ) %] >- <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li> >- [% END %] >- [% IF ( ediaccount ) %] >- [%- BLOCK edi_status -%] >- [%- SWITCH edi_order.status -%] >- [%- CASE 'Pending' -%]<span>Pending</span> >- [%- CASE 'Sent' -%]<span>Sent</span> >- [%- CASE 'Processed' -%]<span>Processed</span> >- [%- END -%] >- [%- END -%] >- [% IF ( edi_order ) %] >- <li><span class="label">EDI status:</span> [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])</li> >- [% ELSE %] >- <li><span class="label">EDI status:</span> Not ordered</li> >- [% END %] >- [% END %] >- [% IF ( estimateddeliverydate ) %] >- <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li> >- [% END %] >- <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li> >- >- [% IF basket.create_items %] >- <li> >- <span class="label">Create items when:</span> >- [% SWITCH basket.create_items %] >- [% CASE 'receiving' %]<span>Receiving items</span> >- [% CASE 'cataloguing' %]<span>Cataloguing items</span> >- [% CASE %]<span>Placing orders</span> >- [% END %] >- </li> >- [% END %] > </ol> >- >+ > [% IF ( closedate ) %] > <ol> > <li> >-- >2.39.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 32733
:
145688
|
145689
|
145691
|
145692
|
145693
|
145738
|
145739