From 1f6c99e62a0f4e5f06016c5f6f2380dbaa98ec17 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 13 Nov 2010 16:19:15 +0000
Subject: [PATCH] Cosmetic : DIV centered, and use table with the class result

---
 html/priv_user.php      |  2 +-
 include/dossier.inc.php | 29 ++++++++++++++++-------------
 include/modele.inc.php  | 13 ++++++++-----
 include/user.inc.php    | 33 ++++++++++++++++++---------------
 4 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/html/priv_user.php b/html/priv_user.php
index f93cfb5a0..25432ab38 100644
--- a/html/priv_user.php
+++ b/html/priv_user.php
@@ -55,7 +55,7 @@ echo '<H2 class="info"> Administration Globale</H2>';
 
 echo "<div>".MenuAdmin()."</div>";
 
-echo '<DIV>';
+echo '<DIV class="content" style="width:80%;margin-left:10%">';
 
 echo '<h2>Gestion Utilisateurs</h2>';
 
diff --git a/include/dossier.inc.php b/include/dossier.inc.php
index 20311f22f..13651b28d 100644
--- a/include/dossier.inc.php
+++ b/include/dossier.inc.php
@@ -38,7 +38,7 @@ if ( isset ($_POST['upd']) && isset ($_POST['d']))
     $dos->set_parameter('desc',$_POST['desc']);
     $dos->save();
 }
-echo '<div class="u_redcontent">';
+echo '<div class="content" style="width:80%;margin-left:10%">';
 // check and add an new folder
 if ( isset ($_POST["DATABASE"]) )
 {
@@ -173,8 +173,10 @@ if ( $sa == 'list' )
     $compteur=1;
     $template="";
     echo JS_CONFIRM;
-    echo '<TABLE BORDER=1>';
-
+    echo '<TABLE class="result" style="border-collapse:separate;border-spacing:4">';
+    $r=th('ID').th('Nom du dossier ').th('Description').th('Nom base de données');
+    $r=tr($r);
+    echo $r;
     // show all dossiers
     if ( $Res != null )
     {
@@ -187,18 +189,19 @@ if ( $sa == 'list' )
                 $cl='class="even"';
 
             echo "<TR $cl><TD VALIGN=\"TOP\"> ".
-            $Dossier['dos_id']." <B>".h($Dossier['dos_name'])."</B> </TD>".
+            $Dossier['dos_id']."</td><td> <B>".h($Dossier['dos_name'])."</B> </TD>".
             "<TD><I>  ".h($Dossier['dos_description'])."</I>
-            </TD>
-            <TD>";
+            </TD>";
+	    echo td(domaine."dossier".$Dossier['dos_id']);
+            echo "<TD>";
             echo HtmlInput::button_anchor(_('Effacer'),'?action=dossier_mgt&sa=del&d='.$Dossier['dos_id']);
-            echo "</TD>";
-            echo '<td>'.HtmlInput::button_anchor(_('Modifier'),'?action=dossier_mgt&sa=mod&d='
-                                                 .$Dossier['dos_id']).
-            '</td>';
-            echo '<td>'.HtmlInput::button_anchor(_('Backup'),'backup.php?action=backup&sa=b&t=d&d='
-                                                 .$Dossier['dos_id']).
-            '</td>';
+
+            echo HtmlInput::button_anchor(_('Modifier'),'?action=dossier_mgt&sa=mod&d='
+					  .$Dossier['dos_id']);
+
+            echo HtmlInput::button_anchor(_('Backup'),'backup.php?action=backup&sa=b&t=d&d='
+					  .$Dossier['dos_id']);
+	    echo '</td>';
 
             echo '<tr>';
             $compteur++;
diff --git a/include/modele.inc.php b/include/modele.inc.php
index 9ad22ab71..b30a63c3b 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -213,7 +213,7 @@ if ( isset ($_POST["FMOD_NAME"]) )
 $Res=$cn->exec_sql("select mod_id,mod_name,mod_desc from
                    modeledef order by mod_name");
 $count=Database::num_row($Res);
-echo '<div class="content">';
+echo '<div class="content" style="width:80%;margin-left:10%">';
 echo "<H2>Modèles</H2>";
 if ( $sa=='list')
 {
@@ -228,10 +228,13 @@ if ( $sa=='list')
         echo HtmlInput::button_anchor('Rafra&icirc;chir','admin_repo.php?action=modele_mgt');
         echo HtmlInput::button_anchor('Ajouter','admin_repo.php?action=modele_mgt&sa=add');
 
-        echo '<table width="100%" >';
+        echo '<table class="result" style="border-spacing:5;border-collapse:separate" >';
         echo "<TR><TH>Nom</TH>".
         "<TH>Description</TH>".
-        "<th></th>".
+        "<th> </th>".
+        "<th> </th>".
+        "<th> </th>".
+
         "</TR>";
 
         for ($i=0;$i<$count;$i++)
@@ -255,10 +258,10 @@ if ( $sa=='list')
         }// for
         echo "</table>";
     }// if count = 0
-    echo "Si vous voulez r&eacute;cup&eacute;rer toutes les adaptations d'un dossier ".
+    echo "<p class=\"notice\">Si vous voulez r&eacute;cup&eacute;rer toutes les adaptations d'un dossier ".
     " dans un autre dossier, vous pouvez en faire un modèle.".
     " Seules les fiches, la structure des journaux, les p&eacute;riodes,... seront reprises ".
-    "et aucune donn&eacute;e du dossier sur lequel le dossier est bas&eacute;.";
+    "et aucune donn&eacute;e du dossier sur lequel le dossier est bas&eacute;. Les données contenues dans les extensions ne sont pas effacées</p>";
 }
 //---------------------------------------------------------------------------
 // Add a template
diff --git a/include/user.inc.php b/include/user.inc.php
index 21b167051..42b711989 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -51,7 +51,24 @@ $repo=new Dossier(0);
 $cn=$repo->get_user();
 $compteur=0;
 ?>
+<div class="content" style="width:80%;margin-left:10%">
 <h2>Gestion Utilisateurs</h2>
+<TABLE> <TR>
+<form action="admin_repo.php?action=user_mgt" method="POST">
+             <TD><H3>
+             <?php
+             echo _("Ajout d'utilisateur");
+echo '<H3></TD></TR>';
+echo '<TR><TD> First Name </TD><TD><INPUT class="input_text" TYPE="TEXT" NAME="FNAME"></TD>';
+echo '<TD> Last Name </TD><TD><INPUT class="input_text"  TYPE="TEXT" NAME="LNAME"></TD></TR>';
+echo '<TR><TD> login </TD><TD><INPUT class="input_text"  TYPE="TEXT" NAME="LOGIN"></TD>';
+echo '<TD> password </TD><TD> <INPUT class="input_text" TYPE="TEXT" NAME="PASS"></TD></TR>';
+echo '<TD> <INPUT TYPE="SUBMIT" class="button" Value="Create user" NAME="ADD"></TD>';
+echo '</TABLE>';
+
+?>
+</FORM>
+
 <TABLE><TR>
 <?php
 if ( $cn != null )
@@ -79,19 +96,5 @@ if ( $cn != null )
 } // $cn != null
 ?>
 </TABLE>
-<TABLE> <TR>
-<form action="admin_repo.php?action=user_mgt" method="POST">
-             <TD><H3>
-             <?php
-             echo _("Ajout d'utilisateur");
-echo '<H3></TD></TR>';
-echo '<TR><TD> First Name </TD><TD><INPUT class="input_text" TYPE="TEXT" NAME="FNAME"></TD>';
-echo '<TD> Last Name </TD><TD><INPUT class="input_text"  TYPE="TEXT" NAME="LNAME"></TD></TR>';
-echo '<TR><TD> login </TD><TD><INPUT class="input_text"  TYPE="TEXT" NAME="LOGIN"></TD>';
-echo '<TD> password </TD><TD> <INPUT class="input_text" TYPE="TEXT" NAME="PASS"></TD></TR>';
-echo '<TD> <INPUT TYPE="SUBMIT" class="button" Value="Create user" NAME="ADD"></TD>';
-echo '</TABLE>';
-
-?>
-</FORM>
 
+</div>
\ No newline at end of file