Skip to content

Commit 5c30f7c

Browse files
naumov-socolovnaumov-socolov
committed
WEB / MAIL. Updated mail acc options for different IMAP and SMTP configurations
1 parent 45d5e88 commit 5c30f7c

File tree

5 files changed

+194
-130
lines changed

5 files changed

+194
-130
lines changed

‎web/css/styles.min.css‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2475,7 +2475,7 @@ label {
24752475
-moz-appearance:none;
24762476
-webkit-appearance:none;
24772477
text-shadow: 0 0 0 #555;
2478-
/*color: transparent !important;*/
2478+
cursor: pointer;
24792479
}
24802480

24812481
.vst-list.long-2 {
@@ -2493,6 +2493,17 @@ label {
24932493
color: #333;
24942494
}
24952495

2496+
.vst-list.flat {
2497+
border: 1px solid #fff;
2498+
color: #2c9491;
2499+
text-transform: uppercase;
2500+
font-weight: bold;
2501+
font-size: 11px;
2502+
margin-left: -14px;
2503+
background-position: -210px -604px;
2504+
text-shadow: none !important;
2505+
}
2506+
24962507
a.vst-text,
24972508
a.vst-text b{
24982509
color: #2c9491;
@@ -2808,18 +2819,23 @@ a.button.cancel {
28082819
vertical-align: top;
28092820
}
28102821
.mail-infoblock {
2811-
padding-top: 80px;
2812-
margin-left: -100px;
2822+
margin-left: -110px;
28132823
font-size: 12px;
28142824
color: #777;
2825+
border: 1px solid #d9d9d9;
2826+
padding: 7px 5px 12px 20px;
2827+
margin-top: 17px;
2828+
width: 334px;
28152829
}
28162830
.mail-infoblock td {
28172831
color: #777;
28182832
font-size: 14px;
28192833
height: 18px;
2820-
padding-right: 25px;
28212834
font-weight: normal;
28222835
}
2836+
.mail-infoblock td:first-child{
2837+
padding-right: 15px;
2838+
}
28232839

28242840
.additional-info {
28252841
margin-left: 30px;

‎web/js/pages/add_mail_acc.js‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ App.Actions.MAIL_ACC.disable_unlimited = function(elm, source_elm) {
2424
$(source_elm).css('opacity', '0.5');
2525
}
2626

27-
//
2827
App.Actions.MAIL_ACC.toggle_unlimited_feature = function(evt) {
2928
var elm = $(evt.target);
3029
var ref = elm.prev('.vst-input');
@@ -93,33 +92,6 @@ randomString = function() {
9392
$('#v_password').text(Array(randomstring.length+1).join('*'));
9493
}
9594

96-
use_hostname = function(domain) {
97-
$('#td_imap_hostname').html(domain);
98-
$('#td_smtp_hostname').html(domain);
99-
}
100-
101-
use_starttls = function() {
102-
$('#td_imap_port').html('143');
103-
$('#td_imap_encryption').html('STARTTLS');
104-
$('#td_smtp_port').html('587');
105-
$('#td_smtp_encryption').html('STARTTLS');
106-
}
107-
108-
use_ssl = function() {
109-
$('#td_imap_port').html('993');
110-
$('#td_imap_encryption').html('SSL');
111-
$('#td_smtp_port').html('465');
112-
$('#td_smtp_encryption').html('SSL');
113-
}
114-
115-
use_no_encryption = function(domain, no_encryption) {
116-
use_hostname(domain);
117-
$('#td_imap_port').html('143');
118-
$('#td_imap_encryption').html(no_encryption);
119-
$('#td_smtp_port').html('25');
120-
$('#td_smtp_encryption').html(no_encryption);
121-
}
122-
12395
$(document).ready(function() {
12496
$('#v_account').text($('input[name=v_account]').val());
12597
$('#v_password').text($('input[name=v_password]').val());
@@ -140,5 +112,37 @@ $(document).ready(function() {
140112
$('#v_password').text($('input[name=v_password]').val());
141113
else
142114
$('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
143-
});
115+
});
116+
117+
$('#mail_configuration').change(function(evt){
118+
var opt = $(evt.target).find('option:selected');
119+
120+
switch(opt.attr('v_type')){
121+
case 'hostname':
122+
$('#td_imap_hostname').html(opt.attr('domain'));
123+
$('#td_smtp_hostname').html(opt.attr('domain'));
124+
break;
125+
case 'starttls':
126+
$('#td_imap_port').html('143');
127+
$('#td_imap_encryption').html('STARTTLS');
128+
$('#td_smtp_port').html('587');
129+
$('#td_smtp_encryption').html('STARTTLS');
130+
break;
131+
case 'ssl':
132+
$('#td_imap_port').html('993');
133+
$('#td_imap_encryption').html('SSL');
134+
$('#td_smtp_port').html('465');
135+
$('#td_smtp_encryption').html('SSL');
136+
break;
137+
case 'no_encription':
138+
$('#td_imap_hostname').html(opt.attr('domain'));
139+
$('#td_smtp_hostname').html(opt.attr('domain'));
140+
141+
$('#td_imap_port').html('143');
142+
$('#td_imap_encryption').html(opt.attr('no_encription'));
143+
$('#td_smtp_port').html('25');
144+
$('#td_smtp_encryption').html(opt.attr('no_encription'));
145+
break;
146+
}
147+
});
144148
});

‎web/js/pages/edit_mail_acc.js‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,43 @@ $(document).ready(function() {
107107
else
108108
$('#v_password').text(Array($(this).val().length+1).join('*'));
109109
});
110-
110+
111111
$('.toggle-psw-visibility-icon').click(function(){
112112
if($('input[name=v_password]').attr('type') == 'text')
113113
$('#v_password').text($('input[name=v_password]').val());
114114
else
115115
$('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
116-
});
116+
});
117+
118+
$('#mail_configuration').change(function(evt){
119+
var opt = $(evt.target).find('option:selected');
120+
121+
switch(opt.attr('v_type')){
122+
case 'hostname':
123+
$('#td_imap_hostname').html(opt.attr('domain'));
124+
$('#td_smtp_hostname').html(opt.attr('domain'));
125+
break;
126+
case 'starttls':
127+
$('#td_imap_port').html('143');
128+
$('#td_imap_encryption').html('STARTTLS');
129+
$('#td_smtp_port').html('587');
130+
$('#td_smtp_encryption').html('STARTTLS');
131+
break;
132+
case 'ssl':
133+
$('#td_imap_port').html('993');
134+
$('#td_imap_encryption').html('SSL');
135+
$('#td_smtp_port').html('465');
136+
$('#td_smtp_encryption').html('SSL');
137+
break;
138+
case 'no_encription':
139+
$('#td_imap_hostname').html(opt.attr('domain'));
140+
$('#td_smtp_hostname').html(opt.attr('domain'));
141+
142+
$('#td_imap_port').html('143');
143+
$('#td_imap_encryption').html(opt.attr('no_encription'));
144+
$('#td_smtp_port').html('25');
145+
$('#td_smtp_encryption').html(opt.attr('no_encription'));
146+
break;
147+
}
148+
});
117149
});

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -131,60 +131,62 @@
131131
</td>
132132
<td class="mail-infoblock-td">
133133
<div class="mail-infoblock">
134-
<table>
135-
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
136-
<tr>
137-
<td><?=__('Username')?>:</td>
138-
<td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
139-
</tr>
140-
<tr>
141-
<td><?=__('Password')?>:</td>
142-
<td id="v_password">******</td>
143-
</tr>
144-
<tr>
145-
<td><?=__('IMAP hostname')?>:</td>
146-
<td id="td_imap_hostname"><?=$hostname?></td>
147-
</tr>
148-
<tr>
149-
<td><?=__('IMAP port')?>:</td>
150-
<td id="td_imap_port">143</td>
151-
</tr>
152-
<tr>
153-
<td><?=__('IMAP security')?>:</td>
154-
<td id="td_imap_encryption"><?=__('STARTTLS')?></td>
155-
</tr>
156-
<tr>
157-
<td><?=__('IMAP auth method')?>:</td>
158-
<td><?=__('Normal password')?></td>
159-
</tr>
160-
<tr>
161-
<td><?=__('SMTP hostname')?></td>
162-
<td id="td_smtp_hostname"><?=$hostname?></td>
163-
</tr>
164-
<tr>
165-
<td><?=__('SMTP port')?>:</td>
166-
<td id="td_smtp_port">587</td>
167-
</tr>
168-
<tr>
169-
<td><?=__('SMTP security')?>:</td>
170-
<td id="td_smtp_encryption"><?=__('STARTTLS')?></td>
171-
</tr>
172-
<tr>
173-
<td><?=__('SMTP auth method')?>:</td>
174-
<td><?=__('Normal password')?></td>
175-
</tr>
176-
</table>
177-
<br />
178-
<table>
179-
<tr><td>&#8226; <a href="javascript:use_hostname('<?=$hostname?>');" class="generate"><?php print __('Use server hostname');?></a></td></tr>
180-
<tr><td>&#8226; <a href="javascript:use_hostname('<?=$v_domain?>');" class="generate"><?php print __('Use domain hostname');?></a></td></tr>
181-
<tr><td>&#8226; <a href="javascript:use_starttls();" class="generate"><?php print __('Use STARTTLS');?></a></td></tr>
182-
<tr><td>&#8226; <a href="javascript:use_ssl();" class="generate"><?php print __('Use SSL');?></a></td></tr>
183-
<tr><td>&#8226; <a href="javascript:use_no_encryption('<?=$v_domain?>', '<?php print __('No encryption');?>');" class="generate"><?php print __('Do not use encryption');?></a></td></tr>
184-
</table>
134+
<table>
135+
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
136+
<tr>
137+
<td colspan="2">
138+
<select id="mail_configuration" class="vst-list flat">
139+
<option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
140+
<option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
141+
<option v_type="starttls"><?=__('Use STARTTLS')?></option>
142+
<option v_type="ssl"><?=__('Use SSL')?></option>
143+
<option v_type="no_encription" domain="<?=$v_domain?>" encription="<?=__('No encryption')?>"><?=__('No encryption')?></option>
144+
</select>
145+
</td>
146+
</tr>
147+
<tr>
148+
<td><?=__('Username')?>:</td>
149+
<td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
150+
</tr>
151+
<tr>
152+
<td><?=__('Password')?>:</td>
153+
<td id="v_password">******</td>
154+
</tr>
155+
<tr>
156+
<td><?=__('IMAP hostname')?>:</td>
157+
<td id="td_imap_hostname"><?=$hostname?></td>
158+
</tr>
159+
<tr>
160+
<td><?=__('IMAP port')?>:</td>
161+
<td id="td_imap_port">143</td>
162+
</tr>
163+
<tr>
164+
<td><?=__('IMAP security')?>:</td>
165+
<td id="td_imap_encryption"><?=__('STARTTLS')?></td>
166+
</tr>
167+
<tr>
168+
<td><?=__('IMAP auth method')?>:</td>
169+
<td><?=__('Normal password')?></td>
170+
</tr>
171+
<tr>
172+
<td><?=__('SMTP hostname')?></td>
173+
<td id="td_smtp_hostname"><?=$hostname?></td>
174+
</tr>
175+
<tr>
176+
<td><?=__('SMTP port')?>:</td>
177+
<td id="td_smtp_port">587</td>
178+
</tr>
179+
<tr>
180+
<td><?=__('SMTP security')?>:</td>
181+
<td id="td_smtp_encryption"><?=__('STARTTLS')?></td>
182+
</tr>
183+
<tr>
184+
<td><?=__('SMTP auth method')?>:</td>
185+
<td><?=__('Normal password')?></td>
186+
</tr>
187+
</table>
185188
</div>
186189
</td>
187-
188190
</tr>
189191
</table>
190192
</form>

0 commit comments

Comments
 (0)