summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2012-11-26 14:50:43 +0100
committerPetr Vobornik <pvoborni@redhat.com>2013-01-18 15:10:36 +0100
commite3ce3e4f393d45d4e611a129db6cb7abfa5ad716 (patch)
tree69eac7ad762b4350a87109a18a5aabae98f5a420
parentbe0a120134680c5977f8a8c9e6d359944fa1f2ab (diff)
downloadfreeipa-e3ce3e4f393d45d4e611a129db6cb7abfa5ad716.tar.gz
freeipa-e3ce3e4f393d45d4e611a129db6cb7abfa5ad716.tar.xz
freeipa-e3ce3e4f393d45d4e611a129db6cb7abfa5ad716.zip
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
-rw-r--r--install/ui/config.js39
-rw-r--r--install/ui/index.html58
2 files changed, 52 insertions, 45 deletions
diff --git a/install/ui/config.js b/install/ui/config.js
new file mode 100644
index 000000000..e984676f3
--- /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 ba86a5216..5dc70db56 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>