stany.ferer пре 1 година
родитељ
комит
3188ff3aea

+ 3 - 3
core/class/alert.class.php

@@ -121,19 +121,19 @@ class alert
         $idAlert = "printToastSuccess";
         $texte1 = (self::getSuccess()) ?  self::getSuccess() : NULL;
         $style = 'background:#d4edda;';
-        $icon = '<span data-feather="info" style="color:green;"></span> <strong style="color:green; margin-left:5px;" class="mr-auto">Succès</strong>';
+        $icon = '<i class="bi bi-info-circle" style="color:green; font-size:19px;"></i> <strong style="color:green; margin-left:5px;" class="mr-auto">Succès</strong>';
         self::printToast($idAlert, $style, $icon, $texte1);
 
         $idAlert = "printToastWarning";
         $texte2 = (self::getWarning()) ?  self::getWarning() : NULL;
         $style = 'background:#fff3cd;';
-        $icon = '<span data-feather="alert-circle" style="color:orange;"></span> <strong style="color:orange; margin-left:5px;" class="mr-auto">Attention</strong>';
+        $icon = '<i class="bi bi-exclamation-diamond" style="color:orange; font-size:19px;"></i> <strong style="color:orange; margin-left:5px;" class="mr-auto">Attention</strong>';
         self::printToast($idAlert, $style, $icon, $texte2);
 
         $idAlert = "printToastError";
         $texte3 = (self::getError()) ?  self::getError() : NULL;
         $style = 'background:#f8d7da;';
-        $icon = '<span data-feather="alert-triangle" style="color:red;"></span> <strong style="color:red; margin-left:5px;" class="mr-auto">Erreur</strong>';
+        $icon = '<i class="bi bi-exclamation-triangle" style="color:red; font-size:19px;"></i> <strong style="color:red; margin-left:5px;" class="mr-auto">Erreur</strong>';
         self::printToast($idAlert, $style, $icon, $texte3);
 
         echo '</div>';

+ 2 - 2
core/class/core.class.php

@@ -196,7 +196,7 @@ class core
             ($_style != NULL) ? $_style = ' style="' . $_style . '"' : NULL;
             echo '<li class="nav-item">
                     <a class="nav-link' . get::currentPage($_id) . '" aria-current="page"  href="' . $_href . '"' . $_style . '>
-                        <i class="' . $_feather . '"' . $_style . '></i>
+                        <i class="' . $_feather . ' h6"' . $_style . '></i>
                         ' . $_titre . '
                     </a>
                 </li>';
@@ -209,7 +209,7 @@ class core
             ($_style != NULL) ? $_style = ' style="' . $_style . '"' : NULL;
             echo '<li class="nav-item">
                     <a class="nav-link" target="' . $_target . '" href="' . $_href . '"' . $_style . '>
-                        <i class="' . $_feather . '"' . $_style . '></i>
+                        <i class="' . $_feather . ' h6"' . $_style . '></i>
                         ' . $_titre . '
                     </a>
                 </li>';

+ 1 - 1
core/views/pages/cms.compte.php

@@ -10,7 +10,7 @@
 </h2>
 <?php if(access::ifAccesss("compte-upload")){ ?>
 <div class="fix-container-button-nav">
-    <a href="/?p=compte-upload&add=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="plus-square"></span> Charger un CSV</button></a>
+    <a href="/?p=compte-upload&add=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Charger un CSV</button></a>
 </div>
 <?php } ?>
 </header>

+ 1 - 1
core/views/pages/cms.document.php

@@ -59,7 +59,7 @@ echo core::filAriane(array(
 if (isset($document["id"])) {
 ?>
     <div style="float:right; margin-top: -60px;">
-        <a href="/submit.php?from=document-delete&id=<?php echo $document["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer ce document ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><span data-feather="trash-2"></span> Supprimer</button></a>
+        <a href="/submit.php?from=document-delete&id=<?php echo $document["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer ce document ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="bi bi-trash-fill"></i> Supprimer</button></a>
     </div>
 <?php
 }

+ 1 - 1
core/views/pages/cms.documents.php

@@ -12,7 +12,7 @@
 </h2>
 <?php if(access::ifAccesss("add-document")){ ?>
 <div class="fix-container-button-nav">
-    <a href="/add-document.html"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Ajouter un document</button></a>
+    <a href="/add-document.html"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Ajouter un document</button></a>
 </div>
 <?php } ?>
 </header>

+ 1 - 1
core/views/pages/cms.evenement-fiche.php

@@ -38,7 +38,7 @@ if (!core::ifGet("id")) {
     if(isset($event["id"]) AND $nbEmargement == 0){ 
 ?>
     <div style="float:right; margin-top: -60px;">
-        <a href="/submit.php?from=event-delete&id=<?php echo $event["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer cet évènement ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><span data-feather="trash-2"></span> Supprimer</button></a>
+        <a href="/submit.php?from=event-delete&id=<?php echo $event["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer cet évènement ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="bi bi-trash-fill"></i> Supprimer</button></a>
     </div>
 <?php   
     } 

+ 2 - 2
core/views/pages/cms.evenement-inscrits.php

@@ -9,9 +9,9 @@
     $evenement = event::getFiche(core::getGet("id"));
     if($evenement["type_inscription"] == 1){
 ?>
-    <a href="/?p=evenement-inscription-upload&id=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
+    <a href="/?p=evenement-inscription-upload&id=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Importer un fichier Excel</button></a>
 <?php } ?>
-    <a href="/submit.php?from=event-export-inscription&id=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-primary btn-sm"><span data-feather="download"></span> Extraire en CSV</button></a>
+    <a href="/submit.php?from=event-export-inscription&id=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-primary btn-sm"><i class="bi bi-box-arrow-down"></i> Extraire en CSV</button></a>
 </div>
 <table
     id="table"

+ 1 - 1
core/views/pages/cms.evenements.php

@@ -13,7 +13,7 @@
 </h2>
 <?php if(access::ifAccesss("add-evenement")){ ?>
 <div class="fix-container-button-nav">
-    <a href="/add-evenement.html"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="plus-square"></span> Ajouter un évènement</button></a>
+    <a href="/add-evenement.html"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Ajouter un évènement</button></a>
 </div>
 <?php } ?>
 </header>

+ 1 - 1
core/views/pages/cms.lottery-fiche.php

@@ -11,7 +11,7 @@ if(core::ifGet("add")) {
     if(isset($lottery["id"]) AND $lottery["sortDate"] == NULL){ 
 ?>
     <div style="float:right; margin-top: -60px;">
-        <a href="/submit.php?from=lottery-delete&id=<?php echo $lottery["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer ce tirage au sort ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><span data-feather="trash-2"></span> Supprimer</button></a>
+        <a href="/submit.php?from=lottery-delete&id=<?php echo $lottery["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer ce tirage au sort ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="bi bi-trash-fill"></i> Supprimer</button></a>
     </div>
 <?php   
     }

+ 1 - 1
core/views/pages/cms.lottery-inscrits.php

@@ -11,7 +11,7 @@
     <?php
     if ($lottery["sortDate"] == NULL) {
     ?>
-        <a href="/?p=lottery-upload-excel&id=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="download"></span> Importer les inscrits</button></a>
+        <a href="/?p=lottery-upload-excel&id=<?php echo core::getGet("id") ?>"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-box-arrow-down"></i> Importer les inscrits</button></a>
     <?php } ?>
 </div>
 <?php 

+ 1 - 1
core/views/pages/cms.lottery.php

@@ -54,7 +54,7 @@ if(alert::ifTab()){
             <div style="float:right; margin: -30px;">
             </div>
             <div class="fix-container-button-nav">
-                <a href="/submit.php?from=lottery-delete&id=<?php echo $lottery["id"] ?>" onclick="return confirm('Voulez-vous supprimer ce tirage au sort ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><span data-feather="trash-2"></span> Supprimer</button></a>
+                <a href="/submit.php?from=lottery-delete&id=<?php echo $lottery["id"] ?>" onclick="return confirm('Voulez-vous supprimer ce tirage au sort ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="bi bi-trash-fill"></i> Supprimer</button></a>
             </div>
         <?php } ?>
     </div>

+ 1 - 1
core/views/pages/cms.lotterys.php

@@ -13,7 +13,7 @@
 </h2>
 <?php if(access::ifAccesss("add-lottery")){ ?>
 <div class="fix-container-button-nav">
-    <a href="/add-lottery.html"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="plus-square"></span> Ajouter un tirage au sort</button></a>   
+    <a href="/add-lottery.html"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Ajouter un tirage au sort</button></a>   
 </div>
 <?php } ?>
 </header>

+ 1 - 1
core/views/pages/cms.parametre-users.php

@@ -26,7 +26,7 @@ echo core::filAriane(array(
 <div style="margin-top:20px;">
     <a href="/add-user.html" style="position:absolute; right:25px; margin-top:-60px;">
     <button type="submit" class="btn btn-outline-success btn-sm">
-        <span data-feather="plus-square"></span> Ajouter un utilisateur</button>
+        <i class="bi bi-file-earmark-plus"></i> Ajouter un utilisateur</button>
     </a>
 </div>
 <div>

+ 1 - 1
core/views/pages/cms.parametres-restore.php

@@ -8,7 +8,7 @@
 
     <a href="/submit.php?from=parametres-add-backup" style="position:absolute; right:25px; margin-top:-60px;">
         <button type="submit" class="btn btn-outline-success btn-sm">
-        <span data-feather="plus-square"></span> Créer un nouveau backup</button>
+        <i class="bi bi-file-earmark-plus"></i> Créer un nouveau backup</button>
     </a>
 </div>
 <div>

+ 2 - 2
core/views/pages/cms.proweb-historique-excel.php

@@ -9,8 +9,8 @@
         <span>Proweb : Historique des Excels</span>
     </h2>
     <div class="fix-container-button-nav">
-        <a href="proweb-salaries-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
-        <a href="https://www.cse-invent.com/gestion/beneficiaire/od/export-etat/124/excel?type=EtatListe_od" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><span data-feather="link"></span> Exporter tous les salariés depuis Proweb</button></a>
+        <a href="proweb-salaries-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Importer un fichier Excel</button></a>
+        <a href="https://www.cse-invent.com/gestion/beneficiaire/od/export-etat/124/excel?type=EtatListe_od" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><i class="bi bi-link-45deg"></i> Exporter tous les salariés depuis Proweb</button></a>
     </div>
 </header>
 <?php   

+ 2 - 2
core/views/pages/cms.proweb-salaries.php

@@ -13,8 +13,8 @@ $date = ($dateData != NULL) ? " (au " . core::convertDate($dateData, FALSE) . ")
     </h2>
     <?php if(access::ifAccesss("proweb-salaries-upload")){ ?>
     <div class="fix-container-button-nav">
-        <a href="proweb-salaries-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
-        <a href="https://www.cse-invent.com/gestion/beneficiaire/od/export-etat/124/excel?type=EtatListe_od" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><span data-feather="link"></span> Exporter tous les salariés depuis Proweb</button></a>
+        <a href="proweb-salaries-upload.html"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Importer un fichier Excel</button></a>
+        <a href="https://www.cse-invent.com/gestion/beneficiaire/od/export-etat/124/excel?type=EtatListe_od" target="_blank"><button type="submit" class="btn btn-outline-secondary btn-sm"><i class="bi bi-link-45deg"></i> Exporter tous les salariés depuis Proweb</button></a>
     </div>
     <?php } ?>
 </header>

+ 1 - 1
core/views/pages/cms.rh-historique-excel.php

@@ -13,7 +13,7 @@
         <span>RH : Historique des Excels</span>
     </h2>
     <div class="fix-container-button-nav">
-        <a href="/rh-upload-excel.html" class="fix-button-nav"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
+        <a href="/rh-upload-excel.html" class="fix-button-nav"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Importer un fichier Excel</button></a>
     </div>
 </header>
 <?php   

+ 1 - 1
core/views/pages/cms.rh-liste-salaries.php

@@ -13,7 +13,7 @@
     </h2>
     <?php if(access::ifAccesss("rh-upload-excel")){ ?>
     <div class="fix-container-button-nav">
-        <a href="/rh-upload-excel.html" class="fix-button-nav"><button type="submit" class="btn btn-outline-success btn-sm"><span data-feather="file-plus"></span> Importer un fichier Excel</button></a>
+        <a href="/rh-upload-excel.html" class="fix-button-nav"><button type="submit" class="btn btn-outline-success btn-sm"><i class="bi bi-file-earmark-plus"></i> Importer un fichier Excel</button></a>
     </div>
     <?php } ?>
 </header>

+ 3 - 1
core/views/pages/cms.test.php

@@ -1,7 +1,9 @@
 
 <?php 
 
-core::print_r(access::getArrayTypes());
+$tags = user::getIdTags(session::getId());
+echo document::myAssign($tags);
+core::print_r($tags);
 
 
 ?>

+ 1 - 1
core/views/pages/cms.user.php

@@ -46,7 +46,7 @@ if(core::ifGet("add") AND access::ifAccesss("add-user")) {
         </h2>        
         <?php if(isset($user["id"]) AND session::getId() != $user["id"] AND $protect != 2){ ?>
             <div class="fix-container-button-nav">
-                <a href="/submit.php?from=user-delete&id=<?php echo $user["id"] ?>" onclick="return confirm('Voulez-vous supprimer le compte de <?php echo $user["prenom"] . " " . $user["nom"]; ?> ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><span data-feather="trash-2"></span> Supprimer</button></a>
+                <a href="/submit.php?from=user-delete&id=<?php echo $user["id"] ?>" onclick="return confirm('Voulez-vous supprimer le compte de <?php echo $user["prenom"] . " " . $user["nom"]; ?> ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><i class="bi bi-trash-fill"></i> Supprimer</button></a>
             </div>
         <?php } elseif($protect == 2){ ?>
             <div class="fix-container-button-nav">

+ 1 - 1
public-cms/css/cms.css

@@ -12,4 +12,4 @@
 .fix-button-nav {
     float :right;
     margin-left: 5px;
-}
+}