Verified Commit 027cb9af authored by Alexis Ragot's avatar Alexis Ragot
Browse files

v2.2

parent 85c44a5f
......@@ -25,9 +25,9 @@
<div id="capslockdiv" style="display: none; color: red;">
Caps Lock On
</div>
<div style="color: red;">
<p>Ceci est une version de démo de Maarch RM V2.1 (<a href="//maarchrm.com/download/Maarch%20RM%20v2.1%20-%20Guide%20de%20visite%20sphère%20privée.pdf" target="_blank">Guide de visite</a>)</p>
<p>Le jeu de démo est disponible <a href="//maarchrm.com/download/ERCOLANI.zip" target="_blank">ici</a></p>
<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>
<hr/>
<dl class="dl-horizontal">
......@@ -48,6 +48,8 @@
</div>
</div>
<?hinclude auth/userAccount/login/forgotAccount.html ?>
<div class="modal fade" id="changePasswordModal">
<div class="modal-dialog">
<form>
......@@ -232,11 +234,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",
......
......@@ -9,7 +9,8 @@
<!--
stylesheets
-->
<link rel="stylesheet" href="/presentation/css/style.css" />
<!--<link rel="stylesheet" href="/presentation/css/style.css" />-->
<link rel="stylesheet" href="[?merge .css ?]" />
<!--link rel="stylesheet/less" type="text/css" href="/less/dashboard/style.less" /-->
......@@ -19,19 +20,25 @@
<!--jqueryui-->
<!-- script src="/public/js/jQueryUI_1.10.4/jqueryUI.js"></script -->
<!--less-->
<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 -->
<script>
//less = {
// env: "development",
//};
</script>
<!-- Piwik -->
<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>
<title><?merge .title ?> </title>
\ No newline at end of file
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