[Checkins] SVN: Sandbox/luciano/kirbi/src/kirbi/app changes to make login work (still broken)

Fri Aug 17 12:45:46 EDT 2007

Log message for revision 78909:
  changes to make login work (still broken)
  

Changed:
  U   Sandbox/luciano/kirbi/src/kirbi/app.py
  U   Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt
  U   Sandbox/luciano/kirbi/src/kirbi/app_templates/login.pt

-=-
Modified: Sandbox/luciano/kirbi/src/kirbi/app.py
===================================================================

--- Sandbox/luciano/kirbi/src/kirbi/app.py	2007-08-17 15:16:28 UTC (rev 78908)
+++ Sandbox/luciano/kirbi/src/kirbi/app.py	2007-08-17 16:45:46 UTC (rev 78909)
@@ -90,8 +90,10 @@
     def update(self, login_submit=None):
         if (not IUnauthenticatedPrincipal.providedBy(self.request.principal)
             and login_submit is not None):
-            camefrom = self.request.get('camefrom', '.')
-            self.redirect(camefrom)
+            destination = self.request.get('camefrom')
+            if not destination:
+                destination = self.application_url()
+            self.redirect(destination)
 
 class Logout(grok.View):
     grok.context(Interface)

Modified: Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt	2007-08-17 15:16:28 UTC (rev 78908)
+++ Sandbox/luciano/kirbi/src/kirbi/app_templates/index.pt	2007-08-17 16:45:46 UTC (rev 78909)
@@ -7,7 +7,9 @@
 
   <div metal:fill-slot="content">
 
-  <table><tr><td width="15%">
+  <table><tr>
+    <tal:comment replace="nothing">
+    <td width="15%">
     <form tal:attributes="action view/login_url">
         <table bgcolor="#DDDDDD" width="100%">
            <tr><th>Login</th><td><input name="login"></td></tr>
@@ -15,7 +17,9 @@
            <tr><td></td><td><input type="submit" value="enter"></td></tr>
         </table>
     </form>
-    </td><td valign="top" align="center">
+    </td>
+    </tal:comment>
+    <td valign="top" align="center">
         <h2>Recent additions</h2>
     </td></tr>
   </table>

Modified: Sandbox/luciano/kirbi/src/kirbi/app_templates/login.pt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/app_templates/login.pt	2007-08-17 15:16:28 UTC (rev 78908)
+++ Sandbox/luciano/kirbi/src/kirbi/app_templates/login.pt	2007-08-17 16:45:46 UTC (rev 78909)
@@ -1,22 +1,35 @@
 <html metal:use-macro="context/@@master/page">
 <body>
-<div metal:fill-slot="body">
 
-Login
 
-<form action="" tal:attributes="action request/URL" method="post">
+  <span metal:fill-slot="content_title">Login</span>
 
-  <input type="text" name="login" id="login" />
+  <div metal:fill-slot="content">
 
-  <input type="password" name="password" id="password" />
+    <form action="" tal:attributes="action request/URL" method="post">
+      <input type="hidden" name="camefrom"
+            tal:condition="exists:request/camefrom"
+            tal:attributes="value request/camefrom" />
 
-  <input type="hidden" name="camefrom"
-         tal:attributes="value request/camefrom | nothing">
+        <table>
+           <tr><th>Login</th>
+               <td>
+                    <input type="text" name="login" id="login" />
+                </td>
+           </tr>
+           <tr><th>Password</th>
+               <td>
+                    <input type="password" name="password" id="password" />
+                </td>
+            </tr>
+           <tr><td></td>
+            <td>
+                  <input type="submit" name="login_submit" value="Log in" />
+            </td>
+        </tr>
+        </table>
+    </form>
 
-  <input type="submit" name="login_submit" value="Log in" />
-
-</form>
-
 </div>
 </body>
 </html>

