# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1252355259 -7200
# Node ID 3c9966fc035256e2cf7de247bf864498edb73b1d
# Parent  90de58894949bae41ff483e18ef4623a794dcb65
More reliable way to login

diff -r 90de58894949 -r 3c9966fc0352 freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java
--- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Mon Sep 07 22:16:19 2009 +0200
+++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Mon Sep 07 22:27:39 2009 +0200
@@ -98,7 +98,8 @@
             ex.printStackTrace();
         }
         if (name != null && password.equals(p.getProperty(name))) {
-            return Response.seeOther(new URI("/")).cookie(new NewCookie("login", name)).entity(welcomeImpl()).build();
+            user = name;
+            return Response.ok().cookie(new NewCookie("login", name)).entity(viewable("login.fmt", null)).build();
         } else {
             Viewable v = viewable("login.fmt", null, "message", "Invalid name or password: " + name);
             return Response.status(1).entity(v).build();
diff -r 90de58894949 -r 3c9966fc0352 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.fmt
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.fmt	Mon Sep 07 22:16:19 2009 +0200
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.fmt	Mon Sep 07 22:27:39 2009 +0200
@@ -8,12 +8,18 @@
       <h1>${bundle.TITLE}</h1>
       <h2>${bundle.LOGIN}</h2>
 
+      <#if user?? >
+        ${bundle("logged", user?string)}
+        <a href="/">${bundle.home}</a>
+      <#else>
+
       <b>${message!""}</b>
 
-      <form action="login" method="post">
+      <form action="/login" method="post">
             ${bundle.NAME}: <input type="text" name="name"/>
             ${bundle.PASSWORD}: <input type="password" name="password"/>
             <input type="submit" value="${bundle.LOGIN}"/>
       </form>
+      </#if>
   </body>
 </html>
\ No newline at end of file
diff -r 90de58894949 -r 3c9966fc0352 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.properties
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.properties	Mon Sep 07 22:16:19 2009 +0200
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.properties	Mon Sep 07 22:27:39 2009 +0200
@@ -2,3 +2,5 @@
 NAME=Name
 PASSWORD=Password
 LOGIN=Login!
+logged=You are logged as {0}.
+home=Start!
diff -r 90de58894949 -r 3c9966fc0352 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login_cs.properties
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login_cs.properties	Mon Sep 07 22:16:19 2009 +0200
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login_cs.properties	Mon Sep 07 22:27:39 2009 +0200
@@ -2,3 +2,5 @@
 NAME=Jm\u00E9no
 PASSWORD=Heslo
 LOGIN=P\u0159ihl\u00E1sit se
+logged=Jste p\u0159ihl\u00E1\u0161en jako {0}
+home=Za\u010D\u00EDt hr\u00E1t