Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
81087167
Commit
81087167
authored
8 years ago
by
Laurent Séguin
Browse files
Options
Downloads
Patches
Plain Diff
Correction parse Error dans des en.php
parent
967e4298
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/maarch_entreprise/lang/en.php
+2
-2
2 additions, 2 deletions
apps/maarch_entreprise/lang/en.php
install/css/merged_css.css
+111
-111
111 additions, 111 deletions
install/css/merged_css.css
modules/entities/lang/en.php
+1
-1
1 addition, 1 deletion
modules/entities/lang/en.php
with
114 additions
and
114 deletions
apps/maarch_entreprise/lang/en.php
+
2
−
2
View file @
81087167
...
@@ -388,7 +388,7 @@ if (!defined("_START_DATE_MISSION")) define("_START_DATE_MISSION", "Mission star
...
@@ -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_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
(
"_END_DATE_MISSION"
))
define
(
"_END_DATE_MISSION"
,
"Mission end date"
);
if
(
!
defined
(
"_EVENT_DATE"
))
define
(
"_EVENT_DATE"
,
"Event 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
(
"_CHANGE_DATE"
))
define
(
"_CHANGE_DATE"
,
"Change date"
);
if
(
!
defined
(
"_DOCTYPES_LIST2"
))
define
(
"_DOCTYPES_LIST2"
,
"Document types list"
);
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
...
@@ -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"
);
if
(
!
defined
(
"_NUM_GED"
))
define
(
"_NUM_GED"
,
"EDM number"
);
///// Manage action error
///// 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
(
"_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
(
"_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"
);
if
(
!
defined
(
"_CLOSE_MAIL_WITH_ATTACHMENT"
))
define
(
"_CLOSE_MAIL_WITH_ATTACHMENT"
,
"Closing with attachment"
);
...
...
This diff is collapsed.
Click to expand it.
install/css/merged_css.css
+
111
−
111
View file @
81087167
...
@@ -22,6 +22,89 @@
...
@@ -22,6 +22,89 @@
src
:
local
(
'Arizonia'
),
local
(
'Arizonia-Regular'
),
url('fonts/sonsieOne.woff')
format
(
'woff'
);
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.css */
#buttons
#next
a
{
#buttons
#next
a
{
/* background-color: #64b651; */
/* background-color: #64b651; */
...
@@ -246,89 +329,6 @@
...
@@ -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 */
/* tags.css */
body
{
body
{
margin
:
0
;
margin
:
0
;
...
@@ -369,6 +369,34 @@ a:hover {
...
@@ -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 */
/* general.css */
#fullWrapper
{
#fullWrapper
{
width
:
960px
;
width
:
960px
;
...
@@ -399,31 +427,3 @@ h6 {
...
@@ -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
;
}
This diff is collapsed.
Click to expand it.
modules/entities/lang/en.php
+
1
−
1
View file @
81087167
...
@@ -405,7 +405,7 @@ if (!defined("_PRINT_SEP_TITLE"))
...
@@ -405,7 +405,7 @@ if (!defined("_PRINT_SEP_TITLE"))
if
(
!
defined
(
"_COMMENT_FOR_SEP1"
))
if
(
!
defined
(
"_COMMENT_FOR_SEP1"
))
define
(
"_COMMENT_FOR_SEP1"
,
"Put this delimiter on the stack of "
);
define
(
"_COMMENT_FOR_SEP1"
,
"Put this delimiter on the stack of "
);
if
(
!
defined
(
"_COMMENT_FOR_SEP2"
))
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"
))
if
(
!
defined
(
"_PRINT_SEP_WILL_BE_START"
))
define
(
"_PRINT_SEP_WILL_BE_START"
,
"Documents printing will automatically start."
);
define
(
"_PRINT_SEP_WILL_BE_START"
,
"Documents printing will automatically start."
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment