some cleaning, and css improvements wrt tables that now look really nicer

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

diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css
index 5cd8c06..32ec87c 100644 (file)
--- a/htdocs.net/css/xnet.css
+++ b/htdocs.net/css/xnet.css
@@ -150,6 +150,8 @@ p.descr {
     padding-right: 7px;
 }
 
+table { border-collapse: collapse; }
+
 table.links {
     width: 100%;
     margin: 0.4em 0em;
@@ -167,8 +169,26 @@ table.links a {
 
 table td.titre {
     font-weight: bold;
+    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.normal td { border: none; }
+
+table.tiny td, table.tinybicol td, table.large td, table.bicol td {
+    border: 1px solid gray;
+    padding: 2px;
+}
+table.tiny th, table.tinybicol th, table.large th, table.bicol th {
+    border: 1px solid gray;
+    border-top-width: 2px;
+    border-bottom-width: 2px;
+    padding: 2px;
 }
 
+th { background: #d0c198; }
+
 /***************************************************************************
  * Special pages
  ***************************************************************************/

diff --git a/templates/xnet/admin.tpl b/templates/xnet/admin.tpl
index 90c6ffb..e290124 100644 (file)
--- a/templates/xnet/admin.tpl
+++ b/templates/xnet/admin.tpl
@@ -46,7 +46,7 @@
 
 <h1>Administration des groupes X.net</h1>
 
-<table cellspacing="0" cellpadding="0">
+<table cellspacing="0" cellpadding="0" class='large'>
   {foreach from=$assos item=a key=i name=all}
   {if $i is even}<tr>{/if}
     <td><a href='?del={$a.diminutif}'><img src='{rel}/images/del.png' alt='delete' /></a></td>

diff --git a/templates/xnet/groupe/annuaire.tpl b/templates/xnet/groupe/annuaire.tpl
index 45f0d50..1c24c82 100644 (file)
--- a/templates/xnet/groupe/annuaire.tpl
+++ b/templates/xnet/groupe/annuaire.tpl
@@ -45,20 +45,18 @@ Fonctionnalit
 {/foreach}
 </p>
 
-<table summary="membres du groupe" style="width: 100%">
+<table summary="membres du groupe" class="{if $admin}large{else}tiny{/if}">
   <tr>
-    <th>prénom et nom</th>
-    <th>promotion</th>
-    <th>fiche X.org / carte / lui écrire</th>
+    <th>Prénom NOM</th>
+    <th>Promo</th>
+    <th>Infos</th>
     {if $admin}
-    <th></th>
-    <th>admin</th>
-    <th>éditer un profil</th>
-    <th>désinscrire</th>
+    <th>Éditer</th>
+    <th>suppr.</th>
     {/if}
   </tr>
   {iterate from=$ann item=m}
-  <tr>
+  <tr {if $m.admin}style="background:#d0c198;"{/if}>
     <td>{if $m.femme}&bull;{/if}{$m.prenom} {$m.nom}</td>
     <td>{$m.promo}</td>
     <td>
@@ -71,8 +69,6 @@ Fonctionnalit
       {/if}
     </td>
     {if $admin}
-    <td></td>
-    <td>{if $m.admin}&times;{else}&nbsp;{/if}</td>
     <td><a href="membres-edit.php?edit={$m.email}"><img src="{rel}/images/profil.png" alt="Edition du profil" /></a></td>
     <td><a href="membres-edit.php?del={$m.email}"><img src="{rel}/images/del.png" alt="Suppression de {$m.prenom} {$m.nom}" /></a></td>
     {/if}

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index 0b0b9f7..4c118e4 100644 (file)
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -26,7 +26,7 @@
 
 <h1>{$asso.nom} : Accueil</h1>
 
-<table cellpadding="0" cellspacing="0">
+<table cellpadding="0" cellspacing="0" class='tiny'>
   {if $asso.site}
   <tr>
     <td class="titre">
@@ -64,7 +64,7 @@
   {/if}
 
   <tr>
-    <td class="titre">
+    <td class="titre" colspan="2">
       <strong>TODO: INSCRIPTION</strong>
     </td>
   </tr>

diff --git a/templates/xnet/groupe/edit.tpl b/templates/xnet/groupe/edit.tpl
index 919aed6..c760301 100644 (file)
--- a/templates/xnet/groupe/edit.tpl
+++ b/templates/xnet/groupe/edit.tpl
@@ -23,8 +23,8 @@
 <h1>{$asso.nom} : Éditer l'accueil</h1>
 
 <form method="post" action="{$smarty.server.PHP_SELF}" enctype="multipart/form-data">
-  <table cellpadding="0" cellspacing="0">
-    {perms level=admin}
+  {perms level=admin}
+  <table cellpadding="0" cellspacing="0" class='tiny'>
     <tr>
       <td class="titre">
         Nom:
@@ -43,7 +43,7 @@
     </tr>
     <tr>
       <td class="titre">
-        Nom de Domaine:
+        Domaine DNS:
       </td>
       <td>
         <input type="text" size="40" value="{$asso.mail_domain}" name="mail_domain" />
@@ -70,16 +70,15 @@
         <select name="dom">
           <option value=""></option>
           {iterate from=$dom item=d}
-          <option value="{$d.id}" {if $d.id eq $asso.id}selected="selected"{/if}>{$d.nom} [{$d.cat}]</option>
+          <option value="{$d.id}" {if $d.id eq $asso.dom}selected="selected"{/if}>{$d.nom} [{$d.cat}]</option>
           {/iterate}
         </select>
       </td>
     </tr>
-    <tr>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    {/perms}
-
+  </table>
+  <p></p>
+  {/perms}
+  <table cellpadding="0" cellspacing="0" class='tiny'>
     <tr>
       <td class="titre">
         Logo:
@@ -126,7 +125,7 @@
     </tr>
 
     <tr>
-      <td class="titre">
+      <td class="titre" colspan="2">
         <strong>TODO: INSCRIPTION</strong>
       </td>
     </tr>

diff --git a/templates/xnet/groupe/listes-create.tpl b/templates/xnet/groupe/listes-create.tpl
index acff263..090dde2 100644 (file)
--- a/templates/xnet/groupe/listes-create.tpl
+++ b/templates/xnet/groupe/listes-create.tpl
@@ -32,7 +32,7 @@ Si tu as besoin de cette fonctionnalit
 <a href="alias-create.php">un alias</a> qui, lui, est capable de regrouper plusieurs listes.
 </p>
 <form action='{$smarty.server.PHP_SELF}' method='post'>
-  <table>
+  <table class="large">
     <tr>
       <th colspan='2'>Caractéristiques de la Liste</th>
     </tr>
@@ -51,7 +51,7 @@ Si tu as besoin de cette fonctionnalit
     <tr>
       <td><strong>Propriétés :</strong></td>
       <td>
-        <table style='width: 100%'>
+        <table style='width: 100%' class="normal">
           <tr>
             <td>visibilité :</td>
             <td>

diff --git a/templates/xnet/groupe/listes.tpl b/templates/xnet/groupe/listes.tpl
index 5eaf953..86ec22b 100644 (file)
--- a/templates/xnet/groupe/listes.tpl
+++ b/templates/xnet/groupe/listes.tpl
@@ -47,7 +47,7 @@ la liste. Dans le premier cas, une croix rouge te permet de te d
 croix verte te permet de t'inscrire, après accord des responsables si l'inscription est modérée.
 </p>
 
-<table cellpadding="0" cellspacing="0" style="width: 100%;">
+<table cellpadding="0" cellspacing="0" class='large'>
   <tr>
     <th>Liste</th>
     <th>Description</th>
@@ -92,17 +92,22 @@ t'emp
 <h2>Voici les alias existants pour le groupe {$asso.nom} :</h2>
 
 {if $alias->total()}
-<p>
-{iterate from=$alias item=a}
-{if $may_update}
-<a href='mailto:{$a.alias}'><img src='{rel}/images/mail.png' alt='[mail]' /></a>
-<a href="alias-admin.php?liste={$a.alias}">{$a.alias}</a>
-<a href="?del_alias={$a.alias}"><img src='{rel}/images/del.png' alt='[supprimer]' /></a><br />
-{else}
-<a href='mailto:{$a.alias}'><img src='{rel}/images/mail.png' alt='[mail]' /> {$a.alias}</a><br />
-{/if}
-{/iterate}
-</p>
+<table cellspacing="0" cellpadding="0" class='large'>
+  <tr>
+    <th{if $may_update} colspan='3'{/if}>Alias</th>
+  </tr>
+  {iterate from=$alias item=a}
+  <tr>
+    {if $may_update}
+    <td class="center"><a href='mailto:{$a.alias}'><img src='{rel}/images/mail.png' alt='[mail]' /></a></td>
+    <td><a href="alias-admin.php?liste={$a.alias}">{$a.alias}</a></td>
+    <td class="center"><a href="?del_alias={$a.alias}"><img src='{rel}/images/del.png' alt='[supprimer]' /></a></td>
+    {else}
+    <td><a href='mailto:{$a.alias}'><img src='{rel}/images/mail.png' alt='[mail]' /> {$a.alias}</a></td>
+    {/if}
+  </tr>
+  {/iterate}
+</table>
 {else}
 <p>Aucun alias pour ce groupe</p>
 {/if}

diff --git a/templates/xnet/groupe/membres-edit.tpl b/templates/xnet/groupe/membres-edit.tpl
index e2425e8..859e987 100644 (file)
--- a/templates/xnet/groupe/membres-edit.tpl
+++ b/templates/xnet/groupe/membres-edit.tpl
@@ -31,10 +31,10 @@
 </h2>
 
 <form method="post" action="{$smarty.server.REQUEST_URI}">
-  <table cellpadding="0" cellspacing="0">
+  <table cellpadding="0" cellspacing="0" class='tiny'>
     <tr>
       <td class="titre">
-        Permissions :
+        Permissions:
       </td>
       <td>
         <select name="is_admin">
@@ -73,7 +73,7 @@
 
   <h2>Abonnement aux listes</h2>
 
-  <table cellpadding="0" cellspacing="0">
+  <table cellpadding="0" cellspacing="0" class='large'>
     <tr>
       <th>&nbsp;</th>
       <th>Liste</th>
@@ -99,7 +99,7 @@
 
   <h2>Abonnement aux alias</h2>
 
-  <table cellpadding="0" cellspacing="0">
+  <table cellpadding="0" cellspacing="0" class='large'>
     <tr>
       <th>&nbsp;</th>
       <th>Alias</th>

diff --git a/templates/xnet/include/membre_ext.tpl b/templates/xnet/include/membre_ext.tpl
deleted file mode 100644 (file)
index 5463db8..0000000
--- a/templates/xnet/include/membre_ext.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************}
-
-<h1> Ajout d'un membre ext&eacute;rieur</h1>
-<form method="post" action="{$smarty.server.PHP_SELF}">
-  <table>
-    <tr>
-      <td>Nom :</td>
-      <td><input type="text" name="nom" value="{$smarty.request.nom}" size="40" maxlength="255" /></td>
-    </tr>
-    <tr>
-      <td>Pr&eacute;nom :</td>
-      <td><input type="text" name="prenom" value="{$smarty.request.prenom}" size="40" maxlength="40" /></td>
-    </tr>
-    <tr>
-      <td>Email :</td>
-      <td><input type="text" name="email" value="{$smarty.request.email}" size="40" maxlength="60" /></td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center">
-        <input type="submit" name="addext" value="Ajouter" />
-        <input type="hidden" name="id" value="{$smarty.request.id}" />
-      </td>
-    </tr>
-  </table>
-</form>
-
-{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/xnet/include/membre_x.tpl b/templates/xnet/include/membre_x.tpl
deleted file mode 100644 (file)
index 766dd46..0000000
--- a/templates/xnet/include/membre_x.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************}
-
-<h1> Ajout d'un membre polytechnicien</h1>
-<form method="post" action="{$smarty.server.PHP_SELF}">
-  <p class="descr">
-  Identifiant X.org <small>(prenom.nom)</small> :
-  <input type="text" name="username" value="{$smarty.request.username}" size="40" maxlength="100" />
-  </p>
-  <p class="descr">
-  Permissions sur ce groupe :
-  </p>
-  <select name="is_admin">
-    <option value="0">Membre</option>
-    <option value="1">Administrateur</option>
-  </select>
-  <div class="center">
-    <input type="submit" name="addx" value="Ajouter" />
-  </div>
-</form>
-
-{* vim:set et sw=2 sts=2 sws=2: *}