Bugzilla – Attachment 15036 Details for
Bug 8913
Improve acquisitions navigation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8913 [Revised] Improve acquisitions navigation
Bug-8913-Revised-Improve-acquisitions-navigation.patch (text/plain), 29.56 KB, created by
Owen Leonard
on 2013-02-04 15:35:56 UTC
(
hide
)
Description:
Bug 8913 [Revised] Improve acquisitions navigation
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2013-02-04 15:35:56 UTC
Size:
29.56 KB
patch
obsolete
>From 2f934ee581c5657121b53e8101141aabfe5cec7d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 12 Oct 2012 15:55:16 -0400 >Subject: [PATCH] Bug 8913 [Revised] Improve acquisitions navigation >Content-Type: text/plain; charset="utf-8" > >This patch adds a new menu for vendor-related pages in which >vendor related "views" can be linked to: baskets, basket groups, >contracts, invoices, uncertain prices. > >The acquisitions toolbar is pared down to vendor-related actions: >New basket, contract, or vendor; edit vendor, delete vendor, >receive shipment. > >Other small improvements have been made to other pages: corrections >to breadcrumbs and title tags, adding useful links betweeen pages. > >Vendor menu and toolbar are added to booksellers.pl >when there is only one "search result" (i.e. a vendor id is passed). > >- Menu appears when booksellerid variable is present >- Redundant heading removed >- Additional variables added to enable proper display of the toolbar > >Revision corrects broken links pointed out by QA. > >TODO: Add coverage of Basket groups page. > >To test, navigate Acquisitions pages and test as many links and buttons >as you can, confirming that nothing is broken on vendor pages, invoice >pages, contract pages, uncertain price pages, etc. >--- > acqui/booksellers.pl | 3 +- > acqui/invoice.pl | 2 +- > acqui/invoices.pl | 11 +-- > .../prog/en/includes/acquisitions-toolbar.inc | 45 +++------- > .../intranet-tmpl/prog/en/includes/vendor-menu.inc | 15 ++++ > .../prog/en/modules/acqui/basketheader.tt | 78 ++--------------- > .../prog/en/modules/acqui/booksellers.tt | 7 +- > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- > .../prog/en/modules/acqui/invoices.tt | 14 +-- > .../prog/en/modules/acqui/supplier.tt | 7 +- > .../prog/en/modules/acqui/uncertainprice.tt | 89 +++++++++++--------- > .../prog/en/modules/admin/aqcontract.tt | 33 +++----- > 12 files changed, 126 insertions(+), 180 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc > >diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl >index 1341dc1..f6c7b2e 100755 >--- a/acqui/booksellers.pl >+++ b/acqui/booksellers.pl >@@ -87,7 +87,8 @@ my $supplier_count = @suppliers; > if ( $supplier_count == 1 ) { > $template->param( > supplier_name => $suppliers[0]->{'name'}, >- booksellerid => $suppliers[0]->{'booksellerid'} >+ booksellerid => $suppliers[0]->{'id'}, >+ basketcount => $suppliers[0]->{'basketcount'} > ); > } > >diff --git a/acqui/invoice.pl b/acqui/invoice.pl >index 6e6bb25..1b6d97c 100755 >--- a/acqui/invoice.pl >+++ b/acqui/invoice.pl >@@ -185,7 +185,7 @@ $template->param( > invoiceid => $details->{'invoiceid'}, > invoicenumber => $details->{'invoicenumber'}, > suppliername => $details->{'suppliername'}, >- supplierid => $details->{'booksellerid'}, >+ booksellerid => $details->{'booksellerid'}, > datereceived => $details->{'datereceived'}, > shipmentdate => $details->{'shipmentdate'}, > billingdate => $details->{'billingdate'}, >diff --git a/acqui/invoices.pl b/acqui/invoices.pl >index b7f360e..44589ab 100755 >--- a/acqui/invoices.pl >+++ b/acqui/invoices.pl >@@ -50,7 +50,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( > ); > > my $invoicenumber = $input->param('invoicenumber'); >-my $supplier = $input->param('supplier'); >+my $supplierid = $input->param('supplierid'); > my $shipmentdatefrom = $input->param('shipmentdatefrom'); > my $shipmentdateto = $input->param('shipmentdateto'); > my $billingdatefrom = $input->param('billingdatefrom'); >@@ -71,7 +71,7 @@ if ( $op and $op eq "do_search" ) { > my $billingdateto_iso = C4::Dates->new($billingdateto)->output("iso"); > my @invoices = GetInvoices( > invoicenumber => $invoicenumber, >- suppliername => $supplier, >+ supplierid => $supplierid, > shipmentdatefrom => $shipmentdatefrom_iso, > shipmentdateto => $shipmentdateto_iso, > billingdatefrom => $billingdatefrom_iso, >@@ -89,6 +89,7 @@ if ( $op and $op eq "do_search" ) { > billingdate => $_->{billingdate}, > invoicenumber => $_->{invoicenumber}, > suppliername => $_->{suppliername}, >+ booksellerid => $_->{booksellerid}, > receivedbiblios => $_->{receivedbiblios}, > receiveditems => $_->{receiveditems}, > subscriptionid => $_->{subscriptionid}, >@@ -104,13 +105,13 @@ my @suppliers_loop = (); > my $suppliername; > foreach (@suppliers) { > my $selected = 0; >- if ( $supplier && $supplier == $_->{'id'} ) { >+ if ( $supplierid && $supplierid == $_->{'id'} ) { > $selected = 1; > $suppliername = $_->{'name'}; > } > my %row = ( > suppliername => $_->{'name'}, >- supplierid => $_->{'id'}, >+ booksellerid => $_->{'id'}, > selected => $selected, > ); > push @suppliers_loop, \%row; >@@ -138,7 +139,7 @@ $template->param( > do_search => ( $op and $op eq "do_search" ) ? 1 : 0, > results_loop => \@results_loop, > invoicenumber => $invoicenumber, >- supplier => $supplier, >+ booksellerid => $supplierid, > suppliername => $suppliername, > billingdatefrom => $billingdatefrom, > billingdateto => $billingdateto, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index 0c52cc2..c0654fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -9,38 +9,20 @@ > > // YUI Toolbar Functions > >- function yuiToolbar() { >- >- new YAHOO.widget.Button("newperiod"); >- new YAHOO.widget.Button("newbudget"); >- new YAHOO.widget.Button("newsupplier"); >- new YAHOO.widget.Button("newbasket"); >+ function yuiToolbar() { > new YAHOO.widget.Button("editsupplier"); > new YAHOO.widget.Button("deletesupplier"); > new YAHOO.widget.Button("receive"); >- new YAHOO.widget.Button("newcontract"); >- new YAHOO.widget.Button("editcontracts"); >+ [% UNLESS ( booksellerid ) %]new YAHOO.widget.Button("newvendor");[% END %] > >- var manageorders = [ >+ var newmenu = [ > [% IF ( CAN_user_acquisition_order_manage ) %] >- [% IF (active) %] >- { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"}, >- [% END %] >- { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"}, >- { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]"}, >- [% END %] >- { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" }, >- [% IF ( basketno ) %] >- { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1"} >- [% ELSE %] >- { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1"} >+ { text: _("Basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"}, > [% END %] >+ [% IF ( CAN_user_acquisition_contracts_manage ) %]{ text: _("Contract"), url: "/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]"},[% END %] >+ { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?op=enter"} > ] >- [% IF ( booksellerid ) %] >- [% IF ( basketcount ) %] >- new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"}); >- [% END %] >- [% END %] >+ new YAHOO.widget.Button({type: "menu", label: _("New"), name: "newmenu", menu: newmenu, container: "newmenuc"}); > } > > //]]> >@@ -48,18 +30,15 @@ > <ul id="toolbar-list" class="toolbar"> > [% IF ( booksellerid ) %] > [% IF ( CAN_user_acquisition_vendors_manage ) %] >- <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter">Edit</a></li> >+ <li id="newmenuc"></li> >+ <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter">Edit vendor</a></li> > [% UNLESS ( basketcount OR subscriptioncount ) %] >- <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete</a></li> >- [% END %] >- <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New contract</a></li> >- <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li> >- [% IF (active && !basketcount) %] >- <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">New basket</a></li> >+ <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete vendor</a></li> > [% END %] > [% END %] >+ [% IF ( CAN_user_acquisition_order_receive && basketcount ) %]<li><a id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Receive shipments</a></li>[% END %] > [% ELSE %] >- <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li> >+ <li><a id="newvendor" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >new file mode 100644 >index 0000000..106221e >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >@@ -0,0 +1,15 @@ >+[% IF ( booksellerid ) %] >+<div id="menu"> >+ <ul> >+ [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]">Baskets</a></li>[% END %] >+ [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a></li>[% END %] >+ [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid %]&op=do_search">Invoices</a></li> >+ [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %] >+ <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1">Uncertain prices</a></li> >+ [% ELSE %] >+ <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1">Uncertain prices</a></li> >+ [% END %] [% END %] >+ </ul> >+</div> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index e1061da..07db148 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › >+<title>Koha › Acquisitions › > [% IF ( add_form ) %] > [% IF ( basketno ) %]Edit basket '[% basketname %]' >- [% ELSE %]add a basket to [% booksellername %] >+ [% ELSE %]Add a basket to [% booksellername %] > [% END %] > [% END %] > </title> >@@ -28,61 +28,6 @@ function Check(ff) { > } > //]]> > </script> >-<style type="text/css"> >- >-div.workarea { padding:10px; float:left } >- >-ul.draglist { >- position: relative; >- width: 200px; >- height:240px; >- background: #f7f7f7; >- border: 1px solid gray; >- list-style: none; >- margin:0; >- padding:0; >-} >- >-ul.draglist li { >- margin: 1px; >- cursor: move; >- zoom: 1; >-} >- >-ul.draglist_alt { >- position: relative; >- width: 200px; >- list-style: none; >- margin:0; >- padding:0; >- /* >- The bottom padding provides the cushion that makes the empty >- list targetable. Alternatively, we could leave the padding >- off by default, adding it when we detect that the list is empty. >- */ >- padding-bottom:20px; >-} >- >-ul.draglist_alt li { >- margin: 1px; >- cursor: move; >-} >- >- >-li.list1 { >- background-color: #D1E6EC; >- border:1px solid #7EA6B2; >-} >- >-li.list2 { >- background-color: #D8D4E2; >- border:1px solid #6B4C86; >-} >- >-#user_actions { float: right; } >- >-</style> >- > </head> > <body id="acq_basketheader" class="acq"> > [% INCLUDE 'header.inc' %] >@@ -94,18 +39,16 @@ li.list2 { > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › > [% IF ( add_form ) %] > [% IF ( basketno ) %]Edit basket '[% basketname %]' >- [% ELSE %]add a basket to [% booksellername %] >+ [% ELSE %]Add a basket to [% booksellername %] > [% END %] > [% END %] > </div> > >-<div id="doc3" class="yui-t2"> >+<div id="doc" class="yui-t7"> > <div id="bd"> >- >+ > <div id="yui-main"> >- >- <div class="yui-b"> >- >+ > [% IF ( add_form ) %] > [% IF ( basketno ) %] > <h1>Edit basket [% basketname %]</h1> >@@ -126,7 +69,7 @@ li.list2 { > <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" /> > </li> > <li> >- <label for="billingplace">Billing Place:</label> >+ <label for="billingplace">Billing place:</label> > <select name="billingplace" id="billingplace"> > <option value="">--</option> > [% FOREACH billingplace IN billingplaceloop %] >@@ -141,7 +84,7 @@ li.list2 { > </select> > </li> > <li> >- <label for="deliveryplace">Delivery Place:</label> >+ <label for="deliveryplace">Delivery place:</label> > <select name="deliveryplace" id="deliveryplace"> > <option value="">--</option> > [% FOREACH deliveryplace IN deliveryplaceloop %] >@@ -194,14 +137,11 @@ li.list2 { > <fieldset class="action"> > <input type="hidden" name="op" value="add_validate" /> > <input type="button" value="Save" onclick="Check(this.form);" /> >+ <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a> > </fieldset> > </form> > [% END %] > </div> > </div> >-<div class="yui-b"> >- [% INCLUDE 'acquisitions-menu.inc' %] >-</div> >-</div> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 4077b5d..b0e4549 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -47,9 +47,7 @@ $(document).ready(function() { > <div class="yui-b"> > > [% INCLUDE 'acquisitions-toolbar.inc' %] >-[% IF ( count == 1 ) %] >-<h1> [% supplier_name %] </h1> >-[% ELSE %] >+[% UNLESS ( count == 1 ) %] > <h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1> > [% END %] > [% IF ( loop_suppliers.size ) %] >@@ -139,6 +137,9 @@ $(document).ready(function() { > </div> > </div> > <div class="yui-b"> >+[% IF ( booksellerid ) %] >+[% INCLUDE 'vendor-menu.inc' %] >+[% END %] > [% INCLUDE 'acquisitions-menu.inc' %] > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 7b28b87..d357e18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -40,7 +40,7 @@ > [% END %] > <h1>Invoice: [% invoicenumber %]</h1> > >- <p>Supplier: [% suppliername %]</p> >+ <p>Supplier: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p> > <form action="" method="post"> > <fieldset> > <label for="shipmentdate">Shipment date:</label> >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 21147e5..54e12ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -57,8 +57,8 @@ $(document).ready(function() { > <tbody> > [% FOREACH result IN results_loop %] > <tr> >- <td>[% result.invoicenumber %]</td> >- <td>[% result.suppliername %]</td> >+ <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% result.invoiceid %]">[% result.invoicenumber %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% result.booksellerid %]">[% result.suppliername %]</a></td> > <td> > [% IF (result.billingdate) %] > [% result.billingdate | $KohaDates %] >@@ -76,9 +76,9 @@ $(document).ready(function() { > <td> > <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% result.invoiceid %]">Details</a> / > [% IF ( result.closedate ) %] >- <a href="invoice.pl?op=reopen&invoiceid=[% result.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Reopen</a> >+ <a href="invoice.pl?op=reopen&invoiceid=[% result.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Reopen</a> > [% ELSE %] >- <a href="invoice.pl?op=close&invoiceid=[% result.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Close</a> >+ <a href="invoice.pl?op=close&invoiceid=[% result.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Close</a> > [% END %] > </td> > </tr> >@@ -148,13 +148,13 @@ $(document).ready(function() { > </li> > <li> > <label for="supplier">Supplier:</label> >- <select id="supplier" name="supplier"> >+ <select id="supplier" name="supplierid"> > <option value="">All</option> > [% FOREACH supplier IN suppliers_loop %] > [% IF ( supplier.selected ) %] >- <option selected="selected" value="[% supplier.supplierid %]">[% supplier.suppliername %]</option> >+ <option selected="selected" value="[% supplier.booksellerid %]">[% supplier.suppliername %]</option> > [% ELSE %] >- <option value="[% supplier.supplierid %]">[% supplier.suppliername %]</option> >+ <option value="[% supplier.booksellerid %]">[% supplier.suppliername %]</option> > [% END %] > [% END %] > </select> >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 e4efa70..51ec129 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -47,10 +47,11 @@ if (f.company.value == "") { > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › Update: [% name %][% ELSE %]Add vendor[% END %] [% ELSE %][% name %][% END %]</div> > >-<div id="doc" class="yui-t7"> >+<div id="doc3" class="yui-t2"> > > <div id="bd"> > <div id="yui-main"> >+ <div class="yui-b"> > [% IF ( enter ) %] > [% IF ( booksellerid ) %] > <h1>Update: [% name %]</h1> >@@ -284,4 +285,8 @@ if (f.company.value == "") { > > </div> > </div> >+<div class="yui-b"> >+[% INCLUDE 'vendor-menu.inc' %] >+</div> >+</div> > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 1b1f070..7bbad51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Orders with uncertain prices for Vendor [% booksellername %]</title> >+<title>Koha › Acquisitions › [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >@@ -30,41 +30,48 @@ function check(form) { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> ›<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Uncertain prices for vendor: [% booksellername %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Uncertain prices for vendor [% booksellername %][% ELSE %]Uncertain prices[% END %]</div> > >-<div id="doc" class="yui-t7"> >- <div id="bd"> >- <div id="yui-main"> >+<div id="doc3" class="yui-t2"> >+ >+ <div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+ >+[% INCLUDE 'acquisitions-toolbar.inc' %] > [% IF ( validate ) %] > <META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]"> > [% ELSE %] >- <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter">(edit)</a></h1> >- <h2>Contact information</h2> >- <p><strong>Address: </strong> >- [% booksellerpostal %] >- [% bookselleraddress1 %] >- [% bookselleraddress2 %] >- [% bookselleraddress3 %] >- [% bookselleraddress4 %] >- <a href="[% booksellerurl %]">[% booksellerurl %]</a> >- </p> >- <p><strong>Phone: </strong> >- [% booksellerphone %] / Fax: >- [% booksellerfax %]</p> >- <dl> >- <dt><strong>Contact: </strong></dt> >- <dd>[% booksellercontact %] >- [% booksellercontpos %] >- [% booksellercontphone %] >- [% booksellercontaltphone %] >- [% booksellercontemail %] >- [% booksellercontnotes %] >- </dd> >- </dl> >- [% IF ( booksellernotes ) %] >- <p><strong>Notes: </strong> >- [% booksellernotes %]</p> >+ [% IF ( booksellername ) %] >+ <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1> >+ <h2>Contact information</h2> >+ <p><strong>Address: </strong> >+ [% booksellerpostal %] >+ [% bookselleraddress1 %] >+ [% bookselleraddress2 %] >+ [% bookselleraddress3 %] >+ [% bookselleraddress4 %] >+ <a href="[% booksellerurl %]">[% booksellerurl %]</a> >+ </p> >+ <p><strong>Phone: </strong> >+ [% booksellerphone %] / Fax: >+ [% booksellerfax %]</p> >+ <dl> >+ <dt><strong>Contact: </strong></dt> >+ <dd>[% booksellercontact %] >+ [% booksellercontpos %] >+ [% booksellercontphone %] >+ [% booksellercontaltphone %] >+ [% booksellercontemail %] >+ [% booksellercontnotes %] >+ </dd> >+ </dl> >+ [% IF ( booksellernotes ) %] >+ <p><strong>Notes: </strong> >+ [% booksellernotes %]</p> >+ [% END %] > [% END %] >+ > <h2>Orders with uncertain prices</h2> > <form action="[% scriptname %]" method="post" name="uncertainprices"> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> >@@ -86,12 +93,12 @@ function check(form) { > <table id="uncertainpricet"> > <thead> > <tr> >- <th>basket</th> >- <th>order</th> >- <th>by</th> >- <th>uncertain</th> >- <th>price</th> >- <th>quantity</th> >+ <th>Basket</th> >+ <th>Order</th> >+ <th>By</th> >+ <th>Uncertain</th> >+ <th>Price</th> >+ <th>Quantity</th> > </tr> > </thead> > <tbody> >@@ -128,5 +135,11 @@ function check(form) { > <fieldset class="action"><input type="button" value="Save" onclick="check(this.form)" /></fieldset> > </form> > [% END %] >+ >+</div> >+</div> >+<div class="yui-b"> >+[% INCLUDE 'vendor-menu.inc' %] >+</div> > </div> >-</div>[% INCLUDE 'intranet-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index e723ed4..969869c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -83,9 +83,13 @@ function Check(ff) { > [% IF ( else ) %]Contracts[% END %] > </div> > >-<div id="doc" class="yui-t7"> >+<div id="doc3" class="yui-t2"> >+ > <div id="bd"> >- <div id="yui-main"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+ >+[% INCLUDE 'acquisitions-toolbar.inc' %] > [% IF ( add_form ) %] > <form name="Aform" action="[% script_name %]" method="post"> > <input type="hidden" name="op" value="add_validate" /> >@@ -161,23 +165,6 @@ function Check(ff) { > </form> > [% END %] > [% IF ( else ) %] >- <div id="toolbar"> >- <script type="text/javascript"> >- //<![CDATA[ >- // prepare DOM for YUI Toolbar >- $(document).ready(function() { >- yuiToolbar(); >- }); >- // YUI Toolbar Functions >- function yuiToolbar() { >- new YAHOO.widget.Button("newcontract"); >- } >- //]]> >- </script> >- <ul class="toolbar"> >- <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New contract</a></li> >- </ul> >- </div> > <h2>Contract(s) of [% booksellername %]</h2> > [% IF ( loop ) %] > <table> >@@ -202,9 +189,13 @@ function Check(ff) { > [% END %] > </table> > [% ELSE %] >- <div class="dialog message">There are no contracts with this vendor.</div> >+ <div class="dialog message">There are no contracts with this vendor. <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">Add a contract</a>.</div> > [% END %] > [% END %] >- </div> >+</div> >+</div> >+<div class="yui-b"> >+[% INCLUDE 'vendor-menu.inc' %] >+</div> > </div> > [% INCLUDE 'intranet-bottom.inc' %] >-- >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 8913
:
12890
|
12892
|
12914
|
12918
|
12928
|
12929
|
15036
|
15057
|
15246
|
15281