Permalink
Browse files

Everything running now, except adding friends

	modified:   app/controllers/Security.java
	modified:   app/views/Register/index.html
	modified:   app/views/tags/register.html
  • Loading branch information...
1 parent 124b70a commit de3fc2763c6ee629c7cc5260825d485dc67ffcf0 Rafael Breu committed Dec 18, 2011
Showing with 95 additions and 84 deletions.
  1. +1 −1 app/controllers/Security.java
  2. +33 −9 app/views/Register/index.html
  3. +61 −74 app/views/tags/register.html
@@ -68,7 +68,7 @@ public static void logout() throws Throwable
//ESEDatabase.getCurrentUser().getProfile().changeState(ESEState.OFFLINE);
//ESEDatabase.setCurrentUser("guest");
- Application.showCalendars(); // go to the start screen, not to the login
+ Application.index(); // go to the start screen, not to the login
}
private static Object invoke(String m, Object... args) throws Throwable
@@ -1,13 +1,37 @@
#{extends 'main.html' /}
-#{set title:'ESECalendar' /}
<body>
- <section id="section">
- <article>
- #{register /}
- <article>
- </section>
- <footer>
- #{footer /}
- </footer>
+
+ <table>
+ <colgroup>
+ <col width="190">
+ <col width="5">
+ <col width="190">
+ </colgroup>
+ <tr style="height: 40px;">
+ <td colspan="3" rowspan="1" style="vertical-align: top; font-weight: bold; text-align: center;"><font size="6">Register</font></td>
+ </tr>
+ <tr style="height: 5px;">
+ <td colspan="3" rowspan="1"></td>
+ </tr>
+
+ <tr style="height: 40px;">
+ <td colspan="3" style="vertical-align: center;">Register for SPACECal</td>
+ </tr>
+ <tr>
+ <td colspan="3" rowspan="1" id="border" style="vertical-align: top; border: 2px solid; height: 190px; padding: 5px;">
+ #{register /}
+
+ </td>
+ </tr>
+ <tr style="height: 10px;">
+ <td colspan="3"></td>
+ </tr>
+ <tr>
+ <td colspan="3" rowspan="1" id="border" style="vertical-align: top; border: 2px solid; height: 190px; padding: 5px;">
+ ...or sign in
+ #{login /}
+ </td>
+ </tr>
+ </table>
</body>
@@ -1,79 +1,66 @@
-<!DOCTYPE html>
-<html>
- <head>
- <link rel="stylesheet" type="text/css" media="screen" href="@{'/public/stylesheets/main.css'}" />
- </head>
- <body>
- <table id="registertable" border="0">
- <tr>
- #{if flash.error}
+<body>
+register...
+#{form @Register.createNewUser()}
+ #{if flash.error}
<p id="error">
${flash.error}
</p>
#{/if}
- #{form @Register.createNewUser()}
- <tr>
- <td>
- <p id="username-field">
- <label for="username">New &{'secure.username'}</label>
- </p>
- </td>
- <td>
- <input type="text" name="username" id="username" value="${flash.username}" />
- </td>
- </tr>
- <tr>
- <td>
- <p id="password-field">
- <label for="password">New &{'secure.password'}</label>
- </p>
- </td>
- <td>
- <input type="password" name="password" id="password" value="" />
- </td>
- </tr>
- <tr>
- <td>
- <p id="confirmpassword-field">
- <label for="confirmpassword">Confirm new &{'secure.password'}</label>
- </p>
- </td>
- <td>
- <input type="password" name="confirmpassword" id="confirmpassword" value="" />
- </td>
- </tr>
- <tr>
- <td>
- <p id="question-field">
- <label for="question">A question you have to answer if you forget the password:</label>
- </p>
- </td>
- <td>
- <input type="text" name="question" id="question" value="${flash.question}" />
- </td>
- </tr>
- <tr>
- <td>
- <p id="answer-field">
- <label for="answer">The answer:</label>
- </p>
- </td>
- <td>
- <input type="text" name="answer" id="answer" value="" />
- </td>
- </tr>
- <tr>
- <td>
- </td>
- <td>
- <p id="register-field">
- <input type="submit" id="register" value="&{'Register'}" />
- </p>
- </td>
- </tr>
- #{/form}
- </tr>
- </table>
- </body>
-</html>
+
+ <table>
+ <colgroup>
+ <col width="180">
+ <col width="150">
+ </colgroup>
+ <tr>
+ <td>
+ <label for="username">&{'secure.username'}</label>
+ </td>
+ <td>
+ <input type="text" name="username" id="username" style="width: 150px;" value="${flash.username}" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label for="password">&{'secure.password'}</label>
+ </td>
+ <td>
+ <input type="password" name="password" id="password" style="width: 150px;" value="" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label for="confirmpassword">Confirm &{'secure.password'}</label>
+ </td>
+ <td>
+ <input type="password" name="confirmpassword" id="confirmpassword" style="width: 150px;" value="" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label for="question">Secret Question</label>
+ </td>
+ <td>
+ <input type="text" name="question" id="question" style="width: 150px;" value="${flash.question}" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label for="answer">Secret Answer</label>
+ </td>
+ <td>
+ <input type="text" name="answer" id="answer" style="width: 150px;" value="" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+ <div style="text-align:right;"><input type="submit" id="register" style="width: 100px;" value="&{'Register'}" /></div>
+ </td>
+ </tr>
+ #{/form}
+ </tr>
+</table>
+</body>

0 comments on commit de3fc27

Please sign in to comment.