From: Jean-Marc Pigeon Date: Sun, 7 Sep 2025 10:52:54 +0000 (-0400) Subject: added logout within main screen X-Git-Tag: end-0.15~16 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=685b4da49d909348aaae41e791c07d500d62b6bb;p=jmp%2Fmailleur added logout within main screen --- diff --git a/www/gesdis.php b/www/gesdis.php index 8f2851d..2b6bd3b 100644 --- a/www/gesdis.php +++ b/www/gesdis.php @@ -18,10 +18,10 @@ function topper($isadmin,$logname,$pageref) global $userlang; $entete=""; -$admcolor="black"; $click1=""; $click2=""; $click3=""; +$admcolor="black"; if ($isadmin==true) $admcolor="red"; switch ($pageref) { @@ -30,10 +30,10 @@ switch ($pageref) { //$entete=gettranslate(lng::fra,"nuts"); break; case "lvlmai" : - $entete="main"; if ($isadmin==true) { - $click2="Remotes"; - $click3="Users"; + $click1="Remotes"; + $click2="Users"; + $click3="logout"; } break; case "lvlusr" : @@ -52,20 +52,26 @@ $entete - -
+ $logname +
- $click1 +

+ $click1 +

- $click2 +

+ $click2 +

- $click3 +

+ $click3 +

diff --git a/www/lvllog.php b/www/lvllog.php index daa4041..3e9b64d 100644 --- a/www/lvllog.php +++ b/www/lvllog.php @@ -19,12 +19,6 @@ include_once "gessql.php"; function login() { -global $userlang; - -$lngemail=gettranslate($userlang,"Email"); -$lngpass=gettranslate($userlang,"Password"); -$lngshow=gettranslate($userlang,"Show"); - $STR = << diff --git a/www/lvlmai.php b/www/lvlmai.php index accc9de..249bb55 100644 --- a/www/lvlmai.php +++ b/www/lvlmai.php @@ -7,7 +7,7 @@ //============================================================== include_once "subrou.php"; include_once "unienv.php"; -include_once "unidis.php"; +include_once "gesdis.php"; include_once "gessql.php"; //section to generate the main screen body diff --git a/www/translations.js b/www/translations.js index fffb2db..ae1f663 100644 --- a/www/translations.js +++ b/www/translations.js @@ -1,3 +1,5 @@ +// vim: smarttab tabstop=8 shiftwidth=2 expandtab + var translationMap = new Map(); var translationEn = new Map(); @@ -10,7 +12,7 @@ var translationFr = new Map(); translationFr.set("Email", "Courriel"); translationFr.set("Password","Mot de passe"); translationFr.set("Show","Afficher"); -translationFr.set("Login","Action"); +translationFr.set("Login","Connexion"); translationMap.set("fr", translationFr); translationMap.set("en", translationEn); @@ -21,9 +23,7 @@ translationMap.set("en", translationEn); function showpass() { -var datain; - -datain=document.getElementById("myInput"); +let datain=document.getElementById("myInput"); if (datain.type==="password") { datain.type="text"; } @@ -32,22 +32,25 @@ else { } } +//============================================================== +//function to translate login screen +//============================================================== function updateTranslations() -{ - let translationLng = document.getElementById("first-choice").value; - - let translatables = document.getElementsByClassName("translatable"); - for(var i of translatables){ - let key = i.getAttribute("trkey"); - if (i.tagName === 'INPUT') - { - i.value = translationMap.get(translationLng).get(key); - } - else { - i.innerHTML = translationMap.get(translationLng).get(key); - } - } +{ +let translationLng = document.getElementById("first-choice").value; +let translatables = document.getElementsByClassName("translatable"); +for (var i of translatables) { + let key = i.getAttribute("trkey"); + if (i.tagName === 'INPUT') { + i.value = translationMap.get(translationLng).get(key); + } + else { + i.innerHTML = translationMap.get(translationLng).get(key); + } + } } +//execute function at first display updateTranslations(); +//==============================================================