Removed the large general dojo import set from base.html. now, each

page/lib needs to manage those imports.

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9551 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/dojo/openils/acq/Fund.js b/Open-ILS/web/js/dojo/openils/acq/Fund.js
index d4715aa..351f226 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/acq/Fund.js
+++ b/Open-ILS/web/js/dojo/openils/acq/Fund.js
@@ -18,6 +18,7 @@ if(!dojo._hasResource['openils.acq.Fund']) {
 dojo._hasResource['openils.acq.Fund'] = true;
 dojo.provide('openils.acq.Fund');
 dojo.require('fieldmapper.Fieldmapper');
+dojo.require('fieldmapper.dojoData');
 
 /** Declare the Fund class with dojo */
 dojo.declare('openils.acq.Fund', null, {

diff --git a/Open-ILS/web/js/dojo/openils/acq/FundingSource.js b/Open-ILS/web/js/dojo/openils/acq/FundingSource.js
index 11790c1..d5cf3f6 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/acq/FundingSource.js
+++ b/Open-ILS/web/js/dojo/openils/acq/FundingSource.js
@@ -18,6 +18,7 @@ if(!dojo._hasResource['openils.acq.FundingSource']) {
 dojo._hasResource['openils.acq.FundingSource'] = true;
 dojo.provide('openils.acq.FundingSource');
 dojo.require('fieldmapper.Fieldmapper');
+dojo.require('fieldmapper.dojoData');
 
 /** Declare the FundingSource class with dojo */
 dojo.declare('openils.acq.FundingSource', null, {

diff --git a/Open-ILS/web/js/dojo/openils/acq/Provider.js b/Open-ILS/web/js/dojo/openils/acq/Provider.js
index a13bd22..1d015b2 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/acq/Provider.js
+++ b/Open-ILS/web/js/dojo/openils/acq/Provider.js
@@ -18,6 +18,7 @@ if(!dojo._hasResource['openils.acq.Provider']) {
 dojo._hasResource['openils.acq.Provider'] = true;
 dojo.provide('openils.acq.Provider');
 dojo.require('fieldmapper.Fieldmapper');
+dojo.require('fieldmapper.dojoData');
 
 /** Declare the Provider class with dojo */
 dojo.declare('openils.acq.Provider', null, {

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
index 7e37598..72987a6 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
@@ -38,25 +38,17 @@
 
     <script type="text/javascript">
         dojo.require("dojo.parser");
-        dojo.require("dijit.layout.LayoutContainer")
-        dojo.require("dijit.layout.ContentPane")
-        dojo.require("dijit.form.Form")
-        dojo.require("dijit.form.Button");
-        dojo.require("dijit.form.TextBox");
-        dojo.require("dijit.form.NumberTextBox");
-        dojo.require("dijit.form.NumberSpinner");
-        dojo.require("dijit.form.FilteringSelect");
-        dojo.require("dojo.data.ItemFileWriteStore");
-        dojo.require("dojox.grid.Grid");
-        dojo.require("dojox.grid._data.model");
-        dojo.require("fieldmapper.dojoData");
-        dojo.require("fieldmapper.OrgUtils");
-        dojo.require("openils.User");
+        /* import ILS object definitions */
+        dojo.require("fieldmapper.Fieldmapper");
     </script>
 
-    <!-- set up some global JS variables -->
     <script type='text/javascript'>
-        openils.User.authtoken = '${c.oils.core.authtoken.value}';
+        /* first thing, let's make sure we're logged in */
+        dojo.require('dojo.cookie');
+        dojo.require('openils.CGI');
+        dojo.require("openils.User");
+        openils.User.authcookie = 'ses';
+        openils.User.authtoken = dojo.cookie('ses') || new openils.CGI().param('ses');
     </script>
 </%def>
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
index 2e0dbf7..79c2824 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
@@ -7,13 +7,18 @@
     <div id='oils-acq-list-header-label'>${_('Funding Sources')}</div>
 </div>
 
+<script src='/oils/media/js/dojo/fieldmapper/OrgUtils.js'> </script>
+<script src='/oils/media/js/dojo/openils/widget/OrgUnitFilteringSelect.js'> </script>
+
 <script type="text/javascript">
     dojo.require("dijit.Dialog");
     dojo.require("dijit.form.FilteringSelect");
     dojo.require('openils.acq.FundingSource');
-    dojo.require('openils.Event');
     dojo.require('openils.acq.CurrencyType');
     dojo.require('openils.widget.OrgUnitFilteringSelect');
+    dojo.require('dijit.form.Button');
+    dojo.require('dojox.grid.Grid');
+    dojo.require('openils.Event');
 
     var globalUser = new openils.User();
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
index f5caa94..ca52199 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
@@ -10,10 +10,13 @@
 <script type="text/javascript">
     dojo.require("dijit.Dialog");
     dojo.require("dijit.form.FilteringSelect");
-    dojo.require('openils.acq.Fund');
-    dojo.require('openils.Event');
-    dojo.require('openils.acq.CurrencyType');
+    dojo.require('dijit.form.Button');
+    dojo.require('dojox.grid.Grid');
+
     dojo.require('openils.widget.OrgUnitFilteringSelect');
+    dojo.require('openils.acq.CurrencyType');
+    dojo.require('openils.Event');
+    dojo.require('openils.acq.Fund');
 
     var globalUser = new openils.User();
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
index bd586ef..6211d06 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
@@ -6,9 +6,13 @@
 <script type="text/javascript">
     dojo.require("dijit.Dialog");
     dojo.require("dijit.form.FilteringSelect");
-    dojo.require('openils.acq.Provider');
-    dojo.require('openils.Event');
+    dojo.require('dijit.form.Button');
+    dojo.require('dojox.grid.Grid');
+
     dojo.require('openils.acq.CurrencyType');
+    dojo.require('openils.Event');
+    dojo.require('openils.acq.Provider');
+    dojo.require("fieldmapper.OrgUtils");
 </script>
 
 <div id='oils-acq-list-header' class='container'>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
index dc9b1ba..ecc148f 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
@@ -7,6 +7,9 @@
     dojo.require("dijit.Dialog");
     dojo.require('dijit.layout.TabContainer');
     dojo.require('dijit.layout.ContentPane');
+    dojo.require('dojox.grid.Grid');
+
+    dojo.require("fieldmapper.OrgUtils");
     dojo.require('openils.acq.Fund');
     dojo.require('openils.acq.FundingSource');
     dojo.require('openils.Event');

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
index a6a4804..6436075 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
@@ -11,6 +11,9 @@
     dojo.require("dijit.form.FilteringSelect");
     dojo.require("dijit.form.Textarea");
     dojo.require("dijit.form.CurrencyTextBox");
+    dojo.require('dojox.grid.Grid');
+
+    dojo.require("fieldmapper.OrgUtils");
     dojo.require('openils.acq.FundingSource');
     dojo.require('openils.acq.Fund');
     dojo.require('openils.Event');

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
index 8669af3..e27917c 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
@@ -12,8 +12,9 @@
     <script>
         dojo.require('dojox.form.CheckedMultiSelect');
         dojo.require('fieldmapper.Fieldmapper');
-        dojo.require('dojo.data.ItemFileReadStore');
         dojo.require('dijit.ProgressBar');
+        dojo.require('dijit.form.Form');
+        dojo.require('dijit.form.TextBox');
         dojo.require('openils.Event');
 
         var searchLimit = ${c.oils.acq.limit.value} || 10;
@@ -171,7 +172,8 @@
             </script>
             <div id='oils-acq-search-sources-block'>
                 <div id='oils-acq-search-sources-label'>${_('Search Sources')}</div>
-                <select multiple='true' jsId="bibSourceSelect" dojoType="dojox.form.CheckedMultiSelect">
+                <select style='overflow-y:auto;' id='oils-acq-search-source-select' 
+                        multiple='true' jsId="bibSourceSelect" dojoType="dojox.form.CheckedMultiSelect">
                     <option value='native-evergreen-catalog'>${_('Evergreen Catalog')}</option>
                 </select>
             </div>