Commit 9ad39ebb 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!520
parents c5a9e89e 6953e089
......@@ -64,7 +64,8 @@ $cakeDescription = 'web-DPO';
'/js/node_modules/components-font-awesome/css/all.min.css',
'/js/node_modules/select2/dist/css/select2.min.css',
'main.css',
'style.css'
'style.css',
'flash.css'
]);
echo $this->fetch('meta');
......
......@@ -15,61 +15,67 @@
$cakeDescription = 'web-DPO';
?>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8">
<title>
<?php
echo $cakeDescription
?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php
echo $cakeDescription
?>
</title>
// CSS
echo $this->Html->css([
'/js/node_modules/bootstrap/dist/css/bootstrap.min.css',
]);
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php
// CSS
echo $this->Html->css([
'/js/node_modules/@libriciel/ls-bootstrap-4/dist/ls-bootstrap-4.css',
'/js/node_modules/components-font-awesome/css/all.min.css'
]);
// JS
echo $this->Html->script([
'/js/node_modules/jquery/dist/jquery.min.js',
'/js/node_modules/@popperjs/core/dist/umd/popper.min.js',
'/js/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js',
'/js/node_modules/@libriciel/ls-bootstrap-4/dist/ls-bootstrap-4.js',
]);
echo $this->Html->script('fadeflash.js', ['inline' => false]);
// JS
echo $this->Html->script('fadeflash.js', ['inline' => false]);
?>
// CSS
echo $this->Html->css([
'/js/node_modules/@libriciel/ls-bootstrap-4/dist/ls-bootstrap-4.css',
'/js/node_modules/components-font-awesome/css/all.min.css',
'flash.css'
]);
<style>
.forgot-passwd-lnk {
display: none;
}
echo $this->fetch('meta');
echo $this->fetch('css');
echo $this->fetch('script');
?>
#flasherror {
position: absolute;
top: 0;
left: 35%;
right: 35%;
border: 1px solid #D9534F;
z-index: 20;
max-width: 483px;
}
</style>
</head>
<style>
.forgot-passwd-lnk {
display: none;
}
</style>
</head>
<body>
<?php
echo $this->Flash->render();
//$this->Flash->render('auth');
echo $this->fetch('content');
?>
<body>
<?php
echo $this->Flash->render();
//$this->Flash->render('auth');
echo $this->fetch('content');
?>
<!-- Footer Libriciel SCOP -->
<ls-lib-footer
class="ls-login-footer ls-footer-fixed-bottom"
active="webdpo"
application_name="<?php echo $cakeDescription . ' ' . VERSION . " / "; ?>">
</ls-lib-footer>
<!-- Footer Libriciel SCOP -->
<ls-lib-footer
class="ls-login-footer ls-footer-fixed-bottom"
active="webdpo"
application_name="<?php echo $cakeDescription . ' ' . VERSION . " / "; ?>">
</ls-lib-footer>
<?php
echo $this->Html->script('/js/node_modules/@libriciel/ls-composants/ls-elements.js');
?>
</body>
<?php
echo $this->Html->script('/js/node_modules/@libriciel/ls-composants/ls-elements.js');
?>
</body>
</html>
.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;
}
......@@ -115,39 +115,3 @@ 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;
}
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