From: Stéphane Jacob <jacou@melix.net>
Date: Sat, 13 Dec 2008 17:03:01 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~74
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=79414508519eab284fbf5093acf478a858a77ec9;p=platal.git

Merge commit 'origin/master' into fusionax
---

79414508519eab284fbf5093acf478a858a77ec9
diff --cc ChangeLog
index d8816f0,fee06ea..778ee12
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,9 +1,23 @@@
  ================================================================================
 +VERSION 0.f.0                                                         XX XX XXXX
 +
 +New:
 +    * Core:
 +        - Centralises email management through an email combobox           -JAC
 +
 +Bug/Wish:
 +    * Profile:
 +        - #188: Adds informations about the Corps d'État                   -JAC
 +        - #209: Thoroughly changes education's implementation              -JAC
 +        - #386: Adds the possibility to fill in multiple nationalities     -JAC
 +        - #891: Improves education display                                 -JAC
 +
 +================================================================================
- VERSION 0.10.0                                                        XX XX XXXX
+ VERSION 0.10.1                                                        XX XX XXXX
+ 
+ 
+ ================================================================================
+ VERSION 0.10.0                                                        11 12 2008
  
  New:
  
diff --cc templates/admin/index.tpl
index 453be21,bdc5473..08c9730
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@@ -71,42 -100,30 +100,40 @@@
      </td>
    </tr>
    <tr class="pair">
+     <td class="titre">AX</td>
      <td>
-       <strong>Infos dynamiques&nbsp;:</strong>&nbsp;&nbsp;
-       <a href="admin/downtime">Coupures</a>
+       <a href="admin/ax-xorg">AX/X.org</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/mx/broken">MX défaillants</a>
+       <a href="admin/synchro_ax">Synchro AX</a>
+     </td>
+   </tr>
+   <tr class="impair">
+     <td class="titre">Administration</td>
+     <td>
+       <a href="admin/dead-but-active">Décédés actifs</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/tips">Astuces</a>
+       <a href="admin/accounts">Administrateurs/Désactivations</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/icons">Icônes</a>
+       <a href="admin/googleapps">Google Apps</a>
      </td>
    </tr>
+ 
+   <tr><th colspan="2">{icon name=user_gray} Champs</th></tr>
    <tr class="impair">
 -    <td class="titre">Emploi</td>
++    <td class="titre">Formation</td>
      <td>
-       <strong>Champs profil&nbsp;:</strong>&nbsp;&nbsp;
 -      <a href="admin/formations">Formations</a>
 +      <a href="admin/education">Formations</a>
 +      &nbsp;&nbsp;|&nbsp;&nbsp;
 +      <a href="admin/education_field">Domaines de formation</a>
 +      &nbsp;&nbsp;|&nbsp;&nbsp;
 +      <a href="admin/education_degree">Niveau de formation</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
 +      <a href="admin/education_degree_set">Niveau par formation</a>
-       &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/binets">Binets</a>
-       &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/skins">Skins</a>
-       &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/medals">Décorations</a>
-       &nbsp;&nbsp;|&nbsp;&nbsp;
-       <a href="admin/sections">Sections</a>
-       &nbsp;&nbsp;|&nbsp;&nbsp;
++    </td>
++  </tr>
++  <tr class="impair">
++    <td class="titre">Emploi</td>
++    <td>
        <a href="admin/secteurs">Secteurs</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
        <a href="admin/ss_secteurs">Sous-secteurs</a>