Fixed issue 5, add a way for user to manage their account.

Also added for each user a small public profile.

src/IDF/Form/UserAccount.php

@@ -0,0 +1,136 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008 Céondo Ltd and contributors.
+#
+# InDefero is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Allow a user to update its details.
+ */
+class IDF_Form_UserAccount  extends Pluf_Form
+{
+    public $user = null;
+
+    public function initFields($extra=array())
+    {
+        $this->user = $extra['user'];
+        $this->fields['first_name'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('First name'),
+                                            'initial' => $this->user->first_name,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+        $this->fields['last_name'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => true,
+                                            'label' => __('Last name'),
+                                            'initial' => $this->user->last_name,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 20,
+                                                                    ),
+                                            ));
+        $this->fields['password'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Your password'),
+                                            'initial' => '',
+                                            'widget' => 'Pluf_Form_Widget_PasswordInput',
+                                            'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change your password.').'<br />'.__('Your password must be hard for other people to find it, but easy for you to remember.')),
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+        $this->fields['password2'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Confirm your password'),
+                                            'initial' => '',
+                                            'widget' => 'Pluf_Form_Widget_PasswordInput',
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+        
+
+    }
+
+
+    /**
+     * Save the model in the database.
+     *
+     * @param bool Commit in the database or not. If not, the object
+     *             is returned but not saved in the database.
+     * @return Object Model with data set from the form.
+     */
+    function save($commit=true)
+    {
+        if (!$this->isValid()) {
+            throw new Exception(__('Cannot save the model from an invalid form.'));
+        }
+        unset($this->cleaned_data['password2']);
+        if (strlen($this->cleaned_data['password']) == 0) {
+            unset($this->cleaned_data['password']);
+        }
+        $this->user->setFromFormData($this->cleaned_data);
+        if ($commit) {
+            $this->user->update();
+        }
+        return $this->user;
+    }
+
+    function clean_last_name()
+    {
+        $last_name = trim($this->cleaned_data['last_name']);
+        if ($last_name == mb_strtoupper($last_name)) {
+            return mb_convert_case(mb_strtolower($last_name), 
+                                   MB_CASE_TITLE, 'UTF-8');
+        }
+        return $last_name;
+    }
+
+    function clean_first_name()
+    {
+        $first_name = trim($this->cleaned_data['first_name']);
+        if ($first_name == mb_strtoupper($first_name)) {
+            return mb_convert_case(mb_strtolower($first_name), 
+                                   MB_CASE_TITLE, 'UTF-8');
+        }
+        return $first_name;
+    }
+
+    /**
+     * Check to see if the 2 passwords are the same.
+     */
+    public function clean()
+    {
+        if (!isset($this->errors['password']) 
+            && !isset($this->errors['password2'])) {
+            $password1 = $this->cleaned_data['password'];
+            $password2 = $this->cleaned_data['password2'];
+            if ($password1 != $password2) {
+                throw new Pluf_Form_Invalid(__('The passwords do not match. Please give them again.'));
+            }
+        }
+        return $this->cleaned_data;
+    }
+}

src/IDF/Views/User.php

@@ -0,0 +1,78 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008 Céondo Ltd and contributors.
+#
+# InDefero is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+Pluf::loadFunction('Pluf_Shortcuts_RenderToResponse');
+
+/**
+ * User management views.
+ *
+ * Edit your account.
+ * Add emails for the link between a commit and an account.
+ */
+class IDF_Views_User
+{
+    /**
+     * Simple management of the base info of the user.
+     */
+    public $myAccount_precond = array('Pluf_Precondition::loginRequired');
+    public function myAccount($request, $match)
+    {
+        $params = array('user' => $request->user);
+        if ($request->method == 'POST') {
+            $form = new IDF_Form_UserAccount($request->POST, $params);
+            if ($form->isValid()) {
+                $user = $form->save();
+                $url = Pluf_HTTP_URL_urlForView('IDF_Views::index');
+                $request->user->setMessage(__('Your personal information have been updated.'));
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            $form = new IDF_Form_UserAccount($request->user->getData(), $params);
+        }
+        return Pluf_Shortcuts_RenderToResponse('user/myaccount.html', 
+                                               array('page_title' => __('Your Account'),
+                                                     'form' => $form),
+                                               $request);
+    }
+
+    /**
+     * Public profile of a user.
+     */
+    public function view($request, $match)
+    {
+        $projects = Pluf::factory('IDF_Project')->getList(); 
+        $sql = new Pluf_SQL('login=%s', array($match[1]));
+        $users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen())); 
+        if (count($users) != 1 or !$users[0]->active) {
+            throw new Pluf_HTTP_Error404();
+        }
+        return Pluf_Shortcuts_RenderToResponse('user/public.html', 
+                                               array('page_title' => (string) $users[0],
+                                                     'member' => $users[0],
+                                                     'projects' => $projects,
+                                                     ),
+                                               $request);
+    }
+
+}

src/IDF/conf/views.php

@@ -37,6 +37,18 @@ $ctl[] = array('regex' => '#^/login/$#',
                'method' => 'login',
                'name' => 'login_view');
 
+$ctl[] = array('regex' => '#^/preferences/$#',
+               'base' => $base,
+               'priority' => 4,
+               'model' => 'IDF_Views_User',
+               'method' => 'myAccount');
+
+$ctl[] = array('regex' => '#^/u/(.*)/$#',
+               'base' => $base,
+               'priority' => 4,
+               'model' => 'IDF_Views_User',
+               'method' => 'view');
+
 $ctl[] = array('regex' => '#^/register/$#',
                'base' => $base,
                'priority' => 4,

src/IDF/templates/base-simple.html

@@ -34,7 +34,7 @@
 <div id="{block docid}doc3{/block}" class="{block docclass}yui-t3{/block}">
   <div id="hd">
     <p class="top">
-{if !$user.isAnonymous()}{blocktrans}Welcome, <strong>{$user.first_name} {$user.last_name}</strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
+{if !$user.isAnonymous()}{aurl 'url', 'IDF_Views_User::myAccount'}{blocktrans}Welcome, <strong><a class="userw" href="{$url}">{$user}</a></strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
 | <a href="{url 'IDF_Views::faq'}">{trans 'Help'}</a>
     </p>
 {* <div id="header">

src/IDF/templates/base.html

@@ -35,7 +35,7 @@
   <div id="hd">
 {if $project}<h1 class="project-title">{$project}</h1>{/if}
     <p class="top">
-{if !$user.isAnonymous()}{blocktrans}Welcome, <strong>{$user.first_name} {$user.last_name}</strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
+{if !$user.isAnonymous()}{aurl 'url', 'IDF_Views_User::myAccount'}{blocktrans}Welcome, <strong><a class="userw" href="{$url}">{$user}</a></strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
 | <a href="{url 'IDF_Views::faq'}">{trans 'Help'}</a>
     </p>
 <div id="header">

src/IDF/templates/issues/view.html

@@ -4,14 +4,14 @@
 {assign $i = 0} 
 {assign $nc = $comments.count()} 
 {foreach $comments as $c}
-<div class="issue-comment{if $i == 0} issue-comment-first{/if}{if $i == ($nc-1)} issue-comment-last{/if}" id="ic{$c.id}">
+<div class="issue-comment{if $i == 0} issue-comment-first{/if}{if $i == ($nc-1)} issue-comment-last{/if}" id="ic{$c.id}">{assign $who = $c.get_submitter()}{aurl 'whourl', 'IDF_Views_User::view', array($who.login)}
-{if $i == 0}{assign $who = $issue.get_submitter()}
+{if $i == 0}
-<p>{blocktrans}Reported by {$who}, {$c.creation_dtime|date}{/blocktrans}</p>
+<p>{blocktrans}Reported by <a href="{$whourl}">{$who}</a>, {$c.creation_dtime|date}{/blocktrans}</p>
-{else}{assign $who = $c.get_submitter()}
+{else}
 {aurl 'url', 'IDF_Views_Issue::view', array($project.shortname, $issue.id)}
 {assign $id = $c.id}
 {assign $url = $url~'#ic'~$c.id}
-<p>{blocktrans}Comment <a href="{$url}">{$i}</a> by {$who}, {$c.creation_dtime|date}{/blocktrans}</p>
+<p>{blocktrans}Comment <a href="{$url}">{$i}</a> by <a href="{$whourl}">{$who}</a>, {$c.creation_dtime|date}{/blocktrans}</p>
 {/if}
 
 <pre class="issue-comment-text">{if strlen($c.content) > 0}{issuetext $c.content, $request}{else}<i>{trans '(No comments were given for this change.)'}</i>{/if}</pre>
@@ -91,15 +91,15 @@
 {/block}
 {block context}
 <div class="issue-info">
-{assign $submitter = $issue.get_submitter()}
+{assign $submitter = $issue.get_submitter()}{aurl 'url', 'IDF_Views_User::view', array($submitter.login)}
-<p><strong>{trans 'Created:'}</strong> <span class="nobrk">{$issue.creation_dtime|dateago}</span> <span class="nobrk">{blocktrans}by {$submitter}{/blocktrans}</span></p>
+<p><strong>{trans 'Created:'}</strong> <span class="nobrk">{$issue.creation_dtime|dateago}</span> <span class="nobrk">{blocktrans}by <a href="{$url}">{$submitter}</a>{/blocktrans}</span></p>
 {if $issue.modif_dtime != $issue.creation_dtime}<p>
 <strong>{trans 'Updated:'}</strong> <span class="nobrk">{$issue.modif_dtime|dateago}</span></p>{/if}
 <p>
 <strong>{trans 'Status:'}</strong> {$issue.get_status.name}</p>
-<p>
+{if $issue.get_owner != null}<p>{aurl 'url', 'IDF_Views_User::view', array($issue.get_owner().login)}
-<strong>{trans 'Owner:'}</strong> {if $issue.get_owner == null}{trans 'No owner'}{else}{$issue.get_owner}{/if}
+<strong>{trans 'Owner:'}</strong> <a href="{$url}">{$issue.get_owner}</a>
-</p>{assign $tags = $issue.get_tags_list()}{if $tags.count()}
+</p>{/if}{assign $tags = $issue.get_tags_list()}{if $tags.count()}
 <p>
 <strong>{trans 'Labels:'}</strong><br />
 {foreach $tags as $tag}{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $tag.id, 'open')}

src/IDF/templates/project-home.html

@@ -21,13 +21,13 @@
 {assign $km = 'members'}
 <p><strong>{trans 'Development Team'}</strong><br />
 {trans 'Admins'}<br />
-{foreach $team[$ko] as $owner}
+{foreach $team[$ko] as $owner}{aurl 'url', 'IDF_Views_User::view', array($owner.login)}
-<span class="label">{$owner}</span><br />
+<span class="label"><a class="label" href="{$url}">{$owner}</a></span><br />
 {/foreach}
 {if count($team[$km]) > 0}
 {trans 'Happy Crew'}<br />
-{foreach $team[$km] as $member}
+{foreach $team[$km] as $member}{aurl 'url', 'IDF_Views_User::view', array($member.login)}
-<span class="label">{$member}</span><br />
+<span class="label"><a class="label" href="{$url}">{$member}</a></span><br />
 {/foreach}
 {/if}
 </p>

src/IDF/templates/user/myaccount.html

@@ -0,0 +1,59 @@
+{extends "base-simple.html"}
+{block body}
+{if $form.errors}
+<div class="px-message-error">
+<p>{trans 'Oups, please check the form for errors.'}</p>
+{if $form.get_top_errors}
+{$form.render_top_errors|unsafe}
+{/if}
+</div>
+{/if}
+
+<form method="post" action=".">
+<table class="form" summary="">
+<tr>
+<th>{trans 'Login:'}</th>{aurl 'url', 'IDF_Views_User::view', array($user.login)}
+<td><a href="{$url}">{$user.login}</a></td>
+</tr>
+<tr>
+<th>{$form.f.first_name.labelTag}:</th>
+<td>{if $form.f.first_name.errors}{$form.f.first_name.fieldErrors}{/if}
+{$form.f.first_name|unsafe}
+</td>
+</tr>
+<tr>
+<th><strong>{$form.f.last_name.labelTag}:</strong></th>
+<td>{if $form.f.last_name.errors}{$form.f.last_name.fieldErrors}{/if}
+{$form.f.last_name|unsafe}
+</td>
+</tr>
+<tr>
+<th>{$form.f.password.labelTag}:</th>
+<td>{if $form.f.password.errors}{$form.f.password.fieldErrors}{/if}
+{$form.f.password|unsafe}<br />
+<span class="helptext">{$form.f.password.help_text}</span>
+</td>
+</tr>
+<tr>
+<th>{$form.f.password2.labelTag}:</th>
+<td>{if $form.f.password2.errors}{$form.f.password2.fieldErrors}{/if}
+{$form.f.password2|unsafe}
+</td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+<td><input type="submit" value="{trans 'Update Your Account'}" name="submit" /> | <a href="{url 'IDF_Views::index'}">{trans 'Cancel'}</a>
+</td>
+</tr>
+</table>
+</form>
+{/block}
+{block context}
+<div class="issue-submit-info">
+<p>{trans 'If possible, use your real name. By using your real name, people will have more trust in your comments and remarks.'}</p>
+</div>{/block}
+{block javascript}<script type="text/javascript">
+document.getElementById('id_first_name').focus()
+</script>
+{/block}
+

src/IDF/templates/user/public.html

@@ -0,0 +1,28 @@
+{extends "base-simple.html"}
+{block body}
+<table class="form" summary="">
+<tr>
+<th></th>
+<td>{$member}</td>
+</tr>
+<tr>
+<th>{trans 'Last time seen:'}</th>
+<td>{$member.last_login|dateago}</td>
+</tr>
+<tr>
+<th>{trans 'Member since:'}</th>
+<td>{$member.date_joined|date}</td>
+</tr>
+</table>
+{/block}
+{block context}
+<div class="issue-submit-info">
+<p>{blocktrans}You are looking at the public profile of {$member}.{/blocktrans}</p>
+</div>
+<h2>{trans 'Projects'}</h2>
+<ul>{foreach $projects as $p}
+<li><a href="{url 'IDF_Views_Project::home', array($p.shortname)}">{$p}</a></li>
+{/foreach}</ul>
+{/block}
+
+

www/media/idf/css/style.css

@@ -37,6 +37,10 @@
   color: #a00;
 }
 
+a.userw { 
+  color: #000;
+}
+
 .mono { 
   font-family: monospace;
 }