Commit c5a9e89e authored by THEO GUILLON's avatar THEO GUILLON
Browse files

Merge branch '484-messages-courts-d-informations' into '2.1.0'

Resolve "Messages courts d'informations"

See merge request libriciel/pole-citoyens/web-DPO/web-DPO!517
parents bcf315be c036357c
......@@ -47,6 +47,7 @@ Le format est basé sur le modèle [Keep a Changelog](http://keepachangelog.com/
- Modification de la variable "valeur_rt_organisation_email_dpo" par "valeur_rt_organisation_emaildpo"
- Modififcation de la police d'écriture (Ubuntu)
- Amélioration de la navigation en tant que superadmin
- modification de l'affichage des messages
### Corrections
- Système de génération du numéro d'enregistrement du traitement au registre.
......
<div class="toast fade show float-right <?php echo $classFlash; ?>" role="alert" aria-live="assertive" aria-atomic="true">
<div class="toast-body">
<div class="col-sm-12 float-right">
<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<i class="fas <?php echo $icon; ?> fa-lg"></i>
<?php
echo h($message);
?>
</div>
</div>
<div id="flasherror" class="alertFlash alert alert-danger">
<div class="text-center">
<i class="fa fa-2x fa-times-circle"><!----></i>
</div>
<div class="text-center">
<?php echo h($message); ?>
</div>
</div>
\ No newline at end of file
<?php
echo $this->element('flash', [
'classFlash' => 'flasherror',
'icon' => 'fa-times',
'message' => $message,
]);
<div id="flashinfo" class="alertFlash alert alert-info">
<div class="text-center">
<i class="fa fa-2x fa-info-circle"><!----></i>
</div>
<div class="text-center">
<?php echo h($message); ?>
</div>
</div>
\ No newline at end of file
<?php
echo $this->element('flash', [
'classFlash' => 'flashinfo',
'icon' => 'fa-info-circle',
'message' => $message,
]);
<div id="flashsuccess" class="alertFlash alert alert-success">
<div class="text-center">
<i class="fa fa-2x fa-check-circle"><!----></i>
</div>
<div class="text-center">
<?php echo h($message); ?>
</div>
</div>
\ No newline at end of file
<?php
echo $this->element('flash', [
'classFlash' => 'flashsuccess',
'icon' => 'fa-check',
'message' => $message,
]);
<div id="flashwarning" class="alertFlash alert alert-warning">
<div class="text-center">
<i class="fa fa-2x fa-check-warning"><!----></i>
</div>
<div class="text-center">
<?php echo h($message); ?>
</div>
</div>
\ No newline at end of file
<?php
echo $this->element('flash', [
'classFlash' => 'flashwarning',
'icon' => 'fa-exclamation-triangle',
'message' => $message,
]);
......@@ -228,38 +228,6 @@ tr[class^='selectDestValidValider'] {
margin-top: 35px;
}
#flashsuccess {
position: absolute;
left: 35%;
right: 35%;
border: 1px solid #5CB85C;
z-index: 20;
}
#flasherror {
position: absolute;
left: 35%;
right: 35%;
border: 1px solid #D9534F;
z-index: 20;
}
#flashinfo {
position: absolute;
left: 35%;
right: 35%;
border: 1px solid #337AB7;
z-index: 20;
}
#flashwarning {
position: absolute;
left: 35%;
right: 35%;
border: 1px solid #F0AD4E;
z-index: 20;
}
#relatif {
position: relative;
}
......
......@@ -5,8 +5,8 @@ body {
}
.container-fluid-custom {
margin-left: 5%;
margin-right: 5%;
margin-left: 5%;
margin-right: 5%;
}
.head {
......@@ -96,7 +96,7 @@ table {
}
.btn-default-primary-card {
background-color: #ffffff;
background-color: var(--white) !important;
border-color: var(--ls-primary-700) !important;
color: var(--ls-primary-700) !important;
}
......@@ -115,3 +115,39 @@ table {
border-color: var(--ls-primary-700) !important;
color: var(--ls-primary-700) !important;
}
.flashsuccess {
color: var(--white) !important;
border-color: var(--green) !important;
background-color: var(--green) !important;
right: 0;
position: fixed;
z-index: 20;
}
.flasherror {
color: var(--white) !important;
border-color: var(--red) !important;
background-color: var(--red) !important;
right: 0;
position: fixed;
z-index: 20;
}
.flashinfo {
color: var(--white) !important;
border-color: var(--blue) !important;
background-color: var(--blue) !important;
right: 0;
position: fixed;
z-index: 20;
}
.flashwarning {
color: var(--white) !important;
border-color: var(--yellow) !important;
background-color: var(--yellow) !important;
right: 0;
position: fixed;
z-index: 20;
}
......@@ -2,9 +2,12 @@
* Created by aurelien on 11/06/14.
*/
$(document).ready(function(){
// fade out good flash messages after 3 seconds
$('.alertFlash').animate({opacity: 1.0}, 3000).fadeOut();
// fade out good flash messages after 5 seconds
$('.toast').animate({opacity: 1.0}, 5000).fadeOut();
$('.toast').toast({
'autohide': false
});
// $('.toast').toast('show');
});
/**
* Created by aurelien on 11/06/14.
*/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment