diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index a7eec9dee0..8e87f7c701 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -46,7 +46,6 @@ body {
margin-bottom: 60px;
}
.footer {
- position: absolute;
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
@@ -8351,10 +8350,6 @@ ul#toolnavbox-two li a.btn {
border-top: none !important;
}
-.page-blank {
- padding: 20px 30px;
-}
-
/* groups social */
.group-tool {
padding: 10px;
@@ -9453,10 +9448,24 @@ ul.dropdown-menu.inner > li > a {
}
.compilation_block .progress {
- margin:0px;
+ margin:0;
width:120px
}
-
+#registration .form_list {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));;
+}
+#registration .form_list .form-group{
+ margin: 10px;
+}
+#registration .form_list > *:nth-child(3n-2):nth-last-of-type(2) {
+ border-color: red;
+ grid-column: span 2;
+}
+#registration .form_list > *:nth-child(3n-1):nth-last-of-type(1) {
+ border-color: red;
+ grid-column: span 2;
+}
/* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) {
.sidebar-scorm {
diff --git a/app/Resources/public/css/themes/chamilo/custompage.css b/app/Resources/public/css/themes/chamilo/custompage.css
new file mode 100644
index 0000000000..b480a87f50
--- /dev/null
+++ b/app/Resources/public/css/themes/chamilo/custompage.css
@@ -0,0 +1,83 @@
+@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap');
+
+:root {
+ --primary-color: #486F88;
+ --success-color: #16D090;
+}
+
+body, html {
+ height: 100%;
+}
+body {
+ margin: 0;
+ line-height: 1.5;
+ color: #212529;
+ background-color: #fff;
+ font-family: 'Lato', sans-serif;
+}
+.custompage .limiter {
+ width: 100%;
+ margin: 0 auto;
+}
+.custompage .container-login {
+ width: 100%;
+ min-height: 100vh;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ align-items: center;
+ padding: 15px;
+ background: #f2f2f2;
+}
+.custompage .wrap-login {
+ background: #fff;
+ border-radius: 10px;
+ padding: 30px 45px;
+ box-shadow: 0 12px 26px rgba(16, 30, 115, 0.06);
+}
+.custompage .width-login{
+ width: 390px;
+}
+.custompage .width-register{
+ width: 690px;
+}
+.custompage h3.title, legend{
+ font-weight: 900;
+ font-size: 24px;
+ color: #486F88;
+ padding: 1rem 0;
+}
+.custompage label{
+ color: #486F88;
+ font-weight: 400;
+}
+.custompage .form-control,
+.custompage .bootstrap-select .dropdown-toggle.btn-default{
+ border: 2px solid #B3C8D7;
+}
+.custompage .last-password{
+ padding: 2.5rem 0;
+ text-align: center;
+}
+.btn-primary {
+ color: #fff;
+ background-color: var(--primary-color);
+ border-color: var(--primary-color);;
+ text-transform: uppercase;
+ font-weight: bold;
+}
+.btn-success {
+ color: #fff;
+ background-color: var(--success-color);
+ border-color: var(--success-color);
+ text-transform: uppercase;
+ font-weight: bold;
+}
+.custompage .software-name{
+ text-align: center;
+ padding: 2rem 0;
+ margin-top: 1rem;
+ display: inline-block;
+ width: 100%;
+ font-size: 12px;
+}
\ No newline at end of file
diff --git a/app/Resources/public/css/themes/chamilo/images/favicon.png b/app/Resources/public/css/themes/chamilo/images/favicon.png
new file mode 100644
index 0000000000..3f6fe71041
Binary files /dev/null and b/app/Resources/public/css/themes/chamilo/images/favicon.png differ
diff --git a/app/Resources/public/css/themes/chamilo/images/header-logo.svg b/app/Resources/public/css/themes/chamilo/images/header-logo.svg
index 4cd18ff19e..4f994191c5 100644
--- a/app/Resources/public/css/themes/chamilo/images/header-logo.svg
+++ b/app/Resources/public/css/themes/chamilo/images/header-logo.svg
@@ -9,14 +9,14 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="245"
- height="68"
- id="svg3184"
+ width="400"
+ height="100"
+ id="svg3034"
version="1.1"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="header-logo.svg">
+ id="defs3036" />
-
-
-
-
-
+ inkscape:window-maximized="1" />
+ id="metadata3039">
@@ -70,80 +48,62 @@
+ transform="translate(0,-952.36218)">
-
+ id="g1506"
+ transform="matrix(0.9888601,0,0,0.9888601,5.0058309,11.465934)">
+ transform="matrix(0.36616743,0,0,0.36616743,-28.877844,687.95782)"
+ id="g1448">
-
-
+ d="m 1058.0129,888.63471 v -22.06134 c 7.2881,0 13.4273,-2.49373 18.4148,-7.67233 4.7963,-5.1796 7.2901,-11.89527 7.2901,-19.95187 0,-8.05861 -2.3006,-14.77227 -7.2901,-19.76174 -4.7943,-4.98747 -10.9336,-7.4812 -18.4148,-7.4812 v -22.44561 c 8.633,0.19114 17.0729,2.3026 24.7472,6.71367 7.8645,4.41307 14.0037,10.55234 18.4168,18.22467 4.4111,7.4842 6.5226,15.73194 6.5226,24.55607 0,9.01827 -2.1105,17.266 -6.5226,25.13247 -4.6052,7.86447 -10.5523,13.8126 -18.2257,18.22467 -7.4812,4.41107 -15.922,6.52254 -24.9383,6.52254 z m 0,-99.37509 v 22.44561 h -0.1931 c -7.2901,0 -13.4294,2.49373 -18.4168,7.4832 -4.7944,5.1796 -7.2881,11.70113 -7.2881,19.75974 0,8.24773 2.4937,14.9634 7.2881,19.95187 4.7963,5.1786 10.9356,7.67233 18.4168,7.67233 0,0 0,0 0.1931,0 v 22.06134 c -0.1931,0 -0.1931,0 -0.3853,0 -13.6204,0 -25.1304,-4.79634 -34.7231,-14.38801 -9.5927,-9.7838 -14.389,-21.48493 -14.389,-35.29753 0,-14.77227 5.3727,-26.85868 16.3083,-36.83561 9.3996,-8.44087 20.3342,-12.85294 32.6127,-12.85294 0.1911,0 0.3833,0 0.5764,0 z m -370.44947,99.18295 v -21.48693 c 7.4812,0 13.61947,-2.68587 18.4158,-7.86447 4.98747,-5.1796 7.48221,-11.89527 7.48221,-20.33614 0,-8.24773 -2.49374,-14.9634 -7.48221,-19.95187 -4.79633,-4.98747 -10.9346,-7.4822 -18.4158,-7.4822 v -21.67807 c 3.83567,0.38427 7.4812,1.34293 10.9346,2.878 4.98747,2.10947 9.59267,5.37173 13.81261,9.59167 v -10.3592 h 23.78753 v 94.57775 h -23.78753 v -10.16707 c -4.60521,4.6052 -9.20741,7.67233 -14.00374,9.59167 -3.26227,1.53606 -6.9078,2.3036 -10.74347,2.68686 z m 72.32428,-96.68821 h 23.78754 v 10.9356 c 4.0278,-4.6052 8.633,-7.86547 13.62047,-9.97594 4.98746,-2.3026 10.3612,-3.4534 16.1152,-3.4534 5.94713,0 11.31887,1.53407 16.1152,4.41207 4.79634,2.878 8.633,7.09794 11.512,12.6618 3.64554,-5.56487 8.43987,-9.7838 13.81261,-12.6618 5.56286,-2.878 11.51,-4.41207 18.03253,-4.41207 6.71567,0 12.6628,1.53407 17.65127,4.79634 5.1796,3.06813 8.82414,7.09793 11.12674,12.27853 2.10846,4.98647 3.26026,13.04607 3.26026,24.36394 v 55.63368 H 881.134 v -48.15148 c 0,-10.74347 -1.34294,-18.03353 -4.0278,-21.67907 -2.68487,-3.64553 -6.71567,-5.56287 -12.0864,-5.56287 -4.0278,0 -7.67334,1.1508 -10.93561,3.45441 -3.26026,2.10846 -5.56286,5.37073 -7.09893,9.39953 -1.7262,4.22194 -2.49374,10.74347 -2.49374,19.75974 v 42.78074 h -23.78753 v -45.84888 c 0,-8.633 -0.76854,-14.77227 -1.91733,-18.4168 -1.34494,-3.83667 -3.26227,-6.52253 -5.75601,-8.44187 -2.49373,-1.7262 -5.37073,-2.68586 -9.01626,-2.68586 -3.83867,0 -7.48421,1.1508 -10.74347,3.4544 -3.07014,2.10846 -5.56487,5.56286 -7.09894,9.7838 -1.7262,4.21993 -2.49373,10.9336 -2.49373,19.95187 v 42.20434 H 759.89071 V 791.75436 Z M 936.9578,752.80929 c 4.22194,0 7.67534,1.53506 10.74347,4.41306 2.877,3.06914 4.41305,6.71367 4.41305,10.9356 0,4.41107 -1.34291,7.86447 -4.41305,10.93461 -2.877,3.06913 -6.52253,4.41206 -10.55033,4.41206 -4.22194,0 -7.86647,-1.53406 -10.9356,-4.6042 -2.879,-2.878 -4.41307,-6.71467 -4.41307,-10.9356 0,-4.22093 1.53407,-7.86547 4.41307,-10.74247 2.878,-3.07012 6.52253,-4.41306 10.74246,-4.41306 z m -11.89326,38.94507 h 23.78753 v 94.57775 h -23.78753 z m 42.77972,-36.64348 h 23.78953 v 131.22023 h -23.78953 z m -451.02252,25.89901 -17.07387,16.30733 c -11.70214,-12.27853 -24.74721,-18.4168 -39.13521,-18.4168 -12.27853,0 -22.63774,4.22094 -30.88647,12.46967 -8.44187,8.44187 -12.6618,18.60894 -12.6618,30.69534 0,8.633 1.91833,16.1152 5.56387,22.82787 3.64553,6.52453 9.01726,11.70313 15.73193,15.5398 6.9058,3.83567 14.388,5.56187 22.63674,5.56187 7.09893,0 13.62047,-1.1488 19.37647,-3.83567 5.94613,-2.68587 12.46967,-7.4822 19.37547,-14.387 l 16.49847,17.07387 c -9.40054,9.39953 -18.41681,15.73194 -26.85867,19.37647 -8.24874,3.4514 -17.84141,5.1796 -28.77601,5.1796 -19.75973,0 -36.06707,-6.13927 -48.92101,-18.80207 -12.6618,-12.6608 -18.9922,-28.775 -18.9922,-48.53474 0,-12.6618 2.877,-23.98067 8.82514,-33.95661 5.755,-9.7838 14.00373,-17.8414 24.7472,-23.78753 10.74247,-6.13927 22.25347,-9.20941 34.72314,-9.20941 10.55133,0 20.7194,2.30261 30.5032,6.71467 9.7848,4.6042 18.22467,10.9346 25.32361,19.18334 z m 170.74169,8.633 v 21.67807 h -0.19113 c -7.4822,0 -13.42934,2.49473 -18.4168,7.4822 -4.79634,5.1796 -7.29007,11.89527 -7.29007,19.95187 0,8.24974 2.49373,14.9634 7.4822,20.33614 4.98747,5.1786 11.12673,7.86447 18.22567,7.86447 0.19113,0 0.19113,0 0.19113,0 v 21.48693 c -1.34293,0.19114 -2.877,0.19114 -4.41106,0.19114 -12.27854,0 -22.82987,-4.60521 -31.84714,-14.19687 -8.82414,-9.39954 -13.23821,-21.29381 -13.23821,-35.29754 0,-14.58014 4.21994,-26.47541 12.85294,-35.87594 8.633,-9.2074 19.18534,-14.00374 31.46387,-14.00374 1.91633,0 3.4524,0.19214 5.1786,0.38327 z M 535.62181,755.11088 h 23.5974 v 46.23515 c 4.6052,-4.02881 9.40154,-7.09894 14.00374,-9.01727 4.79633,-2.10947 9.40153,-3.06914 14.19787,-3.06914 9.2074,0 17.266,3.26127 23.5964,9.7838 5.56487,5.56287 8.24973,14.00574 8.24973,24.74721 v 62.54048 h -23.40527 v -41.62995 c 0,-10.9356 -0.38526,-18.4168 -1.53606,-22.25347 -0.95767,-3.83666 -2.877,-6.52253 -5.17961,-8.44186 -2.49373,-1.91834 -5.56286,-2.877 -9.2074,-2.877 -4.98746,0 -9.01827,1.53506 -12.46966,4.79633 -3.45341,2.877 -5.94714,7.29007 -7.29007,12.85294 -0.5764,2.879 -0.95967,9.2094 -0.95967,19.37647 v 38.17553 h -23.5974 z" />
+ d="m 1094.6911,953.87671 v -3.1068 0 c 1.9421,0 3.4945,-0.38784 5.047,-1.35897 1.5544,-0.97113 2.72,-2.3301 3.4946,-4.07591 h 3.4946 c -0.971,2.71795 -2.7179,4.85362 -4.6602,6.40601 -2.1335,1.35897 -4.4637,2.13567 -7.1817,2.13567 z m 0,-12.03734 v -2.71794 h 9.3194 c -0.5833,-2.71795 -1.5524,-4.85362 -3.3013,-6.2126 -1.5524,-1.35897 -3.4946,-2.13567 -6.0181,-2.13567 v -3.10478 c 0.1954,0 0.1954,0 0.1954,0 3.8825,0 6.7938,1.35898 9.124,3.88249 2.33,2.52352 3.689,6.01614 3.689,10.09509 v 0.19341 z m 0,-14.17099 v 3.10478 h -0.1935 c -2.3301,0 -4.4638,0.77771 -6.0182,2.13567 -1.7467,1.55239 -2.7179,3.68908 -3.1048,6.2126 h 9.3174 v 2.71794 h -9.5118 c 0.1934,2.71795 1.1645,4.85362 2.9114,6.40601 1.7488,1.74682 4.0759,2.52352 6.6004,2.52352 v 3.1068 c -3.4926,0 -6.6004,-1.361 -8.9295,-3.88451 -2.5236,-2.52352 -3.8825,-5.62931 -3.8825,-9.12396 0,-3.88249 1.3589,-6.98727 3.6891,-9.5118 2.5214,-2.32807 5.4328,-3.49262 9.122,-3.68705 z m -40.5738,26.20833 v -2.91338 c 0.1934,0 0.1934,0 0.1934,0 2.5236,0 4.6603,-1.16455 6.6005,-3.10478 1.7488,-1.94226 2.72,-4.46578 2.72,-7.18372 0,-2.71795 -0.9712,-5.04704 -2.72,-6.9893 -1.9402,-1.94023 -4.0759,-2.91136 -6.6005,-2.91136 0,0 0,0 -0.1934,0 v -2.91136 c 0.1934,0 0.1934,0 0.3879,0 1.9422,0 3.4946,0.38785 5.2414,1.16455 1.5545,0.77568 2.9134,1.94023 3.8825,3.2992 v -3.88249 h 3.1068 v 24.65594 h -3.1068 v -3.88249 c -0.9691,1.55239 -2.328,2.52352 -4.0759,3.49465 -1.5524,0.77569 -3.4946,1.16252 -5.4349,1.16252 v 0 0.002 z m 20.7735,-0.77771 h -3.1068 v -24.65594 h 2.9113 v 2.91136 c 0.7778,-1.16252 1.7489,-1.94023 2.5236,-2.52352 0.9711,-0.58126 2.1356,-0.77569 3.3012,-0.77569 v 3.49465 c -1.9402,0.19342 -3.4947,0.77569 -4.2703,1.74682 -0.7778,0.97113 -1.359,2.71794 -1.359,4.85362 z m -20.7735,-25.23619 v 2.91136 c -2.5235,0 -4.6602,0.97113 -6.6004,2.91136 -1.7488,1.94226 -2.72,4.46578 -2.72,7.37714 0,2.71795 0.9712,5.04704 2.72,6.9893 1.9402,1.94023 4.0759,2.71794 6.6004,2.91136 v 2.91338 0 c -3.4946,0 -6.6004,-1.36099 -8.9295,-3.68907 -2.5235,-2.52352 -3.6891,-5.63133 -3.6891,-9.3194 0,-3.68806 1.1646,-6.79385 3.6891,-9.31737 2.3301,-2.3301 5.4349,-3.68806 8.9295,-3.68806 z m -46.0096,3.68806 v -2.91338 l 8.3483,24.46151 h 1.9402 l 5.8247,-18.83119 5.8248,18.83119 h 2.1336 l 8.3483,-24.65594 h -3.4946 l -6.0182,18.44335 -5.6293,-18.44335 h -2.3301 l -5.6293,18.44335 -6.0182,-18.44335 h -3.3012 v 0 3.10781 0 0 z m 0,-2.91338 v 2.91338 h -4.6603 V 953.099 h -3.1047 v -21.54813 h -4.66024 v -3.1068 h 4.66024 v -7.9584 h 3.1047 v 7.9584 h 4.6603 v 0 z m -39.21483,25.23922 v -3.1068 c 0,0 0,0 0.19342,0 2.52352,0 4.85362,-0.97113 6.60044,-2.91136 1.74681,-1.74884 2.71794,-4.27236 2.71794,-7.18372 0,-2.91136 -0.97113,-5.24147 -2.71794,-7.18372 -1.74682,-1.74682 -4.07591,-2.71795 -6.79386,-2.71795 v -3.10478 c 3.49263,0 6.60044,1.35898 9.12396,3.68705 2.52352,2.52352 3.68907,5.63134 3.68907,9.12598 0,3.68908 -1.16454,6.79385 -3.68907,9.5118 -2.52352,2.52352 -5.43488,3.88452 -8.92953,3.88452 -0.19443,-0.001 -0.19443,-0.001 -0.19443,-0.001 z m 20.96485,-0.77771 h -3.10478 v -21.938 h -3.30123 v -2.71794 h 3.30123 v -0.77569 c 0,-2.52554 0.58126,-4.46578 1.94023,-5.82475 1.361,-1.16454 3.30123,-1.74884 6.01817,-1.74884 h 0.38986 v 2.71997 c -1.94225,0 -3.30123,0.38784 -4.07793,1.16455 -0.77568,0.77568 -1.16454,1.94023 -1.16454,3.68907 v 0.77569 h 5.24349 v 2.71794 h -5.24349 v 21.938 z m -20.96485,-25.43062 v 3.10478 h -0.19544 c -2.52351,0 -4.65818,0.97113 -6.40601,2.71795 -1.94023,1.94225 -2.71794,4.46577 -2.71794,7.18372 0,2.91136 0.77771,5.43488 2.71794,7.18372 1.74885,1.94023 3.8825,2.91136 6.60247,2.91136 v 3.1068 c -3.49465,0 -6.60247,-1.36099 -8.93155,-3.88451 -2.52352,-2.52352 -3.8825,-5.62931 -3.8825,-9.12396 0,-3.68907 1.35898,-6.79385 3.8825,-9.31737 2.52351,-2.71997 5.4369,-3.88249 8.73611,-3.88249 0.19442,0 0.19442,0 0.19442,0 z m -81.53836,26.20833 v -3.1068 0 c 2.71795,0 4.85362,-0.97113 6.79588,-2.91136 1.74682,-1.74884 2.52352,-4.27236 2.52352,-7.18372 0,-2.91136 -0.77771,-5.24147 -2.71795,-7.18372 -1.74884,-1.74682 -3.88451,-2.71795 -6.60246,-2.71795 v -3.10478 c 3.49465,0 6.40601,1.35898 8.92953,3.68705 2.52351,2.52352 3.88451,5.63134 3.88451,9.12598 0,3.68908 -1.361,6.79385 -3.68907,9.5118 -2.52149,2.52251 -5.6283,3.8835 -9.12396,3.8835 z m 16.5011,-25.43264 h 3.1068 v 2.71795 c 0.97113,-0.96911 2.13567,-1.94024 3.30123,-2.52352 1.35897,-0.38784 2.71795,-0.77569 4.46375,-0.77569 1.74884,0 3.49465,0.38785 4.85362,0.9691 1.35897,0.77772 2.52352,1.74885 3.30123,2.91339 0.58126,0.97113 0.9691,1.94023 1.35897,3.29921 0.19342,1.16454 0.38785,2.91338 0.38785,5.24349 v 12.81201 h -3.30123 v -13.78416 c 0,-2.91136 -0.58126,-5.04703 -1.55239,-6.406 -1.16455,-1.35898 -2.91136,-1.94226 -5.43488,-1.94226 -1.35897,0 -2.71795,0.19341 -3.68908,0.77771 -1.16454,0.58126 -1.94225,1.55239 -2.71794,2.52352 -0.38987,0.77569 -0.58329,1.55239 -0.77772,2.3301 -0.19341,0.96911 -0.19341,2.3301 -0.19341,4.46375 v 12.03734 h -3.1068 z m 31.06195,15.33554 h 3.1068 c 0,2.13567 0.58126,3.68907 1.55239,4.85361 1.16454,1.16455 2.52352,1.74885 4.27236,1.74885 1.94023,0 3.49262,-0.58329 4.65818,-1.74885 1.16553,-1.16555 1.74882,-2.71794 1.74882,-4.85361 0,-2.91137 -2.33008,-5.24147 -6.98927,-6.79386 -0.38785,0 -0.58126,-0.19341 -0.77772,-0.19341 -2.52352,-0.77772 -4.0759,-1.94226 -5.24146,-3.10681 -0.97113,-1.35897 -1.55239,-2.91136 -1.55239,-5.04703 0,-2.52352 0.77771,-4.65818 2.52352,-6.40601 1.55239,-1.55239 3.68907,-2.52352 6.21259,-2.52352 2.52352,0 4.46578,0.77772 5.82473,2.33011 1.55239,1.55238 2.3301,3.68907 2.52352,6.406 h -3.10681 c -0.19341,-1.74681 -0.77566,-3.10477 -1.55237,-4.0759 -0.97112,-0.97113 -2.13567,-1.55239 -3.68907,-1.55239 -1.5534,0 -2.91136,0.58126 -3.88249,1.55239 -1.16455,1.16454 -1.55239,2.52351 -1.55239,4.0759 0,0.97113 0,1.55239 0.38784,2.33011 0.38785,0.58328 0.77772,1.16454 1.55239,1.55238 0.58329,0.58329 1.94226,1.16455 3.88249,1.74885 1.16455,0.38784 1.94226,0.77568 2.52352,0.9691 2.13566,0.77771 3.68906,1.74884 4.66019,3.1068 0.97112,1.35796 1.35897,2.91136 1.35897,5.04704 0,3.30123 -0.77569,5.82475 -2.52352,7.76498 -1.7468,1.94226 -4.07589,2.91339 -6.98725,2.91339 -2.52554,0 -4.85362,-0.97113 -6.40803,-2.71997 -1.74682,-1.94024 -2.52352,-4.27034 -2.52352,-7.37512 v -0.003 z m -47.56305,-16.11123 v 3.10478 c -0.19341,0 -0.19341,0 -0.19341,0 -2.52352,0 -4.85362,0.97113 -6.60044,2.71795 -1.74884,1.94225 -2.71794,4.46577 -2.71794,7.18372 0,2.91136 0.9691,5.43488 2.71794,7.18372 1.94023,1.94023 4.07591,2.91136 6.79385,2.91136 v 3.1068 c -3.68907,0 -6.60043,-1.36099 -9.12395,-3.88451 -2.52352,-2.52352 -3.68908,-5.62931 -3.68908,-9.12396 0,-3.68907 1.16455,-6.79385 3.68908,-9.31737 2.52352,-2.71997 5.43488,-3.88249 8.92953,-3.88249 10e-4,0 10e-4,0 0.19442,0 z m -49.89213,26.20833 v -2.91338 0 c 2.52352,0 4.66021,-1.16455 6.60246,-3.10478 1.74682,-1.94226 2.71795,-4.46578 2.71795,-7.18372 0,-2.71795 -0.97113,-5.04704 -2.71795,-6.9893 -1.94225,-1.94023 -4.07793,-2.91136 -6.60246,-2.91136 v 0 -2.91136 c 0,0 0,0 0.19342,0 1.94226,0 3.68907,0.38785 5.24349,1.16455 1.55239,0.77568 2.91136,1.94023 3.88249,3.2992 v -3.88249 h 3.10477 v 24.65594 h -3.10477 v -3.88249 c -0.97113,1.55239 -2.3301,2.52352 -3.88249,3.49465 -1.74885,0.77569 -3.49465,1.16252 -5.43691,1.16252 v 0 z m 19.6079,-0.77771 v -21.54813 h -4.66021 v -3.1068 h 4.66021 v -7.9584 h 3.30123 v 7.9584 h 4.65818 v 3.1068 h -4.65818 V 953.099 Z m 13.78415,-27.56629 h -3.30123 v -5.04704 h 3.30123 z M 867.5532,953.099 v -24.65594 h 3.30123 V 953.099 Z m -30.09082,-25.23619 v 2.91136 c -2.71794,0 -4.85362,0.97113 -6.79385,2.91136 -1.74884,1.94226 -2.71795,4.46578 -2.71795,7.37714 0,2.71795 0.96911,5.04704 2.71795,6.9893 1.94023,1.94023 4.07591,2.71794 6.79385,2.91136 v 2.91338 h -0.19341 c -3.49465,0 -6.60044,-1.36099 -8.92953,-3.68907 -2.52352,-2.52352 -3.68907,-5.63133 -3.68907,-9.3194 0,-3.68806 1.16454,-6.79385 3.68907,-9.31737 2.32909,-2.3301 5.43387,-3.68806 9.12294,-3.68806 z m -39.60363,26.0139 v -3.1068 0 c 2.71997,0 4.85362,-0.97113 6.79588,-2.91136 1.74681,-1.74884 2.71794,-4.27236 2.71794,-7.18372 0,-2.91136 -0.97113,-5.24147 -2.71794,-7.18372 -1.94226,-1.74682 -4.07591,-2.71795 -6.79588,-2.71795 v -3.10478 c 3.49465,0 6.40803,1.35898 8.93155,3.68705 2.52352,2.52352 3.88249,5.63134 3.88249,9.12598 0,3.68908 -1.35897,6.79385 -3.68907,9.5118 -2.52352,2.52251 -5.63032,3.8835 -9.12497,3.8835 z m 19.60789,-0.77771 h -3.10477 v -24.65594 h 2.91136 v 2.91136 c 0.7777,-1.16252 1.7468,-1.94023 2.52351,-2.52352 0.97113,-0.58126 2.13567,-0.77569 3.30124,-0.77569 v 3.49465 c -1.94227,0.19342 -3.30124,0.77569 -4.27237,1.74682 -0.77569,0.97113 -1.35898,2.71794 -1.35898,4.85362 z m -19.60688,-25.43062 v 3.10478 h -0.19544 c -2.52352,0 -4.65818,0.97113 -6.60044,2.71795 -1.74681,1.94225 -2.71794,4.46577 -2.71794,7.18372 0,2.91136 0.97113,5.43488 2.71794,7.18372 1.94226,1.94023 4.07591,2.91136 6.79588,2.91136 v 3.1068 c -3.49464,0 -6.60246,-1.36099 -9.12598,-3.88451 -2.3301,-2.52352 -3.68907,-5.62931 -3.68907,-9.12396 0,-3.68907 1.35897,-6.79385 3.68907,-9.31737 2.52351,-2.71997 5.43691,-3.88249 8.92953,-3.88249 z m -27.95616,26.20833 v -2.91338 c 2.52352,-0.19342 4.66021,-1.16455 6.60044,-3.10478 1.74884,-1.94226 2.71997,-4.27236 2.71997,-7.18372 0,-2.71795 -0.97113,-5.04704 -2.71997,-6.9893 -1.94023,-1.94023 -4.07591,-2.91136 -6.60044,-2.91136 v -2.91136 h 0.19342 c 3.49464,0 6.40601,1.16455 8.92952,3.68908 2.3301,2.52351 3.49465,5.6293 3.49465,9.31737 0,3.68806 -1.16455,6.79587 -3.68908,9.12395 -2.32807,2.52251 -5.43386,3.8835 -8.92851,3.8835 z m 0,-26.0139 v 2.91136 c 0,0 0,0 -0.19341,0 -2.52352,0 -4.66021,0.97113 -6.60044,3.10681 -1.74884,1.94023 -2.71997,4.27033 -2.71997,7.18169 0,2.71795 0.97113,4.85362 2.91338,6.79588 1.74682,2.13365 3.8825,3.10478 6.40601,3.10478 0,0 0,0 0.19342,0 v 2.91338 c -0.19342,0 -0.19342,0 -0.19342,0 -1.94226,0 -3.49464,-0.38987 -5.04703,-1.16454 -1.55239,-0.77771 -2.91136,-1.74884 -4.27236,-3.30123 v 3.68907 H 757.285 v -32.61434 h 3.10478 v 10.2885 1.74682 c 1.361,-1.55239 2.91338,-2.71795 4.46577,-3.49262 1.5534,-0.77873 3.10782,-1.16556 5.04805,-1.16556 z m -30.09082,26.0139 v -2.91338 0 c 2.52352,0 4.85362,-1.16455 6.60044,-3.10478 1.94225,-1.94226 2.91338,-4.46578 2.91338,-7.18372 0,-2.71795 -0.97113,-5.04704 -2.91338,-6.9893 -1.74682,-1.94023 -4.07591,-2.91136 -6.40601,-2.91136 h -0.19443 v -2.91136 h 0.19342 c 1.94224,0 3.68907,0.38785 5.24145,1.16455 1.55441,0.77568 2.9134,1.94023 4.07794,3.2992 v -3.88249 h 3.10478 v 24.65594 h -3.10478 v -3.88249 c -0.97113,1.55239 -2.3301,2.52352 -4.07794,3.49465 -1.74681,0.77569 -3.49261,1.16252 -5.43488,1.16252 z m 0,-26.0139 v 2.91136 c -2.52352,0 -4.85362,0.97113 -6.60044,2.91136 -1.94226,1.94226 -2.91338,4.46578 -2.91338,7.37714 0,2.71795 0.97112,5.04704 2.91338,6.9893 1.74681,1.94023 4.07591,2.71794 6.60044,2.91136 v 2.91338 0 c -3.68908,0 -6.60044,-1.36099 -9.12395,-3.68907 -2.33011,-2.52352 -3.68908,-5.63133 -3.68908,-9.3194 0,-3.68806 1.35897,-6.79385 3.68908,-9.31737 2.52453,-2.3301 5.43589,-3.68806 9.12395,-3.68806 z m -44.65168,26.0139 v -3.1068 0 c 2.71794,0 4.85362,-0.97113 6.60044,-2.91136 1.94225,-1.74884 2.71997,-4.27236 2.71997,-7.18372 0,-2.91136 -0.77772,-5.24147 -2.71997,-7.18372 -1.74682,-1.74682 -3.8825,-2.71795 -6.60044,-2.71795 v -3.10478 c 3.49465,0 6.40601,1.35898 8.92952,3.68705 2.52352,2.52352 3.8825,5.63134 3.8825,9.12598 0,3.68908 -1.35898,6.79385 -3.8825,9.5118 -2.32908,2.52251 -5.43386,3.8835 -8.92952,3.8835 z m 16.50109,-0.77771 v -32.61434 h 3.1068 V 953.099 Z m 8.34928,0 v -32.61434 h 3.1068 V 953.099 Z M 695.1611,927.66838 v 3.10478 c -0.19342,0 -0.19342,0 -0.19342,0 -2.52351,0 -4.8526,0.97113 -6.59942,2.71795 -1.74884,1.94225 -2.71795,4.46577 -2.71795,7.18372 0,2.91136 0.96911,5.43488 2.71795,7.18372 1.74682,1.94023 4.07591,2.91136 6.79284,2.91136 v 3.1068 c -3.68908,0 -6.59943,-1.36099 -9.12294,-3.88451 -2.52352,-2.52352 -3.68807,-5.62931 -3.68807,-9.12396 0,-3.68907 1.16454,-6.79385 3.68807,-9.31737 2.52351,-2.71997 5.43488,-3.88249 8.92952,-3.88249 0,0 0,0 0.19342,0 z m -74.15719,26.20833 v -3.30123 c 1.35897,-0.19341 2.52351,-0.58328 3.49464,-1.35897 1.16454,-0.97113 2.32808,-2.3301 3.49262,-4.46578 l -6.98726,-6.406 v -5.24147 c 1.55238,-0.77771 2.52351,-1.35897 3.2992,-2.3301 0.77772,-0.97113 1.16455,-2.13567 1.16455,-3.49465 0,-1.16454 -0.38785,-2.3301 -1.16455,-3.10477 -0.9691,-0.97113 -1.94023,-1.35898 -3.10478,-1.35898 0,0 0,0 -0.19341,0 v -3.1068 c 0.19341,0 0.19341,0 0.38784,0 1.94226,0 3.68908,0.77771 5.24147,2.3301 1.55441,1.55239 2.3301,3.30123 2.3301,5.43488 0,1.74884 -0.58126,3.1068 -1.74682,4.66021 -0.97113,1.35897 -2.52352,2.3301 -4.6602,3.30123 l 6.79588,6.21259 3.68705,-10.29052 h 3.68907 l -5.04704,12.42518 7.37714,6.79588 -2.13365,2.3301 -6.60246,-6.01816 c -0.9691,2.3301 -2.3301,3.88249 -4.0759,5.24146 -1.55239,0.97113 -3.30124,1.55239 -5.24147,1.74682 v 0 -0.001 z m 54.5503,-25.0448 c -1.35897,-1.94023 -3.10478,-3.49262 -4.85159,-4.46375 -1.74884,-0.97112 -3.88451,-1.35897 -6.21259,-1.35897 -3.68908,0 -6.79588,1.35897 -9.3194,3.88249 -2.71794,2.71795 -3.88249,6.01817 -3.88249,9.70724 0,4.07591 1.16455,7.37714 3.88249,10.09508 2.52352,2.71795 5.63134,4.07591 9.3194,4.07591 2.32808,0 4.27032,-0.58126 6.21259,-1.55239 1.74681,-0.77771 3.29921,-2.3301 4.65818,-4.0759 h 3.88249 c -1.55239,2.71794 -3.49262,4.85159 -6.01614,6.406 -2.52351,1.55239 -5.4369,2.33011 -8.54269,2.33011 -4.85362,0 -8.73611,-1.74885 -12.03734,-5.04906 -3.30123,-3.29921 -4.85362,-7.37512 -4.85362,-12.22874 0,-2.3301 0.38987,-4.46577 1.35897,-6.60246 0.77771,-1.94023 2.13567,-3.88249 3.88249,-5.43488 1.55441,-1.55239 3.30123,-2.91136 5.24349,-3.68907 1.94023,-0.77772 4.07591,-1.16455 6.21258,-1.16455 3.29922,0 6.2126,0.77772 8.92953,2.33011 2.52352,1.74681 4.66021,3.88249 6.01816,6.79385 h -3.88451 z m -54.5503,-9.12395 v 3.1068 c -1.16455,0 -2.33011,0.38785 -3.10681,1.35898 -0.77568,0.77568 -1.16454,1.94023 -1.16454,3.2992 0,0.97113 0.19341,1.94226 0.7777,2.91339 0.58127,0.77569 1.55239,1.74682 2.91136,2.91136 0.19342,0 0.38987,-0.19342 0.58329,-0.19342 v 5.24147 l -1.74884,-1.55239 c -1.55238,0.77771 -2.91135,1.74682 -3.68907,2.91136 -0.7757,1.35897 -1.35897,2.71795 -1.35897,4.27236 0,1.94023 0.58327,3.49262 1.74883,4.85362 1.35897,1.16252 2.71795,1.74682 4.65818,1.74682 0.19544,0 0.38987,0 0.38987,0 v 3.30123 c -0.19341,0 -0.38987,0 -0.58329,0 -2.71794,0 -4.85362,-0.97113 -6.79385,-2.91339 -1.74884,-1.94023 -2.71794,-4.27033 -2.71794,-6.98727 0,-1.94225 0.58126,-3.88249 1.55238,-5.4369 1.16455,-1.74682 2.71795,-3.10478 4.66021,-3.88249 -1.55442,-1.35897 -2.52352,-2.52352 -2.91339,-3.49465 -0.58126,-1.16454 -0.9691,-2.32807 -0.9691,-3.68907 0,-2.13365 0.77569,-3.88249 2.32807,-5.43488 1.55341,-1.361 3.29921,-2.13871 5.43591,-2.33213 z m -34.3632,43.09828 v -3.1068 0 c 2.71795,0 5.04705,-0.77569 6.79588,-2.71795 1.74682,-1.94226 2.52352,-4.46577 2.52352,-7.57156 v -0.58329 c -1.16454,1.55441 -2.52352,2.91339 -4.07793,3.68908 -1.55239,0.77771 -3.29921,1.16454 -5.04704,1.16454 -0.19341,0 -0.19341,0 -0.19341,0 v -2.91136 0 c 2.3301,0 4.6602,-0.97113 6.40601,-2.91136 1.94225,-1.94226 2.91338,-4.27236 2.91338,-6.9893 0,-2.71693 -0.97113,-5.24146 -2.91338,-7.18372 -1.74682,-1.94023 -3.88249,-2.91136 -6.40601,-2.91136 v 0 -2.91136 c 1.94226,0 3.68907,0.38784 5.24146,1.16454 1.55442,0.58126 2.91339,1.94024 4.07793,3.49262 v -4.0759 h 3.10478 v 20.57902 c 0,4.46375 -1.16454,7.76498 -3.29921,10.09509 -2.13567,2.52351 -5.04906,3.68907 -8.93155,3.68907 z m 0,-34.94343 v 2.91136 c -2.71794,0 -4.6602,0.97113 -6.40599,2.71795 -1.94024,1.94226 -2.91137,4.27236 -2.91137,7.18372 0,2.71795 0.97113,5.24146 2.91137,7.18372 1.74884,1.94023 3.68907,2.91136 6.40599,2.91136 v 2.91137 c -3.49464,0 -6.60042,-1.16455 -8.92952,-3.68908 -2.52351,-2.52352 -3.68908,-5.62931 -3.68908,-9.31737 0,-3.68806 1.16455,-6.60044 3.68908,-9.12395 2.3301,-2.52352 5.43488,-3.68908 8.73612,-3.68908 0,0 0,0 0.1934,0 z m 0,31.83663 v 3.1068 c -2.71794,0 -4.85361,-0.77771 -6.79385,-1.94226 -2.13567,-1.55239 -3.30123,-3.30123 -3.88248,-5.62931 h 3.68907 c 0.38784,1.35898 1.35897,2.52352 2.52351,3.29921 1.35898,0.77771 2.52352,1.16556 4.46375,1.16556 z m -100.17413,-5.82273 v -2.91338 0 c 2.52353,0 4.66022,-1.16455 6.60145,-3.10478 1.94126,-1.94226 2.71795,-4.46578 2.71795,-7.18372 0,-2.71795 -0.7767,-5.04704 -2.71795,-6.9893 -1.94123,-1.94023 -4.07691,-2.91136 -6.406,-2.91136 -0.19443,0 -0.19443,0 -0.19443,0 v -2.91136 h 0.19443 c 1.94125,0 3.68908,0.38785 5.24147,1.16455 1.5534,0.77568 2.91237,1.94023 3.88249,3.2992 v -3.88249 h 3.10579 v 24.65594 h -3.10579 v -3.88249 c -0.97012,1.55239 -2.32909,2.52352 -3.88249,3.49465 -1.74784,0.77569 -3.49365,1.16252 -5.4359,1.16252 v 0 0.002 z m 20.77346,-0.77771 h -3.30123 v -24.65594 h 3.10579 v 2.91136 c 0.77772,-1.16252 1.5534,-1.94023 2.52352,-2.52352 0.77771,-0.58126 1.94226,-0.77569 3.10579,-0.77569 v 3.49465 c -1.94125,0.19342 -3.30022,0.77569 -4.27033,1.74682 -0.77772,0.97113 -1.16455,2.71794 -1.16455,4.85362 v 14.9487 z m 8.34726,-24.65493 h 3.10578 v 2.71795 c 0.97114,-0.96911 1.94124,-1.94024 3.30022,-2.52352 1.35998,-0.38784 2.71895,-0.77569 4.46577,-0.77569 1.74682,0 3.30022,0.38785 4.85261,0.9691 1.35998,0.77772 2.52352,1.74885 3.30124,2.91339 0.58227,0.97113 0.97011,1.94023 1.16353,3.29921 0.38886,1.16454 0.38886,2.91338 0.38886,5.24349 v 12.81201 h -3.10579 v -13.78416 c 0,-2.91136 -0.58227,-5.04703 -1.55239,-6.406 -1.16455,-1.35898 -2.91238,-1.94226 -5.43589,-1.94226 -1.5534,0 -2.71795,0.19341 -3.88249,0.77771 -0.97113,0.58126 -1.94125,1.55239 -2.52352,2.52352 -0.38886,0.77569 -0.58227,1.55239 -0.77771,2.3301 -0.19342,0.96911 -0.19342,2.3301 -0.19342,4.46375 v 12.03734 h -3.10579 v -24.65594 z m 28.92526,-2.91136 h -3.10478 v -5.04704 h 3.10478 z m -3.10478,27.56629 v -24.65594 h 3.10478 V 953.099 Z m 8.15485,-24.65493 h 3.10478 v 2.71795 c 0.97113,-0.96911 2.13567,-1.94024 3.49464,-2.52352 1.16454,-0.38784 2.71795,-0.77569 4.27033,-0.77569 1.94226,0 3.49465,0.38785 4.85362,0.9691 1.55239,0.77772 2.52352,1.74885 3.49465,2.91339 0.58126,0.97113 0.97113,1.94023 1.16454,3.29921 0.19342,1.16454 0.38785,2.91338 0.38785,5.24349 v 12.81201 h -3.10478 v -13.78416 c 0,-2.91136 -0.58328,-5.04703 -1.74884,-6.406 -1.16556,-1.35898 -2.91136,-1.94226 -5.43488,-1.94226 -1.35897,0 -2.52352,0.19341 -3.68908,0.77771 -1.16454,0.58126 -1.94225,1.55239 -2.52351,2.52352 -0.38785,0.77569 -0.77772,1.55239 -0.97113,2.3301 0,0.96911 -0.19342,2.3301 -0.19342,4.46375 v 12.03734 h -3.10478 z m -63.09605,-0.58126 v 2.91136 c -2.71794,0 -4.85261,0.97113 -6.60043,2.91136 -1.94125,1.94226 -2.91238,4.46578 -2.91238,7.37714 0,2.71795 0.97114,5.04704 2.91238,6.9893 1.74782,1.94023 3.88249,2.71794 6.60043,2.91136 v 2.91338 0 c -3.68806,0 -6.79385,-1.36099 -9.12394,-3.68907 -2.52353,-2.52352 -3.68908,-5.63133 -3.68908,-9.3194 0,-3.68806 1.35898,-6.79385 3.68908,-9.31737 2.52453,-2.3301 5.43689,-3.68806 9.12394,-3.68806 z m -27.95413,26.0139 v -3.1068 0 c 1.74681,0 3.49363,-0.38784 5.04703,-1.35897 1.35897,-0.97113 2.52353,-2.3301 3.30023,-4.07591 h 3.68907 c -1.16455,2.71795 -2.71794,4.85362 -4.85361,6.40601 -2.13467,1.35897 -4.46477,2.13365 -7.18271,2.13365 v 0 0 z m 0,-12.03734 v -2.71794 h 9.31838 c -0.58227,-2.71997 -1.74783,-4.85362 -3.30123,-6.2126 -1.55239,-1.35897 -3.68907,-2.13567 -6.01715,-2.13567 v -3.1068 c 0,0 0,0 0.19341,0 3.68908,0 6.79487,1.361 9.12497,3.88451 2.32909,2.52352 3.49363,6.01614 3.49363,10.09509 v 0.19341 z m -62.51276,-6.79588 h 13.78416 v 3.30124 h -13.78416 v 11.64747 h 13.78416 v 3.1068 h -17.08437 v -32.61434 h 17.08438 v 3.10478 H 395.9997 Z m 62.51276,-7.37511 v 3.10478 c -0.19443,0 -0.19443,0 -0.38886,0 -2.3301,0 -4.27135,0.77771 -6.01816,2.13567 -1.74682,1.55239 -2.71795,3.68908 -3.10579,6.2126 h 9.51382 v 2.71794 h -9.51382 c 0.19442,2.71795 1.16454,4.85362 2.91237,6.40601 1.74783,1.74682 3.88249,2.52352 6.60145,2.52352 v 3.1068 c -3.68908,0 -6.60145,-1.361 -9.12497,-3.88451 -2.52352,-2.52352 -3.68907,-5.62931 -3.68907,-9.12396 0,-3.88249 1.16454,-6.98727 3.68907,-9.51382 2.32909,-2.32605 5.43488,-3.4906 9.12396,-3.68503 z m -33.78091,11.64747 v 2.91137 h -10.67736 v -2.91137 z m 19.99675,13.78315 h -14.75428 v -32.61434 h 3.1058 v 29.50754 h 11.64848 z" />
+ transform="matrix(5.4922993,0,0,5.4922993,11.080492,-581.35219)"
+ id="g1073">
-
-
+ sodipodi:nodetypes="cccccccccscssccccccccccccccccccccccccccccccccccccccccssccccccscsccsss" />
+
+
+ sodipodi:nodetypes="sssssssss"
+ id="path2958"
+ style="fill:#aad400;stroke-width:0.05782014" />
+
-
-
diff --git a/custompages/index-unlogged-dist.php b/custompages/index-unlogged-dist.php
index 6ced6fb27b..656e501346 100644
--- a/custompages/index-unlogged-dist.php
+++ b/custompages/index-unlogged-dist.php
@@ -8,6 +8,9 @@
require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
require_once __DIR__.'/language.php';
+
+$template = new Template(get_lang('SignIn'),false,false,false,false,true,true);
+
/**
* Homemade micro-controller.
*/
@@ -15,107 +18,42 @@ if (isset($_GET['loginFailed'])) {
if (isset($_GET['error'])) {
switch ($_GET['error']) {
case 'account_expired':
- $error_message = custompages_get_lang('AccountExpired');
+ $error_message = get_lang('AccountExpired');
break;
case 'account_inactive':
- $error_message = custompages_get_lang('AccountInactive');
+ $error_message = get_lang('AccountInactive');
break;
case 'user_password_incorrect':
- $error_message = custompages_get_lang('InvalidId');
+ $error_message = get_lang('InvalidId');
break;
case 'access_url_inactive':
- $error_message = custompages_get_lang('AccountURLInactive');
+ $error_message = get_lang('AccountURLInactive');
break;
default:
- $error_message = custompages_get_lang('InvalidId');
+ $error_message = get_lang('InvalidId');
}
} else {
$error_message = get_lang('InvalidId');
}
}
-$rootWeb = api_get_path('WEB_PATH');
-
-/**
- * HTML output.
- */
-?>
-
-
- Custompage - login
-
-
-
-
-
-
-
-
-
-
-
-
; ?>/custompages/images/page-background.png)
-
-
-
-
';
- }
- ?>
-
-
-
-
-
+if (isset($error_message)) {
+ $template->assign('error', $error_message);
+}
-
-
-
-
-
+$flash = Display::getFlashToString();
+Display::cleanFlashMessages();
-
-
-
-
-
-
-
-
-
+if (api_get_setting('allow_registration') === 'true') {
+ $urlRegister = api_get_path(WEB_CODE_PATH).'auth/inscription.php?language='.api_get_interface_language();
+ $template->assign('url_register', $urlRegister);
+}
+$urlLostPassword = api_get_path(WEB_CODE_PATH).'auth/lostPassword.php?language='.api_get_interface_language();
+$template->assign('url_lost_password', $urlLostPassword);
+$template->assign('mgs_flash', $flash);
+$template->assign('section_name', $this_section);
+
+$layout = $template->get_template('custompage/login.tpl');
+$content = $template->fetch($layout);
+$template->assign('content', $content);
+$template->display_blank_template();
diff --git a/custompages/lostpassword-dist.php b/custompages/lostpassword-dist.php
index b71ac53c62..6cdeaee095 100644
--- a/custompages/lostpassword-dist.php
+++ b/custompages/lostpassword-dist.php
@@ -8,48 +8,16 @@
require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
require_once __DIR__.'/language.php';
-$rootWeb = api_get_path('WEB_PATH');
-?>
-
-
-
-
-
+$template = new Template(get_lang('LostPassword'),false,false,false,false,true,true);
-
-
+$error = null;
-
-
-
-
-

-
-
-
-
';
- }
-
- echo isset($content['form']) ? $content['form'] : '';
- ?>
-
-
-
-
-
+if (isset($content['info']) && !empty($content['info'])) {
+ $error = $content['info'];
+}
+$template->assign('error');
+$template->assign('form', $content['form']);
+$layout = $template->get_template('custompage/lostpassword.tpl');
+$content = $template->fetch($layout);
+$template->assign('content', $content);
+$template->display_blank_template();
diff --git a/custompages/registration-dist.php b/custompages/registration-dist.php
index c0d45510b7..db6502a23c 100644
--- a/custompages/registration-dist.php
+++ b/custompages/registration-dist.php
@@ -10,6 +10,9 @@
*/
require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
require_once __DIR__.'/language.php';
+
+$template = new Template(get_lang('Registration'),false,false,false,false,true,true);
+
/**
* Removes some unwanted elementend of the form object.
* 03-26-2020 Added check if element exist.
@@ -23,104 +26,11 @@ if (isset($content['form']->_elementIndex['extra_mail_notify_message'])) {
if (isset($content['form']->_elementIndex['extra_mail_notify_group_message'])) {
$content['form']->removeElement('extra_mail_notify_group_message');
}
-
-if (isset($content['form']->_elementIndex['status'])) {
- $content['form']->removeElement('status');
- $content['form']->removeElement('status');
-}
-$rootWeb = api_get_path('WEB_PATH');
-
-// Deprecated since 2015-03-26
-/**
- * Code to change the way QuickForm render html.
- */
-/*
-$renderer = & $content['form']->defaultRenderer();
-$form_template = <<
-{content}
-
-
-
- S'inscrire
-
-
-EOT;
-$renderer->setFormTemplate($form_template);
-
-$element_template = <<
-
-
- {error}
{element}
-
-
-
-EOT;
-$element_template_wimage = <<
-
-
-
-
-EOT;
-$renderer->setElementTemplate($element_template_wimage,'pass1');
-$renderer->setElementTemplate($element_template);
-
-$header_template = <<
-
-
-
-EOT;
-
- */
-?>
-
-
-
-
-
-
-
-
-
-
-
-
+$content['form']->removeElement('official_code');
+$content['form']->removeElement('phone');
+
+$template->assign('form', $content['form']->returnForm());
+$layout = $template->get_template('custompage/registration.tpl');
+$content = $template->fetch($layout);
+$template->assign('content', $content);
+$template->display_blank_template();
diff --git a/favicon.png b/favicon.png
new file mode 100644
index 0000000000..3f6fe71041
Binary files /dev/null and b/favicon.png differ
diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index d886c06fb9..de6d43c595 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -73,7 +73,7 @@ if ($extraConditions && isset($extraConditions['conditions'])) {
}
}
-$form = new FormValidator('registration');
+$form = new FormValidator('registration','post','','',[],FormValidator::LAYOUT_GRID);
$user_already_registered_show_terms = false;
if (api_get_setting('allow_terms_conditions') === 'true') {
$user_already_registered_show_terms = isset($_SESSION['term_and_condition']['user_id']);
@@ -623,7 +623,7 @@ if ($allowDoubleValidation && $showTerms == false) {
$user_already_registered_show_terms ||
$showTerms
) {
- $form->addButtonNext(get_lang('RegisterUser'));
+ $form->addButton('register',get_lang('RegisterUser'),null,'primary','btn-block');
$formContainsSendButton = true;
}
}
diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php
index 050577a215..f685486717 100755
--- a/main/auth/lostPassword.php
+++ b/main/auth/lostPassword.php
@@ -34,15 +34,6 @@ $tool_name = get_lang('LostPassword');
if ($reset && $userId) {
$messageText = Login::reset_password($reset, $userId, true);
-
- /*if (CustomPages::enabled() && CustomPages::exists(CustomPages::INDEX_UNLOGGED)) {
- CustomPages::display(
- CustomPages::INDEX_UNLOGGED,
- ['info' => $messageText]
- );
- exit;
- }*/
-
Display::addFlash(
Display::return_message($messageText, 'info', false)
);
@@ -50,7 +41,7 @@ if ($reset && $userId) {
exit;
}
-$form = new FormValidator('lost_password');
+$form = new FormValidator('lost_password','post','','',[],FormValidator::LAYOUT_GRID);
$form->addHeader($tool_name);
$form->addText(
'user',
@@ -91,7 +82,7 @@ if ($allowCaptcha) {
$form->addRule('captcha', get_lang('TheTextYouEnteredDoesNotMatchThePicture'), 'CAPTCHA', $captcha_question);
}
-$form->addButtonSend(get_lang('Send'));
+$form->addButtonSend(get_lang('Send'),'submit',false,[],'btn-block',null);
if ($form->validate()) {
$values = $form->exportValues();
diff --git a/main/img/icons/svg/favicon.svg b/main/img/icons/svg/favicon.svg
new file mode 100644
index 0000000000..0e5faaf1e7
--- /dev/null
+++ b/main/img/icons/svg/favicon.svg
@@ -0,0 +1,225 @@
+
+
+
+
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index abb38f5af4..ffcd501116 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -164,6 +164,7 @@ define('SECTION_DASHBOARD', 'dashboard');
define('SECTION_REPORTS', 'reports');
define('SECTION_GLOBAL', 'global');
define('SECTION_INCLUDE', 'include');
+define('SECTION_CUSTOMPAGE', 'custompage');
// CONSTANT name for local authentication source
define('PLATFORM_AUTH_SOURCE', 'platform');
diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 200f88299a..d48d7d96fa 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -19,13 +19,13 @@ class FormValidator extends HTML_QuickForm
/**
* Constructor.
*
- * @param string $name Name of the form
- * @param string $method (optional) Method ('post' (default) or 'get')
- * @param string $action (optional) Action (default is $PHP_SELF)
- * @param string $target (optional) Form's target defaults to '_self'
- * @param mixed $attributes (optional) Extra attributes for