--- trunk/web/templates/user_form	2006/06/05 14:06:58	51
+++ trunk/web/templates/users/form	2006/06/11 02:59:18	65
@@ -1,12 +1,18 @@
 <%args>
-$user
-$user_id
+$user_id => 0
 </%args>
-<&|/_elements/wrapper, title => 'Change user' &>
+<%init>
+my $u = Transports::Model::User->new();
+$u->load_by_cols( id => $user_id );
+my $user = Jifty->web->new_action(
+	class => $u->id ? 'UpdateUser' : 'CreateUser',
+	record => $u
+);
+</%init>
 
-% if (not Jifty->web->current_user->id) {
-<% Jifty->web->redirect( '/login/user_form' ) %>
-% } else {
+<div class="boxed boxed-yellow">
+
+<% $user_id ? 'Change user' : 'Add new user' %>
 
 <% Jifty->web->form->start %>
 <% Jifty->web->form->next_page( url => '/transports' ) %>
@@ -14,17 +20,15 @@
 <% $user->form_field('email') %>
 <% $user->form_field('password') %>
 <% $user->form_field('admin') %>
-<% Jifty->web->form->submit( label => 'Update user' ) %>
+<% Jifty->web->form->submit( label => $user_id ? 'Update user' : 'Add user' ) %>
 <% Jifty->web->form->end %>
 
 <% Jifty->web->region(
-	name => "user-on-landscape",
-	path => "/fragments/user_on_landscape",
+	name => "user-landscape",
+	path => "/users/landscape",
 	defaults => {
 		user_id => $user_id,
 	},
 ) %>
 
-% }
-
-</&>
+</div>