Closes #692: New profile format for other skins

 htdocs/css/default.css        |   52 +++++++++++++++++++++++++++++++++++-------
 htdocs/css/keynote.css        |    2 -
 htdocs/css/openweb.css        |   42 ++++++++++++++++++++++++++++++---
 templates/include/emploi.tpl  |    2 -
 templates/profile/profile.tpl |    7 +++--
 5 files changed, 88 insertions(+), 17 deletions(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1879 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 9ffeef7..19d5ab2 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -380,13 +380,32 @@ td.conteneur_tab {
     border-bottom: 1px dotted #369;
 }
 
+#fiche .part {
+    float: left;
+    clear: left;
+    width: 70%;
+    padding-left: 0;
+    padding-right: 0;
+    margin-left: 0;
+    margin-right: 0;
+}
+
+#fiche #photo {
+    float: right;
+    width: 30%;
+    padding-left: 0;
+    margin-left: 0;
+    clear: right;
+}
+
+#fiche #photo img {
+    width: 100%;
+}
+
 #fiche_identite {
     padding: 5px;
-    width: 600px;
 }
 
-#photo { padding-left: 1em; }
-
 #fiche_identite div.civilite {
     text-align: center;
     font-weight: bold;
@@ -400,6 +419,7 @@ td.conteneur_tab {
     font-size: 75%;
     text-align: right;
     clear: right;
+    padding-bottom: 1ex;
 }
 
 #fiche_identite div.contact {
@@ -425,20 +445,36 @@ td.conteneur_tab {
 }
 
 div.adresse {
-    float: left;
-    width: 48%;
+    min-width: 30%;
     padding: 0px;
-    margin: 0px 0.5% 1ex 1%;
+    margin: 0px 2% 1ex 1%;
 }
 
 div.adresse strong {
     font-size: 90%;
 }
 
+#fiche .medal_frame {
+    float: left;
+    width: 33%;
+}
+
+#fiche .medal_frame img {
+    float: left;
+    padding: 0ex 1ex;
+}
+
 /* only for fiche_referent.php*/
 
+#fiche_referent .part {
+    width: 100%;
+}
+
+#fiche_referent #fiche_identite div.civilite {
+    width: 100%;
+}
+
 #fiche_referent{
-    padding: 10px;
     width: 100%;
 }
 
@@ -447,7 +483,7 @@ div.adresse strong {
     width: 31%;
     padding: 0px;
     margin: 0px 1% 1ex 1%;
-
+    text-align: justify;
 }
 
 #fiche_referent em{color: purple;}

diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css
index ebd19dd..ce1af92 100644 (file)
--- a/htdocs/css/keynote.css
+++ b/htdocs/css/keynote.css
@@ -462,7 +462,7 @@ td.conteneur_tab {
 }
 
 div.adresse {
-    min-width: 46%;
+    min-width: 30%;
     padding: 0px;
     margin: 0px 1% 2ex 2%;
 }

diff --git a/htdocs/css/openweb.css b/htdocs/css/openweb.css
index b2abd8b..482b3a1 100644 (file)
--- a/htdocs/css/openweb.css
+++ b/htdocs/css/openweb.css
@@ -369,9 +369,29 @@ div#body {
 
 #fiche em { color: purple; }
 
+#fiche .part {
+    float: left;
+    clear: left;
+    width: 70%;
+    padding: 0em;
+    margin: 0em;
+}
+
+#fiche #photo {
+    float: right;
+    padding-left: 0;
+    padding; 0;
+    margin: 0;
+    clear: right;
+    width: 30%;
+}
+
+#fiche #photo img {
+    width: 100%;
+}
+
 #fiche_identite {
     padding: 5px;
-    width: 600px;
 }
 
 #photo {
@@ -416,14 +436,28 @@ div#body {
 }
 
 div.adresse {
-    float: left;
-    width: 48%;
+    min-width: 30%;
     padding: 0px;
-    margin: 0px 1% 1ex 1%;
+    margin: 0px 2% 2ex 1%;
 }
 
 div.adresse div.titre { color: purple; }
 
+#fiche .medal_frame {
+    float: left;
+    width: 33%;
+}
+
+#fiche .medal_frame img {
+    float: left:
+    padding: 0ex 1ex;
+}
+
+#fiche .medal_text {
+    vertical-align: middle;
+    font-weight: bold;
+}
+
 /* only for fiche_referent.php*/
 
 #fiche_referent{

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index 7dcfff1..682da0b 100644 (file)
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.tpl
@@ -21,7 +21,7 @@
 {**************************************************************************}
 {if $address.entreprise || $address.secteur || $address.fonction ||
   $address.poste || $address.fonction || $address.email || $address.web}
-      <div class="adresse">
+      <div class="adresse" style="float: left">
        <table>
         {if $address.entreprise || $address.web}
         <tr>

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 30be83a..c2aa469 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -155,9 +155,10 @@ function chgMainWinLoc(strPage)
   <div class="part">
     <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 pos="left"}
-    <div class="spacer">&nbsp;</div>
+      {if $i neq 0}<hr />{/if}
+      {include file="include/emploi.tpl" address=$address}
+      {include file="geoloc/address.tpl" address=$address titre="Adresse : " for=$address.entreprise pos="left"}
+      <div class="spacer">&nbsp;</div>
     {/foreach}
   </div>
   {/if}