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

diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css
index f26739b..ebd19dd 100644 (file)
--- 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 (file)
--- 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 = "<a href=\"http://maps.google.fr/?q="
-         .   urlencode(str_replace('États-Unis d\'Amérique', 'USA', implode(", ", $lines) . " ($idt)"))
-         . "\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
+        .   urlencode(str_replace('États-Unis d\'Amérique', 'USA', implode(", ", $lines) . " ($idt)"))
+        . "\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
     if ($restore) {
         array_unshift($lines, $idt);
     }
@@ -68,8 +68,8 @@ function smarty_function_display_address($param, &$smarty)
     {
         if ($param['titre_div'])
             $txthtml .= "<div class='titre'>".$param['titre'].$map."</div>\n";
-    else
-           $txthtml .= "<em>".$param['titre']."</em>".$map."<br />\n";
+        else
+            $txthtml .= "<em>".$param['titre']."</em>".$map."<br />\n";
     }
     foreach ($lines as $line)
     {
@@ -85,9 +85,9 @@ function smarty_function_display_address($param, &$smarty)
         foreach ($param['adr']['tels'] as $tel) 
             $txthtml .= "<div>\n<em>".$tel['tel_type']."&nbsp;: </em>\n<strong>".$tel['tel']."</strong>\n</div>\n";
     }
-    if (!$params['nodiv'])
-    {
-        $txthtml = "<div class='adresse'>\n".$txthtml."</div>\n";
+    if (!$param['nodiv']) {
+        $pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : '';
+        $txthtml = "<div class='adresse' $pos>\n".$txthtml."</div>\n";
     }
     return $txthtml;
 }

diff --git a/templates/geoloc/address.tpl b/templates/geoloc/address.tpl
index 0bfef79..4651a24 100644 (file)
--- 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 (file)
--- a/templates/profile/fiche_referent.tpl
+++ b/templates/profile/fiche_referent.tpl
@@ -22,17 +22,18 @@
 
 {javascript name=ajax}
 <div id="fiche">
-  
-  <div class="center">
-    <strong>{$prenom} {$nom}</strong><br />
-    <span>X{$promo}&nbsp;-&nbsp;</span> <a href="mailto:{$bestalias}@{#globals.mail.domain#}">{$bestalias}@{#globals.mail.domain#}</a>
+<div id="fiche_referent">
+  <div id="fiche_identite">
+    <div class="civilite">
+      <strong>{$prenom} {$nom}</strong><br />
+      <span>X{$promo}&nbsp;-&nbsp;</span> <a href="mailto:{$bestalias}@{#globals.mail.domain#}">{$bestalias}@{#globals.mail.domain#}</a>
+    </div>
   </div>
+  <div class="spacer"></div>
 
   {if $expertise != '' || $secteurs|count || $pays|count }
-
-  <h2>Informations de référent :</h2>
-  
-  <div id="fiche_referent">
+  <div id="part">
+    <h2>Informations de référent :</h2>
     {if $expertise}
     <div class="rubrique_referent">
       <em>Expertise : </em><br />
@@ -63,20 +64,25 @@
   </div>
   {/if}
 
-  {foreach from=$adr_pro item="address" key="i"}
-  <h2>{$address.entreprise}</h2>
-  {include file="include/emploi.tpl" address=$address}
-  {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise}
-  
-  <div class="spacer">&nbsp;</div>
+  <div class="part">
+    {foreach from=$adr_pro item="address" key="i"}
+    <h2>{$address.entreprise}</h2>
+    {include file="include/emploi.tpl" address=$address}
+    {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise}
+
+    <div class="spacer">&nbsp;</div>
   {/foreach}
+  </div>
 
   {if $cv}
-  <h2>Curriculum Vitae : </h2>
-  <div>{$cv|smarty:nodefaults}</div>
+  <div class="part">
+    <h2>Curriculum Vitae : </h2>
+    <div style="padding: 0 2ex">{$cv|smarty:nodefaults}</div>
+  </div>
   {/if}
 
 
-  
+  <div class="spacer"></div>
+</div>
 </div>
 {* 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 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -51,7 +51,7 @@ function chgMainWinLoc(strPage)
       {if $x.binets_join}<div><em class="intitule">Binet(s) : </em><span>{$x.binets_join}</span></div>{/if}
       {if $x.gpxs_join}<div><em class="intitule">Groupe(s) X : </em><span>{$x.gpxs_join|smarty:nodefaults}</span></div>{/if}
     {/if}
-    {if $x.web}<div><em class="intitule">Site Web : </em><a href="{$x.web}" class='popup'>{$x.web}</a></div>{/if}
+    {if $x.web}<div><em class="intitule">Site Web : </em><br /><a href="{$x.web}" class='popup'>{$x.web}</a></div>{/if}
     {if $x.freetext}<div><em class="intitule">Commentaires : </em><br /><span>{$x.freetext|smarty:nodefaults}</span></div>{/if}
   </div>
   <div id="fiche_identite" class="part">
@@ -104,9 +104,11 @@ function chgMainWinLoc(strPage)
         {/if}
       </div>
       {/if}
+      {if $x.mobile}
       <div class="mob">
-        {if $x.mobile}<em class="intitule">Mobile : </em>{$x.mobile}<br />{/if}
+        <em class="intitule">Mobile : </em>{$x.mobile}
       </div>
+      {/if}
       <div class='spacer'></div>
     </div>
     {/if}
@@ -130,15 +132,20 @@ function chgMainWinLoc(strPage)
   <div class="part">
     <h2>Contact : </h2>
     {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}<div class="spacer"></div>{/if}
     {/foreach}
@@ -149,7 +156,7 @@ function chgMainWinLoc(strPage)
     <h2>Informations professionnelles :</h2>
     {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"}
     <div class="spacer">&nbsp;</div>
     {/foreach}
   </div>
@@ -166,7 +173,7 @@ function chgMainWinLoc(strPage)
     </div>
     {/foreach}
     <div class="spacer">&nbsp;</div>
-  </div class="part">
+  </div>
   {/if}
   {if $logged && $x.cv}
   <div class="part">