Merge remote branch 'origin/xorg/maint' into xorg/master

[platal.git] / templates / admin / index.tpl

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index af6d8b1..2af78b5 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -114,6 +114,14 @@
 
   <tr><th colspan="2">{icon name=user_gray} Champs</th></tr>
   <tr class="impair">
+    <td class="titre">Pays / Langues</td>
+    <td>
+      <a href="admin/geocoding/country">Pays</a>
+      &nbsp;&nbsp;|&nbsp;&nbsp;
+      <a href="admin/geocoding/language">Langues</a>
+    </td>
+  </tr>
+  <tr class="impair">
     <td class="titre">Formation</td>
     <td>
       <a href="admin/education">Formations</a>
@@ -172,34 +180,26 @@
     </td>
   </tr>
   <tr class="pair">
-    <td class="titre">Newsletter</td>
+    <td class="titre">Newsletters</td>
     <td>
-      <a href="admin/newsletter">Liste</a>
+      <a href="admin/nls">Liste des NLs groupes</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="admin/newsletter/categories">Catégories</a>
+      <a href="admin/newsletter/">NL de X.org</a>
     </td>
   </tr>
   <tr class="impair">
-    <td class="titre">AX-Letter</td>
-    <td>
-      <a href="ax/edit">Édition</a>
-      &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="admin/axletter">Inscriptions et permissions</a>
-    </td>
-  </tr>
-  <tr class="pair">
     <td class="titre">Wiki</td>
     <td>
       <a href="admin/wiki">Pages et permissions</a>
     </td>
   </tr>
-  <tr class="impair">
+  <tr class="pair">
     <td class="titre">Sondages</td>
     <td>
       <a href="survey/admin">Gestion des sondages</a>
     </td>
   </tr>
-  <tr class="pair">
+  <tr class="impair">
     <td class="titre">Validations</td>
     <td>
       <a href="admin/validate/answers">Réponses automatiques</a>