... masquage date grade actif (19d8b83d) · Commits · open-source / emc2

module/Application/src/Application/Entity/Db/MacroContent/AgentMacroTrait.php

+5 −5

Changes for module/Application/src/Application/Entity/Db/MacroContent/AgentMacroTrait.php: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -134,11 +134,11 @@ trait AgentMacroTrait
		}
		$texte .= $grade_libelle . " ". $grade_bap;
		$texte .= " (";
		if($grade->estFini()) {
		$texte .= "du " . $grade->getDateDebut()->format('d/m/Y') . " au " . $grade->getDateFin()->format('d/m/Y');
		} else {
		$texte .= "depuis le " . (($grade->getDateDebut() !== null)?$grade->getDateDebut()->format('d/m/Y'):"---");
		}
		// if($grade->estFini()) {
		// $texte .= "du " . $grade->getDateDebut()->format('d/m/Y') . " au " . $grade->getDateFin()->format('d/m/Y');
		// } else {
		// $texte .= "depuis le " . (($grade->getDateDebut() !== null)?$grade->getDateDebut()->format('d/m/Y'):"---");
		// }
		$texte .= " - " . $grade->getStructure()->getLibelleCourt() .")";
		// $texte .= "</span>";
		// $texte .= "</li>";

public/unicaen/app/css/unicaen-icon.css

100755 → 100644

+67 −30

Changes for public/unicaen/app/css/unicaen-icon.css: 67 added lines, 30 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,6 +17,11 @@
		content: "\f06e";
		}

		.icon.icon-masquer:before,
		.icon.icon-hide:before {
		content: "\f070";
		}

		.icon.icon-ajouter:before {
		content: "\f0fe";
		}
		@@ -58,16 +63,11 @@
		content: "\f503";
		}

		.icon.icon-user-ok:before,
		.icon.icon-user-checked:before,
		.icon.icon-utilisateur-ok:before {
		content: "\f4fc";
		}

		.icon.icon-student:before,
		.icon.icon-etudiant:before {
		content: "\f501";
		}

		.icon.icon-listing:before,
		.icon.icon-lister:before
		{
		@@ -104,17 +104,10 @@
		content: "\f068";
		}

		.icon.icon-precedent:before,
		.icon.icon-previous:before,
		.icon.icon-retour:before {
		content: "\f053";
		}

		.icon.icon-suivant:before,
		.icon.icon-next:before {
		content: "\f105";
		}

		.icon.icon-supprimer:before,
		.icon.icon-historiser:before,
		.icon.icon-delete:before {
		@@ -141,8 +134,6 @@
		.icon.icon-yes:before {
		content: "\f00c";
		}

		.icon.icon-retirer:before,
		.icon.icon-unchecked:before,
		.icon.icon-non:before,
		.icon.icon-no:before {
		@@ -187,6 +178,16 @@
		content: "\f204";
		}

		.icon.icon-text:before,
		.icon.icon-texte:before {
		content: "\f039";
		}

		.icon.icon-mail:before,
		.icon.icon-courrier:before{
		content: "\f0e0";
		}

		.icon.icon-pdf:before {
		content: "\f1c1";
		}
		@@ -203,8 +204,6 @@
		content: "\f00c";
		}

		.icon.icon-synchroniser:before,
		.icon.icon-synchronize:before,
		.icon.icon-recharger:before,
		.icon.icon-refresh:before {
		content: "\f021";
		@@ -261,27 +260,65 @@
		content: "\f1c6";
		}

		.icon.icon-attente,
		.icon.icon-wait,
		.icon.icon-hourglass {
		.icon.icon-attente:before,
		.icon.icon-wait:before,
		.icon.icon-hourglass:before {
		content: "\f252";
		}

		.icon.icon-signer:before,
		.icon.icon-sign:before {
		content: "\f5b7 ";
		.icon.icon-asterisque:before,
		.icon.icon-asterisk:before,
		.icon.icon-obligatoire:before,
		.icon.icon-mandatory:before
		{
		content: "\f069";
		}

		.icon.icon-gommer:before,
		.icon.icon-erase:before {
		content: "\f12d";
		.icon.icon-sauvegarder:before,
		.icon.icon-save:before
		{
		content: "\f0c7";
		}

		.icon.icon-lier:before {
		.icon.icon-valider:before,
		.icon.icon-validate:before
		{
		content: "\f14a";
		}

		.icon.icon-lier:before,
		.icon.icon-link:before {
		content: "\f0c1";
		}

		.icon.icon-asterisque:before,
		.icon.icon-obligatoire:before {
		content: "\f069";

		.icon.icon-delier:before,
		.icon.icon-unlink:before {
		content: "\f127";
		}

		.icon.icon-trier:before,
		.icon.icon-sort:before {
		content:"\f160";
		}

		.icon.icon-trier-alpha:before,
		.icon.icon-sort-alpha:before {
		content:"\f15d";
		}

		.icon.icon-reduire:before,
		.icon.icon-shrink:before {
		content: "\f78c";
		}

		.icon.icon-agrandir:before,
		.icon.icon-enlarge:before {
		content: "\f31e";
		}

		.icon.icon-effacer:before,
		.icon.icon-gommer:before,
		.icon.icon-erase:before {
		content:"\f12d";
		}