[open-ils-commits] r9307 - in
branches/dojo-admin/Open-ILS/web/conify/global: . actor
config permission
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Apr 11 00:13:04 EDT 2008
Author: miker
Date: 2008-04-10 23:35:33 -0400 (Thu, 10 Apr 2008)
New Revision: 9307
Modified:
branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit.html
branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit_type.html
branches/dojo-admin/Open-ILS/web/conify/global/admin.html
branches/dojo-admin/Open-ILS/web/conify/global/config/copy_status.html
branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.html
branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.js
branches/dojo-admin/Open-ILS/web/conify/global/permission/perm_list.html
Log:
preparing for the merge
Modified: branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit.html
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit.html 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit.html 2008-04-11 03:35:33 UTC (rev 9307)
@@ -17,9 +17,9 @@
<title>Confiy :: Global :: Actor :: Org Units</title>
<style type="text/css">
- @import url("/js/dojo/resources/dojo.css");
- @import url("/js/dijit/themes/tundra/tundra.css");
- @import url("/js/dojox/widget/Toaster/Toaster.css");
+ @import url("/js/dojo/dojo/resources/dojo.css");
+ @import url("/js/dojo/dijit/themes/tundra/tundra.css");
+ @import url("/js/dojo/dojox/widget/Toaster/Toaster.css");
</style>
<style>
@@ -51,8 +51,8 @@
<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
<!-- Dojo goodness -->
- <script type="text/javascript" src="/js/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
- <script type="text/javascript" src="/js/dijit/dijit.js"></script>
+ <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
<script type="text/javascript" src="org_unit.js"></script>
Modified: branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit_type.html
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit_type.html 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/actor/org_unit_type.html 2008-04-11 03:35:33 UTC (rev 9307)
@@ -17,9 +17,9 @@
<title>Confiy :: Global :: Actor :: Org Unit Types</title>
<style type="text/css">
- @import url("/js/dojo/resources/dojo.css");
- @import url("/js/dijit/themes/tundra/tundra.css");
- @import url("/js/dojox/widget/Toaster/Toaster.css");
+ @import url("/js/dojo/dojo/resources/dojo.css");
+ @import url("/js/dojo/dijit/themes/tundra/tundra.css");
+ @import url("/js/dojo/dojox/widget/Toaster/Toaster.css");
</style>
<style>
@@ -51,8 +51,8 @@
<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
<!-- Dojo goodness -->
- <script type="text/javascript" src="/js/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
- <script type="text/javascript" src="/js/dijit/dijit.js"></script>
+ <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
<script type="text/javascript" src="org_unit_type.js"></script>
Modified: branches/dojo-admin/Open-ILS/web/conify/global/admin.html
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/admin.html 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/admin.html 2008-04-11 03:35:33 UTC (rev 9307)
@@ -17,9 +17,9 @@
<title>Conify :: Global :: Admin</title>
<style type="text/css">
- @import url("/js/dojo/resources/dojo.css");
- @import url("/js/dijit/themes/tundra/tundra.css");
- @import url("/js/dojox/widget/Toaster/Toaster.css");
+ @import url("/js/dojo/dojo/resources/dojo.css");
+ @import url("/js/dojo/dijit/themes/tundra/tundra.css");
+ @import url("/js/dojo/dojox/widget/Toaster/Toaster.css");
</style>
<style>
@@ -34,8 +34,8 @@
</style>
<!-- Dojo goodness -->
- <script type="text/javascript" src="/js/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
- <script type="text/javascript" src="/js/dijit/dijit.js"></script>
+ <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
<script type="text/javascript">
dojo.require('dojo.parser');
Modified: branches/dojo-admin/Open-ILS/web/conify/global/config/copy_status.html
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/config/copy_status.html 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/config/copy_status.html 2008-04-11 03:35:33 UTC (rev 9307)
@@ -17,10 +17,10 @@
<title>Confiy :: Global :: Config :: Copy Status</title>
<style type="text/css">
- @import url("/js/dojox/grid/_grid/tundraGrid.css");
- @import url("/js/dojo/resources/dojo.css");
- @import url("/js/dijit/themes/tundra/tundra.css");
- @import url("/js/dojox/widget/Toaster/Toaster.css");
+ @import url("/js/dojo/dojox/grid/_grid/tundraGrid.css");
+ @import url("/js/dojo/dojo/resources/dojo.css");
+ @import url("/js/dojo/dijit/themes/tundra/tundra.css");
+ @import url("/js/dojo/dojox/widget/Toaster/Toaster.css");
</style>
<style>
@@ -54,8 +54,8 @@
<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
<!-- Dojo goodness -->
- <script type="text/javascript" src="/js/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
- <script type="text/javascript" src="/js/dijit/dijit.js"></script>
+ <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
<script type="text/javascript" src="copy_status.js"></script>
Modified: branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.html
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.html 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.html 2008-04-11 03:35:33 UTC (rev 9307)
@@ -17,10 +17,10 @@
<title>Confiy :: Global :: Permission :: Group Tree</title>
<style type="text/css">
- @import url("/js/dojox/grid/_grid/tundraGrid.css");
- @import url("/js/dojo/resources/dojo.css");
- @import url("/js/dijit/themes/tundra/tundra.css");
- @import url("/js/dojox/widget/Toaster/Toaster.css");
+ @import url("/js/dojo/dojox/grid/_grid/tundraGrid.css");
+ @import url("/js/dojo/dojo/resources/dojo.css");
+ @import url("/js/dojo/dijit/themes/tundra/tundra.css");
+ @import url("/js/dojo/dojox/widget/Toaster/Toaster.css");
</style>
<style>
@@ -64,9 +64,8 @@
<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
<!-- Dojo goodness -->
- <script type="text/javascript" src="/js/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
- <script type="text/javascript" src="/js/dijit/dijit.js"></script>
- <script type="text/javascript" src="/js/fieldmapper/Fieldmapper.js"></script>
+ <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
<script type="text/javascript" src="grp_tree.js"></script>
Modified: branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.js
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.js 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/permission/grp_tree.js 2008-04-11 03:35:33 UTC (rev 9307)
@@ -16,7 +16,6 @@
*/
dojo.require('fieldmapper.dojoData');
-//dojo.require('fieldmapper.OrgUtils');
dojo.require('dojo.parser');
dojo.require('dojo.data.ItemFileWriteStore');
dojo.require('dojo.date.stamp');
Modified: branches/dojo-admin/Open-ILS/web/conify/global/permission/perm_list.html
===================================================================
--- branches/dojo-admin/Open-ILS/web/conify/global/permission/perm_list.html 2008-04-11 02:10:34 UTC (rev 9306)
+++ branches/dojo-admin/Open-ILS/web/conify/global/permission/perm_list.html 2008-04-11 03:35:33 UTC (rev 9307)
@@ -17,10 +17,10 @@
<title>Confiy :: Global :: Permission :: Permission List</title>
<style type="text/css">
- @import url("/js/dojox/grid/_grid/tundraGrid.css");
- @import url("/js/dojo/resources/dojo.css");
- @import url("/js/dijit/themes/tundra/tundra.css");
- @import url("/js/dojox/widget/Toaster/Toaster.css");
+ @import url("/js/dojo/dojox/grid/_grid/tundraGrid.css");
+ @import url("/js/dojo/dojo/resources/dojo.css");
+ @import url("/js/dojo/dijit/themes/tundra/tundra.css");
+ @import url("/js/dojo/dojox/widget/Toaster/Toaster.css");
</style>
<style>
@@ -54,8 +54,8 @@
<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
<!-- Dojo goodness -->
- <script type="text/javascript" src="/js/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
- <script type="text/javascript" src="/js/dijit/dijit.js"></script>
+ <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
<script type="text/javascript" src="perm_list.js"></script>
More information about the open-ils-commits
mailing list