From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 26 Oct 2010 14:52:25 +0000 (+0000)
Subject: JS reordering to account for readyState event leakage from XHR to the main page
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=69d6875e204baec1d3bdaa01245ea8ba4035d131;p=evergreen%2Fpines.git

JS reordering to account for readyState event leakage from XHR to the main page

git-svn-id: svn://svn.open-ils.org/ILS/trunk@18474 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2 b/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2
index 107132b1a1..2b00688386 100644
--- a/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2
+++ b/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2
@@ -1,16 +1,4 @@
 [% WRAPPER default/base.tt2 %]
-<script type="text/javascript">
-    dojo.require('dijit.layout.ContentPane');
-    dojo.require('dijit.form.Button');
-    dojo.require('openils.widget.AutoGrid');
-    dojo.require('openils.Util');
-    openils.Util.addOnLoad(
-        function() {
-            ctGrid.loadAll({order_by:{acqct : 'code'}});
-        }
-    );
-</script>
-
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Currency Type</div>
     <div>
@@ -29,6 +17,19 @@
             editOnEnter='true'>
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require('dijit.layout.ContentPane');
+    dojo.require('dijit.form.Button');
+    dojo.require('openils.widget.AutoGrid');
+    dojo.require('openils.Util');
+    openils.Util.addOnLoad(
+        function() {
+            ctGrid.loadAll({order_by:{acqct : 'code'}});
+        }
+    );
+</script>
+
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/acq/lineitem/history.tt2 b/Open-ILS/web/templates/default/acq/lineitem/history.tt2
index 4d0eaed412..4a363dfa6f 100644
--- a/Open-ILS/web/templates/default/acq/lineitem/history.tt2
+++ b/Open-ILS/web/templates/default/acq/lineitem/history.tt2
@@ -1,15 +1,5 @@
 [% WRAPPER "default/base.tt2" %]
 [% ctx.page_title = "Lineitem History" %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    var liId = "[% ctx.page_args.0 %]";
-    openils.Util.addOnLoad(
-        function() {
-            lhGrid.loadAll({order_by : {acqlih :  'audit_time DESC'}}, {id : liId});
-        }
-    );
-</script>
 <h1>Lineitem History</h1>
 <br/>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
@@ -26,4 +16,15 @@
             showPaginator='true'>
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    var liId = "[% ctx.page_args.0 %]";
+    openils.Util.addOnLoad(
+        function() {
+            lhGrid.loadAll({order_by : {acqlih :  'audit_time DESC'}}, {id : liId});
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/acq/po/edi_messages.tt2 b/Open-ILS/web/templates/default/acq/po/edi_messages.tt2
index bf4a8b8c81..76c2101eec 100644
--- a/Open-ILS/web/templates/default/acq/po/edi_messages.tt2
+++ b/Open-ILS/web/templates/default/acq/po/edi_messages.tt2
@@ -1,21 +1,5 @@
 [% WRAPPER "default/base.tt2" %]
 [% ctx.page_title = "EDI Messages" %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    dojo.require('openils.widget.Textarea');
-
-    var poId = "[% ctx.page_args.0 %]";
-    openils.Util.addOnLoad(
-        function() {
-            if (poId) {
-                edimGrid.loadAll({order_by : {acqedim :  'create_time DESC'}}, {purchase_order : poId});
-            } else  {
-                edimGrid.loadAll({order_by : {acqedim :  'create_time DESC'}});
-            }
-        }
-    );
-</script>
 [% IF ctx.page_args.0 %]
 <h1>EDI Messages (Purchase Order [% ctx.page_args.0 %])</h1>
 [% ELSE %]
@@ -42,4 +26,21 @@
             showPaginator='true'>
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    dojo.require('openils.widget.Textarea');
+
+    var poId = "[% ctx.page_args.0 %]";
+    openils.Util.addOnLoad(
+        function() {
+            if (poId) {
+                edimGrid.loadAll({order_by : {acqedim :  'create_time DESC'}}, {purchase_order : poId});
+            } else  {
+                edimGrid.loadAll({order_by : {acqedim :  'create_time DESC'}});
+            }
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/acq/po/history.tt2 b/Open-ILS/web/templates/default/acq/po/history.tt2
index 54545d4e53..2b3c5d0924 100644
--- a/Open-ILS/web/templates/default/acq/po/history.tt2
+++ b/Open-ILS/web/templates/default/acq/po/history.tt2
@@ -1,15 +1,5 @@
 [% WRAPPER "default/base.tt2" %]
 [% ctx.page_title = "PO History" %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    var poId = "[% ctx.page_args.0 %]";
-    openils.Util.addOnLoad(
-        function() {
-            pohGrid.loadAll({order_by : {acqpoh :  'audit_time DESC'}}, {id : poId});
-        }
-    );
-</script>
 <h1>Purchase Order History</h1>
 <br/>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
@@ -26,4 +16,15 @@
             showPaginator='true'>
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    var poId = "[% ctx.page_args.0 %]";
+    openils.Util.addOnLoad(
+        function() {
+            pohGrid.loadAll({order_by : {acqpoh :  'audit_time DESC'}}, {id : poId});
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/acq/po/view.tt2 b/Open-ILS/web/templates/default/acq/po/view.tt2
index bf410e7665..bfbc776dc4 100644
--- a/Open-ILS/web/templates/default/acq/po/view.tt2
+++ b/Open-ILS/web/templates/default/acq/po/view.tt2
@@ -1,8 +1,5 @@
 [% WRAPPER 'default/base.tt2' %]
 [% ctx.page_title = "Purchase Order" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/common/base64.js"></script>
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/po/view_po.js'></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/po/item_table.js"></script>
 <div dojoType="dijit.layout.ContentPane" style="height:100%">
     <div>
         <div id='oils-acq-picklist-header'>
@@ -118,6 +115,9 @@
             </table>
         </div>
     </div>
+    <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/common/base64.js"></script>
+    <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/po/view_po.js'></script>
+    <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/po/item_table.js"></script>
     <script type="text/javascript">
         var poId = "[% ctx.page_args.1 %]";
         var liFocus = "[% ctx.page_args.0 %]";
diff --git a/Open-ILS/web/templates/default/acq/settings/li_attr.tt2 b/Open-ILS/web/templates/default/acq/settings/li_attr.tt2
index 6bbc60b371..357a0476d2 100644
--- a/Open-ILS/web/templates/default/acq/settings/li_attr.tt2
+++ b/Open-ILS/web/templates/default/acq/settings/li_attr.tt2
@@ -1,5 +1,4 @@
 [% WRAPPER default/base.tt2 %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/settings/li_attr.js'></script>
 
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top">
     <div dojoType="dijit.form.DropDownButton">
@@ -70,4 +69,6 @@
         </div>
     </div>
 </div>
+
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/settings/li_attr.js'></script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/booking/pickup.tt2 b/Open-ILS/web/templates/default/booking/pickup.tt2
index 5a81655ed3..8cff3fa138 100644
--- a/Open-ILS/web/templates/default/booking/pickup.tt2
+++ b/Open-ILS/web/templates/default/booking/pickup.tt2
@@ -1,17 +1,5 @@
 [% WRAPPER "default/base.tt2" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/common.js"></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/populator.js"></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/pickup.js"></script>
 <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/booking.css" />
-<script type="text/javascript">
-    dojo.require("dojox.grid.DataGrid");
-    openils.Util.addOnLoad(my_init);
-
-    function act(f) {
-        p.populate({"patron": f.patron_barcode.value});
-        return false; /* Always. */
-    }
-</script>
 <div id="auto_l10n_start_here">
     <h1 class="booking AUTO_h1"></h1>
     <div class="nice_vertical_padding" id="contains_barcode_control">
@@ -74,4 +62,17 @@
         </form>
     </div>
 </div>
+
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/common.js"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/populator.js"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/pickup.js"></script>
+<script type="text/javascript">
+    dojo.require("dojox.grid.DataGrid");
+    openils.Util.addOnLoad(my_init);
+
+    function act(f) {
+        p.populate({"patron": f.patron_barcode.value});
+        return false; /* Always. */
+    }
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/booking/reservation.tt2 b/Open-ILS/web/templates/default/booking/reservation.tt2
index bd9d138fea..5eb4a1d398 100644
--- a/Open-ILS/web/templates/default/booking/reservation.tt2
+++ b/Open-ILS/web/templates/default/booking/reservation.tt2
@@ -1,11 +1,5 @@
 [% WRAPPER "default/base.tt2" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/common.js"></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/reservation.js"></script>
 <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/booking.css" />
-<script type="text/javascript">
-    dojo.require("dojox.grid.DataGrid");
-    openils.Util.addOnLoad(my_init);
-</script>
 <div id="auto_l10n_start_here">
     <div id="brt_search_block" class="container">
         <h1 class="booking AUTO_choose_a_brt"></h1>
@@ -114,4 +108,11 @@
         </div>
     </div>
 </div>
+
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/common.js"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/reservation.js"></script>
+<script type="text/javascript">
+    dojo.require("dojox.grid.DataGrid");
+    openils.Util.addOnLoad(my_init);
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/booking/return.tt2 b/Open-ILS/web/templates/default/booking/return.tt2
index cf0a5317d7..a2f61c7da7 100644
--- a/Open-ILS/web/templates/default/booking/return.tt2
+++ b/Open-ILS/web/templates/default/booking/return.tt2
@@ -1,20 +1,5 @@
 [% WRAPPER "default/base.tt2" %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/common.js"></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/populator.js"></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/return.js"></script>
 <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/booking.css" />
-<script type="text/javascript">
-    dojo.require("dojox.grid.DataGrid");
-    openils.Util.addOnLoad(my_init);
-
-    function act(f) {
-        var key = f.barcode_type.options[f.barcode_type.selectedIndex].value;
-        var obj = {};
-        obj[key] = f.barcode.value;
-        p.populate(obj);
-        return false; /* Always. */
-    }
-</script>
 <div id="auto_l10n_start_here">
     <h1 class="booking AUTO_return_h1"></h1>
     <div class="nice_vertical_padding" id="contains_barcode_control">
@@ -84,4 +69,20 @@
         </form>
     </div>
 </div>
+
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/common.js"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/populator.js"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/booking/return.js"></script>
+<script type="text/javascript">
+    dojo.require("dojox.grid.DataGrid");
+    openils.Util.addOnLoad(my_init);
+
+    function act(f) {
+        var key = f.barcode_type.options[f.barcode_type.selectedIndex].value;
+        var obj = {};
+        obj[key] = f.barcode.value;
+        p.populate(obj);
+        return false; /* Always. */
+    }
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2 b/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2
index 0777455cc4..ab91d7800a 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2
@@ -1,14 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Claim Event Types' %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
-<script type="text/javascript">
-openils.Util.addOnLoad(
-    function() {
-        prepareOwnerSelector("ADMIN_ACQ_CLAIM_EVENT_TYPE");
-        populateGrid();
-    }
-);
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
@@ -39,4 +30,13 @@ openils.Util.addOnLoad(
         editOnEnter="true">
     </table>
 </div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script type="text/javascript">
+openils.Util.addOnLoad(
+    function() {
+        prepareOwnerSelector("ADMIN_ACQ_CLAIM_EVENT_TYPE");
+        populateGrid();
+    }
+);
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2 b/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2
index de982fa275..9bfa59808b 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2
@@ -1,15 +1,6 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Claim Policies' %]
 
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
-<script type="text/javascript">
-openils.Util.addOnLoad(
-    function() {
-        prepareOwnerSelector("ADMIN_CLAIM_POLICY");
-        populateGrid("[% ctx.page_args.0 %]");
-    }
-);
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
@@ -38,4 +29,14 @@ openils.Util.addOnLoad(
         editOnEnter="true">
     </table>
 </div>
+
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script type="text/javascript">
+openils.Util.addOnLoad(
+    function() {
+        prepareOwnerSelector("ADMIN_CLAIM_POLICY");
+        populateGrid("[% ctx.page_args.0 %]");
+    }
+);
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2 b/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2
index 9fdfadb6e4..603b543b45 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2
@@ -1,15 +1,6 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Claim Policy Actions' %]
 
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
-<script type="text/javascript">
-openils.Util.addOnLoad(
-    function() {
-        /* XXX TODO support URI param for claim_policy search constraint */
-        populateGrid();
-    }
-);
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
@@ -31,4 +22,14 @@ openils.Util.addOnLoad(
         editOnEnter="true">
     </table>
 </div>
+
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script type="text/javascript">
+openils.Util.addOnLoad(
+    function() {
+        /* XXX TODO support URI param for claim_policy search constraint */
+        populateGrid();
+    }
+);
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2 b/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2
index 77cf875816..7f0fbc3cb0 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2
@@ -1,15 +1,6 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Claim Types' %]
 
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
-<script type="text/javascript">
-openils.Util.addOnLoad(
-    function() {
-        prepareOwnerSelector("ADMIN_ACQ_CLAIM_TYPE");
-        populateGrid();
-    }
-);
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
@@ -38,4 +29,14 @@ openils.Util.addOnLoad(
         editOnEnter="true">
     </table>
 </div>
+
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script type="text/javascript">
+openils.Util.addOnLoad(
+    function() {
+        prepareOwnerSelector("ADMIN_ACQ_CLAIM_TYPE");
+        populateGrid();
+    }
+);
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 b/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2
index 94a7e2ec3d..d2ec57f2bc 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2
@@ -1,25 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Distribution Formulas' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/distribution_formula.js'></script>
-
-<script type="text/javascript"> 
-    var formulaId = '[% ctx.page_args.0 %]';
-
-    function getFormulaName(rowIndex, item) {
-        if(!item) return '';
-        var name = this.grid.store.getValue(item, 'name');
-        var id = this.grid.store.getValue(item, 'id');
-        return id + ':' + name;
-    }
-
-    function formatName(value) {
-        if(value) {
-            var vals = value.split(/:/);
-            return '<a href="'+location.href+ '/'+vals[0]+'">'+vals[1]+'</a>';
-        }
-    }
-</script>
-
 
 <div id='formula-list-div'>
     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
@@ -95,5 +75,25 @@
     </div>
 </div>
 
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/distribution_formula.js'></script>
+
+<script type="text/javascript"> 
+    var formulaId = '[% ctx.page_args.0 %]';
+
+    function getFormulaName(rowIndex, item) {
+        if(!item) return '';
+        var name = this.grid.store.getValue(item, 'name');
+        var id = this.grid.store.getValue(item, 'id');
+        return id + ':' + name;
+    }
+
+    function formatName(value) {
+        if(value) {
+            var vals = value.split(/:/);
+            return '<a href="'+location.href+ '/'+vals[0]+'">'+vals[1]+'</a>';
+        }
+    }
+</script>
+
 [% END %]
 
diff --git a/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2 b/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2
index d060031788..8c9e170d2f 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2
@@ -1,33 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'EDI Accounts' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/edi_account.js'> </script>
-
-<script type="text/javascript">
-// dojo.require('openils.widget.OrgUnitFilteringSelect');
-dojo.require('fieldmapper.OrgUtils');
-
-var targetId = '[% ctx.page_args.0 %]';
-
-function getOrgName(orgId) {
-    return fieldmapper.aou.findOrgUnit(orgId).shortname();
-}
-function getOwner(rowIndex, item) {
-    if (!item) return '';
-    var id = this.grid.store.getValue(item, 'owner');
-    return getOrgName(id);
-}
-function getProvider(rowIndex, item) {
-    if (!item) return '';
-    var id = this.grid.store.getValue(item, 'provider');
-    return id + ':' + id;   // TODO: get acq.provider.code from fieldmapper or elsewhere
-}
-function formatProvider(value) {
-    if (value) {
-        var vals = value.split(/:/);
-        return '<a href="[% ctx.base_path %]/conify/global/acq/provider/'+vals[0]+'">'+vals[1]+'</a>';
-    }
-}
-</script>
 <style type="text/css">
     .footer_notes { padding-top: 16px; font-size: smaller; }
 </style>
@@ -75,5 +47,33 @@ function formatProvider(value) {
     </div>
 </div>
 
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/edi_account.js'> </script>
+
+<script type="text/javascript">
+// dojo.require('openils.widget.OrgUnitFilteringSelect');
+dojo.require('fieldmapper.OrgUtils');
+
+var targetId = '[% ctx.page_args.0 %]';
+
+function getOrgName(orgId) {
+    return fieldmapper.aou.findOrgUnit(orgId).shortname();
+}
+function getOwner(rowIndex, item) {
+    if (!item) return '';
+    var id = this.grid.store.getValue(item, 'owner');
+    return getOrgName(id);
+}
+function getProvider(rowIndex, item) {
+    if (!item) return '';
+    var id = this.grid.store.getValue(item, 'provider');
+    return id + ':' + id;   // TODO: get acq.provider.code from fieldmapper or elsewhere
+}
+function formatProvider(value) {
+    if (value) {
+        var vals = value.split(/:/);
+        return '<a href="[% ctx.base_path %]/conify/global/acq/provider/'+vals[0]+'">'+vals[1]+'</a>';
+    }
+}
+</script>
 [% END %]
 
diff --git a/Open-ILS/web/templates/default/conify/global/acq/exchange_rate.tt2 b/Open-ILS/web/templates/default/conify/global/acq/exchange_rate.tt2
index 937e99f862..47694e6801 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/exchange_rate.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/exchange_rate.tt2
@@ -1,14 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Exchange Rates' %]
-<script type="text/javascript">
-    dojo.require('openils.widget.AutoGrid');
-    dojo.require('dijit.form.FilteringSelect');
-    openils.Util.addOnLoad(
-        function() {
-            erGrid.loadAll({order_by:{acqpro : 'name'}});
-        }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Exchange Rates</div>
     <div>
@@ -27,6 +18,16 @@
             editOnEnter='true'>
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.widget.AutoGrid');
+    dojo.require('dijit.form.FilteringSelect');
+    openils.Util.addOnLoad(
+        function() {
+            erGrid.loadAll({order_by:{acqpro : 'name'}});
+        }
+    );
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2 b/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
index 3729442db2..b1eeced2bf 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
@@ -1,12 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Invoice Item Types' %]
-<script type="text/javascript">
-    dojo.require("openils.widget.AutoGrid");
-    dojo.require("dijit.form.FilteringSelect");
-    openils.Util.addOnLoad(
-        function() { aiitGrid.loadAll({"order_by": {"aiit": "name"}}); }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
     <div>Invoice Item Types</div>
     <div>
@@ -24,4 +17,12 @@
             editOnEnter="true">
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.AutoGrid");
+    dojo.require("dijit.form.FilteringSelect");
+    openils.Util.addOnLoad(
+        function() { aiitGrid.loadAll({"order_by": {"aiit": "name"}}); }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2 b/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
index 610b86cd4b..31389918e1 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
@@ -1,12 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Invoice Payment Methods' %]
-<script type="text/javascript">
-    dojo.require("openils.widget.AutoGrid");
-    dojo.require("dijit.form.FilteringSelect");
-    openils.Util.addOnLoad(
-        function() { acqipmGrid.loadAll({"order_by": {"acqipm": "name"}}); }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
     <div>Invoice Payment Methods</div>
     <div>
@@ -24,4 +17,12 @@
             editOnEnter="true">
     </table>
 </div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.AutoGrid");
+    dojo.require("dijit.form.FilteringSelect");
+    openils.Util.addOnLoad(
+        function() { acqipmGrid.loadAll({"order_by": {"acqipm": "name"}}); }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 b/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
index de2049024c..ddef4b88fb 100644
--- a/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
@@ -1,38 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Providers' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/provider.js'> </script>
-
-<script type="text/javascript"> 
-    var providerId = '[% ctx.page_args.0 %]';
-
-function getInvIdent(rowIndex, item) {
-    if (!item) return {};
-    return {
-          "id": this.grid.store.getValue(item, "id"),
-        "name": this.grid.store.getValue(item, "inv_ident")
-    };
-}
-
-function formatInvIdent(o) {
-    return "<a href='" + oilsBasePath + "/acq/invoice/view/" + o.id + "'>" + o.name + "</a>";
-}
-
-function getProviderName(rowIndex, item) {
-    if(!item) return '';
-    var name = this.grid.store.getValue(item, 'name');
-    var id   = this.grid.store.getValue(item, 'id');
-    return id + ':' + name;
-}
-
-function formatName(value) {
-    if(value) {
-        var vals = value.split(/:/);
-        return '<a href="[% ctx.base_path %]/conify/global/acq/provider/'+vals[0]+'">'+vals[1]+'</a>';
-    }
-}
-
-</script>
-
 
 <div class="hidden">
     <select dojoType="dijit.form.FilteringSelect" jsId="nameSelect">
@@ -201,5 +168,39 @@ function formatName(value) {
     </div>
 </div>
 </div>
+
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/provider.js'> </script>
+
+<script type="text/javascript"> 
+    var providerId = '[% ctx.page_args.0 %]';
+
+function getInvIdent(rowIndex, item) {
+    if (!item) return {};
+    return {
+          "id": this.grid.store.getValue(item, "id"),
+        "name": this.grid.store.getValue(item, "inv_ident")
+    };
+}
+
+function formatInvIdent(o) {
+    return "<a href='" + oilsBasePath + "/acq/invoice/view/" + o.id + "'>" + o.name + "</a>";
+}
+
+function getProviderName(rowIndex, item) {
+    if(!item) return '';
+    var name = this.grid.store.getValue(item, 'name');
+    var id   = this.grid.store.getValue(item, 'id');
+    return id + ':' + name;
+}
+
+function formatName(value) {
+    if(value) {
+        var vals = value.split(/:/);
+        return '<a href="[% ctx.base_path %]/conify/global/acq/provider/'+vals[0]+'">'+vals[1]+'</a>';
+    }
+}
+
+</script>
+
 [% END %]
 
diff --git a/Open-ILS/web/templates/default/conify/global/action/survey.tt2 b/Open-ILS/web/templates/default/conify/global/action/survey.tt2
index 528456dd33..e08fae7c61 100644
--- a/Open-ILS/web/templates/default/conify/global/action/survey.tt2
+++ b/Open-ILS/web/templates/default/conify/global/action/survey.tt2
@@ -1,16 +1,4 @@
 [% WRAPPER default/base.tt2 %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action/survey.js'></script>
-<script type="text/javascript">
-    function formatName(inDatum) {
-        for(var i in svCache){
-            var sv = svCache[i];
-            var id = sv.id();
-            if (inDatum  == sv.name()){
-                return '<a href="[% ctx.base_path %]/conify/global/action/survey/edit/'+id+'">'+inDatum+'</a>';
-            }
-        }
-    }
-</script>
    <div dojoType="dijit.layout.ContentPane" layoutAlign='top'>
         <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Survey List</div>
@@ -91,6 +79,18 @@
         </table>
 </div>
 
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action/survey.js'></script>
+<script type="text/javascript">
+    function formatName(inDatum) {
+        for(var i in svCache){
+            var sv = svCache[i];
+            var id = sv.id();
+            if (inDatum  == sv.name()){
+                return '<a href="[% ctx.base_path %]/conify/global/action/survey/edit/'+id+'">'+inDatum+'</a>';
+            }
+        }
+    }
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2 b/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2
index f7279386f1..f498d8a2b8 100644
--- a/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2
+++ b/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2
@@ -1,12 +1,6 @@
 [% WRAPPER 'default/base.tt2' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action/survey/edit.js'></script>
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/default/conify.css'/>
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/default/conify.css'/>
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    var surveyId = [%ctx.page_args.0 %];
-    openils.Util.addOnLoad(function() { drawSurvey(surveyId) });
-</script>
 
 <!-- General survey info -->
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
@@ -18,4 +12,12 @@
 <table id='survey_table'>
 </table>
 
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action/survey/edit.js'></script>
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    var surveyId = [%ctx.page_args.0 %];
+    openils.Util.addOnLoad(function() { drawSurvey(surveyId) });
+</script>
+
+
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/action_trigger/event_definition_data.tt2 b/Open-ILS/web/templates/default/conify/global/action_trigger/event_definition_data.tt2
index ebbfa3d034..997af3d704 100644
--- a/Open-ILS/web/templates/default/conify/global/action_trigger/event_definition_data.tt2
+++ b/Open-ILS/web/templates/default/conify/global/action_trigger/event_definition_data.tt2
@@ -1,10 +1,4 @@
 [% WRAPPER default/base.tt2 %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action_trigger/event_definition.js'></script>
-<script type="text/javascript">
-    eventDefId = [% ctx.page_args.0 %];
-    openils.Util.addOnLoad(loadEventDefData)
-</script>
-
 <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
     <h2 id='at-event-def-name'/>
 </div>
@@ -83,6 +77,12 @@
 
 </div>
 
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action_trigger/event_definition.js'></script>
+<script type="text/javascript">
+    eventDefId = [% ctx.page_args.0 %];
+    openils.Util.addOnLoad(loadEventDefData)
+</script>
+
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/booking/resource.tt2 b/Open-ILS/web/templates/default/conify/global/booking/resource.tt2
index b49a438cda..18e0f6e1d0 100644
--- a/Open-ILS/web/templates/default/conify/global/booking/resource.tt2
+++ b/Open-ILS/web/templates/default/conify/global/booking/resource.tt2
@@ -1,18 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Resources' %]
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            var search = {"id": {"!=": null}};
-            if (xulG && xulG.resultant_brsrc)
-                search = {id: xulG.resultant_brsrc};
-            brsrcGrid.loadAll({order_by:{brsrc : 'barcode'}}, search);
-        }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Resources</div>
@@ -31,4 +18,18 @@
             editOnEnter='true'>
     </table>
 </div>
+
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            var search = {"id": {"!=": null}};
+            if (xulG && xulG.resultant_brsrc)
+                search = {id: xulG.resultant_brsrc};
+            brsrcGrid.loadAll({order_by:{brsrc : 'barcode'}}, search);
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2 b/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
index 86debfaf1d..b860c81edc 100644
--- a/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
+++ b/Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
@@ -1,15 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Resource Attributes' %]
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            braGrid.loadAll({order_by:{bra : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Resource Attributes</div>
@@ -28,4 +18,14 @@
     </table>
 </div>
 
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            braGrid.loadAll({order_by:{bra : 'name'}}, {"id": {"!=": null}});
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2 b/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2
index 0aad3e2618..d35442e805 100644
--- a/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2
+++ b/Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2
@@ -1,13 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Resource Attribute Maps' %]
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() { bramGrid.loadAll({order_by:{bram : 'resource_attr'}}); }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Resource Attribute Maps</div>
@@ -25,4 +17,13 @@
             editOnEnter='true'>
     </table>
 </div>
+
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() { bramGrid.loadAll({order_by:{bram : 'resource_attr'}}); }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2 b/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2
index 5734a783d8..af1c5a73b3 100644
--- a/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2
+++ b/Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2
@@ -1,15 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Resource Attribute Values' %]
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            bravGrid.loadAll({order_by:{brav : 'attr'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Resource Attribute Values</div>
@@ -27,4 +17,15 @@
             editOnEnter='true'>
     </table>
 </div>
+
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            bravGrid.loadAll({order_by:{brav : 'attr'}}, {"id": {"!=": null}});
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2 b/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2
index bdd108f20a..36afba7f00 100644
--- a/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2
+++ b/Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2
@@ -1,15 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Resource Types' %]
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            brtGrid.loadAll({"order_by": {"brt": "name"}}, {"id": {"!=": null}});
-        }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Resource Types</div>
@@ -30,4 +20,15 @@
             editOnEnter='true'>
     </table>
 </div>
+
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            brtGrid.loadAll({"order_by": {"brt": "name"}}, {"id": {"!=": null}});
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/config/circ_modifier.tt2 b/Open-ILS/web/templates/default/conify/global/config/circ_modifier.tt2
index f07bb2340a..7d60814777 100644
--- a/Open-ILS/web/templates/default/conify/global/config/circ_modifier.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/circ_modifier.tt2
@@ -1,47 +1,6 @@
 [% WRAPPER default/base.tt2 %]
 <h1>Circulation Modifier</h1> <br/>
 
-<script type ="text/javascript">
-
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    function formatSIPMediaType(inDatum) {
-        switch (inDatum) {
-            case '000':
-                return 'Other';
-            case '001':
-                return 'Book';
-            case '002':
-                return 'Magazine';
-            case '003':
-                return 'Bound Journal';
-            case '004':
-                return 'Audio Tape';
-            case '005':
-                return 'Video Tape';
-            case '006':
-                return 'CD/CDROM';
-            case '007':
-                return 'Diskette';
-            case '008':
-                return 'Book with diskette';
-            case '009':
-                return 'Book with CD';
-            case '010':
-                return 'Book with audio tape';
-        }
-    }
-
-    openils.Util.addOnLoad(
-        function() {
-            cmGrid.overrideEditWidgets.sip2_media_type = sip2Selector;
-            cmGrid.loadAll({order_by:{ccm : 'name'}});
-        }
-    );
-
-</script>
-
 <div class='hidden'>
     <select dojoType="dijit.form.FilteringSelect" jsId="sip2Selector">
         <option value='000'>Other</option>
@@ -85,4 +44,45 @@
     </table>
  </div>
 
+<script type ="text/javascript">
+
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    function formatSIPMediaType(inDatum) {
+        switch (inDatum) {
+            case '000':
+                return 'Other';
+            case '001':
+                return 'Book';
+            case '002':
+                return 'Magazine';
+            case '003':
+                return 'Bound Journal';
+            case '004':
+                return 'Audio Tape';
+            case '005':
+                return 'Video Tape';
+            case '006':
+                return 'CD/CDROM';
+            case '007':
+                return 'Diskette';
+            case '008':
+                return 'Book with diskette';
+            case '009':
+                return 'Book with CD';
+            case '010':
+                return 'Book with audio tape';
+        }
+    }
+
+    openils.Util.addOnLoad(
+        function() {
+            cmGrid.overrideEditWidgets.sip2_media_type = sip2Selector;
+            cmGrid.loadAll({order_by:{ccm : 'name'}});
+        }
+    );
+
+</script>
+
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/config/global_flag.tt2 b/Open-ILS/web/templates/default/conify/global/config/global_flag.tt2
index 8c4f4ec89e..10a7a3346c 100644
--- a/Open-ILS/web/templates/default/conify/global/config/global_flag.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/global_flag.tt2
@@ -1,15 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Global Flags' %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad( 
-        function() { 
-            gfGrid.overrideWidgetArgs.name = {readOnly : true};
-            gfGrid.loadAll(); 
-        } 
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Global Flags</div>
@@ -26,6 +16,17 @@
             hideSelector='true'
             editOnEnter='true'/>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad( 
+        function() { 
+            gfGrid.overrideWidgetArgs.name = {readOnly : true};
+            gfGrid.loadAll(); 
+        } 
+    );
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/config/hold_matrix_matchpoint.tt2 b/Open-ILS/web/templates/default/conify/global/config/hold_matrix_matchpoint.tt2
index 678966f15f..3c8bbbb864 100644
--- a/Open-ILS/web/templates/default/conify/global/config/hold_matrix_matchpoint.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/hold_matrix_matchpoint.tt2
@@ -1,15 +1,5 @@
 [% ctx.page_title = 'Hold Policy Configuration' %]
 [% WRAPPER default/base.tt2 %]
-<script type="text/javascript">
-    dojo.require('dijit.layout.ContentPane');
-    dojo.require('dijit.form.Button');
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad(
-        function(){
-            hmGrid.loadAll({order_by:{chmm:'circ_modifier'}});
-        }
-    );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Hold Policy Configuration</div>
     <div><button dojoType='dijit.form.Button' onClick='hmGrid.showCreatePane()'>New</button></div>
@@ -30,4 +20,15 @@
     </table>
     <div/>
 </div>
+
+<script type="text/javascript">
+    dojo.require('dijit.layout.ContentPane');
+    dojo.require('dijit.form.Button');
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad(
+        function(){
+            hmGrid.loadAll({order_by:{chmm:'circ_modifier'}});
+        }
+    );
+</script>
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/config/org_unit_setting_type.tt2 b/Open-ILS/web/templates/default/conify/global/config/org_unit_setting_type.tt2
index b23d01462a..4768cce4c4 100644
--- a/Open-ILS/web/templates/default/conify/global/config/org_unit_setting_type.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/org_unit_setting_type.tt2
@@ -1,24 +1,6 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Org Unit Setting Types' %]
 
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            ostGrid.overrideEditWidgets.datatype = dTypeSelector;
-            ostGrid.loadAll({order_by:{coust : 'name'}});
-        }
-    );
-
-    function formatDatatype(dtype) {
-        // pull the label from the type selector
-        return dojo.query('[value=' + dtype +']', dTypeSelector.domNode)[0].innerHTML;
-    }
-
-</script>
-
 <div class='hidden'>
     <select dojoType="dijit.form.FilteringSelect" jsId="dTypeSelector">
         <option value='string' selected='selected'>String</option>
@@ -61,4 +43,22 @@
     </table>
  </div>
 
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            ostGrid.overrideEditWidgets.datatype = dTypeSelector;
+            ostGrid.loadAll({order_by:{coust : 'name'}});
+        }
+    );
+
+    function formatDatatype(dtype) {
+        // pull the label from the type selector
+        return dojo.query('[value=' + dtype +']', dTypeSelector.domNode)[0].innerHTML;
+    }
+
+</script>
+
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2 b/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2
index 66677f11ed..50ed1c97db 100644
--- a/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/rule_age_hold_protect.tt2
@@ -1,10 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Age Hold Protect Rules' %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad( function() { ruleAgeProtectGrid.loadAll(); } );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Age Hold Protect Rules</div>
@@ -22,6 +17,12 @@
             fmClass='crahp'
             editOnEnter='true'/>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad( function() { ruleAgeProtectGrid.loadAll(); } );
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2 b/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2
index 70dd12d1ef..697362da48 100644
--- a/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/rule_circ_duration.tt2
@@ -1,10 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Circ Duration Rules' %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad( function() { ruleCircDurationGrid.loadAll(); } );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Circ Duration Rules</div>
@@ -22,6 +17,12 @@
             fmClass='crcd'
             editOnEnter='true'/>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad( function() { ruleCircDurationGrid.loadAll(); } );
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2 b/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2
index acfd720a57..f6ad07a799 100644
--- a/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/rule_max_fine.tt2
@@ -1,10 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Circ Max Fine Rules' %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad( function() { ruleMaxFineGrid.loadAll(); } );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Circ Max Fine Rules</div>
@@ -22,6 +17,12 @@
             fmClass='crmf'
             editOnEnter='true'/>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad( function() { ruleMaxFineGrid.loadAll(); } );
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2 b/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2
index c561b613d9..47887da3cf 100644
--- a/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/rule_recurring_fine.tt2
@@ -1,10 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Recurring Fine Rules' %]
-<script type="text/javascript">
-    dojo.require('openils.Util');
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad( function() { ruleRecurringFineGrid.loadAll(); } );
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Recurring Fine Rules</div>
@@ -22,6 +17,12 @@
             fmClass='crrf'
             editOnEnter='true'/>
 </div>
+
+<script type="text/javascript">
+    dojo.require('openils.Util');
+    dojo.require('openils.widget.AutoGrid');
+    openils.Util.addOnLoad( function() { ruleRecurringFineGrid.loadAll(); } );
+</script>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/config/standing_penalty.tt2 b/Open-ILS/web/templates/default/conify/global/config/standing_penalty.tt2
index 610eb1e794..598e639100 100644
--- a/Open-ILS/web/templates/default/conify/global/config/standing_penalty.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/standing_penalty.tt2
@@ -1,10 +1,33 @@
 [% WRAPPER default/base.tt2 %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/standing_penalty.js'></script>
 <style type="text/css">
     @import "[% ctx.media_prefix %]/js/dojo/dojox/form/resources/CheckedMultiSelect.css";
 </style>
 <h1>Standing Penalty Types</h1><br/>
 
+  <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+            <div>Standing Penalty Types</div>
+            <div>
+                <button dojoType='dijit.form.Button' onClick='spGrid.showCreateDialog()'>New Penalty Type</button>
+                <button dojoType='dijit.form.Button' onClick='spGrid.deleteSelected()'>Delete Selected</button>
+            </div>
+        </div>
+
+        <table  jsId="spGrid"
+                dojoType="openils.widget.AutoGrid"
+                fieldOrder="['id', 'name', 'label', 'block_list']"
+                query="{name: '*'}"
+                defaultCellWidth='"auto"'
+                fmClass='csp'
+                editOnEnter='true'>
+            <thead>
+                <tr> <th field="id" formatter='formatId'/> </tr>
+            </thead>
+        </table>
+    </div>
+</div>
+
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/standing_penalty.js'></script>
 <script type="text/javascript">
 
     if(!dojo._hasResource['openils.widget.StandingPenaltyBlockedSelector']) {
@@ -37,28 +60,6 @@
     }
 
 </script>
-  <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-            <div>Standing Penalty Types</div>
-            <div>
-                <button dojoType='dijit.form.Button' onClick='spGrid.showCreateDialog()'>New Penalty Type</button>
-                <button dojoType='dijit.form.Button' onClick='spGrid.deleteSelected()'>Delete Selected</button>
-            </div>
-        </div>
-
-        <table  jsId="spGrid"
-                dojoType="openils.widget.AutoGrid"
-                fieldOrder="['id', 'name', 'label', 'block_list']"
-                query="{name: '*'}"
-                defaultCellWidth='"auto"'
-                fmClass='csp'
-                editOnEnter='true'>
-            <thead>
-                <tr> <th field="id" formatter='formatId'/> </tr>
-            </thead>
-        </table>
-    </div>
-</div>
 [% END %]
 
 
diff --git a/Open-ILS/web/templates/default/conify/global/config/usr_setting_type.tt2 b/Open-ILS/web/templates/default/conify/global/config/usr_setting_type.tt2
index 41e2dd78a2..2b477a29ff 100644
--- a/Open-ILS/web/templates/default/conify/global/config/usr_setting_type.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/usr_setting_type.tt2
@@ -1,24 +1,6 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'User Setting Types' %]
 
-<script type ="text/javascript">
-    dojo.require('dijit.form.FilteringSelect');
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            ustGrid.overrideEditWidgets.datatype = dTypeSelector;
-            ustGrid.loadAll({order_by:{cust : 'name'}});
-        }
-    );
-
-    function formatDatatype(dtype) {
-        // pull the label from the type selector
-        return dojo.query('[value=' + dtype +']', dTypeSelector.domNode)[0].innerHTML;
-    }
-
-</script>
-
 <div class='hidden'>
     <select dojoType="dijit.form.FilteringSelect" jsId="dTypeSelector">
         <option value='string' selected='selected'>String</option>
@@ -61,4 +43,22 @@
     </table>
  </div>
 
+<script type ="text/javascript">
+    dojo.require('dijit.form.FilteringSelect');
+    dojo.require('openils.widget.AutoGrid');
+
+    openils.Util.addOnLoad(
+        function() {
+            ustGrid.overrideEditWidgets.datatype = dTypeSelector;
+            ustGrid.loadAll({order_by:{cust : 'name'}});
+        }
+    );
+
+    function formatDatatype(dtype) {
+        // pull the label from the type selector
+        return dojo.query('[value=' + dtype +']', dTypeSelector.domNode)[0].innerHTML;
+    }
+
+</script>
+
 [% END %]
diff --git a/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2 b/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2
index c2e379dfda..5984739634 100644
--- a/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2
+++ b/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2
@@ -1,6 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = 'Group Penalty Thresholds' %]
-<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/permission/grp_penalty_threshold.js'> </script>    
 
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Penalty Threshold</div>
@@ -31,6 +30,7 @@
     </table>    
 </div>
     
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/permission/grp_penalty_threshold.js'> </script>    
 <script type='javascript/text'>
     var org_id = openils.User.user.ws_ou();
     var list = fieldmapper.aou.findOrgUnit(org_id).orgNodeTrail().map( 
diff --git a/Open-ILS/web/templates/default/menu.tt2 b/Open-ILS/web/templates/default/menu.tt2
index dbb87a409b..fcd1992de9 100644
--- a/Open-ILS/web/templates/default/menu.tt2
+++ b/Open-ILS/web/templates/default/menu.tt2
@@ -1,13 +1,4 @@
 <div id='oils-menu-div'>
-    <script type="text/javascript">
-        dojo.require('openils.XUL');
-        if(openils.XUL.isXUL()) 
-            openils.Util.hide('oils-menu-div')
-        dojo.require('dijit.form.Button');
-        dojo.require('dijit.Toolbar');
-        dojo.require('dijit.Menu');
-    </script>
-
     <div dojoType="dijit.Toolbar" class='menuBar'>
 
         <div dojoType="dijit.form.DropDownButton">
@@ -125,3 +116,12 @@
     </div>
 </div>
 
+    <script type="text/javascript">
+        dojo.require('openils.XUL');
+        if(openils.XUL.isXUL()) 
+            openils.Util.hide('oils-menu-div')
+        dojo.require('dijit.form.Button');
+        dojo.require('dijit.Toolbar');
+        dojo.require('dijit.Menu');
+    </script>
+
diff --git a/Open-ILS/web/templates/default/serial/list_stream.tt2 b/Open-ILS/web/templates/default/serial/list_stream.tt2
index 7cda19dbba..660c761296 100644
--- a/Open-ILS/web/templates/default/serial/list_stream.tt2
+++ b/Open-ILS/web/templates/default/serial/list_stream.tt2
@@ -1,9 +1,5 @@
 [% WRAPPER default/base.tt2 %]
 [% ctx.page_title = "Streams" %]
-<script
-    type="text/javascript"
-    src="[% ctx.media_prefix %]/js/ui/default/serial/list_stream.js">
-</script>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane"
         layoutAlign="top" class="oils-header-panel">
@@ -67,4 +63,5 @@
     </div>
     <div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog"></div>
 </div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/list_stream.js"> </script>
 [% END %]