Repository: wicket Updated Branches: refs/heads/master ea82a6b1c -> e0b105e5b
WICKET-5349 SignInPanel replace <table> markup Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e0b105e5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e0b105e5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e0b105e5 Branch: refs/heads/master Commit: e0b105e5bcee89917d04c3a2164440d0ed2fc738 Parents: ea82a6b Author: svenmeier <[email protected]> Authored: Thu Jul 17 09:20:59 2014 +0200 Committer: svenmeier <[email protected]> Committed: Thu Jul 17 09:31:47 2014 +0200 ---------------------------------------------------------------------- .../authentication/panel/SignInPanel.html | 41 +++++++------------ .../authentication/panel/SignInPanel.java | 15 +++---- .../authentication/panel/SignInPanel_de.html | 41 +++++++------------ .../authentication/panel/SignInPanel_fr.html | 41 +++++++------------ .../authentication/panel/SignInPanel_hu.html | 43 +++++++------------- .../authentication/panel/SignInPanel_ja.html | 42 +++++++++---------- .../authentication/panel/SignInPanel_ko.html | 41 +++++++------------ .../authentication/panel/SignInPanel_nl.html | 41 +++++++------------ .../authentication/panel/SignInPanel_ru.html | 40 ++++++------------ .../authentication/panel/SignInPanel_zh_CN.html | 41 +++++++------------ .../wicket/examples/authentication1/SignIn.html | 34 ++++++---------- wicket-examples/src/main/webapp/style.css | 13 +++++- .../wicket/examples/signin2/Signin2Test.java | 2 +- 13 files changed, 164 insertions(+), 271 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.html index 445c5f1..5f562f5 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.html @@ -19,33 +19,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">Username:</td> - <td> - <input wicket:id="username" type="text"/> - </td> - </tr> - <tr> - <td align="right">Password:</td> - <td> - <input wicket:id="password" type="password"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> Remember Me </td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="Sign In"/> - <input type="reset" value="Reset"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>Username:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>Password:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> Remember Me </dd> + <dd> + <input type="submit" name="submit" value="Sign In"/> + <input type="reset" value="Reset"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java index f9e9dac..d525c94 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java @@ -49,9 +49,6 @@ public class SignInPanel extends Panel { private static final long serialVersionUID = 1L; - /** Log. */ - private static final Logger log = LoggerFactory.getLogger(SignInPanel.class); - private static final String SIGN_IN_FORM = "signInForm"; /** True if the panel should display a remember-me checkbox */ @@ -284,18 +281,18 @@ public class SignInPanel extends Panel setModel(new CompoundPropertyModel<>(SignInPanel.this)); // Attach textfields for username and password - add(new TextField<>("username")); + add(new TextField<>("username").setRequired(true)); add(new PasswordTextField("password")); - // MarkupContainer row for remember me checkbox - WebMarkupContainer rememberMeRow = new WebMarkupContainer("rememberMeRow"); - add(rememberMeRow); + // container for remember me checkbox + WebMarkupContainer rememberMeContainer = new WebMarkupContainer("rememberMeContainer"); + add(rememberMeContainer); // Add rememberMe checkbox - rememberMeRow.add(new CheckBox("rememberMe")); + rememberMeContainer.add(new CheckBox("rememberMe")); // Show remember me checkbox? - rememberMeRow.setVisible(includeRememberMe); + rememberMeContainer.setVisible(includeRememberMe); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_de.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_de.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_de.html index 5ffb4d4..5405ca2 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_de.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_de.html @@ -23,33 +23,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">Benutzername:</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30"/> - </td> - </tr> - <tr> - <td align="right">Passwort:</td> - <td> - <input wicket:id="password" type="password" value="password" size="30"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> erinnern </td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="Anmelden"/> - <input type="reset" value="Reset"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>Benutzername:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>Passwort:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> erinnern </dd> + <dd> + <input type="submit" name="submit" value="Anmelden"/> + <input type="reset" value="Reset"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_fr.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_fr.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_fr.html index e0bdfe8..d1842e9 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_fr.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_fr.html @@ -19,33 +19,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">Identifiant:</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30"/> - </td> - </tr> - <tr> - <td align="right">Mot de passe:</td> - <td> - <input wicket:id="password" type="password" value="password" size="30"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> Se rappeler de moi </td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="S'identifier"/> - <input type="reset" value="Annuler"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>Identifiant:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>Mot de passe:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> Se rappeler de moi </dd> + <dd> + <input type="submit" name="submit" value="S'identifier"/> + <input type="reset" value="Annuler"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_hu.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_hu.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_hu.html index 45d860f..088e1e3 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_hu.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_hu.html @@ -19,33 +19,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">Felhasználónév:</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30"/> - </td> - </tr> - <tr> - <td align="right">Jelszó:</td> - <td> - <input wicket:id="password" type="password" value="password" size="30"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> Emlékezzen rám </td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="Bejelentkezés"/> - <input type="reset" value="Alaphelyzet"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>Felhasználónév:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>Jelszó:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> Emlékezzen rám </dd> + <dd> + <input type="submit" name="submit" value="Bejelentkezés"/> + <input type="reset" value="Alaphelyzet"/> + </dd> + </dl> + </form> </wicket:panel> </body> -</html> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ja.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ja.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ja.html index 65940fc..663aabf 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ja.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ja.html @@ -15,24 +15,24 @@ See the License for the specific language governing permissions and limitations under the License. --> -<HTML xmlns:wicket="http://wicket.apache.org";><HEAD> -<META http-equiv="Content-Type" content="text/html; charset=windows-1252" /> -<META content="MSHTML 6.00.2900.3354" name="GENERATOR" /></HEAD> -<BODY><wicket:panel><SPAN wicket:id="feedback"></SPAN> -<FORM wicket:id="signInForm"> -<TABLE> - <TBODY> - <TR> - <TD align="right">ユーザー名:</TD> - <TD><INPUT size="30" value="[email protected]" wicket:id="username"/> </TD></TR> - <TR> - <TD align="right">パスワード:</TD> - <TD><INPUT type="password" size="30" value="password" wicket:id="password"/> - </TD></TR> - <TR wicket:id="rememberMeRow"> - <TD></TD> - <TD><INPUT type="checkbox" wicket:id="rememberMe"/> ユーザー名を記憶する </TD></TR> - <TR> - <TD></TD> - <TD><INPUT type="submit" value="サインイン" name="submit"/> <INPUT type="reset" value="リセット"/> -</TD></TR></TBODY></TABLE></FORM></wicket:panel></BODY></HTML> +<html xmlns:wicket="http://wicket.apache.org";> +<body> + <wicket:panel> + <span wicket:id="feedback"/> + + <form wicket:id="signInForm"> + <dl> + <dt>ã¦ã¼ã¶ã¼å:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>ãã¹ã¯ã¼ã:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> ã¦ã¼ã¶ã¼åãè¨æ¶ãã </dd> + <dd> + <input type="submit" name="submit" value="ãµã¤ã³ã¤ã³"/> + <input type="reset" value="ãªã»ãã"/> + </dd> + </dl> + </form> + </wicket:panel> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ko.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ko.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ko.html index 1e54f07..a7b3883 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ko.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ko.html @@ -19,33 +19,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">사용자명:</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30"/> - </td> - </tr> - <tr> - <td align="right">비밀번호:</td> - <td> - <input wicket:id="password" type="password" value="password" size="30"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> ID 저장 </td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="로그인"/> - <input type="reset" value="취소"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>ì¬ì©ìëª :</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>ë¹ë°ë²í¸:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> ID ì ì¥ </dd> + <dd> + <input type="submit" name="submit" value="ë¡ê·¸ì¸"/> + <input type="reset" value="ì·¨ì"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_nl.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_nl.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_nl.html index ef0fed5..23a5969 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_nl.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_nl.html @@ -23,33 +23,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">Gebruikersnaam:</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30"/> - </td> - </tr> - <tr> - <td align="right">Wachtwoord:</td> - <td> - <input wicket:id="password" type="password" value="password" size="30"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> Onthouden </td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="Aanmelden"/> - <input type="reset" value="Reset"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>Gebruikersnaam:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>Wachtwoord:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> Onthouden </dd> + <dd> + <input type="submit" name="submit" value="Aanmelden"/> + <input type="reset" value="Reset"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ru.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ru.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ru.html index 2f503d4..3e4a2cc 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ru.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_ru.html @@ -20,33 +20,19 @@ <wicket:panel> <span wicket:id="feedback" /> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">Ðогин:</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30" /> - </td> - </tr> - <tr> - <td align="right">ÐаÑолÑ:</td> - <td> - <input wicket:id="password" type="password" value="password" size="30" /> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td><input wicket:id="rememberMe" type="checkbox" /> ÐапомниÑÑ Ð¼ÐµÐ½Ñ</td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="ÐÑ Ð¾Ð´" /> - <input type="reset" value="СбÑоÑ" /> - </td> - </tr> - </table> - </form> + <form wicket:id="signInForm"> + <dl> + <dt>Ðогин:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>ÐаÑолÑ:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> ÐапомниÑÑ Ð¼ÐµÐ½Ñ </dd> + <dd> + <input type="submit" name="submit" value="ÐÑ Ð¾Ð´"/> + <input type="reset" value="СбÑоÑ"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_zh_CN.html ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_zh_CN.html b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_zh_CN.html index 74d3458..001c11b 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_zh_CN.html +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel_zh_CN.html @@ -23,33 +23,20 @@ <body> <wicket:panel> <span wicket:id="feedback"/> - <form wicket:id="signInForm"> - <table> - <tr> - <td align="right">用户名</td> - <td> - <input wicket:id="username" type="text" value="[email protected]" size="30"/> - </td> - </tr> - <tr> - <td align="right">密码</td> - <td> - <input wicket:id="password" type="password" value="password" size="30"/> - </td> - </tr> - <tr wicket:id="rememberMeRow"> - <td></td> - <td> <input wicket:id="rememberMe" type="checkbox" /> 记住我</td> - </tr> - <tr> - <td></td> - <td> - <input type="submit" name="submit" value="签到"/> - <input type="reset" value="重新设置"/> - </td> - </tr> - </table> - </form> + + <form wicket:id="signInForm"> + <dl> + <dt>ç¨æ·å:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>å¯ç :</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd wicket:id="rememberMeContainer"><input wicket:id="rememberMe" type="checkbox" /> è®°ä½æ </dd> + <dd> + <input type="submit" name="submit" value="å°"/> + <input type="reset" value="éæ°è®¾ç½®"/> + </dd> + </dl> + </form> </wicket:panel> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html index daba186..89a713d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html @@ -8,29 +8,19 @@ <span wicket:id = "feedback"/> <p> - <i>Username and password are both "wicket"</i> + <i>Username and password are both "wicket"</i> </p> - <form wicket:id = "signInForm"> - <table> - <tr> - <td align = "right">Username:</td> - <td> - <input wicket:id = "username" type = "text" value = "[email protected]" size = "30"/> - </td> - </tr> - <tr> - <td align = "right">Password:</td> - <td> - <input wicket:id = "password" type = "password" value = "password" size="30"/> - </td> - </tr> - <tr> - <td></td> - <td> - <input type = "submit" value = "Sign In"/> - </td> - </tr> - </table> + + <form wicket:id="signInForm"> + <dl> + <dt>Username:</dt> + <dd><input wicket:id="username" type="text" size="30"/></dd> + <dt>Password:</dt> + <dd><input wicket:id="password" type="password" size="30"/></dd> + <dd> + <input type="submit" name="submit" value="Sign In"/> + </dd> + </dl> </form> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-examples/src/main/webapp/style.css ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/webapp/style.css b/wicket-examples/src/main/webapp/style.css index 89b46ef..6e5cf43 100644 --- a/wicket-examples/src/main/webapp/style.css +++ b/wicket-examples/src/main/webapp/style.css @@ -503,4 +503,15 @@ table.grid td.filter-td select { width: 100%; font-size: 0.6em; } tr.section td { padding-top: 0.75em; -} \ No newline at end of file +} + +/* LIBRARY */ +form dt { + float: left; + width: 33%; + text-align: right; +} +form dd { + margin-left: 33%; + padding-left: 5px; +} http://git-wip-us.apache.org/repos/asf/wicket/blob/e0b105e5/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java b/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java index 58ca834..0e6cd95 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java @@ -51,7 +51,7 @@ public class Signin2Test extends Assert FormTester formTester = tester.newFormTester("signInPanel:signInForm"); formTester.setValue("username", "wicket"); formTester.setValue("password", "wicket"); - formTester.setValue("rememberMeRow:rememberMe", "true"); + formTester.setValue("rememberMeContainer:rememberMe", "true"); formTester.submit(); tester.assertRenderedPage(Home.class);
