[open-ils-commits] r18479 - in trunk/Open-ILS/web/templates/default/acq: financial invoice lineitem picklist po receiving (miker)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Oct 26 16:12:04 EDT 2010
Author: miker
Date: 2010-10-26 16:11:59 -0400 (Tue, 26 Oct 2010)
New Revision: 18479
Modified:
trunk/Open-ILS/web/templates/default/acq/financial/claim_eligible.tt2
trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2
trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2
trunk/Open-ILS/web/templates/default/acq/financial/view_fund.tt2
trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2
trunk/Open-ILS/web/templates/default/acq/financial/view_provider.tt2
trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2
trunk/Open-ILS/web/templates/default/acq/lineitem/findbib.tt2
trunk/Open-ILS/web/templates/default/acq/lineitem/related.tt2
trunk/Open-ILS/web/templates/default/acq/lineitem/search.tt2
trunk/Open-ILS/web/templates/default/acq/lineitem/worksheet.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/brief_record.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/from_bib.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/upload.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/user_request.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/view.tt2
trunk/Open-ILS/web/templates/default/acq/po/create.tt2
trunk/Open-ILS/web/templates/default/acq/po/events.tt2
trunk/Open-ILS/web/templates/default/acq/po/search.tt2
trunk/Open-ILS/web/templates/default/acq/receiving/process.tt2
Log:
More reordering of JS. Helps for simple interfaces, not for complex ones. More work needed.
Modified: trunk/Open-ILS/web/templates/default/acq/financial/claim_eligible.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/claim_eligible.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/financial/claim_eligible.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,12 +1,6 @@
[% WRAPPER "default/base.tt2" %]
[% ctx.page_title = "Items Eligible For Claiming" %]
<script type="text/javascript">var filter = "[% ctx.page_args.0 %]";</script>
-<script type="text/javascript"
- src="[% ctx.media_prefix %]/js/ui/default/acq/financial/claim_eligible.js">
-</script>
-<script type="text/javascript"
- src="[% ctx.media_prefix %]/js/ui/default/acq/financial/claim_voucher.js">
-</script>
<div>
<h1>Items Eligible For Claiming</h1>
<div class="oils-acq-basic-roomy">
@@ -58,4 +52,6 @@
[% INCLUDE "default/acq/common/final_claim_dialog.tt2" %]
</div>
</div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/financial/claim_eligible.js"> </script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/financial/claim_voucher.js"> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,8 +1,5 @@
[% WRAPPER 'default/base.tt2' %]
-<!-- load the page-specific JS -->
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/list_funding_sources.js'></script>
-
<!-- The main grid lives here -->
<script type="text/javascript">
function getName(rowIndex, item) {
@@ -48,6 +45,7 @@
</table>
</div>
+<!-- load the page-specific JS -->
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/list_funding_sources.js'></script>
-
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -2,7 +2,6 @@
[% ctx.page_title = 'Funds' %]
<!-- load the page-specific JS -->
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/list_funds.js'> </script>
<script type="text/javascript">
function getFundName(rowIndex, item) {
if (!item) return null;
@@ -159,4 +158,5 @@
</table>
</div>
<div dojoType="openils.widget.ProgressDialog" jsId="progressDialog"></div>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/list_funds.js'> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/financial/view_fund.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/view_fund.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/financial/view_fund.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,10 +1,6 @@
[% WRAPPER 'default/base.tt2' %]
<script type="text/javascript"> var fundID = [% ctx.page_args.0 %] </script>
-<!-- load the page-specific JS -->
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/common/tag_manager.js"></script>
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/view_fund.js'></script>
-
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>Fund Details</div>
</div>
@@ -253,4 +249,9 @@
</div>
</div>
</div>
+
+<!-- load the page-specific JS -->
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/common/tag_manager.js"></script>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/view_fund.js'></script>
+
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,9 +1,6 @@
[% WRAPPER 'default/base.tt2' %]
<script type="text/javascript"> var fundingSourceID = [% ctx.page_args.0 %]; </script>
-<!-- load the page-specific JS -->
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/view_funding_source.js'> </script>
-
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>Funding Source Details</div>
</div>
@@ -169,5 +166,8 @@
</div>
</div>
+<!-- load the page-specific JS -->
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/view_funding_source.js'> </script>
+
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/financial/view_provider.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/view_provider.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/financial/view_provider.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER default/base.tt2 %]
<script type="text/javascript">var providerId = [% ctx.page_args.0 %]</script>
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/view_provider.js'></script>
<div dojoType="dijit.layout.ContentPane" layoutAlign="top">
<div dojoType="dijit.layout.TabContainer">
@@ -114,5 +113,6 @@
</div>
</div>
</div>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/view_provider.js'></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,7 +1,5 @@
[% WRAPPER 'default/base.tt2' %]
[% ctx.page_title = 'Invoicing' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/invoice/common.js'> </script>
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/invoice/view.js'> </script>
<script type="text/javascript">var invoiceId = '[% ctx.page_args.0 %]';</script>
<div dojoType="dijit.layout.ContentPane" style="height:100%">
@@ -134,4 +132,6 @@
<button dojoType='dijit.form.Button' jsId='extraCopiesGo'>Add New Items</button>
</div>
</div>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/invoice/common.js'> </script>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/invoice/view.js'> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/lineitem/findbib.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/lineitem/findbib.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/lineitem/findbib.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER "default/base.tt2" %]
[% ctx.page_title = "Locate Bib Record" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/findbib.js"></script>
<script type="text/javascript">
function iterateSubfields(item) {
var out = '';
@@ -70,4 +69,5 @@
</div>
<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Searching....'/>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/findbib.js"></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/lineitem/related.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/lineitem/related.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/lineitem/related.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER "default/base.tt2" %]
[% ctx.page_title = "Related Lineitems" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/related.js"></script>
<script type="text/javascript">var targetId = "[% ctx.page_args.0 %]";</script>
<h1>Related Lineitems</h1>
<div id="acq-related-mini">
@@ -49,4 +48,5 @@
</div>
[% INCLUDE "default/acq/common/info.tt2" which = "Related" %]
[% INCLUDE "default/acq/common/li_table.tt2" %]
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/related.js"></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/lineitem/search.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/lineitem/search.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/lineitem/search.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER 'default/base.tt2' %]
[% ctx.page_title = 'Lineitem Search' %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/search.js"></script>
<!-- later: "[% ctx.page_args.0 %]" -->
<div id="oils-acq-li-search-form-holder" class="hidden">
<h1 class="oils-acq-li-search">Lineitem Search</h1>
@@ -112,4 +111,5 @@
</form>
</div>
[% INCLUDE 'default/acq/common/li_table.tt2' %]
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/search.js"></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/lineitem/worksheet.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/lineitem/worksheet.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/lineitem/worksheet.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER "default/base.tt2" %]
[% ctx.page_title = "Lineitem Worksheet" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/worksheet.js"></script>
<script type="text/javascript">var liId = "[% ctx.page_args.0 %]";</script>
<h1>Lineitem Worksheet</h1>
<br/>
@@ -8,4 +7,5 @@
<div class='hidden'>
<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Loading Worksheet...'/>
</div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/worksheet.js"></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,5 +1,4 @@
[% WRAPPER 'default/base.tt2' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/bib_search.js'></script>
<style type="text/css">
@import "[% ctx.media_prefix %]/js/dojo/dojox/form/resources/CheckedMultiSelect.css";
</style>
@@ -70,5 +69,6 @@
</div>
<script type="text/javascript">dojo.style('oils-acq-pl-search-results', 'display', 'none');</script>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/bib_search.js'></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/brief_record.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/brief_record.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/brief_record.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,4 @@
[% WRAPPER 'default/base.tt2' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/brief_record.js'> </script>
-
<h1>New Brief Record</h1><br/>
<form dojoType='dijit.form.Form'>
<script type='dojo/method' event='onSubmit'>
@@ -31,4 +29,7 @@
</tbody>
</table>
</form>
+
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/brief_record.js'> </script>
+
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/from_bib.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/from_bib.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/from_bib.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,7 +1,5 @@
[% WRAPPER "default/base.tt2" %]
[% ctx.page_title = "Items by Bibliographic ID" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/picklist/from_bib.js">
-</script>
<div id="acq-frombib-upload-box">
<div class="oils-acq-basic-roomy">
Provide one or more CSV files whose first columns
@@ -22,4 +20,5 @@
<hr />
[% INCLUDE "default/acq/common/li_table_pager.tt2" %]
[% INCLUDE "default/acq/common/li_table.tt2" %]
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/picklist/from_bib.js"> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,19 +1,6 @@
[% WRAPPER 'default/base.tt2' %]
[% ctx.page_title = 'Selection Lists' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/view_list.js'></script>
-<script type="text/javascript">
- function formatName(inDatum) {
- for(var i in plCache){
- var pl = plCache[i];
- var id = pl.id();
- if (inDatum == pl.name()){
- return '<a href="[% ctx.base_path %]/acq/picklist/view/'+id+'">'+inDatum+'</a>';
- }
- }
- }
-</script>
-
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-picklist-my-list-header'>
@@ -103,4 +90,18 @@
</div>
</div>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/view_list.js'></script>
+
+<script type="text/javascript">
+ function formatName(inDatum) {
+ for(var i in plCache){
+ var pl = plCache[i];
+ var id = pl.id();
+ if (inDatum == pl.name()){
+ return '<a href="[% ctx.base_path %]/acq/picklist/view/'+id+'">'+inDatum+'</a>';
+ }
+ }
+ }
+</script>
+
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/upload.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/upload.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/upload.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,5 +1,4 @@
[% WRAPPER 'default/base.tt2' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/upload.js'> </script>
<h1>Upload</h1><br/>
<form id="acq-pl-upload-form" enctype="multipart/form-data">
@@ -94,4 +93,5 @@
</div>
</div>
</form>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/upload.js'> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/user_request.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/user_request.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/user_request.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER 'default/base.tt2' %]
[% ctx.page_title = 'Patron Requests' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/user_request.js'></script>
<script type="text/javascript">var reqId = '[% ctx.page_args.0 %]';</script>
<div dojoType="dijit.layout.StackContainer" id="stackContainer" doLayout="false">
@@ -63,4 +62,5 @@
<div id="detail_content_pane" />
</div>
</div>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/user_request.js'></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/view.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/view.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/view.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,6 +1,5 @@
[% WRAPPER 'default/base.tt2' %]
[% ctx.page_title = 'Selection List' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/view.js'></script>
<div dojoType="dijit.layout.ContentPane" style="height:100%">
<div class='container'>
<div id='oils-acq-picklist-header'>
@@ -16,5 +15,6 @@
<script type="text/javascript">var plId = '[% ctx.page_args.0 %]';</script>
[% INCLUDE 'default/acq/common/li_table.tt2' %]
</div>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/view.js'></script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/po/create.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/po/create.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/po/create.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,8 +1,5 @@
[% WRAPPER "default/base.tt2" %]
[% ctx.page_title = "Create Purchase Order" %]
-<script
- type="text/javascript"
- src="[% ctx.media_prefix %]/js/ui/default/acq/po/create.js">
-</script>
<h1>Create Purchase Order</h1>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/po/create.js"> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/po/events.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/po/events.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/po/events.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,5 +1,4 @@
[% WRAPPER default/base.tt2 %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/po/events.js"> </script>
<!-- grid -->
@@ -59,6 +58,7 @@
</table>
</div>
</div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/po/events.js"> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/po/search.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/po/search.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/po/search.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -19,8 +19,6 @@
<span>Status: <span attr="state"></span></span>
<span><a class="hidden" attr="activator" href="javascript:void(0);">Activate Order</a></span>
</div>
-<!-- load the page-specific JS -->
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/po/search.js'> </script>
<script type="text/javascript">
function formatId(id) {
@@ -46,6 +44,7 @@
<label for='state'>State</label></td>
<script type="text/javascript">
+ dojo.require('dojo.data.ItemFileReadStore');
var stateStore = new dojo.data.ItemFileReadStore({
data : {
identifier:"value",
@@ -138,4 +137,7 @@
</table>
</div>
[% INCLUDE 'default/acq/common/li_table.tt2' %]
+
+<!-- load the page-specific JS -->
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/po/search.js'> </script>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/receiving/process.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/receiving/process.tt2 2010-10-26 20:04:01 UTC (rev 18478)
+++ trunk/Open-ILS/web/templates/default/acq/receiving/process.tt2 2010-10-26 20:11:59 UTC (rev 18479)
@@ -1,5 +1,4 @@
[% WRAPPER default/base.tt2 %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/receiving/process.js'> </script>
<h1>Receiving Processing</h1><br/>
<div id='oils-acq-recv-search-block' class='container'>
<form dojoType='dijit.form.Form' action='' method=''>
@@ -34,5 +33,6 @@
[% INCLUDE 'default/acq/common/jubgrid.tt2' %]
</div>
<script type="text/javascript">dojo.style('oils-acq-recv-grid', 'visibility', 'hidden');</script>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/receiving/process.js'> </script>
[% END %]
More information about the open-ils-commits
mailing list