[open-ils-commits] r9551 - in branches/acq-experiment/Open-ILS/web:
js/dojo/openils/acq oilsweb/oilsweb/templates/oils
oilsweb/oilsweb/templates/oils/default/acq/financial
oilsweb/oilsweb/templates/oils/default/acq/picklist
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri May 9 21:27:00 EDT 2008
Author: erickson
Date: 2008-05-09 21:26:59 -0400 (Fri, 09 May 2008)
New Revision: 9551
Modified:
branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Fund.js
branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/FundingSource.js
branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Provider.js
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
Log:
Removed the large general dojo import set from base.html. now, each
page/lib needs to manage those imports.
Modified: branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Fund.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Fund.js 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Fund.js 2008-05-10 01:26:59 UTC (rev 9551)
@@ -18,6 +18,7 @@
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, {
Modified: branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/FundingSource.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/FundingSource.js 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/FundingSource.js 2008-05-10 01:26:59 UTC (rev 9551)
@@ -18,6 +18,7 @@
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, {
Modified: branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Provider.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Provider.js 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/openils/acq/Provider.js 2008-05-10 01:26:59 UTC (rev 9551)
@@ -18,6 +18,7 @@
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, {
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -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>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -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();
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -10,10 +10,13 @@
<script type="text/javascript">
dojo.require("dijit.Dialog");
dojo.require("dijit.form.FilteringSelect");
+ 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');
- dojo.require('openils.Event');
- dojo.require('openils.acq.CurrencyType');
- dojo.require('openils.widget.OrgUnitFilteringSelect');
var globalUser = new openils.User();
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -6,9 +6,13 @@
<script type="text/javascript">
dojo.require("dijit.Dialog");
dojo.require("dijit.form.FilteringSelect");
+ 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('openils.Event');
- dojo.require('openils.acq.CurrencyType');
+ dojo.require("fieldmapper.OrgUtils");
</script>
<div id='oils-acq-list-header' class='container'>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -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');
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -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');
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html 2008-05-10 01:25:45 UTC (rev 9550)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html 2008-05-10 01:26:59 UTC (rev 9551)
@@ -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>
More information about the open-ils-commits
mailing list