Skip to content

Commit 868e7af

Browse files
author
latham
committed
email autoresponder patches. Now with subject line and language file updates
1 parent 687eb2f commit 868e7af

File tree

4 files changed

+53
-36
lines changed

4 files changed

+53
-36
lines changed

‎interface/web/mail/form/mail_user.tform.php‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
'value' => array(1 => 'y',0 => 'n')
197197
),
198198
##################################
199-
# ENDE Datatable fields
199+
# END Datatable fields
200200
##################################
201201
)
202202
);
@@ -209,6 +209,14 @@
209209
##################################
210210
# Begin Datatable fields
211211
##################################
212+
'autoresponder_subject' => array (
213+
'datatype' => 'VARCHAR',
214+
'formtype' => 'TEXT',
215+
'default' => 'Out of office reply',
216+
'value' => '',
217+
'width' => '30',
218+
'maxlength' => '255'
219+
),
212220
'autoresponder_text' => array (
213221
'datatype' => 'TEXT',
214222
'formtype' => 'TEXTAREA',
@@ -242,7 +250,7 @@
242250
),
243251
),
244252
##################################
245-
# ENDE Datatable fields
253+
# END Datatable fields
246254
##################################
247255
)
248256
);
@@ -262,7 +270,7 @@
262270
'value' => array(0 => 'n',1 => 'y')
263271
),
264272
##################################
265-
# ENDE Datatable fields
273+
# END Datatable fields
266274
##################################
267275
),
268276
'plugins' => array (
@@ -296,7 +304,7 @@
296304
'rows' => '15'
297305
),
298306
##################################
299-
# ENDE Datatable fields
307+
# END Datatable fields
300308
##################################
301309
)
302310
);

‎interface/web/mail/lib/lang/en_mail_user.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb["password_strength_txt"] = 'Password strength';
66
$wb["active_txt"] = 'Active';
77
$wb["email_error_isemail"] = 'Email address is invalid.';
88
$wb["email_error_unique"] = 'Duplicate Email address.';
9+
$wb["autoresponder_subject_txt"] = 'Email Subject';
10+
$wb["autoresponder_subject"] = 'Out of office reply';
911
$wb["autoresponder_text_txt"] = 'Text';
1012
$wb["autoresponder_txt"] = 'Active';
1113
$wb["autoresponder_start_date_txt"] = 'Start on';

‎interface/web/mail/lib/lang/es_mail_user.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ $wb['password_strength_txt'] = 'Fortaleza de la contraseña';
66
$wb['active_txt'] = 'Activar';
77
$wb['email_error_isemail'] = 'La dirección de correo no es válida.';
88
$wb['email_error_unique'] = 'Dirección de correo duplicada.';
9+
$wb['autoresponder_subject_txt'] = 'Asunto';
910
$wb['autoresponder_text_txt'] = 'Texto';
11+
$wb['autoresponder_subject'] = 'Fuera de la Oficina';
1012
$wb['autoresponder_txt'] = 'Autorespondedor';
1113
$wb['no_domain_perm'] = 'No tiene permiso para administrar este dominio.';
1214
$wb['error_no_pwd'] = 'La contraseña está vacía.';

‎interface/web/mail/templates/mail_user_autoresponder_edit.htm‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,41 @@ <h2><tmpl_var name="list_head_txt"></h2>
22
<p><tmpl_var name="list_desc_txt"></p>
33

44
<div class="panel panel_mail_user">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
10-
<textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
11-
</div>
12-
<div class="ctrlHolder">
13-
<p class="label">{tmpl_var name='autoresponder_txt'}</p>
14-
<div class="multiField">
15-
<div class="ctrlHolder" style="margin-bottom: 5px;">
16-
<label for="autoresponder"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />&nbsp;{tmpl_var name='autoresponder_active'}</label><br />
17-
</div>
18-
19-
<p style="margin-bottom: 3px;">
20-
<label for="autoresponder_start_date[day]" style="width: 55px;">{tmpl_var name='autoresponder_start_date_txt'}</label>
21-
{tmpl_var name='autoresponder_start_date'}&nbsp;<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a></p>
22-
23-
<label for="password" style="width: 55px;">{tmpl_var name='autoresponder_end_date_txt'}</label>
24-
{tmpl_var name='autoresponder_end_date'}
25-
</div>
26-
</div>
27-
</fieldset>
28-
29-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
30-
31-
<div class="buttonHolder buttons">
32-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
33-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
34-
</div>
35-
</div>
36-
5+
<div class="pnl_formsarea">
6+
<fieldset class="inlineLabels">
7+
<div class="ctrlHolder">
8+
<label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
9+
<input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
10+
</div>
11+
<div class="ctrlHolder">
12+
<label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
13+
<textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
14+
</div>
15+
<div class="ctrlHolder">
16+
<label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
17+
<input type="checkbox" value="y" id="autoresponder" name="autoresponder"
18+
onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
19+
</div>
20+
<div class="ctrlHolder">
21+
<label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
22+
{tmpl_var name='autoresponder_start_date'}&nbsp;
23+
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
24+
</div>
25+
<div class="ctrlHolder">
26+
<label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
27+
{tmpl_var name='autoresponder_end_date'}
28+
</div>
29+
</fieldset>
30+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
31+
<div class="buttonHolder buttons">
32+
<button class="positive iconstxt icoPositive" type="button"
33+
value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');">
34+
<span>{tmpl_var name='btn_save_txt'}</span>
35+
</button>
36+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}"
37+
onClick="loadContent('mail/mail_user_list.php');">
38+
<span>{tmpl_var name='btn_cancel_txt'}</span>
39+
</button>
40+
</div>
41+
</div>
3742
</div>

0 commit comments

Comments
 (0)