preparing for the merge

git-svn-id: svn://svn.open-ils.org/ILS/branches/dojo-admin@9307 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index 5d86d4f..b250faa 100644 (file)
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -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>
 

diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.html b/Open-ILS/web/conify/global/actor/org_unit_type.html
index bd4cf5b..0818da7 100644 (file)
--- a/Open-ILS/web/conify/global/actor/org_unit_type.html
+++ b/Open-ILS/web/conify/global/actor/org_unit_type.html
@@ -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>
 

diff --git a/Open-ILS/web/conify/global/admin.html b/Open-ILS/web/conify/global/admin.html
index 6057219..8a4ff3f 100644 (file)
--- a/Open-ILS/web/conify/global/admin.html
+++ b/Open-ILS/web/conify/global/admin.html
@@ -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');

diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html
index 99f5417..90e3b2f 100644 (file)
--- a/Open-ILS/web/conify/global/config/copy_status.html
+++ b/Open-ILS/web/conify/global/config/copy_status.html
@@ -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>
 

diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html
index 42fbb8e..f8ea5ca 100644 (file)
--- a/Open-ILS/web/conify/global/permission/grp_tree.html
+++ b/Open-ILS/web/conify/global/permission/grp_tree.html
@@ -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>
 

diff --git a/Open-ILS/web/conify/global/permission/grp_tree.js b/Open-ILS/web/conify/global/permission/grp_tree.js
index 0037a0a..05d3dbd 100644 (file)
--- a/Open-ILS/web/conify/global/permission/grp_tree.js
+++ b/Open-ILS/web/conify/global/permission/grp_tree.js
@@ -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');

diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html
index 38d6921..4fc1a05 100644 (file)
--- a/Open-ILS/web/conify/global/permission/perm_list.html
+++ b/Open-ILS/web/conify/global/permission/perm_list.html
@@ -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>