Skip to content
Snippets Groups Projects
Commit a9d3403f authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

13H33 - Fix traduction & Page utilisateurs

parent 06176178
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
vbcms-admin/css/manager.css
+ 25
− 0
View file @ a9d3403f
......@@ -763,3 +763,28 @@ header .menu-item{
align-items: center;
justify-content: center;
}
.userList .userCard{
width: 100%;
margin: 5px 0 5px 0;
border-radius: 5px;
padding: .5em;
}
.userList .userCard:hover{
background-color: #dadada;
}
.userList .userCard .userProfilPic{
height: 56px;
width: 56px;
background-size: cover;
border-radius: 50%;
}
@media (min-width: 1400px){
.userList .userCard{
width:calc(50% - 10px);
margin: 5px;
}
}
\ No newline at end of file
vbcms-admin/includes/settingsPage.php
+ 72
− 2
View file @ a9d3403f
......@@ -173,9 +173,79 @@ function getSettingsHTML($params){
<div class="d-flex">
<div class="flex-grow-1 d-flex flex-column">
<div>
<?php
$userGroups=$bdd->query("SELECT * FROM `vbcms-userGroups` ORDER BY `groupId` ASC")->fetchAll(PDO::FETCH_ASSOC);
foreach($userGroups as $userGroup){
echo ('<div class="d-flex flex-column p-4">
<div class="text-brown border-bottom">');
$usersCount = $bdd->prepare("SELECT COUNT(*) FROM `vbcms-users` WHERE groupId = ?");
$usersCount->execute([$userGroup['groupId']]);
$usersCount=$usersCount->fetchColumn();
echo translate($userGroup['groupName'])." (".$usersCount;
if($usersCount>1) echo " ".strtolower(translate("users")).")";
else echo " ".strtolower(translate("user")).")";
echo ('</div>
<div class="d-flex flex-wrap userList">');
$users = $bdd->prepare("SELECT * FROM `vbcms-users` WHERE groupId = ?");
$users->execute([$userGroup['groupId']]);
$users=$users->fetchAll(PDO::FETCH_ASSOC);
foreach($users as $user){
$userProfilPic = file_get_contents("https://api.vbcms.net/profiles/v1/".$user['netId']);
if(isJson($userProfilPic)){
$userProfilPic = json_decode($userProfilPic, true);
$userProfilPic = $userProfilPic['profilePic'];
} else {
// Ici on a soit pas trouvé l'utilisateur, soit les serveurs sont down
// Du coup on va check dans localAccounts
$userProfilPic = $bdd->prepare("SELECT * FROM `vbcms-localAccounts` WHERE netIdAssoc = ?");
$userProfilPic->execute([$user['netId']]);
$userProfilPic=$userProfilPic->fetch(PDO::FETCH_ASSOC);
if(!empty($userProfilPic)){
$userProfilPic = $userProfilPic['profilePic'];
}else{
// Ici l'utilisateur n'existe pas dans la liste des comptes locaux
// Donc on va lui mettre une image placeholder
$userProfilPic = $GLOBALS['websiteUrl']."vbcms-admin/images/misc/programmer.png";
}
}
$joinedDate = new DateTime($user['localJoinedDate']);
echo ('<div class="userCard d-flex">
<div class="userProfilPic" style="background-image:url(\''.$userProfilPic.'\')"></div>
<div class="ml-2">
<h6 class="mb-n1">'.$user['username'].'</h6>
<small class="text-muted">'.translate('joinedOn').': '. $joinedDate->format('l jS F').'</small><br>
<small><a href="#" class="text-brown">'.translate("modifyUser").'</a></small>
</div>
</div>');
}
echo "</div></div>";
}
?>
<!--
<div class="d-flex flex-column p-4">
<div class="text-brown border-bottom">
Un groupe trop génial (1 utilisateur)
</div>
<div class="d-flex flex-wrap userList">
<div class="userCard d-flex">
<div class="userProfilPic" style="background-image:url('https://cdn.akamai.steamstatic.com/steamcommunity/public/images/avatars/ee/ee6f9c9ffd6bb2fd2114a378f3f03d997f79e4b9_full.jpg')"></div>
<div class="ml-2">
<h6 class="mb-n1">sofianelasri</h6>
<small class="text-muted">A rejoint le: </small><br>
<a href="#" class="text-brown"><?=translate("modifyUser")?></a>
</div>
</div>
</div>
</div>
-->
</div>
<div class="admin-tips" style="position: relative !important; ">
<div class="tip">
......
vbcms-content/translations/FR.php
+ 10
− 5
View file @ a9d3403f
......@@ -40,10 +40,10 @@ $translation["username"] = "Nom d'utilisateur";
$translation["password"] = "Mot de passe";
$translation["create"] = "Créer";
$translation["repeatPassword"] = "Re-écris le mot de passe";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["users"] = "Utilisateurs";
$translation["user"] = "Utilisateur";
$translation["superadmins"] = "Super adminstrateurs";
$translation["admins"] = "Administrateurs";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
......@@ -68,7 +68,12 @@ $translation["localAccountCreation_yourPasswordIsTooWeak"] = "Ton mot de passe d
$translation["whyCreateALocalAccount"] = "Pourquoi créer un compte local?";
$translation["localAccountCreation_error"] = "Erreur lors de la création du compte local. Check les logs pour plus d'infos (ouai j'ai pas fait de vérification ^^').";
$translation["localAccountCreation_success"] = "Compte local créé. 🥳";
$translation["unknownTranslation"] = "Traduction incconue";
$translation["unknownTranslation"] = "Traduction inconnue";
$translation["createUser"] = "Créer un utilisateur";
$translation["modifyUser"] = "Modifier l'utilisateur";
$translation["deleteUser"] = "Supprimer l'utilisateur";
$translation["joinedOn"] = "À rejoint le";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
......
vbcms-core/functions.php
+ 2
− 1
View file @ a9d3403f
......@@ -101,7 +101,8 @@ function translate($index){
$activatedExtensions = $response->fetchAll(PDO::FETCH_ASSOC);
foreach ($activatedExtensions as $activatedExtension){
$ext = new module($activatedExtension["name"]);
$ext->getTranslationFile($language);
$extTrsl = $ext->getTranslationFile($language);
if(!empty($extTrsl)) include $extTrsl;
if(isset($translation[$index])) return $translation[$index];
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment