From dc31155de19b8ba472a5c210711c3bb264a9ba8d Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Mon, 11 Apr 2011 15:37:40 +0200 Subject: [PATCH] Second pass of code review --- INSTALL.mdtext | 6 ++ logo/no_logo.svg | 75 ++++------------------- src/IDF/Form/ProjectConf.php | 4 +- src/IDF/Views/Project.php | 2 +- src/IDF/templates/idf/admin/summary.html | 2 +- src/IDF/templates/idf/base-full.html | 2 +- src/IDF/templates/idf/base.html | 2 +- www/media/idf/css/style.css | 4 +- www/media/idf/img/no_logo.png | Bin 1308 -> 1248 bytes 9 files changed, 24 insertions(+), 73 deletions(-) diff --git a/INSTALL.mdtext b/INSTALL.mdtext index 97a43d6..7827f25 100644 --- a/INSTALL.mdtext +++ b/INSTALL.mdtext @@ -4,6 +4,12 @@ The installation of InDefero is composed of 2 parts, first the installation of the [Pluf framework](http://www.pluf.org) and second, the installation of InDefero by itself. +## PHP modules for indefero + +Indefero need the GD module for PHP. It's named "php5-gd" in debian. + + $ apt-get install php5-gd + ## Recommended Layout of the Files If your server document root is in `/var/www` a good thing is to keep diff --git a/logo/no_logo.svg b/logo/no_logo.svg index 8ae85f2..80c206b 100644 --- a/logo/no_logo.svg +++ b/logo/no_logo.svg @@ -14,7 +14,10 @@ id="svg2985" height="32" width="32" - version="1.1"> + version="1.1" + inkscape:export-filename="/home/www/indefero/logo/no_logo.png" + inkscape:export-xdpi="89.989998" + inkscape:export-ydpi="89.989998"> image/svg+xml - + - - - - - - - - - - - - - - - - - + id="g3838" /> ? diff --git a/src/IDF/Form/ProjectConf.php b/src/IDF/Form/ProjectConf.php index 9290cde..0144cd1 100644 --- a/src/IDF/Form/ProjectConf.php +++ b/src/IDF/Form/ProjectConf.php @@ -3,7 +3,7 @@ /* # ***** BEGIN LICENSE BLOCK ***** # This file is part of InDefero, an open source project management application. -# Copyright(C) 2008 Céondo Ltd and contributors. +# Copyright(C) 2008-2011 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 @@ -63,7 +63,7 @@ class IDF_Form_ProjectConf extends Pluf_Form 'label' => __('Update the logo'), 'initial' => '', 'help_text' => __('The logo must be a picture with a size of 32 by 32.'), - 'max_size' => Pluf::f('max_upload_size', 100 * 1024), + 'max_size' => Pluf::f('max_upload_size', 5 * 1024), 'move_function_params' => array('upload_path' => $upload_path, 'upload_path_create' => true, diff --git a/src/IDF/Views/Project.php b/src/IDF/Views/Project.php index 58ecf91..394a898 100644 --- a/src/IDF/Views/Project.php +++ b/src/IDF/Views/Project.php @@ -40,7 +40,7 @@ class IDF_Views_Project $prj = $request->project; $logo = $prj->getConf()->getVal('logo'); - if(empty($logo)) { + if (empty($logo)) { $url = Pluf::f('url_media') . '/idf/img/no_logo.png'; return new Pluf_HTTP_Response_Redirect($url); } diff --git a/src/IDF/templates/idf/admin/summary.html b/src/IDF/templates/idf/admin/summary.html index 349a840..5a44503 100644 --- a/src/IDF/templates/idf/admin/summary.html +++ b/src/IDF/templates/idf/admin/summary.html @@ -34,7 +34,7 @@ {trans 'Current logo'}: {if $logo} -{trans 'project logo'} +{trans 'Project logo'} {else} {trans 'Your project does not have a logo configured yet.'} {/if} diff --git a/src/IDF/templates/idf/base-full.html b/src/IDF/templates/idf/base-full.html index 8e19345..51baf73 100644 --- a/src/IDF/templates/idf/base-full.html +++ b/src/IDF/templates/idf/base-full.html @@ -37,7 +37,7 @@
- {if $project}

{$project}

{/if} + {if $project}

{$project} {trans 'Project logo'}

{/if} {include 'idf/main-menu.html'}