diff --git a/html/admin_repo.php b/html/admin_repo.php index d41d5fd89..8a200f80b 100644 --- a/html/admin_repo.php +++ b/html/admin_repo.php @@ -22,6 +22,9 @@ include_once("ac_common.php"); include_once("postgres.php"); include_once("debug.php"); +include_once("user_menu.php"); + + html_page_start($g_UserProperty['use_theme']); echo_debug(__FILE__,__LINE__,"entering admin_repo"); @@ -33,10 +36,9 @@ if ($g_UserProperty['use_admin'] != 1) { html_page_stop(); return; } -include ("top_menu_compta.php"); -echo '

Administration Globale

'; -ShowMenuAdminGlobal(); +echo '

Administration Globale

'; +echo "
".MenuAdmin()."
"; @@ -61,6 +63,7 @@ if ( isset ($_GET["action"]) ) { echo_debug(__FILE__,__LINE__,"Array = $cn"); $compteur=0; ?> +

Gestion Utilisateurs

- +'; echo ''; @@ -124,7 +127,7 @@ if ( isset ($_GET["action"]) ) { } // if $l_id != 0 } // $_POST[DATABASE] ?> - Dossier Management +

Dossier Management

Add User

Ajout d'utilisateur

First Name Last Name
'; for ($i=0;$i<$count;$i++) { $mod=pg_fetch_array($Res,$i); - $template.='
- + - + - + @@ -203,12 +206,12 @@ if ( $count == 0 ) { // get the mod_id $l_id=GetSequence($cn,'s_modid'); if ( $l_id != 0 ) { - $Sql=sprintf("CREATE DATABASE MOD%d encoding='ISO8859-1' TEMPLATE DOSSIER%s",$l_id,$_POST["FMOD_DBID"]); - ExecSql($cn,$Sql); - } + $Sql=sprintf("CREATE DATABASE MOD%d encoding='ISO8859-1' TEMPLATE DOSSIER%s",$l_id,$_POST["FMOD_DBID"]); + ExecSql($cn,$Sql); + } }// if $mod_name != null - $mod=sprintf("mod%d",$l_id); - $cn_mod=dbconnect($mod); + + $cn_mod=dbconnect($l_id,'mod'); // Clean some tables $Res=ExecSql($cn_mod,"truncate table jrn"); $Res=ExecSql($cn_mod,"truncate table jrnx"); @@ -234,14 +237,30 @@ if ( $count == 0 ) { if ( $count == 0 ) { echo "No template available"; } else { - + echo "

Modèles

"; + + echo '
Name Name
Description Description
Modèle
'; + echo "". + "". + ""; + for ($i=0;$i<$count;$i++) { $mod=pg_fetch_array($Res,$i); - printf(' %s %s ', - $mod['mod_name'],$mod['mod_desc']); + printf(''. + ''. + ''. + '', + $mod['mod_name'], + $mod['mod_desc']); }// for + echo "
NomDescription
%s %s
"; }// if count = 0 + echo "Si vous voulez récupé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ériodes,... seront reprises ". + "et aucune données du dossier sur lequel le dossier est basé."; + // Show All available folder $Res=ExecSql($cn,"select dos_id, dos_name,dos_description from ac_dossier order by dos_name"); @@ -264,7 +283,7 @@ if ( $count == 0 ) { Description - + Basé sur diff --git a/html/priv_user.php b/html/priv_user.php index a4fdcc2dd..63163f692 100644 --- a/html/priv_user.php +++ b/html/priv_user.php @@ -20,7 +20,7 @@ include_once("ac_common.php"); include_once("postgres.php"); include_once("debug.php"); -include_once("top_menu_compta.php"); +include_once("user_menu.php"); html_page_start($g_UserProperty['use_theme']); echo_debug(__FILE__,__LINE__,"entering priv_users"); @@ -50,7 +50,8 @@ if ( $r_UID == false ) { } echo_debug(__FILE__,__LINE__,"UID IS VALID"); echo '

Administration Globale

'; -ShowMenuAdminGlobal(); + +echo "
".MenuAdmin()."
"; echo '
'; echo '

User Management

'; diff --git a/html/style-light.css b/html/style-light.css index 6c7ad2cb2..69c8aa140 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -6,6 +6,11 @@ BODY { font-family:sans-serif; } +h2 { + font-family:sans-serif; + font-size:14px; + color:grey; +} div.info { background:#879ed4; color:white; diff --git a/html/user_login.php b/html/user_login.php index 346eca329..dc911bc9f 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -1,3 +1,5 @@ + + Check(); html_page_start($g_UserProperty['use_theme']); include_once("user_menu.php"); -//u_ShowMenu($g_UserProperty['use_admin']); - $priv=($g_UserProperty['use_admin']==1)?"Administrator":"User";