Skip to content

Commit 8a0484e

Browse files
author
Kristan Kenney
committed
Merge branch 'main' into feature/ui-themes_vestia
2 parents fd029eb + 1c91527 commit 8a0484e

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

‎web/templates/admin/edit_web.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@
170170
<table style="display:<?php if (empty($v_redirect)) { echo 'none';} else {echo 'block';}?> ;" id="v_redirect">
171171
<tr>
172172
<td>
173-
<input type="radio" name="v-redirect" value="<?php echo 'www.'.$v_domain;?>" <?php if ($v_redirect == "www.".$v_domain) echo "checked"; ?> class="v-redirect-custom-value"><?=sprintf(_('Redirect visitors to %s'),"www.".$v_domain);?></label></input><br />
174-
<input type="radio" name="v-redirect" value="<?php echo $v_domain;?>" <?php if( $v_redirect == $v_domain) echo "checked";?> class="v-redirect-custom-value"><?=sprintf(_('Redirect visitors to %s'),$v_domain);?></label></input><br />
175-
<input type="radio" name="v-redirect" value="custom" <?php if( !empty($v_redirect_custom)) echo "checked";?> class="v-redirect-custom-value"><?=_("Redirect visitors to a custom domain or web address");?></label></input>
173+
<label><input type="radio" name="v-redirect" value="<?php echo 'www.'.$v_domain;?>" <?php if ($v_redirect == "www.".$v_domain) echo "checked"; ?> class="v-redirect-custom-value"><?=sprintf(_('Redirect visitors to %s'),"www.".$v_domain);?></label></input><br />
174+
<label><input type="radio" name="v-redirect" value="<?php echo $v_domain;?>" <?php if( $v_redirect == $v_domain) echo "checked";?> class="v-redirect-custom-value"><?=sprintf(_('Redirect visitors to %s'),$v_domain);?></label></input><br />
175+
<label><input type="radio" name="v-redirect" value="custom" <?php if( !empty($v_redirect_custom)) echo "checked";?> class="v-redirect-custom-value"><?=_("Redirect visitors to a custom domain or web address");?></label></input>
176176
</td>
177177
</tr>
178178
<tr>

‎web/templates/admin/list_mail_dns.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,37 @@
4242
<div class="l-unit animated fadeIn">
4343
<div class="l-unit__col l-unit__col--right">
4444
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="mail.<?=htmlspecialchars($_GET['domain']);?>"/></b> </div>
45-
<div class="clearfix l-unit__stat-col--left text-center"><b>A</b></div>
46-
<div class="clearfix l-unit__stat-col--left text-center"><b>10</b></div>
47-
<div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
45+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>A</b></div>
46+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>10</b></div>
47+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
4848
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?php echo array_key_first($ips);?>"/></b></div>
4949
</div>
5050
</div>
5151
<div class="l-unit animated fadeIn">
5252
<div class="l-unit__col l-unit__col--right">
5353
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain']);?>"/></b> </div>
54-
<div class="clearfix l-unit__stat-col--left text-center"><b>A</b></div>
55-
<div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
56-
<div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
54+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>A</b></div>
55+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
56+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
5757
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?php echo array_key_first($ips);?>"/></b></div>
5858
</div>
5959
</div>
6060
<div class="l-unit animated fadeIn">
6161
<div class="l-unit__col l-unit__col--right">
6262
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="@"/></b> </div>
63-
<div class="clearfix l-unit__stat-col--left text-center"><b>TXT</b></div>
64-
<div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
65-
<div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
63+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
64+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
65+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
6666
<div class="clearfix l-unit__stat-col--left wide-3 "><b><input type="text" class="vst-input" value="<?php echo htmlspecialchars('"v=spf1 a mx ip4:'.array_key_first($ips).'; -all"');?>"/></b></div>
6767
</div>
6868
</div>
6969
<?php foreach($dkim as $key => $value){ ?>
7070
<div class="l-unit animated fadeIn">
7171
<div class="l-unit__col l-unit__col--right">
7272
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=htmlspecialchars($key);?>"/></b></div>
73-
<div class="clearfix l-unit__stat-col--left text-center"><b>TXT</b></div>
74-
<div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
75-
<div class="clearfix l-unit__stat-col--left text-center"><b>3600</b></div>
73+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
74+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
75+
<div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>3600</b></div>
7676
<div class="clearfix l-unit__stat-col--left wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars(str_replace("'",'"',$dkim[$key]['TXT']));?>"</b></div>
7777
</div>
7878
</div>

‎web/templates/admin/list_stats.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223

224224
</table>
225225
</div>
226+
</div>
226227
<!-- /.l-unit__stats -->
227228
</div>
228229
<!-- /.l-unit__col -->
@@ -240,7 +241,6 @@
240241
<div class="l-unit-ft">
241242
<table class='data'></table>
242243
<!-- /form -->
243-
<div class="l-unit__col l-unit__col--left clearfix"></div>
244244
<div class="data-count l-unit__col l-unit__col--right clearfix">
245245
<?php
246246
printf(ngettext('%d month', '%d months', $i),$i);

‎web/templates/user/list_stats.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199

200200
</table>
201201
</div>
202+
</div>
202203
<!-- /.l-unit__stats -->
203204
</div>
204205
<!-- /.l-unit__col -->
@@ -216,7 +217,6 @@
216217
<div class="l-unit-ft">
217218
<table class='data'></table>
218219
<!-- /form -->
219-
<div class="l-unit__col l-unit__col--left clearfix"></div>
220220
<div class="data-count l-unit__col l-unit__col--right clearfix">
221221
<?php
222222
printf(ngettext('%d month', '%d months', $i),$i);

0 commit comments

Comments
 (0)