Attachment 7950 Details for Bug 7166 – Follow-up fix: Markup corrections and improvements

[patch] Follow-up fix: Markup corrections and improvements

0001-Bug-7166-FOLLOW-UP-Modify-order-notes-when-basket-is.patch (text/plain), 9.36 KB, created by Owen Leonard on 2012-02-29 21:01:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2012-02-29 21:01:43 UTC

Size: 9.36 KB

patch

obsolete

>From 07063ead48cc5912f71f572c25cd3b690fd6b1d4 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 29 Feb 2012 15:39:08 -0500
>Subject: [PATCH] Bug 7166 [FOLLOW-UP] Modify order notes when basket is closed
>Content-Type: text/plain; charset="utf-8"
>
>Correcting markup issues with modordernotes.pl:
>
>- Adding "rows" and "cols" attributes to <textarea> (required)
>- Converting cancel button to link to stay consistent with
>  other pages
>- Changing page layout to fixed & centered (not sidebar needed)
>- Expanding information in breadcrumbs to match information
>  on basket.pl
>
>Changing markup around note add and edit links: Moving output
>of order note to the end of the table cell, putting it in its
>own paragraph, and adding a "Note:" label
>---
> acqui/modordernotes.pl                             |    8 ++++++++
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   12 ++++++------
> .../prog/en/modules/acqui/modordernotes.tt         |   19 +++++--------------
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    4 ++--
> 4 files changed, 21 insertions(+), 22 deletions(-)
>
>diff --git a/acqui/modordernotes.pl b/acqui/modordernotes.pl
>index 9a4c77a..ffdc9f6 100755
>--- a/acqui/modordernotes.pl
>+++ b/acqui/modordernotes.pl
>@@ -32,6 +32,7 @@ use CGI;
> use C4::Auth;
> use C4::Output;
> use C4::Acquisition;
>+use C4::Bookseller qw( GetBookSellerFromId);
> 
> my $input = new CGI;
> my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
>@@ -48,6 +49,9 @@ my $ordernumber = $input->param('ordernumber');
> my $referrer = $input->param('referrer') || $input->referer();
> 
> my $order = GetOrder($ordernumber);
>+my $basket = GetBasket($order->{basketno});
>+my ($bookseller) = GetBookSellerFromId($basket->{booksellerid});
>+
> 
> if($op and $op eq 'save') {
>     my $ordernotes = $input->param('ordernotes');
>@@ -66,6 +70,10 @@ if($op) {
> }
> 
> $template->param(
>+    basketname           => $basket->{'basketname'},
>+    basketno             => $order->{basketno},
>+    booksellerid         => $bookseller->{'id'},
>+    booksellername       => $bookseller->{'name'},
>     ordernumber => $ordernumber,
>     referrer => $referrer,
> );
>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 ce43f45..568cd00 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -279,21 +279,21 @@
>                             <p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
>                                 <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
>                                 <br />
>-                                [% IF ( books_loo.notes ) %]
>-                                    [% books_loo.notes|html %] - <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]">Change note</a>
>-                                [% ELSE %]
>-                                    <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]">Add note</a>
>-                                [% END %]
>                                 [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
>                                 [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
>                                 [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
>                                 [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
>+                                [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
>                                 [% IF ( books_loo.suggestionid ) %]
>                                     <br/>
>                                     Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %],Â [% books_loo.firstnamesuggestedby %] [% END %]
>                                     (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]">suggestion #[% books_loo.suggestionid %]</a>)
>                                 [% END %]
>-                                [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
>+                                [% IF ( books_loo.notes ) %]
>+                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
>+                                [% ELSE %]
>+                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]
>+                                [% END %]
>                             </p>
>                         </td>
>                         <td class="number">[% books_loo.rrp %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>index b25e708..0961f4a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>@@ -1,40 +1,31 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Acquisition &rsaquo; Change order notes</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript">
>-//<![CDATA[
>-function returnToReferrer() {
>-    window.location.href = "[% referrer %]";
>-}
>-//]]>
>-</script>
> </head>
> 
> <body>
> [% INCLUDE 'header.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; Change order notes</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname|html %] ([% basketno %])</a> &rsaquo; Change order notes</div>
> 
>-<div id="doc3" class="yui-t2">
>+<div id="doc" class="yui-t7">
> 
> <div id="bd">
>   <div id="yui-main">
>-    <div class="yui-b">
>       <h1>Change order notes (order no. [% ordernumber %])</h1>
>       <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
>-        <fieldset>
>+        <fieldset class="brief">
>           <label for="ordernotes">Notes:</label>
>-          <textarea id="ordernotes" name="ordernotes">[% ordernotes %]</textarea>
>+          <textarea id="ordernotes" name="ordernotes" rows="3" cols="30">[% ordernotes %]</textarea>
>         </fieldset>
>         <input type="hidden" name="referrer" value="[% referrer %]" />
>         <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
>         <input type="hidden" name="op" value="save" />
>         <fieldset class="action">
>           <input type="submit" value="Save" />
>-          <input type="button" value="Cancel" onclick="returnToReferrer();" />
>+          <a class="cancel" href="[% referrer %]">Cancel</a>
>         </fieldset>
>       </form>
>-    </div>
>   </div>
> </div>
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index 7570663..4596d04 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -248,9 +248,9 @@
>                 [% END %]
>                 <br />
>                 [% IF ( loop_order.notes ) %]
>-                    [% loop_order.notes|html %] - <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Fsupplierid=[% loop_order.supplierid %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]">Change note</a>
>+                    <p class="ordernote"><strong>Note: </strong>[% loop_order.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Fbooksellerid=[% loop_order.booksellerid %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]">Change note</a>]</p>
>                 [% ELSE %]
>-                    <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Fsupplierid=[% loop_order.supplierid %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]">Add note</a>
>+                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Fbooksellerid=[% loop_order.booksellerid %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]">Add note</a>]
>                 [% END %]
>                 </td>
>                 <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 7166: 7068 | 7736 | 7848 | 7887 | 7888 | 7889 | 7943 | 7950 | 7955 | 8289