From 0bba8807eda03eb2186a98e1550beb470c752ca1 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@linuxdv.org>
Date: Fri, 21 Nov 2014 14:54:16 +1000
Subject: [PATCH] * registration form

---
 lib/LDV/User.pm                       |  3 ++-
 templates/includes/auth_block.html.ep |  3 +++
 templates/user/register.html.ep       | 14 +++-----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/LDV/User.pm b/lib/LDV/User.pm
index de0cdd1..e57c6ab 100644
--- a/lib/LDV/User.pm
+++ b/lib/LDV/User.pm
@@ -80,11 +80,12 @@ sub create {
 
     # TODO: confirmation email
 
+    $self->flash({result => "Success! Now you may log in."});
     $self->redirect_to('/user/profile'); 1;
   } or do {
     $self->app->log->error($@);
     $self->flash({result => "Can't create user: $@"});
-    $self->redirect_to('/user/create');
+    $self->redirect_to('/user/register');
   };
 
   $self->rendered();
diff --git a/templates/includes/auth_block.html.ep b/templates/includes/auth_block.html.ep
index 22cb2f5..01998e1 100644
--- a/templates/includes/auth_block.html.ep
+++ b/templates/includes/auth_block.html.ep
@@ -6,5 +6,8 @@
       <li><a href="/user/logout"  rel="nofollow">Выйти</a></li>
 % } else {
       <li><a href="/user/login" rel="nofollow">Войти</a></li>
+%   if (config->{user}->{allow_register}) {
+      <li><a href="/user/register" rel="nofollow">Регистрация</a></li>
+%   }
 % }
     </ul>
diff --git a/templates/user/register.html.ep b/templates/user/register.html.ep
index dce4e29..4bb7414 100644
--- a/templates/user/register.html.ep
+++ b/templates/user/register.html.ep
@@ -6,22 +6,15 @@
 <table>
   <tr>
     <td><%= l('Login') %></td>
-    <td><%= text_field 'login', required => 1, placeholder => 'petrov'  %></td>
+    <td><%= text_field 'username', required => 1, placeholder => 'petrov'  %></td>
   </tr>
   <tr>
     <td><%= l('Password') %></td>
-    <td><%= password_field 'pass', required => 1, placeholder => '******' %></td>
-  </tr>
-  <tr>
-    <td colspan='2'><hr/></td>
-  </tr>
-  <tr>
-    <td><%= l('Display name') %></td>
-    <td><%= text_field 'displayname', placeholder => l('John Doe') %></td>
+    <td><%= password_field 'password', required => 1, placeholder => '******' %></td>
   </tr>
   <tr>
     <td><%= l('Email') %></td>
-    <td><%= text_field 'mail', type => 'email', placeholder => 'petrov@example.com' %></td>
+    <td><%= text_field 'mail', required => 1, type => 'email', placeholder => 'petrov@example.com' %></td>
   </tr>
   <tr>
     <td colspan='2'><hr/></td>
@@ -37,5 +30,4 @@
 % } else {
 <p>Эта учётная запись будет действовать для всех сервисов *.linuxdv.org</p>
 <p>Восстановления пароля пока не предусмотрено.</p>
-<p>Обязательными являются только логин и пароль.</p>
 % }