Rework xnet skin :

* smaller menu and texts
* group icon in title bar

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

diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css
index 894dd7f..28710f7 100644 (file)
--- a/htdocs.net/css/xnet.css
+++ b/htdocs.net/css/xnet.css
@@ -31,7 +31,11 @@ table, body {
     font-family: "Bitstream vera sans","Verdana",sans-serif;
 }
 
-input,textarea,select,option,tt,pre {
+input,textarea,select,option {
+    font-size: 9pt;
+}
+
+tt,pre {
     font-size: 10pt;
 }
 
@@ -41,8 +45,8 @@ a img { border: none; }
 img   { vertical-align: middle; }
 td    { vertical-align: top; }
 
-h1    { font-size: 150%; }
-h2    { font-size: 130%; }
+h1    { font-size: 130%; }
+h2    { font-size: 115%; }
 
 /***************************************************************************
  * DEBUG
@@ -71,10 +75,20 @@ table#layout {
     margin-right: auto;
 }
 
-tr#top td {
+#top {
+    width: 765px;
+}
+
+#top td {
+    padding: 0;
+    margin: 0;
     vertical-align: middle;
 }
 
+#top td.logo {
+    text-align: right;
+}
+
 td#credits {
     text-align: center;
     font-size: 90%;
@@ -106,23 +120,24 @@ td#search {
 }
 
 td#menu {
-    width: 150px;
+    width: 130px;
     padding-right: 1em;
     font-family: "Trebuchet MS", "Arial",sans-serif;
     font-weight: bold;
 }
 
 #menu h1 {
-    padding: 0.5em 0em 0.6em 0em;
-    font-size: 90%;
+    padding: 0.5em 0em 0.8em 0em;
+    font-size: 85%;
     text-align: center;
+    width: 130px;
     background: url('../images/barre.png') bottom left no-repeat;
 }
 
 #menu a {
     display: block;
     padding: 0.2em 0em 0.2em 15px;
-    font-size: 90%;
+    font-size: 85%;
     background: url('../images/puce.png') no-repeat center left;
 }
 
@@ -172,8 +187,18 @@ table td.titre {
     white-space: nowrap;
 }
 
-table.tiny,  table.tinybicol { width: 70%; margin-left: 15%; border: 2px solid gray; }
-table.large, table.bicol     { width: 96%; margin-left:  2%; border: 2px solid gray; }
+table.tiny,  table.tinybicol {
+    width: 70%;
+    margin-left: 15%;
+    border: 2px solid gray;
+    font-size: 85%;
+}
+table.large, table.bicol {
+    width: 96%;
+    margin-left:  2%;
+    border: 2px solid gray;
+    font-size: 85%;
+}
 
 table.tiny td, table.tinybicol td, table.large td, table.bicol td {
     border: 1px solid gray;

diff --git a/htdocs.net/images/bandeau.jpg b/htdocs.net/images/bandeau.jpg
new file mode 100644 (file)
index 0000000..a4d803d
Binary files /dev/null and b/htdocs.net/images/bandeau.jpg differ

diff --git a/htdocs.net/images/fin_logo.jpg b/htdocs.net/images/fin_logo.jpg
new file mode 100644 (file)
index 0000000..435165c
Binary files /dev/null and b/htdocs.net/images/fin_logo.jpg differ

diff --git a/htdocs.net/images/texte_binets.jpg b/htdocs.net/images/texte_binets.jpg
index cb1ba39..467c7fc 100644 (file)
Binary files a/htdocs.net/images/texte_binets.jpg and b/htdocs.net/images/texte_binets.jpg differ

diff --git a/htdocs.net/images/texte_evenements.jpg b/htdocs.net/images/texte_evenements.jpg
index e7dd082..ec962d7 100644 (file)
Binary files a/htdocs.net/images/texte_evenements.jpg and b/htdocs.net/images/texte_evenements.jpg differ

diff --git a/htdocs.net/images/texte_groupesx.jpg b/htdocs.net/images/texte_groupesx.jpg
index c8df5df..b6118b5 100644 (file)
Binary files a/htdocs.net/images/texte_groupesx.jpg and b/htdocs.net/images/texte_groupesx.jpg differ

diff --git a/htdocs.net/images/texte_institutions.jpg b/htdocs.net/images/texte_institutions.jpg
index f803676..3473c4d 100644 (file)
Binary files a/htdocs.net/images/texte_institutions.jpg and b/htdocs.net/images/texte_institutions.jpg differ

diff --git a/htdocs.net/images/texte_plan.jpg b/htdocs.net/images/texte_plan.jpg
index df9ce65..7c3dfae 100644 (file)
Binary files a/htdocs.net/images/texte_plan.jpg and b/htdocs.net/images/texte_plan.jpg differ

diff --git a/htdocs.net/images/texte_promotions.jpg b/htdocs.net/images/texte_promotions.jpg
index 94f1a89..2684aa9 100644 (file)
Binary files a/htdocs.net/images/texte_promotions.jpg and b/htdocs.net/images/texte_promotions.jpg differ

diff --git a/htdocs.net/images/texte_recherche.jpg b/htdocs.net/images/texte_recherche.jpg
index ba826d3..28d1d85 100644 (file)
Binary files a/htdocs.net/images/texte_recherche.jpg and b/htdocs.net/images/texte_recherche.jpg differ

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index c1e6737..f144b0d 100644 (file)
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -20,12 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $asso.site}
-<a href="{$asso.site}"><img src='{$platal->ns}logo' alt="LOGO" style="float: right;" /></a>
-{else}
-<img src='{$platal->ns}logo' alt="LOGO" style="float: right;" />
-{/if}
-
 <h1>{$asso.nom} : Accueil</h1>
 
 <table cellpadding="0" cellspacing="0" class='tiny'>

diff --git a/templates/xnet/groupe/edit.tpl b/templates/xnet/groupe/edit.tpl
index e41e827..1a2add4 100644 (file)
--- a/templates/xnet/groupe/edit.tpl
+++ b/templates/xnet/groupe/edit.tpl
@@ -20,8 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<img src='{$platal->ns}logo' alt="LOGO" style="float: right;" />
-
 <h1>{$asso.nom} : Éditer l'accueil</h1>
 
 <form method="post" action="{$platal->ns}edit" enctype="multipart/form-data">

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 3ba34e0..de34b78 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -59,15 +59,36 @@
 
     <table id="layout" cellspacing="0" cellpadding="0">
       {if $xnet_type}
-      <tr id="top">
-        <td>
-          <a href=""><img src="images/asso-montants.png" alt="Logo Assos" /></a>
-        </td>
-        <td>
-          <img src="images/logo_{$xnet_type}.png" alt="Logo {$xnet_type}" width="106" height="96" />
-        </td>
+      <tr>
         <td colspan="2">
-          <img src="images/texte_{$xnet_type}.jpg" alt="{$xnet_type}" width="490" height="96" />
+        <table cellspacing="0" cellpadding="0" id="top">
+          <tr>
+            <td style="width: 150px">
+              <a href=""><img src="images/asso-montants.png" alt="Logo Assos" /></a>
+            </td>
+            <td style="width: 106px">
+              <img src="images/logo_{$xnet_type}.png" alt="Logo {$xnet_type}" width="106" height="96" />
+            </td>
+            <td style="width: 44px">
+              <img src="images/fin_logo.jpg" alt="Fin logo" width="44" height="96" />
+            </td>
+            <td style="white-space: nowrap">
+              <img src="images/bandeau.jpg" alt="bandeau" height="96" style="width: 100%" />
+            </td>
+            <td class="logo">
+              <img src="images/texte_{$xnet_type}.jpg" alt="{$xnet_type}" height="96" />
+            </td>
+            <td>
+              {if $asso}
+              {if $asso.site}
+                <a href="{$asso.site}"><img src='{$platal->ns}logo' alt="LOGO" height="96" /></a>
+              {else}
+                <img src='{$platal->ns}logo' alt="LOGO" height="96"/>
+              {/if}
+              {/if}
+            </td>
+          </tr>
+        </table>
         </td>
       </tr>
       {else}
@@ -75,12 +96,12 @@
         <td>
           <img src="images/logo.png" alt="LOGO Assos" />
         </td>
-        <td colspan="3" style="text-align: right">
+        <td style="text-align: right">
           <a href="https://www.polytechnique.org/"><img src="images/logo-xorg.png" alt="LOGO X.Org" /></a>
           <img src="images/asso2.png" alt="titre_du_site" />
         </td>
       </tr>
-      <tr><td colspan="4"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
+      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
       {/if}
 
       {if $menu}
@@ -93,7 +114,7 @@
           {/foreach}
           {/foreach}
         </td>
-        <td colspan="3">
+        <td>
           <div class="breadcrumb">
             {if $asso}
             <a href="groups/{$asso.cat}">{$asso.cat|cat_pp}</a> »
@@ -115,15 +136,15 @@
       </tr>
       {else}
       <tr>
-        <td colspan="4">
+        <td colspan="2">
           {include file="skin/common.content.tpl"}
         </td>
       </tr>
 
-      <tr><td colspan="4"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
+      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
 
       <tr>
-        <td colspan="4">
+        <td colspan="2">
           <table class="links" summary="liens" cellspacing="0" cellpadding="0">
             <tr>
               <td> <a href="plan">PLAN DU SITE</a> </td>
@@ -137,10 +158,10 @@
       </tr>
       {/if}
 
-      <tr><td colspan="4"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
+      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
 
       <tr>
-        <td colspan="4" id="perso">
+        <td colspan="2" id="perso">
           {list_all_my_groups}
           {if !$smarty.session.auth}
           <div>Me connecter :</div>
@@ -151,10 +172,10 @@
         </td>
       </tr>
 
-      <tr><td colspan="4"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
+      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="765" /></td></tr>
 
       <tr>
-        <td colspan="4" id="credits">
+        <td colspan="2" id="credits">
           <a href="plan">liste des associations</a> -
           <a href="services">services proposés</a> -
           <a href="about">à propos de ce site</a> -

diff --git a/templates/xnetlists/index.tpl b/templates/xnetlists/index.tpl
index 62267f8..e8bc6bc 100644 (file)
--- a/templates/xnetlists/index.tpl
+++ b/templates/xnetlists/index.tpl
@@ -60,7 +60,7 @@ croix verte te permet de t'inscrire, apr
   </tr>
   {foreach from=$listes item=l}
   <tr>
-    <td>
+    <td class='center'>
       <a href="mailto:{$l.list}@{$asso.mail_domain}">{icon name=email title="mail"}</a>
     </td>
     <td>
@@ -77,7 +77,7 @@ croix verte te permet de t'inscrire, apr
     </td>
     <td class='center'>{if $l.ins}modérée{else}libre{/if}</td>
     <td align='right'>{$l.nbsub}</td>
-    <td align='right'>
+    <td align='center'>
       {if $l.sub eq 2}
       <a href="{$platal->ns}lists?del={$l.list}">{icon name=delete title="me désinscrire"}</a>
       {elseif $l.sub eq 1}