Skip to content

Commit ac85a04

Browse files
author
Kristan Kenney
committed
Merge branch 'refactor/v1.4.0-ui-cleanup' into main
2 parents 54fb5ee + 2925a16 commit ac85a04

File tree

5 files changed

+38
-31
lines changed

5 files changed

+38
-31
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,7 +2599,7 @@ label:hover {
25992599

26002600
.vst-input:focus:disabled,
26012601
.vst-textinput:disabled {
2602-
border-color: #f1f1f1;
2602+
border-color: #dedede;
26032603
background-color: #f1f1f1;
26042604
}
26052605

@@ -3158,7 +3158,7 @@ a.button.cancel {
31583158
color: #777;
31593159
border: 1px solid #d9d9d9;
31603160
padding: 6px 6px 6px 18px;
3161-
margin-top: 102px;
3161+
margin-top: 97px;
31623162
min-width: 320px;
31633163
overflow: hidden;
31643164
box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
@@ -3193,19 +3193,20 @@ a.button.cancel {
31933193
}
31943194

31953195
.additional-info {
3196-
margin-top: 30px;
3197-
width: 547px;
3196+
margin-top: 12px;
3197+
width: 400px;
31983198
}
31993199

32003200
.additional-info td {
32013201
font-size: 0.75rem;
32023202
height: 20px;
32033203
font-weight: normal;
32043204
line-height: 0.95rem;
3205+
min-width: 70px
32053206
}
32063207

32073208
.additional-info td.details {
3208-
padding-left: 20px;
3209+
padding-left: 20px !important;
32093210
}
32103211

32113212
:focus {outline:none;}
@@ -3864,7 +3865,7 @@ form#vstobjects.suspended {
38643865
.helper-container {
38653866
float: right;
38663867
margin-bottom: -450px;
3867-
margin-top: 420px;
3868+
margin-top: 410px;
38683869
margin-right: 22px;
38693870
padding-top: 0px;
38703871
width: 600px;

‎web/css/themes/default.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/templates/admin/edit_mail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</td>
134134
</tr>
135135
<tr>
136-
<td class="vst-text input-label">
136+
<td class="vst-text input-label step-top">
137137
<?php print _('SSL Certificate');?>
138138
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_domain?>"><?=_('Generate CSR')?></a></span>
139139
</td>

‎web/templates/admin/edit_mail_acc.html‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,39 +88,40 @@
8888
</td>
8989
</tr>
9090
<tr>
91-
<td class="vst-text input-type input-label">
92-
<?php print _('Quota');?> <span class="optional">(<?=_('in megabytes')?>)</span>
91+
<td class="vst-text input-label">
92+
<?php print _('Send login credentials to email address') ?>
9393
</td>
9494
</tr>
9595
<tr>
96-
<td>
97-
<input type="text" size="20" class="vst-input" name="v_quota" value="<? if (!empty($v_quota)) {echo htmlentities(trim($v_quota, "'"));} else { echo "0"; } ?>">
98-
<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited')?>" id="unlim-quota"></i>
96+
<td>
97+
<input type="text" class="vst-input" name="v_send_email" value="<?=htmlentities(trim($v_send_email, "'"))?>">
98+
<input type="hidden" name="v_credentials" id="v_credentials">
9999
</td>
100100
</tr>
101101
<tr>
102102
<td class="vst-text input-type input-label">
103-
<?php print _('Aliases');?> <span class="optional">(<?=_('use local-part')?>)</span>
103+
<?php print _('Quota');?> <span class="optional">(<?=_('in megabytes')?>)</span>
104104
</td>
105105
</tr>
106106
<tr>
107-
<td>
108-
<textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
107+
<td>
108+
<input type="text" size="20" class="vst-input" name="v_quota" value="<? if (!empty($v_quota)) {echo htmlentities(trim($v_quota, "'"));} else { echo "0"; } ?>">
109+
<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited')?>" id="unlim-quota"></i>
109110
</td>
110111
</tr>
111112
<tr>
112113
<td class="vst-text input-type input-label">
113-
<?php print _('Forward to');?> <span class="optional">(<?=_('one or more email addresses')?>)</span>
114+
<?php print _('Aliases');?> <span class="optional">(<?=_('use local-part')?>)</span>
114115
</td>
115116
</tr>
116117
<tr>
117118
<td>
118-
<textarea size="20" class="vst-textinput short" name="v_fwd" id="v_fwd" <?php if($v_blackhole == 'yes') echo "disabled";?>><?=htmlentities(trim($v_fwd, "'"))?></textarea>
119+
<textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
119120
</td>
120121
</tr>
121122
<tr>
122123
<td class="vst-text input-label">
123-
<label><input type="checkbox" size="20" class="vst-checkbox" id="v_blackhole" name="v_blackhole" <?php if ($v_blackhole == 'yes') echo "checked=yes" ?>><?php print _('Discard all mail');?></label>
124+
<label><input type="checkbox" size="20" class="vst-checkbox" onclick="javascript:elementHideShow('v-fwd-opt');" id="v_blackhole" name="v_blackhole" <?php if ($v_blackhole == 'yes') echo "checked=yes" ?>><?php print _('Discard all mail');?></label>
124125
</td>
125126
</tr>
126127
<tr <?php if ($v_blackhole == 'yes') echo 'style="display:none"'; ?> id="id_fwd_for">
@@ -149,17 +150,22 @@
149150
</table>
150151
</td>
151152
</tr>
152-
<tr>
153-
<td class="vst-text input-label">
154-
<?php print _('Send login credentials to email address') ?>
155-
</td>
156-
</tr>
157-
<tr>
158-
<td>
159-
<input type="text" class="vst-input" name="v_send_email" value="<?=htmlentities(trim($v_send_email, "'"))?>">
160-
<input type="hidden" name="v_credentials" id="v_credentials">
161-
</td>
162-
</tr>
153+
<tr>
154+
<td>
155+
<table id="v-fwd-opt">
156+
<tr>
157+
<td class="vst-text input-type input-label">
158+
<?php print _('Forward to');?> <span class="optional">(<?=_('one or more email addresses')?>)</span>
159+
</td>
160+
</tr>
161+
<tr>
162+
<td>
163+
<textarea size="20" class="vst-textinput short" name="v_fwd" id="v_fwd" <?php if($v_blackhole == 'yes') echo "disabled";?>><?=htmlentities(trim($v_fwd, "'"))?></textarea>
164+
</td>
165+
</tr>
166+
</table>
167+
</td>
168+
</tr>
163169
</table>
164170
<table class="data-col2">
165171
</table>

‎web/templates/admin/edit_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
</td>
255255
</tr>
256256
<tr>
257-
<td class="vst-text input-label">
257+
<td class="vst-text input-label step-top">
258258
<?php print _('SSL Certificate');?>
259259
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_domain?>"><?=_('Generate CSR')?></a></span>
260260
</td>

0 commit comments

Comments
 (0)