Kristan Kenney 6 лет назад
Родитель
Сommit
44f37abadc
44 измененных файлов с 653 добавлено и 423 удалено
  1. 24 8
      install/deb/themes/dark.css
  2. 32 7
      install/deb/themes/flat.css
  3. 55 32
      web/css/styles.min.css
  4. 13 9
      web/templates/admin/add_cron.html
  5. 13 9
      web/templates/admin/add_db.html
  6. 13 9
      web/templates/admin/add_dns.html
  7. 13 9
      web/templates/admin/add_dns_rec.html
  8. 13 9
      web/templates/admin/add_firewall.html
  9. 23 19
      web/templates/admin/add_firewall_banlist.html
  10. 13 9
      web/templates/admin/add_ip.html
  11. 13 9
      web/templates/admin/add_mail.html
  12. 13 9
      web/templates/admin/add_mail_acc.html
  13. 13 9
      web/templates/admin/add_package.html
  14. 13 9
      web/templates/admin/add_user.html
  15. 12 9
      web/templates/admin/add_web.html
  16. 14 10
      web/templates/admin/edit_backup_exclusions.html
  17. 13 9
      web/templates/admin/edit_cron.html
  18. 14 10
      web/templates/admin/edit_db.html
  19. 14 10
      web/templates/admin/edit_dns.html
  20. 14 10
      web/templates/admin/edit_dns_rec.html
  21. 14 10
      web/templates/admin/edit_firewall.html
  22. 14 10
      web/templates/admin/edit_ip.html
  23. 14 10
      web/templates/admin/edit_mail.html
  24. 14 10
      web/templates/admin/edit_mail_acc.html
  25. 14 10
      web/templates/admin/edit_package.html
  26. 14 10
      web/templates/admin/edit_server.html
  27. 13 9
      web/templates/admin/edit_server_bind9.html
  28. 13 9
      web/templates/admin/edit_server_dovecot.html
  29. 13 9
      web/templates/admin/edit_server_httpd.html
  30. 13 9
      web/templates/admin/edit_server_mysql.html
  31. 13 9
      web/templates/admin/edit_server_nginx.html
  32. 13 9
      web/templates/admin/edit_server_pgsql.html
  33. 13 9
      web/templates/admin/edit_server_php.html
  34. 13 9
      web/templates/admin/edit_server_service.html
  35. 14 10
      web/templates/admin/edit_user.html
  36. 16 12
      web/templates/admin/edit_web.html
  37. 1 1
      web/templates/admin/list_backup_exclusions.html
  38. 2 2
      web/templates/admin/list_db.html
  39. 2 2
      web/templates/admin/list_server_info.html
  40. 20 12
      web/templates/admin/list_webapps.html
  41. 7 8
      web/templates/admin/setup_webapp.html
  42. 14 10
      web/templates/user/edit_dns.html
  43. 14 10
      web/templates/user/edit_user.html
  44. 30 10
      web/templates/user/edit_web.html

+ 24 - 8
install/deb/themes/dark.css

@@ -90,6 +90,8 @@ a {
   color: #dadada;
   background: linear-gradient(to bottom, rgba(15,15,15,0.6) 0%,rgba(45,45,45,0.75) 30%,rgba(60,60,60,1) 95%);
   text-shadow: 0px 1px rgba(0,0,0,0.5);
+  border-left-color: #353535;
+  border-right-color: #353535;
 }
 
 .l-menu {
@@ -111,11 +113,15 @@ a {
   box-shadow: none !important;
 }
 .l-menu__item a:active {
-  background: linear-gradient(to bottom, rgba(15,15,15,0.6) 0%,rgba(45,45,45,0.75) 30%,rgba(60,60,60,1) 95%) !important;
+  background: linear-gradient(to bottom, rgba(15,15,15,0.7) 0%,rgba(45,45,45,0.85) 30%,rgba(50,50,50,1) 95%) !important;
   color: #fff !important;
   text-shadow: 0px -1px 1px rgba(0,0,0,0.5) !important;
 }
 
+.l-menu__item.l-menu__item--active:hover {
+  background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0.15) 30%,rgba(255,255,255,0.15) 95%) !important;
+}
+
 .l-menu.active .l-menu__item.focus a {
 	
 }
@@ -250,7 +256,7 @@ a {
 
 .notification-container .unseen .title a,
 .notification-container .unseen .title {
-
+  color: #fff !important;
 }
 .notification-container .unseen .title a:hover {
 
@@ -1268,12 +1274,12 @@ body.mobile .l-icon-shortcuts {
 
 
 .vst-error {
-  color: #f864fa;
+  color: #ff3333;
 
 }
 
 .vst-ok {
-
+  color: #53ba55;
 }
 
 .l-unit-toolbar__buttonstrip .vst-ok, .l-unit-toolbar__buttonstrip .vst-error {
@@ -1351,7 +1357,9 @@ label:hover {
 }
 .vst-input:hover {
   border-color: #0090ff;
+  background-color: #494949;
 }
+
 .vst-input:focus {
   background-color: #222222;
   border-color: #0080df;
@@ -1385,7 +1393,7 @@ label:hover {
 
 }
 .vst-input.vst-list-editor:focus {
-  background-color: #505050;
+  background-color: #222222;
   box-shadow: none !important;
 }
 
@@ -1409,6 +1417,7 @@ select.vst-list:-moz-focusring {
 }
 .vst-list:hover {
   border-color: #0090ff;
+  background-color: #494949;
 }
 .vst-list:focus {
   background-color: #222222;
@@ -1445,7 +1454,8 @@ a.vst-text:active b{
   background: #454545 !important;
   border: 1px solid #505050 !important;
   text-shadow: 0px 1px rgba(0,0,0,0.4);
-  box-shadow: 0px 2px 6px rgba(0,0,0,0.4) !important;
+  box-shadow: inset 0px 0px 2px rgba(0,0,0,0.5), 
+              0px 2px 6px rgba(0,0,0,0.4) !important;
   color: #fff !important;
   padding: 4px 0px 0px 18px;
   overflow: hidden;
@@ -1468,6 +1478,7 @@ a.vst-text:active b{
 }
 .vst-textinput:hover {
   border: 1px solid #0090ff;
+  background-color: #494949;
 }
 .vst-textinput:focus {
   background-color: #222222;
@@ -1810,10 +1821,11 @@ a.button.cancel {
 
 .login {
   background-color: #282828;
+  box-shadow: 0px 8px 25px rgba(0,0,0, 0.3), inset 0px 0px 2px rgba(0,0,0,0.25) !important;
 }
 
 .login-welcome {
-
+  color: #fff !important;
 }
 
 .page-title {
@@ -2032,7 +2044,7 @@ form#vstobjects.suspended {
   color: #33cccc;
 }
 .status-icon.purple, .status-icon.purple:hover {
-  color: #8e2fca;
+  color: #c364ff;
 }
 
 .status-icon.maroon, .status-icon.maroon:hover {
@@ -2121,12 +2133,14 @@ form#vstobjects.suspended {
 
 .ui-dialog .ui-dialog-buttonpane {
   border-color: #404040 !important;
+  background-color: #252525 !important;
 }
 
 .shortcuts {
   background: rgba(30,30,30,0.95);
   border: 1px solid rgba(255,255,255,0.25);
   box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+  border-bottom: none !important;
 }
 
 .shortcuts .header {
@@ -2222,6 +2236,8 @@ form#vstobjects.suspended {
 .ui-dialog {
   background-color: rgba(45,45,45,0.95) !important;
   border: 1px solid rgba(80,80,80,0.97) !important;
+  box-shadow: inset 0px 1px 3px rgba(0,0,0,0.25), 
+              0px 8px 25px rgba(0,0,0,0.9) !important;
 }
 
 .ui-dialog .ui-dialog-content {

+ 32 - 7
install/deb/themes/flat.css

@@ -31,6 +31,7 @@ b, strong {
 .l-header {
     box-shadow: none;
     background: #5070a6;
+    text-shadow: none !important;
 }
 
 .l-menu__item--active {
@@ -39,6 +40,7 @@ b, strong {
 
 .l-menu__item.l-menu__item--active a {
     background: none;
+    box-shadow: none !important;
 }
 
 .l-menu__item a:hover {
@@ -48,7 +50,7 @@ b, strong {
 
 .l-menu__item a:active {
     background: none;
-    box-shadow: none;
+    box-shadow: none !important;
 }
 
 .l-profile__notifications:hover,
@@ -90,24 +92,31 @@ b, strong {
     box-shadow: none;
 }
 
-.ui-button, .button {
+.ui-button, .button, .ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit, .vst-advanced {
     box-shadow: none !important;
     background: linear-gradient(to bottom, rgba(235,243,249,1) 0%,rgba(223,235,245,1) 100%) !important;
 }
 
-.ui-button.cancel, .button.cancel {
+.ui-button.cancel,
+.button.cancel,
+.to-top, .to-shortcuts {
     box-shadow: none !important;
     background: linear-gradient(to bottom, rgba(250,250,250,1) 0%,rgba(241,241,241,1) 100%) !important;
 }
 
-.ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover {
+.ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover,
+.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:hover,
+.vst-advanced:hover, .to-top:hover, .to-shortcuts:hover  {
+    color: #6986b7 !important;
     box-shadow: none !important;
     background: linear-gradient(to bottom, rgba(241,248,253,1) 0%,rgba(227,240,251,1) 100%) !important;
 }
 
 .ui-button:focus,.ui-button:active,
 .button:active,.button:focus,.ui-button.cancel:focus,.ui-button.cancel:active,
-.button.cancel:active,.button.cancel:focus {
+.button.cancel:active,.button.cancel:focus,
+.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:active,
+.vst-advanced:active,.to-top:focus, .to-shortcuts:focus {
     box-shadow: none !important;
     background: linear-gradient(to bottom, rgba(210,232,250,1) 0%,rgba(194,224,248,1) 100%) !important;
 }
@@ -124,6 +133,14 @@ b, strong {
     border: 1px solid #F4301A !important;
 }
 
+.ui-dialog .ui-dialog-buttonpane button:nth-of-type(2) {
+    box-shadow: none !important;
+}
+
+.ui-dialog {
+    box-shadow: 0 2px 11px 0 rgba(0, 0, 0, 0.5) !important;
+}
+
 .alert {
     text-shadow: none !important;
     box-shadow: none !important;
@@ -139,10 +156,18 @@ b, strong {
 
 .notification-container {
     box-shadow: none;
-    border: 1px solid #dadada;
+    border: 1px solid #ccc;
+    background: #fff;
 }
 
 .context-menu.sort-order {
     box-shadow: none;
-    border: 1px solid #dadada;
+    border: 1px solid #ccc;
+    background: #fff !important;
+}
+
+.login {
+    background-color: rgba(255,255,255,0.8) !important;
+    box-shadow: 0px 2px 10px rgba(0,0,0, 0.3), 
+                inset 0px 0px 2px rgba(255,255,255,1) !important;
 }

+ 55 - 32
web/css/styles.min.css

@@ -784,8 +784,8 @@ a {
   width: 100%;
   z-index: 900;
   height: 38px;
-  text-shadow: 1px 1px rgba(0,0,0,0.65);
-  box-shadow: 0px 8px 16px rgba(140,140,140,0.5);
+  text-shadow: 1px 1px rgba(0,0,0,0.25);
+  box-shadow: 0px 4px 10px rgba(100,100,100,0.4);
   border-bottom: 1px solid #fff;
 }
 
@@ -802,6 +802,12 @@ a {
   font-size: 0.8rem;
   background: linear-gradient(to bottom, rgba(255,255,255,0.6) 0%,rgba(255,255,255,0.75) 30%,rgba(255,255,255,1) 95%);
   text-shadow: 0px 1px rgba(255,255,255,0.8);
+  border-left: 1px solid rgba(255,255,255,0.98);
+  border-right: 1px solid rgba(255,255,255,0.98);
+}
+
+.l-menu__item.l-menu__item--active:hover {
+  box-shadow: none;
 }
 
 .l-menu {
@@ -824,18 +830,19 @@ a {
 
 .l-menu__item a:hover {
   color: #3b9de8 !important;
-  text-shadow: 1px 1px rgba(255,255,255,0.5) !important;
   border: 0;
-  background: linear-gradient(to bottom, rgba(241,248,253,1) 0%,rgba(218,236,250,1) 50%,rgba(190,221,246,1) 51%,rgba(227,240,251,1) 100%) !important;
-  box-shadow: inset 0px 0px 1px #fff,
-              inset 0px 0px 6px rgba(255,255,255,0.6) !important;
+  box-shadow: inset 0px 0px 6px rgba(255,255,255,0.6) !important;
   transition: 0.2s;
   border-left: 1px solid rgba(0,0,0,0.1);
   border-right: 1px solid rgba(0,0,0,0.1);
+  color: #4686b8 !important;
+  background: linear-gradient(to bottom, rgba(255,255,255,0.6) 0%,rgba(255,255,255,0.75) 30%,rgba(255,255,255,1) 95%);
+  text-shadow: 0px 1px rgba(255,255,255,0.8);
 }
+
 .l-menu__item a:active {
   border: 0;
-  background: linear-gradient(to bottom, rgba(210,232,250,1) 0%,rgba(187,220,247,1) 50%,rgba(162,207,244,1) 51%,rgba(194,224,248,1) 100%) !important;
+  background: linear-gradient(to bottom, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0.6) 30%,rgba(255,255,255,0.95) 95%);
   color: #046c98 !important;
   text-shadow: 0px -1px 1px rgba(255,255,255,0.5) !important;
   box-shadow: inset 0px 0px 1px #fff,
@@ -914,8 +921,7 @@ a {
 }
 
 .l-profile__notifications.active.l-profile__notifications.updates:active {
-  border: 1px solid #378ccd !important;
-  background: linear-gradient(to bottom, rgba(210,232,250,1) 0%,rgba(187,220,247,1) 50%,rgba(162,207,244,1) 51%,rgba(194,224,248,1) 100%) !important;
+  background: linear-gradient(to bottom, rgba(255,255,255,0.6) 0%,rgba(255,255,255,0.75) 30%,rgba(255,255,255,1) 95%) !important;
   color: #046c98 !important;
   text-shadow: 0px -1px 1px rgba(255,255,255,0.5) !important;
   box-shadow: 0px 1px 3px rgba(0,0,0,0.15),
@@ -926,11 +932,7 @@ a {
 .l-profile__notifications:hover,.l-profile__notifications.updates:hover {
   color: #3b9de8 !important;
   text-shadow: 1px 1px rgba(255,255,255,0.5) !important;
-  border: 1px solid #54a6e5 !important;
-  background: linear-gradient(to bottom, rgba(241,248,253,1) 0%,rgba(218,236,250,1) 50%,rgba(190,221,246,1) 51%,rgba(227,240,251,1) 100%) !important;
-  box-shadow: 0px 1px 3px rgba(0,0,0,0.15),
-              inset 0px 0px 1px #fff,
-              inset 0px 0px 6px rgba(255,255,255,0.6) !important;
+  background: linear-gradient(to bottom, rgba(255,255,255,0.75) 0%,rgba(255,255,255,0.87) 30%,rgba(255,255,255,1) 95%) !important;
   transition: 0.2s;
 }
 
@@ -2424,7 +2426,7 @@ body.mobile .l-icon-shortcuts {
 
 
 .vst-error {
-  color: #BE5ABF;
+  color: #ff3333;
   font-weight: 600;
   overflow: hidden;
   max-width: 500px;
@@ -2433,11 +2435,12 @@ body.mobile .l-icon-shortcuts {
 }
 
 .vst-ok {
-  color: #3b9de8;
+  color: #53ba55;
   overflow: hidden;
   max-width: 500px;
   text-overflow: ellipsis;
   white-space: nowrap;
+  font-size: 0.8rem;
 }
 
 .l-unit-toolbar__buttonstrip .vst-ok, .l-unit-toolbar__buttonstrip .vst-error {
@@ -2751,8 +2754,7 @@ a.vst-text:active b{
   text-decoration: none;
 }
 
-.login-box .vst-advanced:active,
-.vst-advanced:active {
+.login-box .vst-advanced:active {
   color: #fff;
   background-color: #F7D616;
   border-color: #F7D616;
@@ -2763,6 +2765,10 @@ a.vst-text:active b{
   border: none !important
 }
 
+.vst-advanced:active {
+  font-size: unset;
+}
+
 .login-box .vst-advanced {
   border-bottom: none;
   color: #326b9b;
@@ -2870,6 +2876,11 @@ td.hint {
   inset 0px 0px 3px rgba(255,255,255,0.5) !important;
 }
 
+.ui-dialog .ui-dialog-buttonpane {
+  margin-bottom: -6px !important;
+  padding: 0 !important;
+}
+
 .ui-button, .button, .ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit, .vst-advanced {
   filter:chroma(color=#000);
   cursor: pointer;
@@ -2890,8 +2901,8 @@ td.hint {
 }
 .ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover,
 .ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:hover,
-.vst-advanced:hover {
-  color: #0099ff !important;
+.vst-advanced:hover, .to-top:hover, .to-shortcuts:hover {
+  color: #0077c6 !important;
   text-shadow: 1px 1px rgba(255,255,255,0.5) !important;
   border: 1px solid #54a6e5 !important;
   background: linear-gradient(to bottom, rgba(241,248,253,1) 0%,rgba(218,236,250,1) 50%,rgba(190,221,246,1) 51%,rgba(227,240,251,1) 100%) !important;
@@ -2904,11 +2915,11 @@ td.hint {
 .button:active,.button:focus,.ui-button.cancel:focus,.ui-button.cancel:active,
 .button.cancel:active,.button.cancel:focus,
 .ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:active,
-.vst-advanced:active,.vst-advanced:focus {
+.vst-advanced:active,.to-top:focus, .to-shortcuts:focus {
   border: 1px solid #0066b4 !important;
-  background: linear-gradient(to bottom, rgba(210,232,250,1) 0%,rgba(187,220,247,1) 50%,rgba(162,207,244,1) 51%,rgba(194,224,248,1) 100%) !important;
-  color: #046c98 !important;
-  text-shadow: 0px -1px 1px rgba(255,255,255,0.5) !important;
+  background: linear-gradient(to bottom, rgba(194,224,248,1) 0%,  rgba(162,207,244,1) 51%, rgba(210,232,250,1) 100%) !important;
+  color: #517bab !important;
+  text-shadow: 0px -1px 2px rgba(255,255,255,0.85) !important;
   box-shadow: 0px 1px 2px rgba(0,0,0,0.2),
               inset 0px 0px 1px #fff,
               inset -1px -1px 4px rgba(220,220,220,0.4) !important;
@@ -2923,6 +2934,7 @@ td.hint {
 
 .ui-dialog .ui-dialog-buttonpane button span.ui-button-text {
   padding: 2px !important;
+  font-size: 0.85rem !important;
 }
 
 .ui-dialog .ui-button:hover span {
@@ -2971,7 +2983,7 @@ a.button.cancel {
 }
 
 .ui-button.danger:active, .button.danger:active, .ui-button.danger:focus, .button.danger:focus {
-  background: linear-gradient(to bottom, #f9e3df 0%,#f5a69d 50%,#f48578 51%,#fcd0ca 100%) !important; 
+  background: linear-gradient(to bottom, #fcd0ca 0%,#f5a69d 50%,#f9e3df 100%) !important;
   color: #ce1500 !important;
   text-shadow: 0px 1px 1px rgba(255,255,255,0.2),
                0px -1px 1px rgba(255,255,255,0.6) !important;
@@ -3090,8 +3102,9 @@ a.button.cancel {
 ::-moz-focus-inner {border:0;}
 
 .login {
-  background-color: rgba(255,255,255,0.65);
-  box-shadow: 0px 8px 25px rgba(0,0,0, 0.3);
+  background-color: rgba(255,255,255,0.7);
+  box-shadow: 0px 8px 25px rgba(0,0,0, 0.3),
+              inset 0px 0px 2px rgba(255,255,255,1);
   font-family: 'Exo', Tahoma, Arial, Helvetica, sans-serif;
   margin: 0;
   padding: 0;
@@ -3106,6 +3119,10 @@ a.button.cancel {
   border-color: #5787c8;
 }
 
+.login .button {
+  font-size: 0.8rem !important;
+}
+
 .login-welcome {
   font-size: 1.05rem !important;
   font-weight: 500 !important;
@@ -3114,7 +3131,7 @@ a.button.cancel {
 }
 
 .page-title {
-  font-size: 1.2rem !important;
+  font-size: 1.3rem !important;
   font-weight: 400 !important;
   padding-bottom: 30px !important;
   letter-spacing: -0.01em;
@@ -3296,7 +3313,7 @@ form#vstobjects.suspended {
   margin-right: 10px;
   line-height: 0.75rem;
   box-shadow: 0px 1px 1px rgba(0,0,0,0.35), inset 0px 1px 0px rgba(0,0,0,0.1);
-  background-color: rgba(255,255,255,0.65);
+  background-color: rgba(255,255,255,0.75);
   font-weight: 500;
   border: 1px solid rgba(255,255,255,0.75);
   text-shadow: 0px 1px 1px rgba(255,255,255,0.6);
@@ -3687,9 +3704,10 @@ form#vstobjects.suspended {
   font-family: 'Exo', Arial, Helvetica, sans-serif !important;
   font-weight: 500 !important;
   background-color: rgba(255,255,255,0.9) !important;
-  box-shadow: 0 8px 40px 0 rgba(0, 0, 0, 0.35) !important;
+  box-shadow: inset 0px 1px 3px rgba(0,0,0,0.25), 
+              0 8px 40px 0 rgba(0, 0, 0, 0.35) !important;
   border-radius: 6px !important;
-  border: 2px solid rgba(255,255,255,0.95) !important;
+  border: 1px solid rgba(255,255,255,0.98) !important;
   text-align: center !important;
 }
 
@@ -3710,7 +3728,12 @@ form#vstobjects.suspended {
 }
 
 .ui-dialog-buttonpane {
-  border-color: #aaaaaa !important;
+  border-color: #fff!important;
+  box-shadow: inset 0px 0px 2px rgba(0,0,0,0.25);
+  border-bottom: 1px solid #fff !important;
+  background: #e0e0e0;
+  margin-top: 0px !important;
+  padding-top: 0px !important;
 }
 
 .ui-widget {

+ 13 - 9
web/templates/admin/add_cron.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -372,6 +363,19 @@
                                     <span class="page-title"><?=__('Adding Cron Job')?></span>
                                  </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                          echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                          if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                          }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Command');?>

+ 13 - 9
web/templates/admin/add_db.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -47,6 +38,19 @@
                                     <span class="page-title"><?=__('Adding database')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="step-top hint">
                                     <?php print __('Prefix will be automaticaly added to database name and database user',"<b>".$user."_</b>");?>

+ 13 - 9
web/templates/admin/add_dns.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -48,6 +39,19 @@
                                     <span class="page-title"><?=__('Adding DNS Domain')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 13 - 9
web/templates/admin/add_dns_rec.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="javascript:window.history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -40,6 +31,19 @@
                                     <span class="page-title"><?=__('Adding DNS Record')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 13 - 9
web/templates/admin/add_firewall.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -48,6 +39,19 @@
                                     <span class="page-title"><?=__('Adding Firewall Rule')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Action') ?>

+ 23 - 19
web/templates/admin/add_firewall_banlist.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -48,6 +39,29 @@
                                     <span class="page-title"><?=__('Adding IP Address to Banlist')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                          echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                          if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                          }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text input-label">
+                                    <?=__('IP address')?> <span class="optional">(<?=__('CIDR format is supported')?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Banlist') ?>
@@ -66,16 +80,6 @@
                                     </select>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?=__('IP address')?> <span class="optional">(<?=__('CIDR format is supported')?>)</span>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-input" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
-                                </td>
-                            </tr>
                         </table>
                         <table class="data-col2">
                             <tr>

+ 13 - 9
web/templates/admin/add_ip.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -48,6 +39,19 @@
                                     <span class="page-title"><?=__('Adding IP address')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('IP address') ?>

+ 13 - 9
web/templates/admin/add_mail.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -47,6 +38,19 @@
                                     <span class="page-title"><?=__('Adding Mail Domain')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 13 - 9
web/templates/admin/add_mail_acc.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="javascript:window.history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -41,6 +32,19 @@
                                 <span class="page-title"><?=__('Adding Mail Account')?></span>
                             </td>
                         </tr>
+                        <tr>
+                            <td>
+                                <?php
+                                    if (!empty($_SESSION['error_msg'])) {
+                                        echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                    } else {
+                                        if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                        }
+                                    }
+                                ?>
+                            </td>
+                        </tr>
                         <tr>
                             <td class="vst-text step-top">
                                 <?php print __('Domain');?>

+ 13 - 9
web/templates/admin/add_package.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -47,6 +38,19 @@
                                     <span class="page-title"><?=__('Adding Package')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Package Name');?>

+ 13 - 9
web/templates/admin/add_user.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -48,6 +39,19 @@
                                     <span class="page-title"><?=__('Adding User')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Username');?>

+ 12 - 9
web/templates/admin/add_web.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -49,6 +40,18 @@
                         <tr>
                             <td class="step-top">
                                 <span class="page-title"><?=__('Add Web Domain')?></span>
+                                <br>
+                                <span>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </span>
                                 <?php if ($user == 'admin') { ?>
                                 <span class="alert alert-danger alert-with-icon">
                                     <i class="fas fa-exclamation"></i>

+ 14 - 10
web/templates/admin/edit_backup_exclusions.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/backup/exclusions/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -49,7 +40,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Backup Exclusions')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Web Domains');?>

+ 13 - 9
web/templates/admin/edit_cron.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -370,6 +361,19 @@
                                     <span class="page-title"><?=__('Editing Cron Job')?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Command');?>

+ 14 - 10
web/templates/admin/edit_db.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -51,7 +42,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Database')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Database');?>

+ 14 - 10
web/templates/admin/edit_dns.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -49,7 +40,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing DNS Domain')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 14 - 10
web/templates/admin/edit_dns_rec.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" 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>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -49,7 +40,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing DNS Record')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?=__('Domain');?>

+ 14 - 10
web/templates/admin/edit_firewall.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -50,7 +41,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Firewall Rule')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Action'); ?>

+ 14 - 10
web/templates/admin/edit_ip.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -50,7 +41,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing IP Address')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('IP address'); ?>

+ 14 - 10
web/templates/admin/edit_mail.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -49,7 +40,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Mail Domain')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 14 - 10
web/templates/admin/edit_mail_acc.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" 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>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -50,7 +41,20 @@
                             <td class="step-top">
                                 <span class="page-title"><?=__('Editing Mail Account')?></span>
                             </td>
-                        </tr>  
+                        </tr>
+                        <tr>
+                            <td>
+                                <?php
+                                    if (!empty($_SESSION['error_msg'])) {
+                                        echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                    } else {
+                                        if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                        }
+                                    }
+                                ?>
+                            </td>
+                        </tr>
                         <tr>
                             <td class="vst-text step-top input-label">
                                 <?php print __('Account');?>

+ 14 - 10
web/templates/admin/edit_package.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -44,7 +35,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Package')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Package Name');?>

+ 14 - 10
web/templates/admin/edit_server.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -47,9 +38,22 @@
                           <tr>
                             <td class="step-top">
                                 <span class="page-title"><?=__('Configuring Server')?></span>
-                                <br /><br />
                             </td>
                           </tr>
+                        <tr>
+                            <td>
+                                <?php
+                                    if (!empty($_SESSION['error_msg'])) {
+                                        echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                    } else {
+                                        if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                        }
+                                    }
+                                ?>
+                                <br /><br />
+                            </td>
+                        </tr>
                           <tr>
                                 <td class="vst-text input-label step-top advanced-options">
                                     <a href="javascript:elementHideShow('basic');" class="vst-text">

+ 13 - 9
web/templates/admin/edit_server_bind9.html

@@ -4,15 +4,6 @@
           <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-            <?php
-            if (!empty($_SESSION['error_msg'])) {
-              echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-            } else {
-              if (!empty($_SESSION['ok_msg'])) {
-                echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-              }
-            }
-          ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
       </div>
@@ -50,6 +41,19 @@
                                     <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print $v_options_path ?>

+ 13 - 9
web/templates/admin/edit_server_dovecot.html

@@ -4,15 +4,6 @@
           <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-                <?php
-                if (!empty($_SESSION['error_msg'])) {
-                  echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-                } else {
-                  if (!empty($_SESSION['ok_msg'])) {
-                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                  }
-                }
-              ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
         </div>
       </div>
@@ -50,6 +41,19 @@
                                     <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?=$v_config_path ?>

+ 13 - 9
web/templates/admin/edit_server_httpd.html

@@ -5,15 +5,6 @@
           <a href="/edit/server/php/" class="ui-button cancel" title="<?=__('Configure')?> PHP"><i class="fas fa-pencil-alt status-icon orange"></i> <?=__('Configure')?> PHP</a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-            <?php
-            if (!empty($_SESSION['error_msg'])) {
-              echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-            } else {
-              if (!empty($_SESSION['ok_msg'])) {
-                echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-              }
-            }
-          ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
       </div>
@@ -50,6 +41,19 @@
                             <td class="step-top">
                               <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                             </td>
+                          </tr>
+                          <tr>
+                              <td>
+                                  <?php
+                                      if (!empty($_SESSION['error_msg'])) {
+                                          echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                      } else {
+                                          if (!empty($_SESSION['ok_msg'])) {
+                                              echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                          }
+                                      }
+                                  ?>
+                              </td>
                           </tr>
                             <tr>
                                 <td class="vst-text step-top">

+ 13 - 9
web/templates/admin/edit_server_mysql.html

@@ -4,15 +4,6 @@
           <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-                <?php
-                if (!empty($_SESSION['error_msg'])) {
-                  echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-                } else {
-                  if (!empty($_SESSION['ok_msg'])) {
-                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                  }
-                }
-              ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
         </div>
       </div>
@@ -50,6 +41,19 @@
                                     <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     max_connections

+ 13 - 9
web/templates/admin/edit_server_nginx.html

@@ -5,15 +5,6 @@
             <a href="/edit/server/php/" class="ui-button cancel" title="<?=__('Configure')?> PHP"><i class="fas fa-pencil-alt status-icon orange"></i> <?=__('Configure')?> PHP</a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-                <?php
-                if (!empty($_SESSION['error_msg'])) {
-                  echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-                } else {
-                  if (!empty($_SESSION['ok_msg'])) {
-                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                  }
-                }
-              ?>
                 <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
         </div>
       </div>
@@ -51,6 +42,19 @@
                                     <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     worker_processes

+ 13 - 9
web/templates/admin/edit_server_pgsql.html

@@ -4,15 +4,6 @@
           <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-            <?php
-            if (!empty($_SESSION['error_msg'])) {
-              echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-            } else {
-              if (!empty($_SESSION['ok_msg'])) {
-                echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-              }
-            }
-          ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
         </div>
       </div>
@@ -50,6 +41,19 @@
                                     <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?=$v_options_path ?>

+ 13 - 9
web/templates/admin/edit_server_php.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-                <?php
-                if (!empty($_SESSION['error_msg'])) {
-                  echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-                } else {
-                  if (!empty($_SESSION['ok_msg'])) {
-                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                  }
-                }
-              ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
         </div>
       </div>
@@ -50,6 +41,19 @@
                                     <span class="page-title"><?=__('Configuring Server')?>: PHP</span>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     max_execution_time

+ 13 - 9
web/templates/admin/edit_server_service.html

@@ -4,15 +4,6 @@
           <a class="ui-button cancel" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         </div>
         <div class="l-unit-toolbar__buttonstrip float-right">
-            <?php
-            if (!empty($_SESSION['error_msg'])) {
-              echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-            } else {
-              if (!empty($_SESSION['ok_msg'])) {
-                echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-              }
-            }
-          ?>
           <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
         </div>
       </div>
@@ -49,6 +40,19 @@
                             <td class="step-top">
                                 <span class="page-title"><?=__('Configuring Server')?>: <?php print $v_service_name ?></span>
                             </td>
+                          </tr>
+                          <tr>
+                              <td>
+                                  <?php
+                                      if (!empty($_SESSION['error_msg'])) {
+                                          echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                      } else {
+                                          if (!empty($_SESSION['ok_msg'])) {
+                                              echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                          }
+                                      }
+                                  ?>
+                              </td>
                           </tr>
                             <tr>
                                 <td class="vst-text step-top">

+ 14 - 10
web/templates/admin/edit_user.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -50,7 +41,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing User')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Username');?>

+ 16 - 12
web/templates/admin/edit_web.html

@@ -4,18 +4,9 @@
             <a class="ui-button cancel" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="/add/webapp/?domain=<?=$v_domain?>" class="ui-button cancel">
-                <i class="fas fa-magic status-icon blue"></i>
-                Quick Install App</a>
+                <i class="fas fa-magic status-icon blue"></i> <?=__('Quick Install App')?>
+            </a>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -54,7 +45,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Domain')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 1 - 1
web/templates/admin/list_backup_exclusions.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=__('Back')?></a>
+          <a class="ui-button cancel" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           <a href="/edit/backup/exclusions/" class="ui-button cancel" title="<?=__('Edit Backup Exclusions')?>"><i class="fas fa-pencil-alt status-icon orange"></i> <?=__('Edit Backup Exclusions')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">

+ 2 - 2
web/templates/admin/list_db.html

@@ -13,13 +13,13 @@
               if ($data[$key]['TYPE'] == 'mysql'){
                 $mysql = 1;
 
-                $db_myadmin_link = "https://".$http_host."/phpmyadmin/";
+                $db_myadmin_link = "//".$http_host."/phpmyadmin/";
                 if (!empty($_SESSION['DB_PMA_URL']))
                   $db_myadmin_link = $_SESSION['DB_PMA_URL'];
               }
               if ($data[$key]['TYPE'] == 'pgsql'){
                 $pgsql = 1;
-                $db_pgadmin_link = "https://".$http_host."/phppgadmin/";
+                $db_pgadmin_link = "//".$http_host."/phppgadmin/";
                 if (!empty($_SESSION['DB_PGA_URL']))
                   $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
               }

+ 2 - 2
web/templates/admin/list_server_info.html

@@ -45,5 +45,5 @@
   </div>
   <!-- /.l-header -->
 
-  <div class="server-info-output animated fadeIn">.</div><div class="l-center">
-  <pre class="console-output">
+  <div class="server-info-output">.</div><div class="l-center">
+  <pre class="console-output animated fadeIn">

+ 20 - 12
web/templates/admin/list_webapps.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/edit/web/?domain=<?=$v_domain?>"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
           </div>
         </div>
       </div>
@@ -28,9 +19,26 @@
             } else {
             $back = "location.href='".$back."'";
             }
-        ?>
-
-        <div class="app-list cards" >
+        ?>       
+        <div style="margin-left:68px; margin-top: 20px">
+          <div class="page-title">
+              <span><?=__('Quick Install App')?></span><br>
+          </div>
+          <div>
+              <span>
+                  <?php
+                  if (!empty($_SESSION['error_msg'])) {
+                      echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                  } else {
+                      if (!empty($_SESSION['ok_msg'])) {
+                          echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                      }
+                  }
+              ?>
+            </span>
+          </div>
+        </div>
+        <div class="app-list cards">
             <?php foreach($v_web_apps as $webapp):?>
                 <div class="card <?=($webapp['enabled']?'':'disable')?>" >
                     <span class="card-thumb"><img src="<?=$webapp['thumbnail']?>"></span>

+ 7 - 8
web/templates/admin/setup_webapp.html

@@ -37,15 +37,14 @@
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="true" />
 
-            <?php if( !$WebappInstaller->isDomainRootClean()): ?>
-                <span class="alert alert-info alert-with-icon">
-                    <i class="fas fa-info"></i>
-                    <?=__('Data loss warning!<br>Your web domain already has files uploaded, the installer will overwrite your files and/or the installation might fail.<br/><br/> Please use the installer only for empty web domains')?>
-                </span>
-                <br/>
-            <?php endif ?>
-
             <div class="app-form" >
+                <?php if( !$WebappInstaller->isDomainRootClean()): ?>
+                  <span class="alert alert-info alert-with-icon">
+                      <i class="fas fa-info"></i>
+                      <?=__('Data loss warning!<br>Your web domain already has files uploaded, the installer will overwrite your files and/or the installation might fail.<br/><br/> Please use the installer only for empty web domains')?>
+                  </span>
+                  <br/>
+                <?php endif ?>
                 <?php foreach ($WebappInstaller->getOptions() as $form_name => $form_control):?>
                     <?php
                         $f_name = $WebappInstaller->formNs() . '_' . $form_name;

+ 14 - 10
web/templates/user/edit_dns.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -49,7 +40,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing DNS Domain')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>

+ 14 - 10
web/templates/user/edit_user.html

@@ -4,15 +4,6 @@
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -50,7 +41,20 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing User')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Username');?>

+ 30 - 10
web/templates/user/edit_web.html

@@ -4,15 +4,9 @@
             <a class="ui-button cancel" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
-              <?php
-              if (!empty($_SESSION['error_msg'])) {
-                echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-              } else {
-                if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                }
-              }
-            ?>
+            <a href="/add/webapp/?domain=<?=$v_domain?>" class="ui-button cancel">
+                <i class="fas fa-magic status-icon blue"></i> <?=__('Quick Install App')?>
+            </a>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
           </div>
         </div>
@@ -51,7 +45,33 @@
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Editing Domain')?></span>
                                 </td>
-                            </tr>  
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                            echo "<span class=\"vst-error\"> <i class=\"fas fa-exclamation-circle status-icon red\"></i> ".htmlentities($_SESSION['error_msg'])."</span>";
+                                        } else {
+                                            if (!empty($_SESSION['ok_msg'])) {
+                                                echo "<span class=\"vst-ok\"> <i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                            }
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <?php print __('Domain');?>