Index: Dev/branches/rest-dojo-ui/client/config/db.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/config/db.js	(revision 407)
+++ Dev/branches/rest-dojo-ui/client/config/db.js	(revision 408)
@@ -6,11 +6,6 @@
          'dojo/query',
          'dijit/registry',
-         'dojo/text!./docs.json',
-         'dojo/domReady!',
-         'dijit/form/TextBox',
-         'dijit/form/Button',
-         'dijit/form/CheckBox',
-         ],
-    function(json,lang,xhr,parser,query,registry,docsJson){
+         'dojo/domReady!'
+],function(json,lang,xhr,parser,query,registry){
     var logNode;
     var usernameInput, passwordInput, resetInput, configButton;
@@ -18,18 +13,19 @@
     var dbUrl = "../data/";
 
-    parser.parse();
+    parser.parse()
+    .then(function(){
+        query("#log").forEach(function(n){logNode = n;});
+        usernameInput = registry.byId('username');
+        passwordInput = registry.byId('password');
+        resetInput = registry.byId('reset');
+        configButton = registry.byId('configure');
 
-    query("#log").forEach(function(n){logNode = n;});
-    usernameInput = registry.byId('username');
-    passwordInput = registry.byId('password');
-    resetInput = registry.byId('reset');
-    configButton = registry.byId('configure');
+        usernameInput.set('value',defaultUsername);
+        passwordInput.set('value',defaultPassword);
+        configButton.on('click',configure);
 
-    usernameInput.set('value',defaultUsername);
-    passwordInput.set('value',defaultPassword);
-    configButton.on('click',configure);
+        log("Give CouchDB admin username & password and click 'Configure' to start.\nIf the database already exists, rft_admin password will suffice.",true);
+    });
 
-    log("Give CouchDB admin username & password and click 'Configure' to start.\nIf the database already exists, rft_admin password will suffice.",true);
-    
     function configure(){
         var docs;
Index: Dev/branches/rest-dojo-ui/client/config/index.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/config/index.html	(revision 407)
+++ Dev/branches/rest-dojo-ui/client/config/index.html	(revision 408)
@@ -2,9 +2,7 @@
 <html>
     <head>
+        <title>Research Facilitator Tool - CouchDB Configure</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research Facilitator Tool - CouchDB Configure</title>
-        <script type="text/javascript" src="../dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, isDebug: true"></script>
-        <script type="text/javascript" src="db.js"></script>
-        <link rel="stylesheet" type="text/css" href="../dojotoolkit/dijit/themes/claro/claro.css" />
+        <link rel="stylesheet" type="text/css" href="../dijit/themes/claro/claro.css" />
         <style>
             label {
@@ -15,10 +13,12 @@
     </head>
     <body class="claro">
+        <script type="text/javascript" src="../dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, isDebug: true"></script>
+        <script type="text/javascript" src="db.js"></script>
         <h1>Configure CouchDB</h1>
         <div>
-            <label for="username">Admin username</label><input type="text" id="username" data-dojo-type="dijit.form.TextBox"/><br/>
-            <label for="password">Admin password</label><input type="password" id="password" data-dojo-type="dijit.form.TextBox"/><br/>
-            <label for="reset">Full reset</label><input type="checkbox" id="reset" data-dojo-type="dijit.form.CheckBox"/><br/>
-            <button id="configure" data-dojo-type="dijit.form.Button">Configure</button><br/>
+            <label for="username">Admin username</label><input type="text" id="username" data-dojo-type="dijit/form/TextBox"/><br/>
+            <label for="password">Admin password</label><input type="password" id="password" data-dojo-type="dijit/form/TextBox"/><br/>
+            <label for="reset">Full reset</label><input type="checkbox" id="reset" data-dojo-type="dijit/form/CheckBox"/><br/>
+            <button id="configure" data-dojo-type="dijit/form/Button">Configure</button><br/>
         </div>
         <pre id="log">Waiting for configurator to initialize...</pre>
Index: Dev/branches/rest-dojo-ui/client/config/package.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/config/package.js	(revision 408)
+++ Dev/branches/rest-dojo-ui/client/config/package.js	(revision 408)
@@ -0,0 +1,12 @@
+var profile = (function(){
+    return {
+        resourceTags: {
+            amd: function (filename, mid) {
+                return /\.js$/.test(filename);
+            },
+            declarative: function(filename,mid) {
+                return /\.html$/.test(filename);
+            }
+        }
+    };
+})();
Index: Dev/branches/rest-dojo-ui/client/config/package.json
===================================================================
--- Dev/branches/rest-dojo-ui/client/config/package.json	(revision 408)
+++ Dev/branches/rest-dojo-ui/client/config/package.json	(revision 408)
@@ -0,0 +1,9 @@
+{
+    "name": "config",
+    "description": "RFT CouchDB Configuration Tool",
+    "dependencies": {
+        "dojo": "~1.8.0",
+        "dijit": "~1.8.0"
+    },
+    "dojoBuild": "package.js"
+}
Index: Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js	(revision 407)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js	(revision 408)
@@ -1,5 +1,5 @@
 define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event','dijit/Dialog',
     'dijit/_WidgetsInTemplateMixin','../auth', 'dojo/text!./templates/LoginDialog.html',
-    '../content','dijit/form/Form','dijit/form/Button','dijit/form/TextBox'],
+    '../app/Controller','dijit/form/Form','dijit/form/Button','dijit/form/TextBox'],
     function (declare, lang, event, Dialog, _WidgetsInTemplateMixin, auth, template, content) {
         return declare([Dialog,_WidgetsInTemplateMixin], {
