diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index b57c7f88c74fbde4976cddc539d1b67d00c1b248..672314b7146bb3c769005d9ec39218d73f0d55eb 100644
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -388,7 +388,7 @@ if (!defined("_START_DATE_MISSION")) define("_START_DATE_MISSION", "Mission star
if (!defined("_END_DATE_TRIAL")) define("_END_DATE_TRIAL", "End date of the trial period");
if (!defined("_END_DATE_MISSION")) define("_END_DATE_MISSION", "Mission end date");
if (!defined("_EVENT_DATE")) define("_EVENT_DATE", "Event date");
-if (!defined("_VISIT_DATE")) define("_VISIT_DATE", "Visit date ") ;
+if (!defined("_VISIT_DATE")) define("_VISIT_DATE", "Visit date ");
if (!defined("_CHANGE_DATE")) define("_CHANGE_DATE", "Change date");
if (!defined("_DOCTYPES_LIST2")) define("_DOCTYPES_LIST2", "Document types list");
@@ -692,7 +692,7 @@ if (!defined("_NO_RIGHT_TXT")) define("_NO_RIGHT_TXT", "You tried to access to a
if (!defined("_NUM_GED")) define("_NUM_GED", "EDM number");
///// Manage action error
-if (!defined("_AJAX_PARAM_ERROR")) define("_AJAX_PARAM_ERROR", "Ajax parameters Error");______________________
+if (!defined("_AJAX_PARAM_ERROR")) define("_AJAX_PARAM_ERROR", "Ajax parameters Error");
if (!defined("_ACTION_CONFIRM")) define("_ACTION_CONFIRM", "Do you want to make the following action ? : ");
if (!defined("_ADD_ATTACHMENT_OR_NOTE")) define("_ADD_ATTACHMENT_OR_NOTE", "Add an attachment or a note pour this mail/ those mails");
if (!defined("_CLOSE_MAIL_WITH_ATTACHMENT")) define("_CLOSE_MAIL_WITH_ATTACHMENT", "Closing with attachment");
diff --git a/install/css/merged_css.css b/install/css/merged_css.css
index 3adb93624b0eba0785e8431114b84859f916c90d..e3547b51ff0b6c89c367ee895dc8279ee56a4760 100644
--- a/install/css/merged_css.css
+++ b/install/css/merged_css.css
@@ -22,6 +22,89 @@
src: local('Arizonia'), local('Arizonia-Regular'), url('fonts/sonsieOne.woff') format('woff');
}
+/* section.css */
+#fullWrapper #section {
+}
+
+#fullWrapper #section .blockWrapper #progressWrapper{
+ font-family: 'Sonsie One';
+ color: rgba(255, 255, 255, 0.9);
+ font-weight: bold;
+ font-size: 30px;
+}
+
+#fullWrapper #section .blockWrapper {
+ width: 910px;
+ background-color: rgba(224, 224, 224, 0.5);
+ text-align: left;
+}
+
+#fullWrapper #section .blockWrapper .titleBlock {
+}
+
+#fullWrapper #section .blockWrapper .titleBlock h2 {
+ font-size: 35px;
+ font-family: 'Contrail One';
+ background-color: rgba(224, 224, 224, 0.8);
+ padding-top: 15px;
+ padding-bottom: 10px;
+ padding-left: 20px;
+ padding-right: 20px;
+}
+
+#fullWrapper #section .blockWrapper .contentBlock {
+}
+
+#fullWrapper #section .blockWrapper .contentBlock p {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ padding-left: 15px;
+ padding-right: 15px;
+ text-align: justify;
+}
+#fullWrapper #section .blockWrapper .contentBlock h6 {
+ padding-top: 0;
+ padding-bottom: 0;
+ padding-left: 15px;
+ padding-right: 15px;
+ margin: 0;
+ margin-bottom: 10px;
+ text-align: justify;
+}
+
+#fullWrapper #section .blockWrapper .contentBlock .previousButton {
+ position: relative;
+ left: 25px;
+}
+
+#fullWrapper #section .blockWrapper .contentBlock .nextButton {
+ position: relative;
+ right: 25px;
+}
+
+#fullWrapper #section .blockWrapper .contentBlock form {
+ padding-left: 15px;
+ padding-right: 15px;
+}
+
+#fullWrapper #section .blockWrapper .contentBlock table {
+ padding-left: 15px;
+ padding-right: 15px;
+}
+
+#fullWrapper #section .blockWrapper .contentBlock table .voyantPrerequisites {
+ width: 30px;
+}
+
+
+/* footer.css */
+#fullWrapper #footer {
+ height: 125px;
+ width: 910px;
+ text-align: left;
+}
+
+
/* buttons.css */
#buttons #next a {
/* background-color: #64b651; */
@@ -246,89 +329,6 @@
}
-/* section.css */
-#fullWrapper #section {
-}
-
-#fullWrapper #section .blockWrapper #progressWrapper{
- font-family: 'Sonsie One';
- color: rgba(255, 255, 255, 0.9);
- font-weight: bold;
- font-size: 30px;
-}
-
-#fullWrapper #section .blockWrapper {
- width: 910px;
- background-color: rgba(224, 224, 224, 0.5);
- text-align: left;
-}
-
-#fullWrapper #section .blockWrapper .titleBlock {
-}
-
-#fullWrapper #section .blockWrapper .titleBlock h2 {
- font-size: 35px;
- font-family: 'Contrail One';
- background-color: rgba(224, 224, 224, 0.8);
- padding-top: 15px;
- padding-bottom: 10px;
- padding-left: 20px;
- padding-right: 20px;
-}
-
-#fullWrapper #section .blockWrapper .contentBlock {
-}
-
-#fullWrapper #section .blockWrapper .contentBlock p {
- padding-top: 15px;
- padding-bottom: 15px;
- padding-left: 15px;
- padding-right: 15px;
- text-align: justify;
-}
-#fullWrapper #section .blockWrapper .contentBlock h6 {
- padding-top: 0;
- padding-bottom: 0;
- padding-left: 15px;
- padding-right: 15px;
- margin: 0;
- margin-bottom: 10px;
- text-align: justify;
-}
-
-#fullWrapper #section .blockWrapper .contentBlock .previousButton {
- position: relative;
- left: 25px;
-}
-
-#fullWrapper #section .blockWrapper .contentBlock .nextButton {
- position: relative;
- right: 25px;
-}
-
-#fullWrapper #section .blockWrapper .contentBlock form {
- padding-left: 15px;
- padding-right: 15px;
-}
-
-#fullWrapper #section .blockWrapper .contentBlock table {
- padding-left: 15px;
- padding-right: 15px;
-}
-
-#fullWrapper #section .blockWrapper .contentBlock table .voyantPrerequisites {
- width: 30px;
-}
-
-
-/* footer.css */
-#fullWrapper #footer {
- height: 125px;
- width: 910px;
- text-align: left;
-}
-
-
/* tags.css */
body {
margin: 0;
@@ -369,6 +369,34 @@ a:hover {
}
+/* header.css */
+#fullWrapper #header {
+ height: 120px;
+ width: 910px;
+ text-align: left;
+}
+
+#fullWrapper #header .headerName {
+ position: relative;
+ top: 18px;
+ left: 0px;
+ float: left;
+}
+
+#fullWrapper #header .headerName h2 {
+ font-size: 70px;
+ font-family: 'Contrail One';
+ color: rgba(81, 112, 144, 1);
+}
+
+#fullWrapper #header .logo {
+ position: relative;
+ top: 17px;
+ right: 0px;
+ float: right;
+}
+
+
/* general.css */
#fullWrapper {
width: 960px;
@@ -399,31 +427,3 @@ h6 {
-/* header.css */
-#fullWrapper #header {
- height: 120px;
- width: 910px;
- text-align: left;
-}
-
-#fullWrapper #header .headerName {
- position: relative;
- top: 18px;
- left: 0px;
- float: left;
-}
-
-#fullWrapper #header .headerName h2 {
- font-size: 70px;
- font-family: 'Contrail One';
- color: rgba(81, 112, 144, 1);
-}
-
-#fullWrapper #header .logo {
- position: relative;
- top: 17px;
- right: 0px;
- float: right;
-}
-
-
diff --git a/modules/entities/lang/en.php b/modules/entities/lang/en.php
index 8aa4e742e2722028cbc729e31640cb36868b2b9a..232731c8d107a0070801558e2c7e8aee7da7118f 100644
--- a/modules/entities/lang/en.php
+++ b/modules/entities/lang/en.php
@@ -405,7 +405,7 @@ if (!defined("_PRINT_SEP_TITLE"))
if (!defined("_COMMENT_FOR_SEP1"))
define("_COMMENT_FOR_SEP1" , "Put this delimiter on the stack of ");
if (!defined("_COMMENT_FOR_SEP2"))
- define("_COMMENT_FOR_SEP2" , "documents type of")
+ define("_COMMENT_FOR_SEP2" , "documents type of");
if (!defined("_PRINT_SEP_WILL_BE_START"))
define("_PRINT_SEP_WILL_BE_START", "Documents printing will automatically start.");