1.1 --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Mon Sep 07 22:16:19 2009 +0200
     1.2 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Mon Sep 07 22:27:39 2009 +0200
     1.3 @@ -98,7 +98,8 @@
     1.4              ex.printStackTrace();
     1.5          }
     1.6          if (name != null && password.equals(p.getProperty(name))) {
     1.7 -            return Response.seeOther(new URI("/")).cookie(new NewCookie("login", name)).entity(welcomeImpl()).build();
     1.8 +            user = name;
     1.9 +            return Response.ok().cookie(new NewCookie("login", name)).entity(viewable("login.fmt", null)).build();
    1.10          } else {
    1.11              Viewable v = viewable("login.fmt", null, "message", "Invalid name or password: " + name);
    1.12              return Response.status(1).entity(v).build();

     2.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.fmt	Mon Sep 07 22:16:19 2009 +0200
     2.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.fmt	Mon Sep 07 22:27:39 2009 +0200
     2.3 @@ -8,12 +8,18 @@
     2.4        <h1>${bundle.TITLE}</h1>
     2.5        <h2>${bundle.LOGIN}</h2>
     2.6  
     2.7 +      <#if user?? >
     2.8 +        ${bundle("logged", user?string)}
     2.9 +        <a href="/">${bundle.home}</a>
    2.10 +      <#else>
    2.11 +
    2.12        <b>${message!""}</b>
    2.13  
    2.14 -      <form action="login" method="post">
    2.15 +      <form action="/login" method="post">
    2.16              ${bundle.NAME}: <input type="text" name="name"/>
    2.17              ${bundle.PASSWORD}: <input type="password" name="password"/>
    2.18              <input type="submit" value="${bundle.LOGIN}"/>
    2.19        </form>
    2.20 +      </#if>
    2.21    </body>
    2.22  </html>
    2.23 \ No newline at end of file

     3.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.properties	Mon Sep 07 22:16:19 2009 +0200
     3.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login.properties	Mon Sep 07 22:27:39 2009 +0200
     3.3 @@ -2,3 +2,5 @@
     3.4  NAME=Name
     3.5  PASSWORD=Password
     3.6  LOGIN=Login!
     3.7 +logged=You are logged as {0}.
     3.8 +home=Start!

     4.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login_cs.properties	Mon Sep 07 22:16:19 2009 +0200
     4.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/login_cs.properties	Mon Sep 07 22:27:39 2009 +0200
     4.3 @@ -2,3 +2,5 @@
     4.4  NAME=Jm\u00E9no
     4.5  PASSWORD=Heslo
     4.6  LOGIN=P\u0159ihl\u00E1sit se
     4.7 +logged=Jste p\u0159ihl\u00E1\u0161en jako {0}
     4.8 +home=Za\u010D\u00EDt hr\u00E1t