From e472a3419e60cda05978994db3915962a241a86f Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Mon, 26 Nov 2012 14:50:43 +0100
Subject: AMD config file

Added configuration file for DOJO loader. Removal of JS links from index.html of
files which were changed to AMD modules.

https://fedorahosted.org/freeipa/ticket/112
---
 install/ui/config.js  | 39 ++++++++++++++++++++++++++++++++++
 install/ui/index.html | 58 ++++++++++++---------------------------------------
 2 files changed, 52 insertions(+), 45 deletions(-)
 create mode 100644 install/ui/config.js

diff --git a/install/ui/config.js b/install/ui/config.js
new file mode 100644
index 00000000..e984676f
--- /dev/null
+++ b/install/ui/config.js
@@ -0,0 +1,39 @@
+/*  Authors:
+ *    Petr Vobornik <pvoborni@redhat.com>
+ *
+ * Copyright (C) 2012 Red Hat
+ * see file 'COPYING' for use and warranty information
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+var dojoConfig= {
+    baseUrl: "js",
+    has: {
+        'dojo-firebug': false,
+        'dojo-debug-messages': true
+    },
+    parseOnLoad: false,
+    async: true,
+    packages: [
+        {
+            name:'dojo',
+            location:'dojo'
+        },
+        {
+            name: 'freeipa',
+            location: 'freeipa'
+        }
+    ]
+};
\ No newline at end of file
diff --git a/install/ui/index.html b/install/ui/index.html
index ba86a521..5dc70db5 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -13,51 +13,19 @@
     <![endif]-->
     <link rel="icon" type="image/ico" href="favicon.ico">
 
-    <script type="text/javascript" src="json2.js"></script>
-    <script type="text/javascript" src="jquery.js"></script>
-    <script type="text/javascript" src="jquery-ui.js"></script>
-    <script type="text/javascript" src="jquery.ba-bbq.js"></script>
-    <script type="text/javascript" src="jquery.ordered-map.js"></script>
-    <script type="text/javascript" src="browser.js"></script>
-    <script type="text/javascript" src="net.js"></script>
-
-    <script type="text/javascript" src="ipa.js"></script>
-    <script type="text/javascript" src="widget.js"></script>
-    <script type="text/javascript" src="field.js"></script>
-    <script type="text/javascript" src="dialog.js"></script>
-    <script type="text/javascript" src="search.js"></script>
-    <script type="text/javascript" src="details.js"></script>
-    <script type="text/javascript" src="add.js"></script>
-    <script type="text/javascript" src="association.js"></script>
-    <script type="text/javascript" src="facet.js"></script>
-    <script type="text/javascript" src="entity.js"></script>
-    <script type="text/javascript" src="navigation.js"></script>
-    <script type="text/javascript" src="rule.js"></script>
-
-    <script type="text/javascript" src="automember.js"></script>
-    <script type="text/javascript" src="automount.js"></script>
-    <script type="text/javascript" src="dns.js"></script>
-    <script type="text/javascript" src="certificate.js"></script>
-    <script type="text/javascript" src="user.js"></script>
-    <script type="text/javascript" src="group.js"></script>
-    <script type="text/javascript" src="hbac.js"></script>
-    <script type="text/javascript" src="hbactest.js"></script>
-    <script type="text/javascript" src="host.js"></script>
-    <script type="text/javascript" src="hostgroup.js"></script>
-    <script type="text/javascript" src="netgroup.js"></script>
-    <script type="text/javascript" src="selinux.js"></script>
-    <script type="text/javascript" src="service.js"></script>
-    <script type="text/javascript" src="serverconfig.js"></script>
-    <script type="text/javascript" src="sudo.js"></script>
-    <script type="text/javascript" src="policy.js"></script>
-    <script type="text/javascript" src="aci.js"></script>
-    <script type="text/javascript" src="entitle.js"></script>
-    <script type="text/javascript" src="trust.js"></script>
-    <script type="text/javascript" src="idrange.js"></script>
-
-    <script type="text/javascript" src="ext/extension.js"></script>
-    <script type="text/javascript" src="webui.js"></script>
-
+    <script type="text/javascript" src="js/libs/json2.js"></script>
+    <script type="text/javascript" src="js/libs/jquery.js"></script>
+    <script type="text/javascript" src="js/libs/jquery-ui.js"></script>
+    <script type="text/javascript" src="js/libs/jquery.ba-bbq.js"></script>
+    <script type="text/javascript" src="js/libs/jquery.ordered-map.js"></script>
+    <script type="text/javascript" src="js/libs/browser.js"></script>
+
+
+    <script type="text/javascript" src="config.js"></script>
+    <script type="text/javascript" src="js/dojo/dojo.js"></script>
+    <script type="text/javascript">
+        require(['freeipa/app'], function(app){ app.run(); });
+    </script>
 </head>
 
 <body>
-- 
cgit