From 6261a1b5739ef81724b29235f41065327f7da656 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Mon, 2 Jul 2007 18:21:28 +0000 Subject: [PATCH] Some improvements again. Same thing for the mentoring profile htdocs/css/keynote.css | 21 ++++++++++-------- plugins/function.display_address.php | 14 ++++++------ templates/geoloc/address.tpl | 2 - templates/profile/fiche_referent.tpl | 40 ++++++++++++++++++++--------------- templates/profile/profile.tpl | 21 ++++++++++++------ 5 files changed, 57 insertions(+), 41 deletions(-) git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1878 839d8a87-29fc-0310-9880-83ba4fa771e5 --- htdocs/css/keynote.css | 21 +++++++++++-------- plugins/function.display_address.php | 14 ++++++------- templates/geoloc/address.tpl | 2 +- templates/profile/fiche_referent.tpl | 40 +++++++++++++++++++++--------------- templates/profile/profile.tpl | 21 ++++++++++++------- 5 files changed, 57 insertions(+), 41 deletions(-) diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css index f26739b..ebd19dd 100644 --- a/htdocs/css/keynote.css +++ b/htdocs/css/keynote.css @@ -391,7 +391,7 @@ td.conteneur_tab { #fiche .part { float: left; clear: left; - width: 75%; + width: 70%; padding-right: 0em; margin-right: 0em; } @@ -401,7 +401,7 @@ td.conteneur_tab { padding-left: 0em; margin-left: 0em; clear: right; - width: 25%; + width: 30%; } #fiche #photo img { @@ -449,6 +449,7 @@ td.conteneur_tab { clear: left; float: left; } + #fiche_identite div.mob { float: right; clear: right; @@ -461,10 +462,9 @@ td.conteneur_tab { } div.adresse { - float: left; min-width: 46%; padding: 0px; - margin: 0px 1% 1ex 1%; + margin: 0px 1% 2ex 2%; } #fiche .medal_frame { @@ -484,17 +484,20 @@ div.adresse { /* only for fiche_referent.php*/ -#fiche_referent{ - padding: 10px; +#fiche_referent .part { + width: 100%; +} + +#fiche_referent #fiche_identite div.civilite { width: 100%; } #fiche_referent div.rubrique_referent{ float: left; - width: 31%; + width: 30%; padding: 0px; - margin: 0px 1% 1ex 1%; - + margin: 0px 1% 1ex 2%; + text-align: justify; } #fiche_referent em { diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php index 81fbebe..c498d90 100644 --- a/plugins/function.display_address.php +++ b/plugins/function.display_address.php @@ -59,8 +59,8 @@ function smarty_function_display_address($param, &$smarty) $txthtml = ""; $map = "\"Google"; + . urlencode(str_replace('États-Unis d\'Amérique', 'USA', implode(", ", $lines) . " ($idt)")) + . "\">\"Google"; if ($restore) { array_unshift($lines, $idt); } @@ -68,8 +68,8 @@ function smarty_function_display_address($param, &$smarty) { if ($param['titre_div']) $txthtml .= "
".$param['titre'].$map."
\n"; - else - $txthtml .= "".$param['titre']."".$map."
\n"; + else + $txthtml .= "".$param['titre']."".$map."
\n"; } foreach ($lines as $line) { @@ -85,9 +85,9 @@ function smarty_function_display_address($param, &$smarty) foreach ($param['adr']['tels'] as $tel) $txthtml .= "
\n".$tel['tel_type']." : \n".$tel['tel']."\n
\n"; } - if (!$params['nodiv']) - { - $txthtml = "
\n".$txthtml."
\n"; + if (!$param['nodiv']) { + $pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : ''; + $txthtml = "
\n".$txthtml."
\n"; } return $txthtml; } diff --git a/templates/geoloc/address.tpl b/templates/geoloc/address.tpl index 0bfef79..4651a24 100644 --- a/templates/geoloc/address.tpl +++ b/templates/geoloc/address.tpl @@ -20,6 +20,6 @@ {* *} {**************************************************************************} -{display_address adr=$address titre=$titre titre_div=$titre_div no_div=$no_div for=$for} +{display_address adr=$address titre=$titre titre_div=$titre_div no_div=$no_div for=$for pos=$pos} {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/profile/fiche_referent.tpl b/templates/profile/fiche_referent.tpl index f05f71d..5155351 100644 --- a/templates/profile/fiche_referent.tpl +++ b/templates/profile/fiche_referent.tpl @@ -22,17 +22,18 @@ {javascript name=ajax}
- -
- {$prenom} {$nom}
- X{$promo} -  {$bestalias}@{#globals.mail.domain#} +
+
+
+ {$prenom} {$nom}
+ X{$promo} -  {$bestalias}@{#globals.mail.domain#} +
+
{if $expertise != '' || $secteurs|count || $pays|count } - -

Informations de référent :

- -
+
+

Informations de référent :

{if $expertise}
Expertise :
@@ -63,20 +64,25 @@
{/if} - {foreach from=$adr_pro item="address" key="i"} -

{$address.entreprise}

- {include file="include/emploi.tpl" address=$address} - {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise} - -
 
+
+ {foreach from=$adr_pro item="address" key="i"} +

{$address.entreprise}

+ {include file="include/emploi.tpl" address=$address} + {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise} + +
 
{/foreach} +
{if $cv} -

Curriculum Vitae :

-
{$cv|smarty:nodefaults}
+
+

Curriculum Vitae :

+
{$cv|smarty:nodefaults}
+
{/if} - +
+
{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl index dc32504..30be83a 100644 --- a/templates/profile/profile.tpl +++ b/templates/profile/profile.tpl @@ -51,7 +51,7 @@ function chgMainWinLoc(strPage) {if $x.binets_join}
Binet(s) : {$x.binets_join}
{/if} {if $x.gpxs_join}
Groupe(s) X : {$x.gpxs_join|smarty:nodefaults}
{/if} {/if} - {if $x.web}
Site Web : {$x.web}
{/if} + {if $x.web}
Site Web :
{$x.web}
{/if} {if $x.freetext}
Commentaires :
{$x.freetext|smarty:nodefaults}
{/if}
@@ -104,9 +104,11 @@ function chgMainWinLoc(strPage) {/if}
{/if} + {if $x.mobile}
- {if $x.mobile}Mobile : {$x.mobile}
{/if} + Mobile : {$x.mobile}
+ {/if}
{/if} @@ -130,15 +132,20 @@ function chgMainWinLoc(strPage)

Contact :

{foreach from=$x.adr item="address" key="i" name=adresses} + {if $i is odd} + {assign var=pos value="right"} + {else} + {assign var=pos value="left"} + {/if} {if $address.active} {include file="geoloc/address.tpl" address=$address titre_div=true titre="Mon adresse actuelle :" - for="`$x.prenom` `$x.nom`"} + for="`$x.prenom` `$x.nom`" pos=$pos} {elseif $address.secondaire} {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse secondaire :" - for="`$x.prenom` `$x.nom`"} + for="`$x.prenom` `$x.nom`" pos=$pos} {else} {include file="geoloc/address.tpl" address=$address titre_div=true titre="Adresse principale :" - for="`$x.prenom` `$x.nom`"} + for="`$x.prenom` `$x.nom`" pos=$pos} {/if} {if $i is odd}
{/if} {/foreach} @@ -149,7 +156,7 @@ function chgMainWinLoc(strPage)

Informations professionnelles :

{foreach from=$x.adr_pro item="address" key="i"} {include file="include/emploi.tpl" address=$address} - {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise} + {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise pos="left"}
 
{/foreach}
@@ -166,7 +173,7 @@ function chgMainWinLoc(strPage)
{/foreach}
 
- + {/if} {if $logged && $x.cv}
-- 2.1.4