Преглед изворни кода

Fix regressions, tidy classes (#3027)

Alec Rust пре 3 година
родитељ
комит
f060181d39
43 измењених фајлова са 84 додато и 104 уклоњено
  1. 1 12
      web/css/src/themes/dark.css
  2. 13 22
      web/css/src/themes/default.css
  3. 0 0
      web/css/themes/dark.min.css
  4. 0 0
      web/css/themes/default.min.css
  5. 1 1
      web/templates/pages/add_access_key.html
  6. 6 6
      web/templates/pages/add_cron.html
  7. 2 2
      web/templates/pages/add_db.html
  8. 1 1
      web/templates/pages/add_dns.html
  9. 1 1
      web/templates/pages/add_dns_rec.html
  10. 1 1
      web/templates/pages/add_firewall.html
  11. 1 1
      web/templates/pages/add_firewall_banlist.html
  12. 1 1
      web/templates/pages/add_firewall_ipset.html
  13. 1 1
      web/templates/pages/add_ip.html
  14. 1 1
      web/templates/pages/add_key.html
  15. 2 2
      web/templates/pages/add_mail.html
  16. 4 4
      web/templates/pages/add_mail_acc.html
  17. 2 2
      web/templates/pages/add_package.html
  18. 1 1
      web/templates/pages/add_user.html
  19. 1 1
      web/templates/pages/add_web.html
  20. 2 2
      web/templates/pages/edit_backup_exclusions.html
  21. 6 6
      web/templates/pages/edit_cron.html
  22. 1 1
      web/templates/pages/edit_db.html
  23. 1 1
      web/templates/pages/edit_dns.html
  24. 1 1
      web/templates/pages/edit_dns_rec.html
  25. 1 1
      web/templates/pages/edit_firewall.html
  26. 1 1
      web/templates/pages/edit_ip.html
  27. 2 2
      web/templates/pages/edit_mail.html
  28. 4 4
      web/templates/pages/edit_mail_acc.html
  29. 2 2
      web/templates/pages/edit_package.html
  30. 6 6
      web/templates/pages/edit_server.html
  31. 1 1
      web/templates/pages/edit_server_bind9.html
  32. 1 1
      web/templates/pages/edit_server_dovecot.html
  33. 1 1
      web/templates/pages/edit_server_httpd.html
  34. 1 1
      web/templates/pages/edit_server_mysql.html
  35. 1 1
      web/templates/pages/edit_server_nginx.html
  36. 1 1
      web/templates/pages/edit_server_pgsql.html
  37. 1 1
      web/templates/pages/edit_server_php.html
  38. 1 1
      web/templates/pages/edit_server_service.html
  39. 2 2
      web/templates/pages/edit_user.html
  40. 2 2
      web/templates/pages/edit_web.html
  41. 1 1
      web/templates/pages/list_access_key.html
  42. 1 1
      web/templates/pages/list_webapps.html
  43. 3 3
      web/templates/pages/setup_webapp.html

+ 1 - 12
web/css/src/themes/dark.css

@@ -991,6 +991,7 @@ a.button.cancel {
 }
 
 .section-title {
+  color: #d4d4d4;
   border-bottom-color: #484848;
 }
 
@@ -999,18 +1000,6 @@ a.button.cancel {
   box-shadow: 0 1px 4px rgb(0 0 0 / 35%);
 }
 
-.hestiacp {
-
-}
-
-.hestiacp:hover {
-
-}
-
-.hestiacp:active {
-  color: #ff3478;
-}
-
 .l-unit.selected {
   background-color: #454545;
   color: #d4d4d4;

+ 13 - 22
web/css/src/themes/default.css

@@ -192,6 +192,14 @@ dialog::backdrop {
   background-color: rgb(0 0 0 / 60%);
 }
 
+summary {
+  list-style: none;
+}
+
+summary::-webkit-details-marker {
+  display: none;
+}
+
 ol,
 ul {
   list-style: none;
@@ -2765,18 +2773,6 @@ a.button.cancel {
   box-shadow: 0 1px 4px rgb(0 0 0 / 15%);
 }
 
-.hestiacp {
-  color: #505050;
-}
-
-.hestiacp:hover {
-  color: #326b9b;
-}
-
-.hestiacp:active {
-  color: #c36;
-}
-
 .l-unit.selected {
   background-color: #f8f8f8;
   color: #4b4b4b;
@@ -3334,7 +3330,7 @@ form#vstobjects.suspended {
 .helper-container {
   float: right;
   margin-bottom: -450px;
-  margin-top: 427px;
+  margin-top: 425px;
   margin-right: 14px;
   padding-top: 0;
   width: 610px;
@@ -3587,11 +3583,6 @@ li[aria-expanded="true"] a {
   padding: 8px 18px;
 }
 
-.collapse-header::marker {
-  display: none;
-  content: "";
-}
-
 .collapse-header:hover {
   color: #ff3478;
 }
@@ -3681,6 +3672,10 @@ li[aria-expanded="true"] a {
   margin-top: 15px !important;
 }
 
+.u-mt10 {
+  margin-top: 10px !important;
+}
+
 .u-mt20 {
   margin-top: 20px !important;
 }
@@ -3713,10 +3708,6 @@ li[aria-expanded="true"] a {
   margin-bottom: 20px !important;
 }
 
-.u-pt6 {
-  padding-top: 6px !important;
-}
-
 .u-pt10 {
   padding-top: 10px !important;
 }

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
web/css/themes/dark.min.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
web/css/themes/default.min.css


+ 1 - 1
web/templates/pages/add_access_key.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/access-key/">

+ 6 - 6
web/templates/pages/add_cron.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -30,7 +30,7 @@
           <input type="hidden" name="h_day" value="*">
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb20">
+          <div class="u-mt10 u-mb20">
             <label for="h_min_1" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_min" id="h_min_1">
               <option value="*" selected="selected"><?=_('every minute');?></option>
@@ -52,7 +52,7 @@
           <input type="hidden" name="h_day" value="*">
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_hour_2" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_hour" id="h_hour_2">
               <option value="*" selected="selected"><?=_('every hour');?></option>
@@ -80,7 +80,7 @@
         <form>
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_day_3" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_day" id="h_day_3">
               <option value="*" selected="selected"><?=_('every day');?></option>
@@ -148,7 +148,7 @@
         <form>
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_day" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_wday_4" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_wday" id="h_wday_4">
               <option value="*" selected="selected"><?=_('every day');?></option>
@@ -218,7 +218,7 @@
       <div id="tabs-5">
         <form>
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_month_5" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_month" id="h_month_5">
               <option value="*" selected="selected"><?=_('every month');?></option>

+ 2 - 2
web/templates/pages/add_db.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -92,7 +92,7 @@
           <div id="advanced-opts" style="display: none;">
             <div class="u-mb10">
               <label for="v_host" class="form-label"><?=_('Host');?></label>
-              <select class="form-select u-mb20" name="v_host" id="v_host">
+              <select class="form-select" name="v_host" id="v_host">
                 <?php
                   foreach ($db_hosts as $value) {
                     echo "\n\t\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($value)."\"";

+ 1 - 1
web/templates/pages/add_dns.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_dns_rec.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_firewall.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_firewall_banlist.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_firewall_ipset.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/ipset/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_ip.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_key.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>

+ 2 - 2
web/templates/pages/add_mail.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -90,7 +90,7 @@
               <?=_('SMTP Relay');?>
             </label>
           </div>
-          <div id="smtp_relay_table" class="u-pl30" style="display:<?php if ($v_smtp_relay == 'true'){echo 'block';} else {echo 'none';} ?>;">
+          <div id="smtp_relay_table" class="u-pl30" style="display:<?php if ($v_smtp_relay == 'true'){echo 'block';} else {echo 'none';}?> ;">
             <div class="u-mb10">
               <label for="v_smtp_relay_host" class="form-label"><?=_('Host');?></label>
               <input type="text" class="form-control" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">

+ 4 - 4
web/templates/pages/add_mail_acc.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -80,15 +80,15 @@
                 <?=_('Discard all mail');?>
               </label>
             </div>
-            <div <?php if ($v_blackhole == 'yes') echo 'style="display:none"'; ?> id="id_fwd_for" class="u-pt6">
-              <div class="form-check u-mb10">
+            <div id="id_fwd_for" style="display:<?php if ($v_blackhole == 'yes') {echo 'none';} else {echo 'block';}?> ;">
+              <div class="form-check">
                 <input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo 'checked' ?>>
                 <label for="v_fwd_for">
                   <?=_('Do not store forwarded mail');?>
                 </label>
               </div>
             </div>
-            <div class="u-mb10">
+            <div class="u-mt10 u-mb10">
               <label for="v_rate" class="form-label">
                 <?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
               </label>

+ 2 - 2
web/templates/pages/add_package.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -267,7 +267,7 @@
           </div>
           <div class="u-mb10">
             <label for="v_shell" class="form-label"><?=_('SSH Access');?></label>
-            <select class="form-select u-mb20" name="v_shell" id="v_shell">
+            <select class="form-select" name="v_shell" id="v_shell">
               <?php
                 foreach ($shells as $key => $value) {
                   echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";

+ 1 - 1
web/templates/pages/add_user.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/add_web.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 2 - 2
web/templates/pages/edit_backup_exclusions.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/backup/exclusions/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -13,7 +13,7 @@
 
 <div class="l-separator"></div>
 
-<div class="l-center edit animated fadeIn">
+<div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_backup_exclusions" method="post" class="<?=_($v_status)?>">
     <input type="hidden" name="token" value="<?=$_SESSION['token']?>">

+ 6 - 6
web/templates/pages/edit_cron.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -30,7 +30,7 @@
           <input type="hidden" name="h_day" value="*">
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb20">
+          <div class="u-mt10 u-mb20">
             <label for="h_min_1" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_min" id="h_min_1">
               <option value="*" selected="selected"><?=_('every minute');?></option>
@@ -52,7 +52,7 @@
           <input type="hidden" name="h_day" value="*">
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_hour_2" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_hour" id="h_hour_2">
               <option value="*" selected="selected"><?=_('every hour');?></option>
@@ -80,7 +80,7 @@
         <form>
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_day_3" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_day" id="h_day_3">
               <option value="*" selected="selected"><?=_('every day');?></option>
@@ -148,7 +148,7 @@
         <form>
           <input type="hidden" name="h_month" value="*">
           <input type="hidden" name="h_day" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_wday_4" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_wday" id="h_wday_4">
               <option value="*" selected="selected"><?=_('every day');?></option>
@@ -218,7 +218,7 @@
       <div id="tabs-5">
         <form>
           <input type="hidden" name="h_wday" value="*">
-          <div class="u-mt15 u-mb10">
+          <div class="u-mt10 u-mb10">
             <label for="h_month_5" class="form-label first"><?=_('Run Command');?>:</label>
             <select class="form-select" name="h_month" id="h_month_5">
               <option value="*" selected="selected"><?=_('every month');?></option>

+ 1 - 1
web/templates/pages/edit_db.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_dns.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_dns_rec.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_firewall.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_ip.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 2 - 2
web/templates/pages/edit_mail.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -190,7 +190,7 @@
             <?=_('SMTP Relay');?>
           </label>
         </div>
-        <div id="smtp_relay_table" class="u-pl30" style="display:<?php if ($v_smtp_relay == 'true') {echo 'block';} else {echo 'none';} ?>;">
+        <div id="smtp_relay_table" class="u-pl30" style="display:<?php if ($v_smtp_relay == 'true') {echo 'block';} else {echo 'none';}?> ;">
           <div class="u-mb10">
             <label for="v_smtp_relay_host" class="form-label"><?=_('Host');?></label>
             <input type="text" class="form-control" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">

+ 4 - 4
web/templates/pages/edit_mail_acc.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -68,14 +68,14 @@
             </label>
             <textarea class="form-control" name="v_aliases" id="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
           </div>
-          <div class="form-check u-mb10">
+          <div class="form-check">
             <input class="form-check-input" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo 'checked' ?>>
             <label for="v_blackhole">
               <?=_('Discard all mail');?>
             </label>
           </div>
-          <div <?php if ($v_blackhole == 'yes') echo 'style="display:none"'; ?> id="id_fwd_for">
-            <div class="form-check u-mb10">
+          <div id="id_fwd_for" style="display:<?php if ($v_blackhole == 'yes') {echo 'none';} else {echo 'block';}?> ;">
+            <div class="form-check">
               <input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo 'checked' ?>>
               <label for="v_fwd_for">
                 <?=_('Do not store forwarded mail');?>

+ 2 - 2
web/templates/pages/edit_package.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -270,7 +270,7 @@
           </div>
           <div class="u-mb10">
             <label for="v_shell" class="form-label"><?=_('SSH Access');?></label>
-            <select class="form-select u-mb20" name="v_shell" id="v_shell">
+            <select class="form-select" name="v_shell" id="v_shell">
               <?php
                 foreach ($shells as $key => $value) {
                   echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";

+ 6 - 6
web/templates/pages/edit_server.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -201,7 +201,7 @@
                 <?php endforeach; ?>
               <?php endif; ?>
               <?php if(!empty($_SESSION['WEB_BACKEND'])){ ?>
-                <div class="u-pt6 u-mb10">
+                <div class="u-mt10">
                   <label for="v_php_default_version" class="form-label"><?=_('System PHP version');?></label>
                   <select class="form-select" name="v_php_default_version" id="v_php_default_version">
                     <?php
@@ -281,7 +281,7 @@
                   <?=_('Global SMTP Relay');?>
                 </label>
               </div>
-              <div id="smtp_relay_table" class="u-pl30 u-mt20" style="display:<?php if ($v_smtp_relay == 'true') {echo 'block';} else {echo 'none';} ?>;">
+              <div id="smtp_relay_table" class="u-pl30 u-mt20" style="display:<?php if ($v_smtp_relay == 'true') {echo 'block';} else {echo 'none';}?> ;">
                 <div class="u-input-width">
                   <div class="u-mb10">
                     <label for="v_smtp_relay_host" class="form-label"><?=_('Host');?></label>
@@ -452,7 +452,7 @@
                   <?php } ?>
                 </select>
               </div>
-              <div class="u-mb10">
+              <div class="u-mb20">
                 <label for="v_backup_dir" class="form-label">
                   <?=_('Directory');?> <a target="_blank" href="https://docs.hestiacp.com/admin_docs/backups.html#how-to-change-default-backup-folder"><i class="fas fa-question-circle"></i></a>
                 </label>
@@ -778,7 +778,7 @@
                 </p>
                 <div class="u-mb10">
                   <label for="v_enforce_subdomain_ownership" class="form-label"><?=_('Enforce subdomain ownership');?></label>
-                  <select class="form-select u-mb20" name="v_enforce_subdomain_ownership" id="v_enforce_subdomain_ownership">
+                  <select class="form-select" name="v_enforce_subdomain_ownership" id="v_enforce_subdomain_ownership">
                     <option value="yes"><?=_('Yes'); ?></option>
                     <option value="no" <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
                   </select>
@@ -818,7 +818,7 @@
               </div>
               <div class="u-mb10">
                 <label for="v_firewall" class="form-label"><?=_('Firewall');?></label>
-                <select class="form-select u-mb20" name="v_firewall" id="v_firewall">
+                <select class="form-select" name="v_firewall" id="v_firewall">
                   <option value="no"><?=_('No'); ?></option>
                   <option value="yes" <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?=_('Yes'); ?></option>
                 </select>

+ 1 - 1
web/templates/pages/edit_server_bind9.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_dovecot.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_httpd.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_mysql.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_nginx.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_pgsql.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_php.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 1 - 1
web/templates/pages/edit_server_service.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 2 - 2
web/templates/pages/edit_user.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -121,7 +121,7 @@
               </label>
             </div>
           </div>
-          <div id="ip-allowlist" class="u-pt6" style="<?php if ($v_login_use_iplist === 'yes') { echo 'display: block;'; } else { echo 'display: none;'; } ?>">
+          <div id="ip-allowlist" class="u-mt10" style="<?php if ($v_login_use_iplist === 'yes') { echo 'display: block;'; } else { echo 'display: none;'; } ?>">
             <input type="text" class="form-control" name="v_login_allowed_ips" value="<?=htmlentities(trim($v_login_allowed_ips, "'"))?>" placeholder="<?=_('Example: 127.0.0.1,192.168.1.100');?>">
           </div>
         </div>

+ 2 - 2
web/templates/pages/edit_web.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -288,7 +288,7 @@
                 </label>
               </div>
               <div id="v_nginx_duration" class="u-pl30" style="display:<?php if ($v_nginx_cache != 'yes' ) { echo 'none';} else {echo 'block';}?> ;">
-                <div class="u-pt6">
+                <div class="u-mb10">
                   <label for="v_nginx_cache_duration" class="form-label">
                     <?=_('Cache Duration'); ?> <span class="optional"><?=_('For example: 30s, 10m or 1d');?>
                   </label>

+ 1 - 1
web/templates/pages/list_access_key.html

@@ -10,7 +10,7 @@ if (!empty($_POST['ok'])) {
 <?php } ?>
 
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/access-key/">

+ 1 - 1
web/templates/pages/list_webapps.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/edit/web/?domain=<?=htmlentities($v_domain)?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>

+ 3 - 3
web/templates/pages/setup_webapp.html

@@ -1,5 +1,5 @@
 <!-- Begin toolbar -->
-<div class="l-center edit">
+<div class="l-center">
   <div class="l-sort clearfix">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/add/webapp/?domain=<?=htmlentities($v_domain);?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -7,10 +7,10 @@
     <div class="l-unit-toolbar__buttonstrip u-float-right">
       <?php
         if (!empty($_SESSION['error_msg'])) {
-          echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
+          echo "<p class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</p>";
         } else {
           if (!empty($_SESSION['ok_msg'])) {
-            echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+            echo "<p class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</p>";
           }
         }
       ?>

Неке датотеке нису приказане због велике количине промена