Changeset 274 for Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.html

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/ui/LoginDialog.html (modified) (1 diff)

Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.html

@@ -9 +9 @@
         <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="loginForm">
             <fieldset>
-                <label for="username" class="loginLabel">Email</label>
-                <input data-dojo-type="dijit.form.TextBox" name="username" type="text" class="loginInput" />
+                <label for="email" class="loginLabel">Email</label>
+                <input data-dojo-type="dijit.form.TextBox" name="email" type="text" class="loginInput" />
                 <label for="password" class="loginLabel">Password</label>
                 <input data-dojo-type="dijit.form.TextBox" name="password" type="password" class="loginInput" />
             </fieldset>
-            <button type="submit" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
-            <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCancel">Cancel</button>
+            <div style="float: right;">
+                <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onRegister">Register</button>
+                <button type="submit" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
+            </div>
         </form>
-        <div data-dojo-attach-point="loginErrors"></div>
+        <div data-dojo-attach-point="loginErrors" style="clear: both; color: red;"></div>
     </div>
 </div>