css fix, wap, deces

diff --git a/etat_migration b/etat_migration
index 87d99ff..97810f1 100644 (file)
--- a/etat_migration
+++ b/etat_migration
@@ -139,8 +139,6 @@ Etat  | Ancien nom                                                            | Nouveau nom
 ------+-------------------------------------------+----------------
 @@@      | groupex/donne-chall.php                                       | -
 @@@      | groupex/export-econfiance.php                         | -
-x        | acces_wap.php                                                         | -
-x        | admin/deces_promo.php                                         | -
 x        | admin/graph_promo.php                                         | stats/graph_promo.php
 x        | admin/index.php                                                       | -
 x        | admin/postfix_blacklist.php                           | -
@@ -161,6 +159,8 @@ x     | trackers/index.php                                            | -
 x        | trackers/tracker_admin.php                            | -
 xx       | AccesPermanentOff.php                                         | cookie_off.php
 xx       | AccesPermanentOn.php                                          | cookie_on.php
+xx       | acces_wap.php                                                         | -
+xx       | admin/deces_promo.php                                         | -
 xx       | acces_redirect.php                                            | carva_redirect.php
 xx       | acces_smtp.php                                                        | -
 xx       | admin/ax-xorg.php                                             | -

diff --git a/htdocs/acces_wap.php b/htdocs/acces_wap.php
index bb56655..3dd282b 100644 (file)
--- a/htdocs/acces_wap.php
+++ b/htdocs/acces_wap.php
@@ -1,7 +1,7 @@
 <?php
 require("auto.prepend.inc.php");
 
-new_skinned_page('access_wap.tpl', AUTH_MDP);
+new_skinned_page('acces_wap.tpl', AUTH_MDP);
 
 if (isset($_REQUEST['op']) && $_REQUEST['op'] == "valid") {
     // on enregistre les modifications des parametres
@@ -41,5 +41,6 @@ if (isset($_REQUEST['op']) && $_REQUEST['op'] == "valid") {
 
     $page->assign('wap', mysql_fetch_assoc($result));
     mysql_free_result($result);
+    $page->display();
 }
 ?>

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 115c51d..16c2ff0 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -178,12 +178,13 @@ table.tinybicol td.info, table.bicol td.info {
     margin-right: auto;
 }
 
-#body-left {
+#body-logo {
     width: 140px;
     border-right: 1px solid gray;
     text-align: center;
     font-family: "MS Sans Serif", sans-serif;
     padding-top: 4px;
+    border-bottom: 1px solid gray;
 }
 
 #body-top {
@@ -208,21 +209,22 @@ table.tinybicol td.info, table.bicol td.info {
     font-family: "MS Sans Serif", sans-serif;
 }
 
-#menu {
-    width: 100%;
-    margin-top: 16px;
-
+#body-menu {
+    width: 140px;
+    border-right: 1px solid gray;
+    text-align: center;
+    font-family: "MS Sans Serif", sans-serif;
     font-size: 75%;
     font-weight: bold;
 }
 
-#menu .menu_item {
+#body-menu .menu_item {
     padding-left: 4px;
     padding: 2px;
     text-align: left;
 }
 
-#menu .menu_title {
+#body-menu .menu_title {
     color: gray;
     background: #eeeeee;
     border-top: 1px solid gray;
@@ -236,6 +238,7 @@ table.tinybicol td.info, table.bicol td.info {
     width: 600px;
     padding: 4px 0px 4px 16px;
     font-size: 95%;
+    vertical-align: top;
 }
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.12 2004-02-02 11:48:34 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.13 2004-02-04 22:47:45 x2000habouzit Exp $ */

diff --git a/templates/acces_wap.tpl b/templates/acces_wap.tpl
index 821e2c4..a981b3c 100644 (file)
--- a/templates/acces_wap.tpl
+++ b/templates/acces_wap.tpl
@@ -1,4 +1,4 @@
-{* $Id: acces_wap.tpl,v 1.1 2004-02-04 19:47:47 x2000habouzit Exp $ *}
+{* $Id: acces_wap.tpl,v 1.2 2004-02-04 22:47:45 x2000habouzit Exp $ *}
 
 {if $OK}
 <p class="erreur">
@@ -127,7 +127,7 @@
         Utiliser le SSL:
       </td>
       <td>
-        <input type="checkbox" name="IMAPssl" {if $wap.IMAPssl}checked="checked"{if} />
+        <input type="checkbox" name="IMAPssl" {if $wap.IMAPssl}checked="checked"{/if} />
       </td>
     </tr>
     <tr>

diff --git a/templates/admin/deces_promo.tpl b/templates/admin/deces_promo.tpl
index 58d110a..9cb2d82 100644 (file)
--- a/templates/admin/deces_promo.tpl
+++ b/templates/admin/deces_promo.tpl
@@ -1,7 +1,7 @@
-{* $Id: deces_promo.tpl,v 1.1 2004-02-04 19:47:47 x2000habouzit Exp $ *}
+{* $Id: deces_promo.tpl,v 1.2 2004-02-04 22:47:45 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
-<table class="bicol">
+<table class="tinybicol">
   <tr>
     <td><input type="submit" value="<<" name="sub10" /></td>
     <td><input type="submit" value="<"  name="sub01" /></td>

diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 760572c..bb8b74c 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -1,4 +1,4 @@
-{* $Id: default.tpl,v 1.5 2004-02-03 09:52:09 x2000gommard Exp $ *}
+{* $Id: default.tpl,v 1.6 2004-02-04 22:47:45 x2000habouzit Exp $ *}
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -24,19 +24,8 @@
 
     <table id="body" cellpadding="0" cellspacing="0">
     <tr>
-      <td id="body-left" rowspan="2">
+      <td id="body-logo">
         <img src="{"images/sk_default_headlogo.jpg"|url}" alt="[ LOGO ]" />
-        <div id="menu">
-{include_php file=menu.conf.php}
-{foreach key=menu_title item=menu_list from=$menu}
-{if $menu_title}
-        <div class="menu_title">{$menu_title}</div>
-{/if}
-{foreach key=menu_item item=menu_url from=$menu_list}
-        <div class="menu_item"><a href="{$menu_url|url}">{$menu_item}</a></div>
-{/foreach}
-{/foreach}
-{perms level=admin}{insert name="mkStats"}{/perms}
       </td>
       <td id="body-top">
         <img src="{"images/sk_default_ban.jpg"|url}" alt="[ Polytechnique.org ]" />
@@ -56,6 +45,18 @@
       </td>
     </tr>
     <tr>
+      <td id="body-menu">
+{include_php file=menu.conf.php}
+{foreach key=menu_title item=menu_list from=$menu}
+{if $menu_title}
+        <div class="menu_title">{$menu_title}</div>
+{/if}
+{foreach key=menu_item item=menu_url from=$menu_list}
+        <div class="menu_item"><a href="{$menu_url|url}">{$menu_item}</a></div>
+{/foreach}
+{/foreach}
+{perms level=admin}{insert name="mkStats"}{/perms}
+      </td>
       <td id="content">
 {include file=$xorg_tpl}
       </td>