Bugzilla – Attachment 20562 Details for
Bug 10402
Add multiple contacts for vendors
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10402 [Template follow-up] Add multiple contacts for vendors
Bug-10402-Template-follow-up-Add-multiple-contacts.patch (text/plain), 6.58 KB, created by
Jared Camins-Esakov
on 2013-08-22 14:19:33 UTC
(
hide
)
Description:
Bug 10402 [Template follow-up] Add multiple contacts for vendors
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2013-08-22 14:19:33 UTC
Size:
6.58 KB
patch
obsolete
>From 051aacffb29cce06e0753b38d8673742644086e6 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 1 Aug 2013 14:35:35 -0400 >Subject: [PATCH] Bug 10402 [Template follow-up] Add multiple contacts for > vendors > >This template-only follow-up tweaks the button labels and restructures >the vendor view layout a little bit to make it more amenable to multiple >contacts: > >- Add spaces after button icons >- Change "Add contact" to "Add another contact" in hopes of making it > less ambiguous whether clicking it will submit the whole form. >- Eliminate duplicate headers on the vendor view page by making the > contact name the subheading for each individual contact. > >To test, view details for vendors with one or more contacts, and try >editing to add additional contacts. Everything should look good and work >correctly. > >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >--- > .../prog/en/modules/acqui/supplier.tt | 76 +++++++++++--------- > 1 file changed, 41 insertions(+), 35 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index fcbaea4..7b92b6f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -16,11 +16,12 @@ > <input type="text" size="40" id="contact_email[% contact.id %]" name="contact_email" value="[% contact.email %]" /></li> > <li><label for="contact_notes[% contact.id %]">Notes: </label> > <textarea id="contact_notes[% contact.id %]" name="contact_notes" cols="40" rows="4">[% contnotes %]</textarea></li> >- [% IF contact.id %]<li><button class="btn" class="delete-contact"><i class="icon-remove"></i>Delete contact</li>[% END %] >+ [% IF contact.id %]<li><button class="btn" class="delete-contact"><i class="icon-remove"></i> Delete contact</li>[% END %] > </ol> > [% END %] >+ > [% BLOCK show_contact %] >- <p><span class="label">Contact name: </span>[% contact.name %]</p> >+ <h3>[% contact.name %]</h3> > <p><span class="label">Position: </span>[% contact.position %]</p> > <p><span class="label">Phone: </span>[% contact.phone %]</p> > <p><span class="label">Alternative phone: </span>[% contact.altphone %]</p> >@@ -32,6 +33,7 @@ > <p><span class="label">Notes: </span>[% contact.notes %]</p> > [% END %] > [% END %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Vendor [% bookselname %]</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >@@ -149,7 +151,7 @@ function delete_contact() { > [% INCLUDE edit_contact %] > </fieldset> > [% END %] >- <button id="add-contact" class="btn"><i class="icon-plus"></i>Add contact</button> >+ <button id="add-contact" class="btn"><i class="icon-plus"></i> Add another contact</button> > </fieldset> > </div> > <div class="yui-g"> >@@ -259,41 +261,45 @@ function delete_contact() { > [% IF ( accountnumber ) %] > <p><span class="label">Account number: </span>[% accountnumber %]</p> > [% END %] >+ >+ <div id="supplier-ordering-information"> >+ <h2>Ordering information</h2> >+ <p><strong>Vendor is: </strong> >+ [% IF ( active ) %] >+ Active >+ [% ELSE %] >+ Inactive >+ [% END %]</p> >+ <p><strong>List prices are: </strong>[% listprice %]</p> >+ <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p> >+ [% IF ( gstrate ) %]<p><strong>Tax number registered: </strong> >+ [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p> >+ <p><strong>List item price includes tax: </strong> >+ [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p> >+ <p><strong>Invoice item price includes tax: </strong> >+ [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %] >+ <p><strong>Discount: </strong> >+ [% discount | format("%.1f") %] %</p> >+ <p><strong>Tax rate: </strong> >+ [% 0 + gstrate * 100 | format("%.1f") %] %</p> >+ [% IF deliverytime.defined %] >+ <p><strong>Delivery time: </strong> >+ [% deliverytime %] days</p> >+ [% END %] >+ [% IF ( notes ) %]<p><strong>Notes: </strong> >+ [% notes %]</p>[% END %] > </div> >- [% FOREACH contact IN contacts %] >- <div class="supplier-contact-details yui-u"> >- <h2>Contact details</h2> >+ </div> >+ >+ <div class="supplier-contact-details yui-u"> >+ <h2>Contact</h2> >+ [% FOREACH contact IN contacts %] > [% INCLUDE show_contact %] >- </div> >- [% END %] >- </div> >- <div id="supplier-ordering-information" class="yui-g"> >- <h3>Ordering information</h3> >- <p><strong>Vendor is: </strong> >- [% IF ( active ) %] >- Active >- [% ELSE %] >- Inactive >- [% END %]</p> >- <p><strong>List prices are: </strong>[% listprice %]</p> >- <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p> >- [% IF ( gstrate ) %]<p><strong>Tax number registered: </strong> >- [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p> >- <p><strong>List item price includes tax: </strong> >- [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p> >- <p><strong>Invoice item price includes tax: </strong> >- [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %] >- <p><strong>Discount: </strong> >- [% discount | format("%.1f") %] %</p> >- <p><strong>Tax rate: </strong> >- [% 0 + gstrate * 100 | format("%.1f") %] %</p> >- [% IF deliverytime.defined %] >- <p><strong>Delivery time: </strong> >- [% deliverytime %] days</p> >- [% END %] >- [% IF ( notes ) %]<p><strong>Notes: </strong> >- [% notes %]</p>[% END %] >+ [% END %] >+ </div> >+ > </div> >+ > [% IF ( contracts ) %] > <div id="supplier-contracts" class="yui-g"> > <h2>Contract(s)</h2> >-- >1.7.9.5
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 10402
:
18973
|
18974
|
18975
|
19233
|
19234
|
19235
|
19603
|
19604
|
19808
|
19809
|
19810
|
20019
|
20020
|
20021
|
20045
|
20046
|
20047
|
20048
|
20559
|
20560
|
20561
|
20562
|
21019
|
21020
|
21021
|
21022
|
21023
|
21056
|
21547
|
21549
|
21804
|
23370
|
23371
|
23372
|
23373
|
23374
|
23375
|
23376
|
23377
|
24561
|
24562
|
24563
|
24564
|
24565
|
24566
|
24567
|
24568
|
29223
|
29224
|
29225
|
29226
|
29227
|
29511
|
29600
|
29601
|
29602
|
29603
|
29604
|
29761
|
30209
|
30210
|
30211
|
30212
|
30213
|
30460
|
30461
|
30462
|
30463
|
30464
|
31091
|
31092
|
31093
|
31094
|
31095
|
31096