[Jifty-commit] r496 - in wifty/trunk: web/templates

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Wed Jan 11 16:59:34 2006
New Revision: 496

Modified:
   wifty/trunk/   (props changed)
   wifty/trunk/web/templates/autohandler
   wifty/trunk/web/templates/login

Log:
 r8627 at zoq-fot-pik:  chmrr | 2006-01-11 16:58:57 -0500
  * Make /login compile
  * Remove extraneous lines from autohandler


Modified: wifty/trunk/web/templates/autohandler
==============================================================================
--- wifty/trunk/web/templates/autohandler	(original)
+++ wifty/trunk/web/templates/autohandler	Wed Jan 11 16:59:34 2006
@@ -1,14 +1,7 @@
 <%init>
-$r->content_type('text/html; charset=utf-8');
-#Jifty->web->handle_request();
-
 if ($m->base_comp->path =~ m|/_elements/|) {
     # Requesting an internal component by hand -- naughty
     $m->redirect("/errors/requested_private_component");
-#} elsif (not Jifty->web->current_user->id and $m->request_comp->path !~ m{^/(?:welcome|dhandler|css|js|images|validator\.xml)} ) {
-#    # Not logged in, trying to access a protected page
-#    $m->notes->{'login-nextpage'} =  $m->{top_path};
-#    Jifty->web->redirect('/welcome/');
 }
 $m->comp('/_elements/nav');
 require Wifty::Dispatcher;

Modified: wifty/trunk/web/templates/login
==============================================================================
--- wifty/trunk/web/templates/login	(original)
+++ wifty/trunk/web/templates/login	Wed Jan 11 16:59:34 2006
@@ -1,3 +1,7 @@
+<%args>
+$action => undef
+$next => undef
+</%args>
 <&|/_elements/wrapper, title => 'Login' &>
 
 % if (not Jifty->web->current_user->id) {