Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
91d30028
Commit
91d30028
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Minor fix in presentation
parent
a05963ee
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/comm/mailing/card.php
+13
-8
13 additions, 8 deletions
htdocs/comm/mailing/card.php
htdocs/comm/mailing/cibles.php
+2
-2
2 additions, 2 deletions
htdocs/comm/mailing/cibles.php
htdocs/langs/en_US/mails.lang
+2
-0
2 additions, 0 deletions
htdocs/langs/en_US/mails.lang
with
17 additions
and
10 deletions
htdocs/comm/mailing/card.php
+
13
−
8
View file @
91d30028
...
...
@@ -948,7 +948,7 @@ else
}
}
print
'<
br><br><
/div>'
;
print
'</div>'
;
}
// Affichage formulaire de TEST
...
...
@@ -1052,20 +1052,25 @@ else
print
'<table class="border" width="100%">'
;
// Ref
print
'<tr><td width="25%">'
.
$langs
->
trans
(
"Ref"
)
.
'</td><td colspan="3">'
.
$object
->
id
.
'</td></tr>'
;
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/comm/mailing/list.php">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
print
'<tr><td width="25%">'
.
$langs
->
trans
(
"Ref"
)
.
'</td>'
;
print
'<td colspan="3">'
;
print
$form
->
showrefnav
(
$object
,
'id'
,
$linkback
);
print
'</td></tr>'
;
// Topic
print
'<tr><td
width="25%"
>'
.
$langs
->
trans
(
"MailTitle"
)
.
'</td><td colspan="3">'
.
$object
->
titre
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"MailTitle"
)
.
'</td><td colspan="3">'
.
$object
->
titre
.
'</td></tr>'
;
// From
print
'<tr><td
width="25%"
>'
.
$langs
->
trans
(
"MailFrom"
)
.
'</td><td colspan="3">'
.
dol_print_email
(
$object
->
email_from
,
0
,
0
,
0
,
0
,
1
)
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"MailFrom"
)
.
'</td><td colspan="3">'
.
dol_print_email
(
$object
->
email_from
,
0
,
0
,
0
,
0
,
1
)
.
'</td></tr>'
;
// To
print
'<tr><td
width="25%"
>'
.
$langs
->
trans
(
"MailErrorsTo"
)
.
'</td><td colspan="3">'
.
dol_print_email
(
$object
->
email_errorsto
,
0
,
0
,
0
,
0
,
1
)
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"MailErrorsTo"
)
.
'</td><td colspan="3">'
.
dol_print_email
(
$object
->
email_errorsto
,
0
,
0
,
0
,
0
,
1
)
.
'</td></tr>'
;
// Status
print
'<tr><td
width="25%"
>'
.
$langs
->
trans
(
"Status"
)
.
'</td><td colspan="3">'
.
$object
->
getLibStatut
(
4
)
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"Status"
)
.
'</td><td colspan="3">'
.
$object
->
getLibStatut
(
4
)
.
'</td></tr>'
;
// Nb of distinct emails
print
'<tr><td
width="25%"
>'
;
print
'<tr><td>'
;
print
$langs
->
trans
(
"TotalNbOfDistinctRecipients"
);
print
'</td><td colspan="3">'
;
$nbemail
=
(
$object
->
nbemail
?
$object
->
nbemail
:
img_warning
(
''
)
.
' <font class="warning">'
.
$langs
->
trans
(
"NoTargetYet"
)
.
'</font>'
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/comm/mailing/cibles.php
+
2
−
2
View file @
91d30028
...
...
@@ -227,7 +227,7 @@ if ($object->fetch($id) >= 0)
// Show email selectors
if
(
$allowaddtarget
&&
$user
->
rights
->
mailing
->
creer
)
{
print
load_fiche_titre
(
$langs
->
trans
(
"ToAddRecipientsChooseHere"
),(
$user
->
admin
?
info_admin
(
$langs
->
trans
(
"YouCanAddYourOwnPredefindedListHere"
),
1
)
:
''
),
'
'
);
print
load_fiche_titre
(
$langs
->
trans
(
"ToAddRecipientsChooseHere"
),
(
$user
->
admin
?
info_admin
(
$langs
->
trans
(
"YouCanAddYourOwnPredefindedListHere"
),
1
)
:
''
),
'title_generic
'
);
print
'<table class="noborder" width="100%">'
;
print
'<tr class="liste_titre">'
;
...
...
@@ -402,7 +402,7 @@ if ($object->fetch($id) >= 0)
if
(
$allowaddtarget
)
{
$cleartext
=
$langs
->
trans
(
"ToClearAllRecipientsClickHere"
)
.
' '
.
'<input type="submit" name="clearlist" class="button" value="'
.
$langs
->
trans
(
"TargetsReset"
)
.
'">'
;
}
print_barre_liste
(
$langs
->
trans
(
"MailSelectedRecipients"
),
$page
,
$_SERVER
[
"PHP_SELF"
],
$param
,
$sortfield
,
$sortorder
,
$cleartext
,
$num
,
$nbtotalofrecords
,
''
,
0
,
''
,
''
,
$limit
);
print_barre_liste
(
$langs
->
trans
(
"MailSelectedRecipients"
),
$page
,
$_SERVER
[
"PHP_SELF"
],
$param
,
$sortfield
,
$sortorder
,
$cleartext
,
$num
,
$nbtotalofrecords
,
'
title_generic
'
,
0
,
''
,
''
,
$limit
);
print
'</form>'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/mails.lang
+
2
−
0
View file @
91d30028
...
...
@@ -169,3 +169,5 @@ AdvTgtDeleteFilter=Delete filter
AdvTgtSaveFilter=Save filter
AdvTgtCreateFilter=Create filter
AdvTgtOrCreateNewFilter=Name of new filter
NoContactWithCategoryFound=No contact/address with a category found
NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
\ No newline at end of file
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