Changeset 274 for Dev/branches/rest-dojo-ui/client/rft/run.js

Timestamp:

02/20/12 16:27:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Moved pages in subtree of rft/, allowing controllers next to them.
• [Client] Created questions page, gives overview and allows adding.
• [Client] Page controllers inherit from _Page, because the previous mechanism w

asn't working.

• [Client] Added new user registration.
• [Server] Changed user passwords to passwordHash/passwordSalt combination.
• [Server] Added simple object marshalling and unmarshalling to preserve types.
• [Server] Added ResearchToolObjectInterface? with static create() method. Implemented for all model classes.

File:

• Dev/branches/rest-dojo-ui/client/rft/run.js (modified) (3 diffs)

Dev/branches/rest-dojo-ui/client/rft/run.js

@@ -1 +1 @@
 require([
     'dijit/form/Form',
+    'dijit/form/TextBox',
+    'dijit/form/Button',
+    'dijit/form/Textarea',
     'dojo/store/JsonRest',
     'dojo/data/ObjectStore',
@@ -6 +9 @@
     'dijit/layout/ContentPane',
     'dijit/layout/TabContainer',
+    'dijit/layout/AccordionContainer',
     'dijit/MenuBar',
     'dijit/MenuBarItem',
+    'dijit/PopupMenuBarItem',
+    'dijit/DropDownMenu',
     'rft/ui/MenuBarLink',
+    'rft/ui/MenuLink',
+    'rft/ui/QuestionWidget',
+    'rft/pages/questions' // could this be done dynamically?
 ]);
 
 require(['dojo/_base/window','dojo/parser', 'rft/ui/LoginDialog', 
     'dojo/dom', 'dojo/_base/connect', 'rft/auth', 'rft/content',
-    'dojo/domReady!', ],
+    'dojo/domReady!' ],
     function(win,parser,LoginDialog,dom,connect,auth,content) {
         parser.parse();
@@ -27 +36 @@
         });
 
-        connect.connect(dom.byId('userinfo'),'click',function(){
+        connect.connect(dom.byId('loginMenu'),'click',function(){
             login.show();
         });
+
     });