Merge branch 'main' into feature/user-roles

web/css/src/themes/default.css

@@ -2599,7 +2599,7 @@ label:hover {
 
 .vst-input:focus:disabled,
 .vst-textinput:disabled {
-  border-color: #f1f1f1;
+  border-color: #dedede;
   background-color: #f1f1f1;
 }
 
@@ -3158,7 +3158,7 @@ a.button.cancel {
   color: #777;
   border: 1px solid #d9d9d9;
   padding: 6px 6px 6px 18px;
-  margin-top: 102px;
+  margin-top: 97px;
   min-width: 320px;
   overflow: hidden;
   box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
@@ -3193,8 +3193,8 @@ a.button.cancel {
 }
 
 .additional-info {
-    margin-top: 30px;
-    width: 547px;
+  margin-top: 12px;
+  width: 400px;
 }
 
 .additional-info td {
@@ -3202,10 +3202,11 @@ a.button.cancel {
     height: 20px;
     font-weight: normal;
     line-height: 0.95rem;
+    min-width: 70px
 }
 
 .additional-info td.details {
-    padding-left: 20px;
+    padding-left: 20px !important;
 }
 
 :focus {outline:none;}
@@ -3864,7 +3865,7 @@ form#vstobjects.suspended {
 .helper-container {
   float: right;
   margin-bottom: -450px;
-  margin-top: 420px;
+  margin-top: 410px;
   margin-right: 22px;
   padding-top: 0px;
   width: 600px;

web/templates/admin/edit_mail.html

@@ -133,7 +133,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text input-label">
+                                            <td class="vst-text input-label step-top">
                                                 <?php print _('SSL Certificate');?>
                                                 <span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_domain?>"><?=_('Generate CSR')?></a></span>
                                             </td>

web/templates/admin/edit_mail_acc.html

@@ -88,39 +88,40 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text input-type input-label">
-                                <?php print _('Quota');?> <span class="optional">(<?=_('in megabytes')?>)</span>
+                            <td class="vst-text input-label">
+                                <?php print _('Send login credentials to email address') ?>
                             </td>
                         </tr>
                         <tr>
-                          <td>
-                                <input type="text" size="20" class="vst-input" name="v_quota" value="<? if (!empty($v_quota)) {echo htmlentities(trim($v_quota, "'"));} else { echo "0"; } ?>">
-                                <i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited')?>" id="unlim-quota"></i>
+                            <td>
+                                <input type="text"  class="vst-input" name="v_send_email" value="<?=htmlentities(trim($v_send_email, "'"))?>">
+                                <input type="hidden" name="v_credentials" id="v_credentials">
                             </td>
                         </tr>
                         <tr>
                             <td class="vst-text input-type input-label">
-                                <?php print _('Aliases');?> <span class="optional">(<?=_('use local-part')?>)</span>
+                                <?php print _('Quota');?> <span class="optional">(<?=_('in megabytes')?>)</span>
                             </td>
                         </tr>
                         <tr>
-                            <td>
-                                <textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+                          <td>
+                                <input type="text" size="20" class="vst-input" name="v_quota" value="<? if (!empty($v_quota)) {echo htmlentities(trim($v_quota, "'"));} else { echo "0"; } ?>">
+                                <i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited')?>" id="unlim-quota"></i>
                             </td>
                         </tr>
                         <tr>
                             <td class="vst-text input-type input-label">
-                                <?php print _('Forward to');?> <span class="optional">(<?=_('one or more email addresses')?>)</span>
+                                <?php print _('Aliases');?> <span class="optional">(<?=_('use local-part')?>)</span>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <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>
+                                <textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
                             </td>
                         </tr>
                         <tr>
                             <td class="vst-text input-label">
-                                <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>
+                                <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>
                             </td>
                         </tr>
                         <tr <?php if ($v_blackhole == 'yes') echo 'style="display:none"'; ?> id="id_fwd_for">
@@ -149,17 +150,22 @@
                                 </table>
                             </td>
                         </tr>
-                    <tr>
-                        <td class="vst-text input-label">
-                            <?php print _('Send login credentials to email address') ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <input type="text"  class="vst-input" name="v_send_email" value="<?=htmlentities(trim($v_send_email, "'"))?>">
-                            <input type="hidden" name="v_credentials" id="v_credentials">
-                        </td>
-                    </tr>
+                        <tr>
+                            <td>
+                                <table id="v-fwd-opt">
+                                    <tr>
+                                        <td class="vst-text input-type input-label">
+                                            <?php print _('Forward to');?> <span class="optional">(<?=_('one or more email addresses')?>)</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <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>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
                     </table>
                     <table class="data-col2">
                     </table>

web/templates/admin/edit_web.html

@@ -254,7 +254,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text input-label">
+                                            <td class="vst-text input-label step-top">
                                                 <?php print _('SSL Certificate');?>
                                                 <span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_domain?>"><?=_('Generate CSR')?></a></span>
                                             </td>