diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 9120df643ba6e9ddd9b94ef9699d1af5e6ec9a04..d936fa8dd022c25afb0be84defd8788b217a37e1 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -1452,12 +1452,30 @@ if (!defined('_AUTORIZED_USER')) {
if (!defined('_SUSPENDED_USER')) {
define('_SUSPENDED_USER', 'Suspended user');
}
+if (!defined('_DELETED_USER')) {
+ define('_DELETED_USER', 'Deleted user');
+}
+if (!defined('_USER_DELETION')) {
+ define('_USER_DELETION', 'User deletion');
+}
if (!defined('_USER_AUTORIZATION')) {
define('_USER_AUTORIZATION', 'User authorization');
}
if (!defined('_USER_SUSPENSION')) {
define('_USER_SUSPENSION', 'User suspension');
}
+if (!defined('_USER_UPDATED')) {
+ define('_USER_UPDATED', 'Modified user');
+}
+if (!defined('_USER_UPDATE')) {
+ define('_USER_UPDATE', 'User modification');
+}
+if (!defined('_USER_ADDED')) {
+ define('_USER_ADDED', 'New added user');
+}
+if (!defined('_NO_PRIMARY_GROUP')) {
+ define('_NO_PRIMARY_GROUP', 'No primary group is selected !');
+}
if (!defined('_THE_USER')) {
define('_THE_USER', 'The user ');
}
@@ -5048,3 +5066,23 @@ if (!defined('_USE_REF')) {
if (!defined('_WARNING_REF')) {
define('_WARNING_REF', '<b>Referential files not found !</b><br/>In order to use refenrential, contact your <a href="mailto:'.$_SESSION['config']['adminmail'].'">administrator</a>');
}
+
+/**** Management of welcome image ****/
+if (!defined('_ERROR')) {
+ define('_ERROR', 'Error');
+}
+if (!defined('_IMG_SIZE_NOT_ALLOWED')) {
+ define('_IMG_SIZE_NOT_ALLOWED', "Image size not allowed");
+}
+if (!defined('_SELECT_IMG_FIRST')) {
+ define('_SELECT_IMG_FIRST', "Select image first");
+}
+if (!defined('_IMG_UPLOADED')) {
+ define('_IMG_UPLOADED', "Image uploaded");
+}
+if (!defined('_IMG_ALREADY_UPLOADED')) {
+ define('_IMG_ALREADY_UPLOADED', "Image already uploaded");
+}
+if (!defined('_FILE_FORMAT_NOT_ALLOWED')) {
+ define('_FILE_FORMAT_NOT_ALLOWED', "Image format not allowed");
+}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index bd085f6c6672f5f762fdeedca60ae288d8425cf9..890581ebd9c94c424c1dda2044404beac3cc2e1d 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -5235,9 +5235,6 @@ if (!defined('_IMG_SIZE_NOT_ALLOWED')) {
if (!defined('_SELECT_IMG_FIRST')) {
define('_SELECT_IMG_FIRST', "Aucun fichier chargé");
}
-if (!defined('_ERROR')) {
- define('_ERROR', "Erreur");
-}
if (!defined('_IMG_UPLOADED')) {
define('_IMG_UPLOADED', "Image chargée");
}
diff --git a/install/lang/en.php b/install/lang/en.php
index a7e8e05331c6b063b0e0dd52746e03700e1796fe..334df378465a0b83e092cd5ae458e501525b508e 100755
--- a/install/lang/en.php
+++ b/install/lang/en.php
@@ -436,3 +436,17 @@ if (!defined('_CHECK_RIGHT_SOURCE_FOLDER')) {
if (!defined('_MISSING_PREREQUISITE_UPDATE')) {
define('_MISSING_PREREQUISITE_UPDATE', 'Prerequisite is missing to update :');
}
+
+// CONFIG LOGIN IMAGE
+if (!defined('_CONFIG_IMAGE')) {
+ define('_CONFIG_IMAGE', 'Picture configuration');
+}
+if (!defined('_CONFIG_IMG_EXP')) {
+ define('_CONFIG_IMG_EXP', "Allows you to update the picture login page, Choose a resolution equal or bigger than 1920*1080 and a JPG format");
+}
+if (!defined('_LOGIN_PICTURE')) {
+ define('_LOGIN_PICTURE', "Choose an picture");
+}
+if (!defined('_UPLOAD_PICTURE')) {
+ define('_UPLOAD_PICTURE', "Upload picture");
+}
diff --git a/install/view/config_view.php b/install/view/config_view.php
index eb13cce16fe08fa5268b3666f6a128b4f7be2fb7..c6426a27bfdc1c847f8af1e31794752c55050eca 100755
--- a/install/view/config_view.php
+++ b/install/view/config_view.php
@@ -125,7 +125,45 @@ if (file_exists($filename)) {
}
</script>
+<div class="blockWrapper">
+ <div class="titleBlock">
+ <h2 onClick="slide('configImage');" style="cursor: pointer;">
+ <?php echo _CONFIG_IMAGE;?>
+ </h2>
+ </div>
+ <div class="contentBlock" id="configImage">
+ <p>
+ <h5>
+ <?php echo _CONFIG_IMG_EXP;?>
+ </h5>
+ <form>
+ <table>
+ <tr>
+ <td>
+ <?php echo _LOGIN_PICTURE;?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input id="loginpicture" type="file" name="loginpicture" onchange="uploadImg($('#loginpicture'))" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <br />
+ <div id="ajaxReturn_upload_ko" style="margin-left :20px;color:red;"></div>
+ <div align="center">
+ <img src="img/wait.gif" width="100" class="wait" style="display: none; background-color: rgba(0, 0, 0, 0.2);"/>
+ </div>
+ <div id="ajaxReturn_upload_ok"></div>
+ <p>Image de la page de login :</p>
+ <div id="imageDiv">
+ <img src="../apps/maarch_entreprise/img/bodylogin.jpg" width="30%" height="30%" />
+ </div>
+ </p>
+</div>
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('configGeneral');" style="cursor: pointer;">
@@ -211,45 +249,7 @@ if (file_exists($filename)) {
</div>
</div>
<br />
-<div class="blockWrapper">
- <div class="titleBlock">
- <h2 onClick="slide('configImage');" style="cursor: pointer;">
- <?php echo _CONFIG_IMAGE;?>
- </h2>
- </div>
- <div class="contentBlock" id="configImage">
- <p>
- <h5>
- <?php echo _CONFIG_IMG_EXP;?>
- </h5>
- <form>
- <table>
- <tr>
- <td>
- <?php echo _LOGIN_PICTURE;?>
- </td>
- <td>
- :
- </td>
- <td>
- <input id="loginpicture" type="file" name="loginpicture" onchange="uploadImg($('#loginpicture'))" />
- </td>
- </tr>
- </table>
- </form>
- <br />
- <div id="ajaxReturn_upload_ko" style="margin-left :20px;color:red;"></div>
- <div align="center">
- <img src="img/wait.gif" width="100" class="wait" style="display: none; background-color: rgba(0, 0, 0, 0.2);"/>
- </div>
- <div id="ajaxReturn_upload_ok"></div>
- <p>Image de la page de login :</p>
- <div id="imageDiv">
- <img src="../apps/maarch_entreprise/img/bodylogin.jpg" width="30%" height="30%" />
- </div>
- </p>
-</div>
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('configNotificationSendmail');" style="cursor: pointer;">