From 3950bc21efd9cd06d800248b36abdeee00e25132 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Fri, 7 Sep 2007 22:15:44 +0200 Subject: [PATCH] Jacou's comments Signed-off-by: Florent Bruneau --- htdocs/css/keynote.css | 2 +- modules/profile.php | 2 +- modules/profile/jobs.inc.php | 33 +++++++++++ modules/profile/page.inc.php | 1 + templates/profile/adresses.tpl | 2 +- templates/profile/general.tpl | 27 +++++---- templates/profile/groups.tpl | 2 +- templates/profile/{emploi.tpl => jobs.job.tpl} | 45 +-------------- templates/profile/jobs.tpl | 76 ++++++++++++++++++++++++++ 9 files changed, 132 insertions(+), 58 deletions(-) create mode 100644 modules/profile/jobs.inc.php rename templates/profile/{emploi.tpl => jobs.job.tpl} (76%) create mode 100644 templates/profile/jobs.tpl diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css index 8261843..084d2aa 100644 --- a/htdocs/css/keynote.css +++ b/htdocs/css/keynote.css @@ -203,7 +203,7 @@ table.tinybicol td, table.bicol td { table.tinybicol td, table.bicol td, table.tinybicol tr, table.bicol tr { padding: 4px; } td.half { width: 50%; padding: 4px; } -td.titre { +.titre { color: #000000; background: inherit; font-weight: bold; diff --git a/modules/profile.php b/modules/profile.php index f001599..2e4d29e 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -335,7 +335,7 @@ class ProfileModule extends PLModule $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses'); $wiz->addPage('ProfileGroups', 'Groupes X - Binets', 'poly'); $wiz->addPage('ProfileDecos', 'Décorations - Medailles', 'deco'); - $wiz->addPage('ProfilePro', 'Informations professionnelles', 'emploi'); + $wiz->addPage('ProfileJobs', 'Informations professionnelles', 'emploi'); $wiz->addPage('ProfileSkills', 'Compétences diverses', 'skill'); $wiz->addPage('ProfileMentor', 'Mentoring', 'mentor'); $wiz->apply($page, 'profile/edit', $opened_tab); diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php new file mode 100644 index 0000000..40628ee --- /dev/null +++ b/modules/profile/jobs.inc.php @@ -0,0 +1,33 @@ + diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php index 7d2dc0d..6decf81 100644 --- a/modules/profile/page.inc.php +++ b/modules/profile/page.inc.php @@ -227,6 +227,7 @@ require_once dirname(__FILE__) . '/general.inc.php'; require_once dirname(__FILE__) . '/addresses.inc.php'; require_once dirname(__FILE__) . '/groups.inc.php'; require_once dirname(__FILE__) . '/decos.inc.php'; +require_once dirname(__FILE__) . '/jobs.inc.php'; // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?> diff --git a/templates/profile/adresses.tpl b/templates/profile/adresses.tpl index 8ca6568..5439dc0 100644 --- a/templates/profile/adresses.tpl +++ b/templates/profile/adresses.tpl @@ -139,7 +139,7 @@ function validAddress(id, pref) {/foreach} {if $addresses|@count eq 0} -
+
{include file="profile/adresses.address.tpl" i=0 adr=0}
{/if} diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl index fd45b22..6c304d2 100644 --- a/templates/profile/general.tpl +++ b/templates/profile/general.tpl @@ -218,7 +218,7 @@ de changer ta photo, celle-ci correspond à ton ancien profil car la nouvelle n'a pas encore été validée par un administrateur du site ! Ta fiche avec la nouvelle photo) - {/if}. + {/if} : [ PHOTO ] @@ -343,19 +343,24 @@ - Complément libre - Commentaire ? ICQ ? etc... - - - - -
- +
+ Complément libre + Commentaire ? ICQ ? etc... +
+
{icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée pour le commentaire -
- +
+ +
+
+ + + + diff --git a/templates/profile/groups.tpl b/templates/profile/groups.tpl index db3563f..cf24edd 100644 --- a/templates/profile/groups.tpl +++ b/templates/profile/groups.tpl @@ -95,7 +95,7 @@ - + diff --git a/templates/profile/emploi.tpl b/templates/profile/jobs.job.tpl similarity index 76% rename from templates/profile/emploi.tpl rename to templates/profile/jobs.job.tpl index 2826683..908edb8 100644 --- a/templates/profile/emploi.tpl +++ b/templates/profile/jobs.job.tpl @@ -20,14 +20,10 @@ {* *} {**************************************************************************} - -{section name=adresses_pro loop=2} -{assign var='i' value=$smarty.section.adresses_pro.index} - - +
{include file=include/flags.radio.tpl name="pubpro[$i]" val=$pubpro.$i} @@ -153,41 +149,4 @@
- Informations professionnelles - Entreprise n°{$i+1} + Entreprise n°{$eid+1}
-{/section} - - - - - - - - - - - - -
- Informations professionnelles - CV -
- - - - - -
- - - privé -
-
- Curriculum vitae
- Le CV n'est jamais public.
- Comment remplir mon CV ?
- {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki - 		- -
- -
- {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/profile/jobs.tpl b/templates/profile/jobs.tpl new file mode 100644 index 0000000..69022ff --- /dev/null +++ b/templates/profile/jobs.tpl @@ -0,0 +1,76 @@ +{**************************************************************************} +{* *} +{* Copyright (C) 2003-2007 Polytechnique.org *} +{* http://opensource.polytechnique.org/ *} +{* *} +{* This program 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. *} +{* *} +{* This program 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., *} +{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} +{* *} +{**************************************************************************} + + +{foreach from=$entreprises item=job key=i} +
+{include file="profile/jobs.job.tpl" i=$i job=$job} +
+{/foreach} +{if $jobs|@count eq 0} +
+{include file="profile/jobs.job.tpl" i=0 job=0} +
+{/if} + + + + + + + + + + +
+ Informations professionnelles - CV +
+ +
+ + +
+
+ +{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} -- 2.1.4