From d04ecd60c4c55edb1932e11369a3ac40f1ab7f9b Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Fri, 1 Apr 2011 14:13:42 +0200 Subject: [PATCH 1/5] Add default logo for project without one --- logo/no_logo.svg | 143 ++++++++++++++++++++++++++++++++++ www/media/idf/img/no_logo.png | Bin 0 -> 1308 bytes 2 files changed, 143 insertions(+) create mode 100644 logo/no_logo.svg create mode 100644 www/media/idf/img/no_logo.png diff --git a/logo/no_logo.svg b/logo/no_logo.svg new file mode 100644 index 0000000..8ae85f2 --- /dev/null +++ b/logo/no_logo.svg @@ -0,0 +1,143 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + + diff --git a/www/media/idf/img/no_logo.png b/www/media/idf/img/no_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..bdaef70cc74822d06fe817f747ee0318c0d4c8f0 GIT binary patch literal 1308 zcmV+%1>^dOP)9pYeg z7qfPuyHGZJ<0|6nSVu}3z3`{CU{Q30iUS#iLDvpO%^0JIj9yfTTX6$v)rob}Fc*{P ziD{B!jyB&e)>@n8B+&}J*>iPx|DNZZ=ljn24gvTZz|Tkl#+WTt&1MjhGmWw`0^r>0 z@SOq?Ik}fXyczsX4Qgy`RO$74n;;0KtE;PDcXoC@NT+W{ENE|U=QxfVE+{B?Q>)bq zZnt~E=ks0XIPUY-*4CIJ`A%7|zP{d6SXfx0)9D1B=V7r}OeG~Hp8@zTRd3n?h-eoP zy+=e>iO5MrE+YD!i0<6DapTjWp&`}M($YqKW@aXDu~^=2X=(X5>0G2?0TI0dU>-nL zvO2X|jjF0D)YsR8hyVZ+6BG9%k;v$tIXO86k|Z5dnw|D8ICbh&e|~=cUY$-?rq}CpMN#yKqIj*n zy}j+ql`GXwr}M4R(NO@v&6_uI^5jVn5wfzfc4@WR(*TAN&E?YB0WB>p9~?e>_}kLb z(&JXEwa{QNsEdkGS8$ze+@Wb#?Vdy(CHScsu|AB7z_YuO*tx7_+6c;KGFq zHj~NZC@Lz-d+O^`7z~E}DwXOTBFYd&aU-r)t6?-6pWP+LX_V$C6>#RvnM|Ed*Ky#$ zfxU_Hk$-W2ZEa2EbUu6aS5{Vn=byPtL>WpPN!NhUXzaIItp}Czp-^afY;4T!@puYn zW@Z2Y#l^*FYHE6}j))X*R8hdWbLR|sd3lv;wOUc2$KzSKd-v{-c(Of@9z6=X-H!O4 z_4RfCmIY`un%eB_Y;zKFI2;ZOfZYI4Q&WSwx;n(K6UG=;S63fyS%4r2$F*85CCbUN zj7yg;Asi0x27tP{I@H$ICY%!t1|Lh3G^oU*=#56B*{_rv85zOc+#CSFY&QFp$N^ws zVPQ5L4&UCg0FL7nb5m1O8`npU9EmE`t*op_!C>%9hrhS}NKdlxTW>`@$qBx`^%rYNqestWt|?fW4V3SG<3&;KbtAB)8>H8u5c zd3pJxWaL1SCm_r6qa@-0K#s*?o=_;X64!_E@$p~1UhlD*Sif34Y#AwXoVmMYEcybkR)lu@AtR$_4S2PkrRCpEz+Ma`x=mYQ~t3G4{!J$x{jdfVQ@_*6Hc#=E=#)2}zO=i9{Z| z-R=k7-Q9Oyg!n1aI+9(!eEFN^=H{VbF!&(=bw);pgFV@cFN**F4GAy#_xvCB@Xk-V SXKV=o0000 Date: Fri, 1 Apr 2011 14:14:30 +0200 Subject: [PATCH 2/5] Update the index template --- src/IDF/templates/idf/index.html | 20 +++++++++++++++++--- www/media/idf/css/style.css | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/IDF/templates/idf/index.html b/src/IDF/templates/idf/index.html index b093e76..a2f5abd 100644 --- a/src/IDF/templates/idf/index.html +++ b/src/IDF/templates/idf/index.html @@ -9,9 +9,23 @@ {aurl 'url', 'IDF_Views_Admin::projectCreate'}

+ {trans 'Create Project'}

{/if} {else} -
    {foreach $projects as $p} -
  • {if $p.private}{trans 'Private project'} {/if}{$p}{if $p.shortdesc}, {$p.shortdesc}{/if}
    • -{/foreach}
+{foreach $projects as $p} +
+ + {if $p.logo != 0} + {trans 'Project logo'} + {else} + {trans 'Project logo'} + {/if} + + {if $p.private}
{trans 'Private project'}
{/if} +
+
+

{$p}{if $p.private} - {trans 'Private project'}

{/if}

+ {if $p.shortdesc}

{$p.shortdesc}

{/if} +
+
+{/foreach} {/if} {/block} {block context} diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css index c1e3356..3e92715 100644 --- a/www/media/idf/css/style.css +++ b/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; +} From 9a93acd1a55e168061e2597577e5a0109cd6c738 Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Fri, 1 Apr 2011 14:17:56 +0200 Subject: [PATCH 3/5] Update the admin template --- src/IDF/Views/Project.php | 28 ++++++++++++++++++++++++ src/IDF/templates/idf/admin/summary.html | 26 +++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/IDF/Views/Project.php b/src/IDF/Views/Project.php index 2befafc..03f2f9b 100644 --- a/src/IDF/Views/Project.php +++ b/src/IDF/Views/Project.php @@ -265,6 +265,33 @@ class IDF_Views_Project public $admin_precond = array('IDF_Precondition::projectOwner'); public function admin($request, $match) { + $prj = $request->project; + $title = sprintf(__('%s Project Summary'), (string) $prj); + $extra = array('project' => $prj); + if ($request->method == 'POST') { + $form = new IDF_Form_ProjectConf(array_merge($request->POST, + $request->FILES), + $extra); + if ($form->isValid()) { + $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 = new IDF_Form_ProjectConf($prj->getData(), $extra); + } + + return Pluf_Shortcuts_RenderToResponse('idf/admin/summary.html', + array( + 'page_title' => $title, + 'form' => $form, + 'project' => $prj, + 'upload_path' => Pluf::f('upload_path'), + ), + $request); +/* $prj = $request->project; $title = sprintf(__('%s Project Summary'), (string) $prj); $form_fields = array('fields'=> array('name', 'shortdesc', @@ -292,6 +319,7 @@ class IDF_Views_Project 'form' => $form, ), $request); +*/ } /** diff --git a/src/IDF/templates/idf/admin/summary.html b/src/IDF/templates/idf/admin/summary.html index 8ee1d71..1c012bb 100644 --- a/src/IDF/templates/idf/admin/summary.html +++ b/src/IDF/templates/idf/admin/summary.html @@ -9,7 +9,7 @@ {/if} {/if} -
+ @@ -30,6 +30,30 @@ {$form.f.description|unsafe} + + + + + + + + +{if $project.logo} + + + + +{/if} -{if $project.logo} +{if $logo}
{$form.f.name.labelTag}:
{trans 'Actual logo'}: +{if $project.logo} +project logo +{else} +{trans 'Your project do not have a logo configured yet.'} +{/if} +
{$form.f.logo.labelTag}:{if $form.f.logo.errors}{$form.f.logo.fieldErrors}{/if} +{$form.f.logo|unsafe} +
{$form.f.logo_remove.labelTag}:{if $form.f.logo_remove.errors}{$form.f.logo_remove.fieldErrors}{/if} +{$form.f.logo_remove|unsafe} +
  From aa164936f44b533252e14d66b93db2c590b0f897 Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Fri, 1 Apr 2011 14:19:07 +0200 Subject: [PATCH 4/5] Remove commented code --- src/IDF/Views/Project.php | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/IDF/Views/Project.php b/src/IDF/Views/Project.php index 03f2f9b..cb071b1 100644 --- a/src/IDF/Views/Project.php +++ b/src/IDF/Views/Project.php @@ -291,35 +291,6 @@ class IDF_Views_Project 'upload_path' => Pluf::f('upload_path'), ), $request); -/* - $prj = $request->project; - $title = sprintf(__('%s Project Summary'), (string) $prj); - $form_fields = array('fields'=> array('name', 'shortdesc', - 'description')); - if ($request->method == 'POST') { - $form = Pluf_Shortcuts_GetFormForModel($prj, $request->POST, - $form_fields); - if ($form->isValid()) { - $prj = $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_fields); - } - $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, - ), - $request); -*/ } /** From 352dc3e179cfa1dc804552aef1e4e83728422306 Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Fri, 1 Apr 2011 16:05:32 +0200 Subject: [PATCH 5/5] Add IDF_Form_ProjectConf Update template --- src/IDF/FileUtil.php | 11 ++ src/IDF/Form/ProjectConf.php | 141 +++++++++++++++++++++++ src/IDF/Views.php | 14 ++- src/IDF/Views/Project.php | 7 +- src/IDF/templates/idf/admin/summary.html | 6 +- src/IDF/templates/idf/index.html | 4 +- 6 files changed, 176 insertions(+), 7 deletions(-) create mode 100644 src/IDF/Form/ProjectConf.php diff --git a/src/IDF/FileUtil.php b/src/IDF/FileUtil.php index 725d980..c9ec8e9 100644 --- a/src/IDF/FileUtil.php +++ b/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; + } } diff --git a/src/IDF/Form/ProjectConf.php b/src/IDF/Form/ProjectConf.php new file mode 100644 index 0000000..1a3bd45 --- /dev/null +++ b/src/IDF/Form/ProjectConf.php @@ -0,0 +1,141 @@ +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'); + } + } +} diff --git a/src/IDF/Views.php b/src/IDF/Views.php index 208299e..8dc92b7 100644 --- a/src/IDF/Views.php +++ b/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); } diff --git a/src/IDF/Views/Project.php b/src/IDF/Views/Project.php index cb071b1..d78dd9c 100644 --- a/src/IDF/Views/Project.php +++ b/src/IDF/Views/Project.php @@ -283,12 +283,17 @@ class IDF_Views_Project $form = new IDF_Form_ProjectConf($prj->getData(), $extra); } + $logo = $prj->getConf()->getVal('logo'); + if (!empty($logo)) { + $logo = Pluf::f('upload_path').'/'.$logo; + $logo_base64 = IDF_FileUtil::getPictureInline($logo); + } return Pluf_Shortcuts_RenderToResponse('idf/admin/summary.html', array( 'page_title' => $title, 'form' => $form, 'project' => $prj, - 'upload_path' => Pluf::f('upload_path'), + 'logo' => $logo_base64, ), $request); } diff --git a/src/IDF/templates/idf/admin/summary.html b/src/IDF/templates/idf/admin/summary.html index 1c012bb..9653ede 100644 --- a/src/IDF/templates/idf/admin/summary.html +++ b/src/IDF/templates/idf/admin/summary.html @@ -33,8 +33,8 @@
{trans 'Actual logo'}: -{if $project.logo} -project logo +{if $logo} +project logo {else} {trans 'Your project do not have a logo configured yet.'} {/if} @@ -46,7 +46,7 @@ {$form.f.logo|unsafe}
{$form.f.logo_remove.labelTag}: {if $form.f.logo_remove.errors}{$form.f.logo_remove.fieldErrors}{/if} diff --git a/src/IDF/templates/idf/index.html b/src/IDF/templates/idf/index.html index a2f5abd..5f70957 100644 --- a/src/IDF/templates/idf/index.html +++ b/src/IDF/templates/idf/index.html @@ -12,8 +12,8 @@ {foreach $projects as $p}
- {if $p.logo != 0} - {trans 'Project logo'} + {if $logos[$p->shortname]} + {trans 'Project logo'} {else} {trans 'Project logo'} {/if}