Indefero Commit Details

Date:

2011-04-11 08:37:40 (13 years 8 months ago)

Author:

William MARTIN

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

dc31155de19b8ba472a5c210711c3bb264a9ba8d

Parents:

0bae69908b20cfd22abdb9f9c2e708ebfbe74c09

Message:

Second pass of code review

Changes:

File differences

-4
5 5
6 6
7
8
9
10
11
12
7 13
8 14
9 15
+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␊
 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␊

-3
4 4
5 5
6 
6
7 7
8 8
9 9
... ...
63 63
64 64
65 65
66 
66
67 67
68 68
69 69
+/*␊
# ***** 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␊

                                                         '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,␊
 ...
 /*␊
 # ***** 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␊
                                                          '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,␊

-40
41 41
42 42
43 
43
44 44
45 45
46 46
+        $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);␊
        }␊
         $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);␊
         }␊

-34
35 35
36 36
37 
37
38 38
39 39
40 40
+<th><strong>{trans 'Current logo'}:</strong></th>␊
<td>␊
{if $logo}␊
<img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'project logo'}" />␊
<img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" />␊
{else}␊
{trans 'Your project does not have a logo configured yet.'}␊
{/if}␊
 <th><strong>{trans 'Current logo'}:</strong></th>␊
 <td>␊
 {if $logo}␊
-<img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'project logo'}" />␊
+<img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" />␊
 {else}␊
 {trans 'Your project does not have a logo configured yet.'}␊
 {/if}␊

-37
38 38
39 39
40 
40
41 41
42 42
43 43
+<body>␊
<div id="{block docid}doc3{/block}">␊
  <div id="hd">␊
    {if $project}<h1 class="project-title">{$project}</h1>{/if}␊
    {if $project}<h1 class="project-title">{$project} <img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" /></h1>{/if}␊
    {include 'idf/main-menu.html'}␊
<div id="header">␊
<div id="main-tabs">␊
 <body>␊
 <div id="{block docid}doc3{/block}">␊
   <div id="hd">␊
-    {if $project}<h1 class="project-title">{$project}</h1>{/if}␊
+    {if $project}<h1 class="project-title">{$project} <img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" /></h1>{/if}␊
     {include 'idf/main-menu.html'}␊
 <div id="header">␊
 <div id="main-tabs">␊

-37
38 38
39 39
40 
40
41 41
42 42
43 43
+<body>␊
<div id="{block docid}doc3{/block}" class="{block docclass}yui-t3{/block}">␊
  <div id="hd">␊
    {if $project}<h1 class="project-title">{$project}</h1>{/if}␊
    {if $project}<h1 class="project-title">{$project} <img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" /></h1>{/if}␊
    {include 'idf/main-menu.html'}␊
<div id="header">␊
<div id="main-tabs">␊
 <body>␊
 <div id="{block docid}doc3{/block}" class="{block docclass}yui-t3{/block}">␊
   <div id="hd">␊
-    {if $project}<h1 class="project-title">{$project}</h1>{/if}␊
+    {if $project}<h1 class="project-title">{$project} <img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" /></h1>{/if}␊
     {include 'idf/main-menu.html'}␊
 <div id="header">␊
 <div id="main-tabs">␊

-330
331 331
332 332
333 
334 
335 
333
336 334
337 335
338 336
+  font-weight: normal;␊
  float: right;␊
  z-index: 100;␊
  text-align: right;␊
  padding-right: 5px;␊
  margin-bottom: 0;␊
  margin: 0;␊
}␊
␊
.note {␊
   font-weight: normal;␊
   float: right;␊
   z-index: 100;␊
-  text-align: right;␊
-  padding-right: 5px;␊
-  margin-bottom: 0;␊
+  margin: 0;␊
 }␊
 ␊
 .note {␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags