Merge branch 'feature.better-home' of git://projects.ceondo.com/indefero into feature.better-home

logo/no_logo.svg

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="no_logo.svg"
+   inkscape:version="0.48.0 r9654"
+   id="svg2985"
+   height="32"
+   width="32"
+   version="1.1">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="11.357903"
+     inkscape:cx="2.6416758"
+     inkscape:cy="13.063247"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2987" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <g
+       id="g3838">
+      <g
+         id="g3776">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988"
+           d="m 0.34564999,22.338428 0,9.323144"
+           style="fill:none;stroke:#000000;stroke-width:0.68403965;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-2"
+           d="m 9.6546337,31.65435 -9.31645142,0"
+           style="fill:none;stroke:#000000;stroke-width:0.68379408;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <g
+         transform="matrix(0,1,-1,0,32.003592,0.00346926)"
+         id="g3776-3">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-5"
+           d="m 0.34564999,22.338428 0,9.323144"
+           style="fill:none;stroke:#000000;stroke-width:0.68403965;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-2-8"
+           d="m 9.6546337,31.65435 -9.31645142,0"
+           style="fill:none;stroke:#000000;stroke-width:0.68379408;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <g
+         transform="matrix(0,-1,1,0,0.00359183,31.996285)"
+         id="g3776-36">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-21"
+           d="m 0.34564999,22.338428 0,9.323144"
+           style="fill:none;stroke:#000000;stroke-width:0.68403965;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-2-2"
+           d="m 9.6546337,31.65435 -9.31645142,0"
+           style="fill:none;stroke:#000000;stroke-width:0.68379408;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <g
+         transform="matrix(-1,0,0,-1,31.996531,31.996408)"
+         id="g3776-6">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-4"
+           d="m 0.34564999,22.338428 0,9.323144"
+           style="fill:none;stroke:#000000;stroke-width:0.68403965;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2988-2-3"
+           d="m 9.6546337,31.65435 -9.31645142,0"
+           style="fill:none;stroke:#000000;stroke-width:0.68379408;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="12.330909"
+       inkscape:export-xdpi="12.330909"
+       inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
+       style="fill:#b4b4b4;stroke:#727272;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
+       id="g2401">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#b4b4b4;fill-opacity:1;fill-rule:nonzero;stroke:#727272;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
+         id="path2383" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#b4b4b4;fill-opacity:1;fill-rule:nonzero;stroke:#727272;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
+         id="path2391" />
+    </g>
+    <text
+       transform="scale(1.118034,0.89442719)"
+       sodipodi:linespacing="125%"
+       style="font-size:30.97047043px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       xml:space="preserve"
+       id="text3763"
+       y="28.666267"
+       x="8.1167412"><tspan
+         style="fill:#000000;fill-opacity:1"
+         id="tspan3765"
+         y="28.666267"
+         x="8.1167412">?</tspan></text>
+  </g>
+</svg>

src/IDF/FileUtil.php

@@ -162,4 +162,15 @@ class IDF_FileUtil
         $ext = array_merge(self::$supportedExtenstions, explode(' ' , $ext));
         return (in_array($fileinfo[2], $ext));
     }
+    
+    /*
+     *
+     */
+    public static function getPictureInline($file)
+    {
+        $info = IDF_FileUtil::getMimeType($file);
+        $content = file_get_contents($file);
+        $base64 = 'data:' . $info[0] . ';base64,' . base64_encode($content);
+        return $base64;
+    }
 }

src/IDF/Form/ProjectConf.php

@@ -0,0 +1,141 @@
+<?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 ***** */
+
+
+/**
+ * Configuration of the project.
+ */
+class IDF_Form_ProjectConf extends Pluf_Form
+{
+    public $project = null;
+
+    public function initFields($extra=array())
+    {
+        $this->project = $extra['project'];
+
+        // Basic part
+        $this->fields['name'] = new Pluf_Form_Field_Varchar(array('required' => true,
+                                                                  'label' => __('Name'),
+                                                                  'initial' => $this->project->name,
+                                                                 ));
+        $this->fields['shortdesc'] = new Pluf_Form_Field_Varchar(array('required' => true,
+                                                                       'label' => __('Short Description'),
+                                                                       'initial' => $this->project->shortdesc,
+                                                                       'widget_attrs' => array('size' => '68'),
+                                                                      ));
+        $this->fields['description'] = new Pluf_Form_Field_Varchar(array('required' => true,
+                                                                         'label' => __('Description'),
+                                                                         'initial' => $this->project->description,
+                                                                         'widget_attrs' => array('cols' => 68,
+                                                                                                 'rows' => 26,
+                                                                                                ),
+                                                                         'widget' => 'Pluf_Form_Widget_TextareaInput',
+                                                                        ));
+                                                                        
+        // Logo part
+        $upload_path = Pluf::f('upload_path', false);
+        if(false === $upload_path) {
+            throw new Pluf_Exception_SettingError(__('The "upload_issue_path" configuration variable was not set.'));
+        }
+        $md5 = md5(rand().microtime().Pluf_Utils::getRandomString());
+        $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s'; 
+        $this->fields['logo'] = new Pluf_Form_Field_File(array('required' => false,
+                                                         'label' => __('Update the logo'),
+                                                         'initial' => '',
+                                                         'help_text' => __('The logo must be a picture with a size of 16 by 16.'),
+                                                         'max_size' => Pluf::f('max_upload_size', 2097152),
+                                                         'move_function_params' => 
+                                                         array('upload_path' => $upload_path,
+                                                               'upload_path_create' => true,
+                                                               'file_name' => $filename,
+                                                               )
+                                                         ));
+                                                         
+        $this->fields['logo_remove'] = new Pluf_Form_Field_Boolean(array('required' => false,
+                                                                         'label' => __('Remove the current logo'),
+                                                                         'initial' => false,
+                                                                         'widget' => 'Pluf_Form_Widget_CheckboxInput',
+                                                                         ));
+    }
+    
+    /**
+     * If we have uploaded a file, but the form failed remove it.
+     *
+     */
+    function failed()
+    {
+        if(!empty($this->cleaned_data['logo']) 
+            and file_exists(Pluf::f('upload_path').'/'.$this->cleaned_data['logo'])) {
+            unlink(Pluf::f('upload_path').'/'.$this->cleaned_data['logo']);
+        }
+    }
+    
+    public function clean()
+    {
+        if(!isset($this->cleaned_data['logo_remove'])) {
+            $this->cleaned_data['logo_remove'] = false;
+        }
+        
+        return $this->cleaned_data;
+    }
+    
+    public function clean_logo()
+    {
+        if(!isset($this->cleaned_data['logo']) ||
+            $this->cleaned_data['logo'] == "") {
+            return '';
+        }
+        
+        $meta = getimagesize(Pluf::f('upload_path').'/'.$this->cleaned_data['logo']);
+        
+        if($meta === FALSE) {
+            throw new Pluf_Form_Invalid("Error during the determination of the size of the picture");
+        }
+        
+        if($meta[0] !== 32 || $meta[1] !== 32) {
+            throw new Pluf_Form_Invalid("The picture must have a size of 16 by 16.");
+        }
+
+        return $this->cleaned_data['logo'];
+    }
+
+    public function save($commit=true)
+    {
+        $conf = $this->project->getConf();
+        
+        // Basic part
+        $this->project->name = $this->cleaned_data['name'];
+        $this->project->shortdesc = $this->cleaned_data['shortdesc'];
+        $this->project->description = $this->cleaned_data['description'];
+        $this->project->update();
+        
+        // Logo part
+        if($this->cleaned_data['logo'] !== "") {
+            $conf->setVal('logo', $this->cleaned_data['logo']);
+        }
+        if($this->cleaned_data['logo_remove'] === true) {
+            @unlink(Pluf::f('upload_path').'/'.$conf->getVal('logo'));
+            $conf->delVal('logo');
+        }
+    }
+}

src/IDF/Views.php

@@ -41,12 +41,24 @@ class IDF_Views
     {
         $projects = self::getProjects($request->user);
         $stats = self::getProjectsStatistics ($projects);
+ 
+        $logos = array();
+        foreach ($projects as $p) {
+            $logo = $p->getConf()->getVal('logo');
+            if (!empty($logo)) {
+                $logo = Pluf::f('upload_path').'/'.$logo;
+                $logos[$p->shortname] = IDF_FileUtil::getPictureInline($logo);
+            } else {
+                $logos[$p->shortname] = "";
+            }      
+        }
         
         if ($api == true) return $projects;
         return Pluf_Shortcuts_RenderToResponse('idf/index.html', 
                                                array('page_title' => __('Projects'),
                                                      'projects' => $projects,
-                                                     'stats' => new Pluf_Template_ContextVars($stats)),
+                                                     'stats' => new Pluf_Template_ContextVars($stats),
+                                                     'logos' => $logos),
                                                $request);
     }
 

src/IDF/Views/Project.php

@@ -272,32 +272,36 @@ class IDF_Views_Project
     public function admin($request, $match)
     {
         $prj = $request->project;
-        $title = sprintf(__('%s Project Summary'), (string) $prj);
+        $title = sprintf(__('%s Project Summary'), (string) $prj);    
-        $form_fields = array('fields'=> array('name', 'shortdesc',
+        $extra = array('project' => $prj);  
-                                              'description'));
         if ($request->method == 'POST') {
-            $form = Pluf_Shortcuts_GetFormForModel($prj, $request->POST,
+            $form = new IDF_Form_ProjectConf(array_merge($request->POST,
-                                                   $form_fields);
+                                                         $request->FILES),
+                                             $extra);      
             if ($form->isValid()) {
-                $prj = $form->save();
+                $form->save();
                 $request->user->setMessage(__('The project has been updated.'));
                 $url = Pluf_HTTP_URL_urlForView('IDF_Views_Project::admin',
                                                 array($prj->shortname));
                 return new Pluf_HTTP_Response_Redirect($url);
             }
         } else {
-            $form = Pluf_Shortcuts_GetFormForModel($prj, $prj->getData(),
+            $form = new IDF_Form_ProjectConf($prj->getData(), $extra);    
-                                                   $form_fields);
+        }
+        
+        $logo = $prj->getConf()->getVal('logo');
+        if (!empty($logo)) {
+            $logo = Pluf::f('upload_path').'/'.$logo;
+            $logo_base64 = IDF_FileUtil::getPictureInline($logo);
         }
-        $form->fields['description']->widget->attrs['cols'] = 68;
-        $form->fields['description']->widget->attrs['rows'] = 26;
-        $form->fields['shortdesc']->widget->attrs['size'] = 67;
         return Pluf_Shortcuts_RenderToResponse('idf/admin/summary.html',
                                                array(
                                                      'page_title' => $title,
                                                      'form' => $form,
+                                                     'project' => $prj,
+                                                     'logo' => $logo_base64,
                                                      ),
-                                               $request);
+                                               $request);        
     }
 
     /**

src/IDF/templates/idf/admin/summary.html

@@ -9,7 +9,7 @@
 {/if}
 </div>
 {/if}
-<form method="post" action=".">
+<form method="post" enctype="multipart/form-data" action=".">
 <table class="form" summary="">
 <tr>
 <th><strong>{$form.f.name.labelTag}:</strong></th>
@@ -30,6 +30,30 @@
 {$form.f.description|unsafe}
 </td>
 </tr>
+<tr>
+<th><strong>{trans 'Actual logo'}:</strong></th>
+<td>
+{if $logo}
+<img src="{$logo}" alt="project logo" />
+{else}
+{trans 'Your project do not have a logo configured yet.'}
+{/if}
+</td>
+</tr>
+<tr>
+<th><strong>{$form.f.logo.labelTag}:</strong></th>
+<td>{if $form.f.logo.errors}{$form.f.logo.fieldErrors}{/if}
+{$form.f.logo|unsafe}
+</td>
+</tr>
+{if $logo}
+<tr>
+<th><strong>{$form.f.logo_remove.labelTag}:</strong></th>
+<td>{if $form.f.logo_remove.errors}{$form.f.logo_remove.fieldErrors}{/if}
+{$form.f.logo_remove|unsafe}
+</td>
+</tr>
+{/if}
 <tr><td>&nbsp;</td>
 <td>
 <input type="submit" name="submit" value="{trans 'Save Changes'}" />

src/IDF/templates/idf/index.html

@@ -9,9 +9,23 @@
 {aurl 'url', 'IDF_Views_Admin::projectCreate'}
 <p><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/add.png'}" alt="+" align="bottom" /></a> <a href="{$url}">{trans 'Create Project'}</a></p>{/if}
 {else}
-<ul>{foreach $projects as $p}
+{foreach $projects as $p}
-<li>{if $p.private}<img style="vertical-align: text-bottom;" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" /> {/if}<a href="{url 'IDF_Views_Project::home', array($p.shortname)}">{$p}</a>{if $p.shortdesc}, {$p.shortdesc}{/if}</li>
+<div class="p-list-img">
-{/foreach}</ul>
+    <a href="{url 'IDF_Views_Project::home', array($p.shortname)}">
+    {if $logos[$p->shortname]}
+        <img src="{$logos[$p->shortname]}" alt="{trans 'Project logo'}" />
+    {else}
+        <img src="{media '/idf/img/no_logo.png'}" alt="{trans 'Project logo'}" />
+    {/if}
+    </a>
+    {if $p.private}<div class="p-list-private"><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><img style="float:right" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" /></a></div>{/if}
+</div>
+<div class="p-list-prj">
+    <p><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><strong>{$p}</strong></a>{if $p.private} - {trans 'Private project'}</p>{/if}</p>
+    {if $p.shortdesc}<p>{$p.shortdesc}</p>{/if}
+</div>
+<div style="clear: both"></div>
+{/foreach}
 {/if}
 {/block}
 {block context}

www/media/idf/css/style.css

@@ -1043,3 +1043,24 @@ span.scm-action.property-changed {
 #stats td {
     padding: .2em;
 }
+
+/*
+ *  Project list on index
+ */
+div.p-list-img {
+    float: left;
+}
+
+div.p-list-prj {
+    float: left;
+    margin: 0 0 .5em 1em;
+}
+
+div.p-list-prj p {
+    margin: 0px;
+}
+
+.p-list-private {
+    bottom: 10px;
+    position: relative;
+}