Commit 257735e6 authored by Alexandre Goldstein's avatar Alexandre Goldstein
Browse files

Merge Tag 2.3 Socle

parent 027cb9af
......@@ -60,8 +60,9 @@ class authentication extends \presentation\maarchRM\Presenter\auth\authenticatio
$view->addHeaders();
$view->addContentFile("auth/userAccount/login/form.html");
$view->setSource('nextExecution', date_format($date, 'H:i:s'));
$view->setSource('nextExecution', date_format($date, 'H:i:s'));
$view->setSource('logo', $this->logoUri);
$view->setSource('loginBackground', $this->loginBackground);
$view->translate();
$view->merge();
......
......@@ -18,6 +18,7 @@
<div class="form-group">
<input type="password" placeholder="Password" class="form-control" name="password" id="password" autocomplete="off">
</div>
<a href="#" class="pull-right" id="forgotAccount">Forgot password ?</a>
<br>
<div class="form-group">
<p class="help-block" id="signInMessage"></p>
......@@ -25,7 +26,7 @@
<div id="capslockdiv" style="display: none; color: red;">
Caps Lock On
</div>
<div style="color: red;">
<div style="color: red;">
<p>Ceci est une version de démo de Maarch RM V2.2 (<a href="//cdn.maarch.org/demorm/MaarchRMv2.2_GuideDeVisite_spherePrivee.pdf" target="_blank">Guide de visite</a>)</p>
<p>Le jeu de démo est disponible <a href="//cdn.maarch.org/demorm/ArchiveTransfer_RM.zip" target="_blank">ici</a></p>
<p>Prochaine remise à zéro des données à <?merge nextExecution ?> (Europe / Paris)</p>
......@@ -82,6 +83,16 @@
<span id="loginPasswordNotSame">Passwords are not the same</span>
</div>
</div>
<style>
[?merge loginBackground ?]
.modal {
text-align: center;
padding: 0!important;
}
</style>
<script>
document.onkeydown = function (e) { //check if capslock key was pressed in the whole window
......@@ -234,11 +245,11 @@
return;
}
var parameters = {
userName: userName,
oldPassword: password,
newPassword: $('#newPassword').val(),
requestPath: document.location.pathname,
};
userName: userName,
oldPassword: password,
newPassword: $('#newPassword').val(),
requestPath: document.location.pathname,
};
$.ajax({
type: "PUT",
url: "/user/password",
......
......@@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="shortcut icon" type="image/x-icon" href="[?merge .favicon ?]" />
<meta class="datePicker">
<!--
stylesheets
-->
......@@ -26,19 +27,20 @@
//};
</script>
<!-- Piwik -->
<!-- Matomo -->
<script type="text/javascript">
var paq = paq || [];
/ tracker methods like "setCustomDimension" should be called before "trackPageView" /
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.maarch.com/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '7']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.maarch.com/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '7']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
<title><?merge .title ?> </title>
\ No newline at end of file
<title><?merge .title ?> </title>
<!-- Matomo -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.maarch.com/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '7']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
<div id="wrapper" lang="en">
<?hinclude dashboard/navbar.html ?>
<div id="page-wrapper" style="padding-bottom: 50px;">
<div id="loadingModal" style="display: none">
<span style="z-index:2; background-color: rgba(200,200,200,0.3); position: fixed; height: 100%; width: 100% "></span>
<span style="z-index:2; background-color: rgba(200,200,200,0.3); position: fixed; height: 100%; width: 100% "></span>
<div style="position: fixed; z-index:3; bottom: 50%; right: 42%;">
<i class="fa fa-spinner fa-spin fa-5x" ></i>
</div>
......
Supports Markdown
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