From f80facd6ae43c4cae9ca80c07a7daf6d7ed94a35 Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Thu, 16 Dec 2004 20:24:42 +0000
Subject: [PATCH] Fix style for compta style

---
 html/enc_jrn.php            |  6 ++++--
 html/style-light.css        | 14 +++++++-------
 html/user_jrn.php           |  4 ++--
 include/top_menu_compta.php |  8 ++++----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/html/enc_jrn.php b/html/enc_jrn.php
index fe87c9b0c..6477ca1e6 100644
--- a/html/enc_jrn.php
+++ b/html/enc_jrn.php
@@ -75,9 +75,10 @@ ShowMenuJrnUser($g_dossier,$g_UserProperty);
 
 if ( isset ( $_GET["action"] )) {
   if ( $_GET["action"] == "view" ) {
-    ShowMenuRecherche($g_dossier,$g_jrn);
+
     // view all the journal's operation
     echo '<DIV class="redcontent">';
+    ShowMenuRecherche($g_dossier,$g_jrn);
     ViewJrn($g_dossier,$g_user,$g_jrn,"enc_jrn.php");
     echo '</DIV>';
   }
@@ -138,9 +139,10 @@ if ( isset ( $_GET["action"] )) {
   }
  if ( isset ($_POST['viewsearch']) ) {
    reset($HTTP_POST_VARS);
-   ShowMenuRecherche($g_dossier,$g_jrn,$HTTP_POST_VARS);
  
    echo '<DIV class="redcontent">';
+   ShowMenuRecherche($g_dossier,$g_jrn,$HTTP_POST_VARS);
+
    ViewJrn($g_dossier,$g_user,$g_jrn,"enc_jrn.php",$HTTP_POST_VARS);
    echo '</DIV>';
  
diff --git a/html/style-light.css b/html/style-light.css
index 5aa0089b3..b058e5e5f 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -52,7 +52,7 @@ div.mtitle {
 
 div.tmenu {
   position: absolute;
-  top:10px;
+  top:60px;
   left:120px;
   width:800px;
   text-align:center;
@@ -74,7 +74,7 @@ div.u_tmenu {
 
 div.lmenu {
 	position: absolute;
-	top:100px;
+	top:10px;
 	left:0px;
 	width:100px;
 	font-size:10px;
@@ -86,12 +86,12 @@ div.lextmenu {
 	left:30px;
 	width:200px;
 }
-/*div.searchmenu {
+div.searchmenu {
   left:30px;
   width:95px;
   top:100px;
   position:absolute;
-}*/
+}
 div.credit{
 	border-style:solid;
 	border-width:1pt;
@@ -112,8 +112,8 @@ div.recherche{
 div.redcontent{
 	position: absolute;
 	top:100px;
-	left:250px;
-	width:700px;
+	left:220px;
+	width:500px;
 	font-size:9px;
 	font-family:sans-serif;
 
@@ -136,7 +136,7 @@ div.ccontent{
 }
 div.rmenu {
 	position: absolute;
-	top:50px;
+	top:110px;
 	right:30px;
 	width:100px;
 }
diff --git a/html/user_jrn.php b/html/user_jrn.php
index f7bdca9c5..fa1a73acc 100644
--- a/html/user_jrn.php
+++ b/html/user_jrn.php
@@ -111,10 +111,10 @@ if ( $g_jrn != -1 ) {
   // display jrn's menu
   include_once('user_menu.php');
    $menu_jrn=u_ShowMenuJrn($cn,$jrn_type);
-      echo '<div class="searchmenu">';
+   //      echo '<div class="searchmenu">';
    //   echo $result;
    echo $menu_jrn;
-      echo '</DIV>';
+   //   echo '</DIV>';
 
   // Execute Action for g_jrn
  
diff --git a/include/top_menu_compta.php b/include/top_menu_compta.php
index 79c5ff1d0..26f843a81 100644
--- a/include/top_menu_compta.php
+++ b/include/top_menu_compta.php
@@ -290,7 +290,6 @@ function ShowMenuRecherche($p_dossier,$p_jrn,$p_array=null)
 
   if ( $p_mont_sel != "" )  $opt.='<OPTION value="'.$p_mont_sel.'" SELECTED> '.$p_mont_sel;
 
-  echo '<div class="searchmenu">';
   echo '<div style="border-style:outset;border-width:1pt;">';
   echo "<B>Recherche</B>";
   echo '<FORM ACTION="enc_jrn.php" METHOD="POST">';
@@ -315,7 +314,6 @@ function ShowMenuRecherche($p_dossier,$p_jrn,$p_array=null)
   echo "</TABLE>";
   echo "</FORM>";
   echo '</div>';
-  echo '</div>';
 
 }
 /* function
@@ -373,7 +371,9 @@ function ShowMenuJrnUserImp($p_cn,$p_user,$p_dossier)
     echo '<TABLE>';
     echo '<TR><TD style="background-color:#4F8DFF;color:white;font-style:bold;align:center" COLSPAN="3" > Journaux</TD></TR>'; 
     include_once("postgres.php");
-    if ( CheckAdmin() ==0) {
+    include_once("class_user.php");
+    $User=new cl_user($p_cn);
+    if ( $User->Admin() ==0) {
       $Ret=ExecSql($p_cn,"select jrn_def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv,
                                jrn_deb_max_line,jrn_cred_max_line
                              from jrn_def join jrn_type on jrn_def_type=jrn_type_id
@@ -394,7 +394,7 @@ function ShowMenuJrnUserImp($p_cn,$p_user,$p_dossier)
     for ($i=0;$i<$Max;$i++) {
       $l_line=pg_fetch_array($Ret,$i);
       // Admin have always rights
-      if ( CheckAdmin() == 0 ){
+      if ( $User->Admin() == 0 ){
 	$right=CheckJrn($p_dossier,$p_user,$l_line['jrn_def_id']);
       }else {
 	$right=3;