';
echo '
User Management
';
// User is valid and you're an admin
diff --git a/html/style-light.css b/html/style-light.css
index 1d08d610d..2b2d5b6dd 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -6,14 +6,30 @@ BODY {
BODY.defaut {
background-color:white;
}
+div.info {
+ background:#879ed4;
+ color:white;
+ font-size:16pt;
+ text-align:center;
+}
+
h2.info {
background:#879ed4;
color:white;
- font-size:20px;
+ font-size:16pt;
+ text-align:center;
}
+h3.info {
+ background:#879ed4;
+ color:white;
+ font-size:10pt;
+ text-align:center;
+}
+
h2.info2 {
- color:blue;
- font-size:20px;
+ color:blue;
+ font-size:20px;
+ text-align:center;
}
@@ -39,7 +55,7 @@ div.tmenu {
top:10px;
left:120px;
width:800px;
-
+ text-align:center;
}
div.u_tmenu {
@@ -58,7 +74,7 @@ div.u_subtmenu {
div.lmenu {
position: absolute;
- top:80px;
+ top:130px;
left:30px;
width:100px;
font-size:10px;
@@ -86,10 +102,11 @@ div.debit{
}
div.redcontent{
position: absolute;
- top:50px;
+ top:130px;
left:250px;
width:600px;
font-size:12px;
+ overflow:auto;
}
div.u_redcontent{
position: absolute;
@@ -101,7 +118,7 @@ div.u_redcontent{
div.ccontent{
position: absolute;
- top:50px;
+ top:110px;
left:130px;
width:670px;
font-size:9pt;
@@ -115,7 +132,7 @@ div.rmenu {
table.mtitle {
border:0;
- align:center
+ text-align:center
}
td.mshort {
text-align:center;
@@ -139,7 +156,7 @@ td.mltitle {
}
td.mtitle {
text-align:center;
-/* width:75px; */
+ width:75px;
font-size:10px;
border: 1px solid;
background-color:#DDE6FF;
diff --git a/html/user_compta.php b/html/user_compta.php
index f85a24ff0..f5cc66519 100644
--- a/html/user_compta.php
+++ b/html/user_compta.php
@@ -57,7 +57,7 @@ if ( $g_UserProperty['use_admin'] == 0 ) {
include_once ("user_menu.php");
include_once ("top_menu_compta.php");
ShowMenuCompta($g_dossier,$g_UserProperty);
-//ShowMenuComptaRight($g_dossier,$g_UserProperty);
+
html_page_stop();
?>
diff --git a/html/user_jrn.php b/html/user_jrn.php
index 0d227637d..a6eb397f5 100644
--- a/html/user_jrn.php
+++ b/html/user_jrn.php
@@ -69,7 +69,7 @@ if ( isset ($_GET['show'])) {
array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
array("user_jrn.php?JRN_TYPE=FIN","Financier"),
array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
- array("","Impression"),
+ array("impress.php","Impression"),
array("","Recherche")
);
$result=ShowItem($p_array,'H',"cell","mtitle");
@@ -86,7 +86,7 @@ if ( isset ($_GET['JRN_TYPE'] ) ) {
array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
array("user_jrn.php?JRN_TYPE=FIN","Financier"),
array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
- array("","Impression"),
+ array("impress.php","Impression"),
array("","Recherche")
);
$result=ShowItem($p_array,'H',"cell","mtitle","user_jrn.php?JRN_TYPE=".$jrn_type);
@@ -109,7 +109,7 @@ if ( isset ($_GET['JRN_TYPE'] ) ) {
array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
array("user_jrn.php?JRN_TYPE=FIN","Financier"),
array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
- array("","Impression"),
+ array("impress.php","Impression"),
array("","Recherche")
);
$result=ShowItem($p_array,'H',"cell","mtitle","user_jrn.php?JRN_TYPE=".$jrn_type);
@@ -125,7 +125,7 @@ if ( $g_jrn != -1 ) {
array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
array("user_jrn.php?JRN_TYPE=FIN","Financier"),
array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
- array("","Impression"),
+ array("impress.php","Impression"),
array("","Recherche")
);
$result=ShowItem($p_array,'H',"cell","mtitle","user_jrn.php?JRN_TYPE=".$jrn_type);
diff --git a/html/user_login.php b/html/user_login.php
index 1dd01f658..88dfaf48b 100644
--- a/html/user_login.php
+++ b/html/user_login.php
@@ -23,18 +23,22 @@ include_once("postgres.php");
CheckUser();
html_page_start($g_UserProperty['use_theme']);
include_once("user_menu.php");
-u_ShowMenu($g_UserProperty['use_admin']);
+//u_ShowMenu($g_UserProperty['use_admin']);
$priv=($g_UserProperty['use_admin']==1)?"Administrator":"User";
-echo '
Welcome '.$g_UserProperty['use_first_name'].' '.
- $g_UserProperty['use_name'].'
, your are an '. $priv.' Please Select your folder
';
+echo '
Welcome '.$g_UserProperty['use_first_name'].' '.
+ $g_UserProperty['use_name'].',
your are an '. $priv.'
Please Select your folder
';
// Show default menu (preference,...)
// If admin show everything otherwise only the available dossier
$res=u_ShowDossier($g_user,$g_UserProperty['use_admin']);
echo $res;
+?>
+
+
+
html_page_stop();
?>
diff --git a/html/user_sec.php b/html/user_sec.php
index 64b6ae776..df53cfb4a 100644
--- a/html/user_sec.php
+++ b/html/user_sec.php
@@ -32,7 +32,7 @@ CheckUser();
include_once ("top_menu_compta.php");
ShowMenuCompta($g_dossier,$g_UserProperty);
-ShowMenuComptaRight($g_dossier,$g_UserProperty);
+
if ( $g_UserProperty['use_admin']== 0 ) {
$r=CheckAction($g_dossier,$g_user,SECU);
if ($r == 0 ){
@@ -50,8 +50,6 @@ $User=ExecSql($cn,"select use_id,use_first_name,use_name,use_login from ac_user
$MaxUser=pg_NumRows($User);
- ShowMenuComptaRight($g_dossier,$g_UserProperty['use_admin']);
-
echo '
';
echo '
Sécurité
';
echo '
';
diff --git a/include/top_menu_compta.php b/include/top_menu_compta.php
index 220b860c4..30740d4e2 100644
--- a/include/top_menu_compta.php
+++ b/include/top_menu_compta.php
@@ -519,8 +519,10 @@ function ShowMenuAdminGlobal()
$item[0]=array("admin_repo.php?action=user_mgt","Utilisateurs");
$item[1]=array("admin_repo.php?action=dossier_mgt","Dossiers");
$item[2]=array("admin_repo.php?action=modele_mgt","Modèles");
- $menu=ShowItem($item);
- echo '