now it looks better

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-562

diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css
index 4078327..f9abaec 100644 (file)
--- a/htdocs.net/css/xnet.css
+++ b/htdocs.net/css/xnet.css
@@ -189,19 +189,28 @@ div.cat {
 div.sel { background-color: #5c81aa; color: #d0c198; }
 div.sel a { color: #d0c198; }
 
-td.oval {
+td.oval, td.oval2 {
     color: #d0c198;
-    background: url("../images/oval.png") no-repeat top center;
     height: 50px;
     text-align: center;
     vertical-align: middle !important;
     font-weight: bold;
+}
+td.oval {
+    background: url("../images/oval.png") no-repeat top center;
     width: 130px;
     padding: 4px 12px;
 }
-.oval a { color: #d0c198; }
+td.oval2 {
+    background: url("../images/oval2.png") no-repeat top center;
+    width: 160px;
+    padding: 4px 10px;
+
+}
+
+.oval a, .oval2 a { color: #d0c198; }
 
-#content td.oval {
+#content td.oval, #content td.oval2 {
     font-size: 90%;
     font-family: "Trebuchet MS", sans-serif;
     letter-spacing: -0.5px;
@@ -217,34 +226,3 @@ td.infos {
     color: #505050;
 }
 
-td.pres {
-    background-repeat: no-repeat;
-    background-image: url("images/oval.png");
-    background-position: center center;
-    height: 50px;
-    text-align: center;
-    width: 210px;
-}
-td.pres2 {
-    background-repeat: no-repeat;
-    background-image: url("images/oval2.png");
-    height: 50px;
-    text-align: center;
-    width: 202px;
-}
-
-td.choix1 {
-    height: 30px;
-    background-color: #D0C198;
-    font-size: 100%;
-    color: #5C81AA;
-}
-DIV.choix1 {
-    text-align: center;
-}
-td.choix1actif {
-    height: 30px;
-    vertical-align: middle;
-    text-decoration: none;
-}
-

diff --git a/htdocs.net/groupes.php b/htdocs.net/groupes.php
index 5d0565f..7547471 100644 (file)
--- a/htdocs.net/groupes.php
+++ b/htdocs.net/groupes.php
@@ -11,6 +11,7 @@
 
     $res = $globals->xdb->iterator("SELECT id,nom FROM groupex.dom WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat);
     $page->assign('doms', $res);
+    $page->assign('hasdom', $res->total()!=0);
     
     if (!$res->total()) {
         $res = $globals->xdb->iterator("SELECT diminutif, nom FROM groupex.asso WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat);

diff --git a/templates/xnet/groupes.tpl b/templates/xnet/groupes.tpl
index 84732de..0a08b79 100644 (file)
--- a/templates/xnet/groupes.tpl
+++ b/templates/xnet/groupes.tpl
@@ -25,13 +25,12 @@
     <td>
       <table cellspacing="0" cellpadding="4">
         <tr>
-          <td colspan="2">
+          <td{if $hasdom} colspan="2"{/if}>
             {include file="xnet/include/descr.tpl" cat=$smarty.get.cat}
           </td>
         </tr>
-
         <tr>
-          <!-- Enumération de tous les domaines existants dans la catégorie concernées -->
+          {if $hasdom}
           <td style="vertical-align: top">
             {iterate from=$doms item=g}
             <div class="cat {if $g.id eq $smarty.get.dom}sel{/if}">
@@ -39,13 +38,12 @@
             </div>
             {/iterate}
           </td>
-          <td>
+          {/if}
+          <td style="text-align:right;">
             {if $gps}
             {iterate from=$gps item=g}
             <table style="float: left;" cellspacing="2" cellpadding="0">
-              <tr>
-                <td class="oval"><a href="...">{$g.nom}</a></td>
-              </tr>
+              <tr><td class="oval{if $hasdom}2{/if}"><a href="...">{$g.nom}</a></td></tr>
             </table>
             {/iterate}
             {else}