Ver código fonte

Fixed syntax errors

Serghey Rodin 11 anos atrás
pai
commit
bf7058f8b6
51 arquivos alterados com 356 adições e 376 exclusões
  1. 3 3
      web/inc/i18n/hu.php
  2. 9 9
      web/templates/admin/add_cron.html
  3. 11 11
      web/templates/admin/add_db.html
  4. 10 10
      web/templates/admin/add_dns.html
  5. 7 7
      web/templates/admin/add_dns_rec.html
  6. 12 17
      web/templates/admin/add_ip.html
  7. 9 24
      web/templates/admin/add_mail.html
  8. 13 19
      web/templates/admin/add_mail_acc.html
  9. 19 19
      web/templates/admin/add_package.html
  10. 11 11
      web/templates/admin/add_user.html
  11. 8 8
      web/templates/admin/edit_backup_exclusions.html
  12. 10 10
      web/templates/admin/edit_cron.html
  13. 9 9
      web/templates/admin/edit_db.html
  14. 8 8
      web/templates/admin/edit_dns.html
  15. 8 8
      web/templates/admin/edit_dns_rec.html
  16. 31 30
      web/templates/admin/edit_ip.html
  17. 10 25
      web/templates/admin/edit_mail.html
  18. 13 23
      web/templates/admin/edit_mail_acc.html
  19. 19 19
      web/templates/admin/edit_package.html
  20. 12 12
      web/templates/admin/edit_user.html
  21. 2 2
      web/templates/admin/list_backup.html
  22. 1 1
      web/templates/admin/list_backup_detail.html
  23. 1 1
      web/templates/admin/list_backup_exclusions.html
  24. 3 3
      web/templates/admin/list_cron.html
  25. 4 4
      web/templates/admin/list_db.html
  26. 2 2
      web/templates/admin/list_dns.html
  27. 1 1
      web/templates/admin/list_dns_rec.html
  28. 1 1
      web/templates/admin/list_ip.html
  29. 1 1
      web/templates/admin/list_log.html
  30. 4 4
      web/templates/admin/list_mail.html
  31. 2 2
      web/templates/admin/list_mail_acc.html
  32. 3 3
      web/templates/admin/list_packages.html
  33. 16 1
      web/templates/admin/list_rrd.html
  34. 2 2
      web/templates/admin/list_search.html
  35. 13 9
      web/templates/admin/list_services.html
  36. 3 3
      web/templates/admin/list_stats.html
  37. 1 1
      web/templates/admin/list_updates.html
  38. 4 4
      web/templates/admin/list_user.html
  39. 16 5
      web/templates/admin/list_web.html
  40. 8 8
      web/templates/user/edit_dns.html
  41. 7 7
      web/templates/user/edit_user.html
  42. 2 2
      web/templates/user/list_cron.html
  43. 4 4
      web/templates/user/list_db.html
  44. 2 2
      web/templates/user/list_dns.html
  45. 1 1
      web/templates/user/list_dns_rec.html
  46. 4 4
      web/templates/user/list_mail.html
  47. 2 2
      web/templates/user/list_mail_acc.html
  48. 2 2
      web/templates/user/list_search.html
  49. 3 3
      web/templates/user/list_stats.html
  50. 4 4
      web/templates/user/list_user.html
  51. 5 5
      web/templates/user/list_web.html

+ 3 - 3
web/inc/i18n/hu.php

@@ -17,7 +17,7 @@ $LANG['hu'] = array(
     'Log in'  => 'Belépés',
     'Log out'  => 'Kilépés',
 
-    'USER'  => 'FELHASZNÁLÓ',
+    'USER'  => 'USER',
     'WEB'  => 'WEB',
     'DNS'  => 'DNS',
     'MAIL'  => 'MAIL',
@@ -142,7 +142,7 @@ $LANG['hu'] = array(
     'Databases'  => 'Adatbázis',
     'User Directories'  => 'Felhasználói könyvtárak',
     'Template'  => 'Sablon',
-    'Web Template'  => 'Apache sablon,
+    'Web Template'  => 'Apache sablon',
     'Proxy Template'  => 'Nginx sablon',
     'DNS Template'  => 'DNS sablon',
     'Web Domains'  => 'Web Domainek',
@@ -398,7 +398,7 @@ $LANG['hu'] = array(
     'LOGGED_IN_AS'  => 'Belépve, mint %s',
     'Error'  => 'Hiba',
     'Invalid username or password'  => 'Hibás felhasználónév vagy jelszó',
-    'Invalid username or code'  => 'Hibás felhasználónév vagy kód
+    'Invalid username or code'  => 'Hibás felhasználónév vagy kód',
     'Passwords not match'  => 'A jelszavak nem egyeznek meg',
     'Please enter valid email address.'  => 'Kérlek valós e-mail címet adj meg!',
     'Field "%s" can not be blank.'  => 'A(z) "%s" mező nem lehet üres.',

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

@@ -34,7 +34,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Minute');?>
                                 </td>
                             </tr>
@@ -44,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Hour');?>
                                 </td>
                             </tr>
@@ -54,7 +54,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Day');?>
                                 </td>
                             </tr>
@@ -64,7 +64,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Month');?>
                                 </td>
                             </tr>
@@ -74,7 +74,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Day of week');?>
                                 </td>
                             </tr>
@@ -84,22 +84,22 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Command');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
+                                    <input type="text" size="30" class="vst-input long" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
                                 </td>
                             </tr>
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 11 - 11
web/templates/admin/add_db.html

@@ -54,12 +54,12 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td style="padding:24px 0 0 0; color:#777;" >
+                                <td class="step-top" style="color:#777;" >
                                     <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Database');?> 
                                 </td>
                             </tr>
@@ -70,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('User');?> 
                                 </td>
                             </tr>
@@ -81,17 +81,17 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_password">
+                                    <input type="text" size="20" class="vst-input password" name="v_password">
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Type');?> 
                                 </td>
                             </tr>
@@ -109,7 +109,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Host');?> 
                                 </td>
                             </tr>
@@ -128,7 +128,7 @@
                             </tr>
 
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Charset');?> 
                                 </td>
                             </tr>
@@ -174,7 +174,7 @@
                                     </select>
                                 </td>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Send login credentials to email address') ?> 
                                 </td>
                             </tr>
@@ -186,10 +186,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 10 - 10
web/templates/admin/add_dns.html

@@ -45,7 +45,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -55,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('IP address');?>
                                 </td>
                             </tr>
@@ -65,15 +65,15 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 0px;">
-                                    <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
+                                <td class="vst-text">
+                                  <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                            <td class="vst-text input-label">
                                                 <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
@@ -83,7 +83,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                            <td class="vst-text input-label">
                                                 TTL
                                             </td>
                                         </tr>
@@ -93,7 +93,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                            <td class="vst-text input-label">
                                                 <?php print __('Name servers');?>
                                             </td>
                                         </tr>
@@ -123,10 +123,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 7 - 7
web/templates/admin/add_dns_rec.html

@@ -34,7 +34,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -44,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Record');?>
                                 </td>
                             </tr>
@@ -55,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -78,7 +78,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('IP or Value');?>
                                 </td>
                             </tr>
@@ -88,7 +88,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -100,10 +100,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok_rec" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 12 - 17
web/templates/admin/add_ip.html

@@ -45,7 +45,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('IP address') ?> 
                                 </td>
                             </tr>
@@ -55,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Netmask');?>
                                 </td>
                             </tr>
@@ -65,7 +65,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Interface');?>
                                 </td>
                             </tr>
@@ -83,25 +83,20 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('Shared');?>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');"> <?php print __('Shared');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');">
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
+                                <td class="step-left">
                                     <table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 0 0 0 2px;">
+                                            <td class="vst-text input-label">
                                                 <?php print __('Assigned user');?>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
+                                            <td class="step-bottom">
                                                 <select class="vst-list" name="v_owner">
                                                     <?php
                                                         foreach ($users as $key => $value) {
@@ -117,7 +112,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -127,7 +122,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('NAT IP association');?> <span class="optional"">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -141,10 +136,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

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

@@ -34,7 +34,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -44,42 +44,27 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('AntiSpam Support');?>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>> <?php print __('AntiSpam Support');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('AntiVirus Support');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('DKIM Support');?>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>> <?php print __('AntiVirus Support');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>> <?php print __('DKIM Support');?></label>
                                 </td>
                             </tr>
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

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

@@ -55,7 +55,7 @@
                 <td class="data-dotted">
                     <table class="data-col2" width="600px">
                         <tr>
-                            <td class="vst-text" style="padding: 24px 0 0 0;">
+                            <td class="vst-text step-top">
                                 <?php print __('Domain');?>
                             </td>
                         </tr>
@@ -65,7 +65,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-label">
                                 <?php print __('Account');?>
                             </td>
                         </tr>
@@ -75,25 +75,25 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-label">
                                 <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="text" size="20" class="vst-input" name="v_password">
+                                <input type="text" size="20" class="vst-input password" name="v_password">
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-label">
                                 <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print __('Advanced options');?></a>
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0px;">
+                            <td class="vst-text input-label">
                                 <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 12px 0 0 0;">
+                                        <td class="vst-text input-label">
                                             <?php print __('Quota');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                                         </td>
                                     </tr>
@@ -103,7 +103,7 @@
                                         </td>
                                     </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 12px 0 0 0;">
+                                    <td class="vst-text input-label">
                                         <?php print __('Aliases');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                                     </td>
                                 </tr>
@@ -113,7 +113,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 12px 0 0 0">
+                                    <td class="vst-text input-label">
                                         <?php print __('Forward to');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                                     </td>
                                 </tr>
@@ -123,26 +123,20 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 12px 0 0 0;">
-                                        <?php print __('Do not store forwarded mail');?>
+                                    <td class="vst-text input-label">
+                                        <label><input type="checkbox" size="20" class="vst-checkbox" name="v_fwd_only" <?php if ($v_fwd_only == 'yes') echo "checked=yes" ?>> <?php print __('Do not store forwarded mail');?></label>
                                     </td>
                                 </tr>
-                                <tr>
-                                    <td>
-                                        <input type="checkbox" size="20" class="vst-checkbox" name="v_fwd_only" <?php if ($v_fwd_only == 'yes') echo "checked=yes" ?>>
-                                    </td>
-                                </tr>
-
                             </table>
                         </td>
                     </tr>
                 </table>
                 <table class="data-col2">
                     <tr>
-                        <td style="padding: 24px 0 0 0;" width="116px">
+                        <td class="step-top" width="116px">
                             <input type="submit" name="ok_acc" value="<?php print __('Add');?>" class="button">
                         </td>
-                        <td style="padding: 24px 0 0 0;">
+                        <td class="step-top">
                             <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                         </td>
                     </tr>

+ 19 - 19
web/templates/admin/add_package.html

@@ -35,7 +35,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Package Name');?>
                                 </td>
                             </tr>
@@ -45,7 +45,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -68,7 +68,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Proxy Template');?>
                                 </td>
                             </tr>
@@ -91,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS Template');?>
                                 </td>
                             </tr>
@@ -114,7 +114,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -137,7 +137,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -147,7 +147,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -157,7 +157,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS domains');?>
                                 </td>
                             </tr>
@@ -167,7 +167,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -177,7 +177,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -187,7 +187,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -197,7 +197,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -207,7 +207,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -217,7 +217,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Backups');?>
                                 </td>
                             </tr>
@@ -227,7 +227,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -237,7 +237,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -247,7 +247,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Name servers');?>
                                 </td>
                             </tr>
@@ -274,10 +274,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 11 - 11
web/templates/admin/add_user.html

@@ -53,7 +53,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -63,17 +63,17 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate" ><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                    <input type="text" size="20" class="vst-input password" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -83,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;" name="v_package">
+                                <td class="vst-text input-label" name="v_package">
                                     <?php print __('Package');?>
                                 </td>
                             </tr>
@@ -107,7 +107,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;" >
+                                <td class="vst-text input-label">
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -133,7 +133,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('First Name');?>
                                 </td>
                             </tr>
@@ -143,7 +143,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Last Name');?>
                                 </td>
                             </tr>
@@ -153,7 +153,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Send login credentials to email address');?>
                                 </td>
                             </tr>
@@ -166,10 +166,10 @@
                         </table>
                     <table class="data-col2">
                         <tr>
-                            <td style="padding: 24px 0 0 0;" width="116px">
+                            <td class="step-top" width="116px">
                                 <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                             </td>
-                            <td style="padding: 24px 0 0 0;">
+                            <td class="step-top">
                                 <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                             </td>
                         </tr>

+ 8 - 8
web/templates/admin/edit_backup_exclusions.html

@@ -38,7 +38,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -48,7 +48,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS Domains');?>
                                 </td>
                             </tr>
@@ -58,7 +58,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -68,7 +68,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -78,7 +78,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -88,7 +88,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('User Directories');?>
                                 </td>
                             </tr>
@@ -100,10 +100,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 10 - 10
web/templates/admin/edit_cron.html

@@ -40,7 +40,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Minute');?>
                                 </td>
                             </tr>
@@ -50,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Hour');?>
                                 </td>
                             </tr>
@@ -60,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Day');?>
                                 </td>
                             </tr>
@@ -70,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Month');?>
                                 </td>
                             </tr>
@@ -80,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Day of week');?>
                                 </td>
                             </tr>
@@ -90,22 +90,22 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Command');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_cmd" <?php if (isset($v_cmd)) echo "value='".$v_cmd."'"; ?>>
+                                    <input type="text" size="20" class="vst-input long" name="v_cmd" <?php if (isset($v_cmd)) echo "value='".$v_cmd."'"; ?>>
                                 </td>
                             </tr>
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
@@ -113,4 +113,4 @@
                     </td>
                 </tr>
             </table>
-        </form>
+        </form>

+ 9 - 9
web/templates/admin/edit_db.html

@@ -61,7 +61,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Database');?>
                                 </td>
                             </tr>
@@ -72,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('User');?>
                                 </td>
                             </tr>
@@ -83,17 +83,17 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password; ?>>
+                                    <input type="text" size="20" class="vst-input password" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password; ?>>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -103,7 +103,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Host');?>
                                 </td>
                             </tr>
@@ -113,7 +113,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Charset');?>
                                 </td>
                             </tr>
@@ -125,10 +125,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 8 - 8
web/templates/admin/edit_dns.html

@@ -40,7 +40,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -50,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -60,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Template');?>
                                 </td>
                             </tr>
@@ -81,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                 </td>
                             </tr>
@@ -91,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     SOA
                                 </td>
                             </tr>
@@ -101,7 +101,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     TTL
                                 </td>
                             </tr>
@@ -113,10 +113,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 8 - 8
web/templates/admin/edit_dns_rec.html

@@ -40,7 +40,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -51,7 +51,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Record');?>
                                 </td>
                             </tr>
@@ -61,7 +61,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -71,7 +71,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('IP or Value');?>
                                 </td>
                             </tr>
@@ -81,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -91,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Record Number');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('internal');?>)</span>
                                 </td>
                             </tr>
@@ -104,10 +104,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 31 - 30
web/templates/admin/edit_ip.html

@@ -52,7 +52,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('IP address'); ?> 
                                 </td>
                             </tr>
@@ -62,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Netmask');?> 
                                 </td>
                             </tr>
@@ -72,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Interface'); ?> 
                                 </td>
                             </tr>
@@ -82,35 +82,36 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('Shared'); ?> 
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');"> <?php print __('Shared');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('Assigned user'); ?> 
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_owner">
-                                        <?php
-                                            foreach ($users as $key => $value) {
-                                                echo "\t\t\t\t<option value=\"".$value."\"";
-                                                if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
-                                                echo ">".$value."</option>\n";
-                                            }
-                                        ?> 
-                                    </select>
+                                <td class="step-left">
+                                    <table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
+                                        <tr>
+                                            <td class="vst-text input-label">
+                                                <?php print __('Assigned user');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="step-bottom">
+                                                <select class="vst-list" name="v_owner">
+                                                    <?php
+                                                        foreach ($users as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -120,7 +121,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('NAT IP association');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -133,10 +134,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
@@ -144,4 +145,4 @@
                     </td>
                 </tr>
             </table>
-        </form>
+        </form>

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

@@ -40,7 +40,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -50,37 +50,22 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('AntiSpam Support');?>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>> <?php print __('AntiSpam Support');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('AntiVirus Support');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('DKIM Support');?>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>> <?php print __('AntiVirus Support');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>>
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>> <?php print __('DKIM Support');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Catchall email');?>
                                 </td>
                             </tr>
@@ -92,10 +77,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 13 - 23
web/templates/admin/edit_mail_acc.html

@@ -62,7 +62,7 @@
                     <td class="data-dotted">
                     <table class="data-col2" width="600px">
                         <tr>
-                            <td class="vst-text" style="padding: 24px 0 0 0;">
+                            <td class="vst-text step-top input-label">
                                 <?php print __('Account');?>
                             </td>
                         </tr>
@@ -74,17 +74,17 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-type input-label">
                                 <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password; ?>
+                                <input type="text" size="20" class="vst-input password" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password; ?>
                             </td>
                          </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-type input-label">
                                 <?php print __('Quota');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                             </td>
                         </tr>
@@ -94,7 +94,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-type input-label">
                                 <?php print __('Aliases');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                             </td>
                         </tr>
@@ -104,7 +104,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                            <td class="vst-text input-type input-label">
                                 <?php print __('Forward to');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                             </td>
                         </tr>
@@ -114,27 +114,17 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
-                                <?php print __('Do not store forwarded mail');?>
+                            <td class="vst-text input-type input-label">
+                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_fwd_only" <?php if ($v_fwd_only == 'yes') echo "checked=yes" ?>> <?php print __('Do not store forwarded mail');?></label>
                             </td>
                         </tr>
                         <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_fwd_only" <?php if ($v_fwd_only == 'yes') echo "checked=yes" ?>>
+                            <td class="vst-text input-type input-label">
+                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_autoreply" <?php if ($v_autoreply == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('autoreplytable');"> <?php print __('Autoreply');?></label>
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 12px 0 0 0;">
-                                <?php print __('Autoreply');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_autoreply" <?php if ($v_autoreply == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('autoreplytable');">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
+                            <td class="step-left">
                                 <table style="display:<?php if ($v_autoreply == 'no') { echo 'none';} else {echo 'block';}?> ;" id="autoreplytable">
                                     <tr>
                                         <td class="vst-text" style="padding: 12px 0 0 0;">
@@ -152,10 +142,10 @@
                     </table>
                     <table class="data-col2">
                         <tr>
-                            <td style="padding: 24px 0 0 0;" width="116px">
+                            <td class="step-top" width="116px">
                                 <input type="submit" name="save" value="<?php print __('Save');?>" class="button">
                             </td>
-                            <td style="padding: 24px 0 0 0;">
+                            <td class="step-top">
                                 <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                             </td>
                         </tr>

+ 19 - 19
web/templates/admin/edit_package.html

@@ -40,7 +40,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Package Name');?>
                                 </td>
                             </tr>
@@ -51,7 +51,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -74,7 +74,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Proxy Template');?>
                                 </td>
                             </tr>
@@ -97,7 +97,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS Template');?>
                                 </td>
                             </tr>
@@ -120,7 +120,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -143,7 +143,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -153,7 +153,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -163,7 +163,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS domains');?>
                                 </td>
                             </tr>
@@ -173,7 +173,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -183,7 +183,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -193,7 +193,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -203,7 +203,7 @@
                                 <td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -213,7 +213,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -223,7 +223,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Backups');?>
                                 </td>
                             </tr>
@@ -233,7 +233,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -243,7 +243,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -253,7 +253,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Name Servers');?>
                                 </td>
                             </tr>
@@ -280,10 +280,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 12 - 12
web/templates/admin/edit_user.html

@@ -52,7 +52,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 28px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -62,17 +62,17 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                    <input type="text" size="20" class="vst-input password" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -82,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;" >
+                                <td class="vst-text input-label">
                                     <?php print __('Package');?>
                                 </td>
                             </tr>
@@ -103,7 +103,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;" >
+                                <td class="vst-text input-label">
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -127,7 +127,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('First Name');?>
                                 </td>
                             </tr>
@@ -137,7 +137,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Last Name');?>
                                 </td>
                             </tr>
@@ -147,7 +147,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;" >
+                                <td class="vst-text input-label">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -168,7 +168,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Default Name Servers');?>
                                 </td>
                             </tr>
@@ -195,10 +195,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

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

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/schedule/backup/'"> <?php print __('Create Backup');?> </button>
                         </div>
@@ -92,7 +92,7 @@
                                     <table>
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:100%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

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

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/schedule/restore/?backup=<?php echo $_GET['backup'] ?>'"> <?php print __('Restore All');?> </button>
                         </div>

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

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/edit/backup/exclusions/'"> <?php print __('Configure');?> </button>
                         </div>

+ 3 - 3
web/templates/admin/list_cron.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
                         </div>
@@ -42,9 +42,9 @@
                             $spnd_action = 'suspend';
                             $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
                         }
-                ?> 
+                ?>
 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
                         </div>
@@ -50,7 +50,7 @@
                         if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
                         if (($data[$key]['TYPE'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL'];
                 ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="database[]" value="<?php echo $key ?>" ></td></tr>
@@ -87,7 +87,7 @@
                         </a>
                         <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
                             <span>
-                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <img src="/images/db.png" width="8px" height="8px">
                                 <?php print __('open %s',$db_admin);?> 
                             </span>
                         </a>
@@ -102,7 +102,7 @@
                                     <table>
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
                         </div>
@@ -42,7 +42,7 @@
                             $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
                         }
                 ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
                         </div>

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/ip/'"> <?php print __('Add IP');?> </button>
                         </div>

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">

+ 4 - 4
web/templates/admin/list_mail.html

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
                         </div>
@@ -49,7 +49,7 @@
                             $data[$key]['CATCHALL'] = '/dev/null';
                         }
                 ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
@@ -86,7 +86,7 @@
                         </a>
                         <a href="<?php echo $webmail; ?>" target="_blank" class="data-controls">
                             <span>
-                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <img src="/images/mail.png" width="9px" height="8px">
                                 <?php print __('open webmail');?> 
                             </span>
                         </a>
@@ -114,7 +114,7 @@
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

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

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
                         </div>
@@ -93,7 +93,7 @@
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 3 - 3
web/templates/admin/list_packages.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/package/'"> <?php print __('Add Package');?> </button>
                         </div>
@@ -82,7 +82,7 @@
                                         <tr>
                                             <td class="chart1" colspan=2 style="padding: 8px 0 0 0">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
@@ -90,7 +90,7 @@
                                         <tr>
                                             <td class="chart1" colspan=2>
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 16 - 1
web/templates/admin/list_rrd.html

@@ -1,12 +1,27 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 16px">
+                    <td class="wrapper">
                         <div style="submenu-button-block">
                             <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "-selected" ?>" href="?period=daily"><?php print __('Daily');?></a>
                             <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo "-selected" ?>" href="?period=weekly"><?php print __('Weekly');?></a>
                             <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'monthly')) echo "-selected" ?>" href="?period=monthly"><?php print __('Monthly');?></a>
                             <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'yearly')) echo "-selected" ?>" href="?period=yearly"><?php print __('Yearly');?></a>
                         </div>
+
+			<div class="timer-container">
+		    	    <span class="timer-button pause"></span>
+    			    <span class="timer-button play hidden"></span>
+
+            		    <div class="refresh-timer">
+                    		<div class="movement left">
+                            	    <div class="loader-half left"></div>
+                    		</div>
+    				<div class="movement right">
+                            	    <div class="loader-half right"></div>
+                    		</div>
+            		    </div>
+			</div>
+
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div style="submenu-button-block">
                             <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
                         </div>
@@ -35,7 +35,7 @@
                         }
                 ?>
 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>

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

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -26,7 +26,7 @@
 
         <div id="vstobjects">
             <table class='data'>
-                <tr class="data-row"">
+                <tr class="data-row">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="system[]" value="<?php echo $sys['sysinfo']['HOSTNAME'] ?>" ></td></tr>
@@ -34,15 +34,19 @@
                         </table>
                     </td>
                     <td class="data-dotted">
-                        <a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>" class="data-controls">
-                            <span>
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
                                 <img src="/images/reload.png" width="6px" height="7px">
-                                <?php print __('restart'); ?> 
+                                 <?php print __('restart');?> 
+                                <input type="hidden" name="delete_url" value="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME']?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('RESTART_SERVER_CONFIRMATION');?></p>
+                                </div>
                             </span>
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td colspan=4 class="domain">
+                                <td colspan=4 class="domain hostname">
                                     <b><?php echo $sys['sysinfo']['HOSTNAME'] ?></b>
                                 </td>
                             </tr>
@@ -108,7 +112,7 @@
                         if ($cpu == '0.0')  $cpu = 0;
                     ?>
 
-                <tr class="data-row">
+                <tr class="data-row <?=$status?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="service[]" value="<?php echo $key ?>" ></td></tr>
@@ -131,12 +135,12 @@
 
                         <table class="data-col2">
                             <tr>
-                                <td colspan=4 class="domain">
+                                <td colspan=4 class="domain step-left">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" width="239px">
+                                <td class="step-left" style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

+ 3 - 3
web/templates/admin/list_stats.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -58,7 +58,7 @@
                                         <tr>
                                             <td class="chart1" colspan=2 style="padding: 14px 0 0 0px;">
                                                 <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
@@ -66,7 +66,7 @@
                                         <tr>
                                             <td class="chart1" colspan=2>
                                                 <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:8px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:8px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

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

@@ -1,7 +1,7 @@
 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">

+ 4 - 4
web/templates/admin/list_user.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <?php
                                 if ($user == 'admin') {
@@ -55,7 +55,7 @@
                             $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
                         }
                     ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
@@ -142,14 +142,14 @@
                                         <tr><td colspan=2 class="counter-name" style="padding: 2px 0 14px 0;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
                                         <tr>
                                             <td class="chart1" colspan=2><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="chart1" colspan=2 style="padding: 0px 0 0 0;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 16 - 5
web/templates/admin/list_web.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                         </div>
@@ -57,7 +57,18 @@
                         $ftp_user='no';
                         if (!empty($data[$key]['FTP_USER'])) {
                             $ftp_user=$data[$key]['FTP_USER'];
+
+                        }
+                        if (strlen($ftp_user) > 16 ) {
+                            $ftp_user = str_replace(':', ', ', $ftp_user);
+                            $ftp_user = substr($ftp_user, 0, 16);
+                            $ftp_user = trim($ftp_user, ":");
+                            $ftp_user = str_replace(':', ', ', $ftp_user);
+                            $ftp_user = $ftp_user.", ...";
+                        } else {
+                            $ftp_user = str_replace(':', ', ', $ftp_user);
                         }
+
                         $proxy_support='no';
                         if (!empty($data[$key]['PROXY'])) {
                             $proxy_support='yes';
@@ -73,7 +84,7 @@
                             $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
                         }
                     ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
@@ -120,7 +131,7 @@
                         ?> 
                         <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
                             <span>
-                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <img src="/images/stats.png" width="8px" height="8px">
                                 <?php print __('open webstats');?> 
                             </span>
                         </a>
@@ -144,14 +155,14 @@
                                         <tr>
                                             <td class="chart1" style="padding: 8px 0 0 0">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                             </div>
                                             </td>

+ 8 - 8
web/templates/user/edit_dns.html

@@ -40,7 +40,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -50,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -60,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                 </td>
                             </tr>
@@ -70,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     SOA
                                 </td>
                             </tr>
@@ -80,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     TTL
                                 </td>
                             </tr>
@@ -92,10 +92,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
@@ -103,4 +103,4 @@
                     </td>
                 </tr>
             </table>
-        </form>
+        </form>

+ 7 - 7
web/templates/user/edit_user.html

@@ -52,7 +52,7 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 28px 0 0 0;">
+                                <td class="vst-text step-top">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -62,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -72,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -82,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;" >
+                                <td class="vst-text input-label">
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -106,7 +106,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <td class="vst-text input-label">
                                     <?php print __('Default Name Servers');?>
                                 </td>
                             </tr>
@@ -133,10 +133,10 @@
                         </table>
                         <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
+                                <td class="step-top" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                 </td>
-                                <td style="padding: 24px 0 0 0;">
+                                <td class="step-top">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>

+ 2 - 2
web/templates/user/list_cron.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
                         </div>
@@ -42,7 +42,7 @@
                         }
                 ?> 
 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>

+ 4 - 4
web/templates/user/list_db.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
                         </div>
@@ -48,7 +48,7 @@
                         if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
                         if (($data[$key]['TYPE'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL'];
                 ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="database[]" value="<?php echo $key ?>" ></td></tr>
@@ -75,7 +75,7 @@
                         </a>
                         <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
                             <span>
-                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <img src="/images/db.png" width="8px" height="8px">
                                 <?php print __('open %s',$db_admin);?> 
                             </span>
                         </a>
@@ -90,7 +90,7 @@
                                     <table>
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 2 - 2
web/templates/user/list_dns.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
                         </div>
@@ -40,7 +40,7 @@
                             $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
                         }
                 ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>

+ 1 - 1
web/templates/user/list_dns_rec.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
                         </div>

+ 4 - 4
web/templates/user/list_mail.html

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
                         </div>
@@ -47,7 +47,7 @@
                             $data[$key]['CATCHALL'] = '/dev/null';
                         }
                 ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
@@ -74,7 +74,7 @@
                         </a>
                         <a href="<?php echo $webmail; ?>" target="_blank" class="data-controls">
                             <span>
-                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <img src="/images/mail.png" width="9px" height="8px">
                                 <?php print __('open webmail');?> 
                             </span>
                         </a>
@@ -102,7 +102,7 @@
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 2 - 2
web/templates/user/list_mail_acc.html

@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
                         </div>
@@ -81,7 +81,7 @@
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 2 - 2
web/templates/user/list_search.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div style="submenu-button-block">
                             <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
                         </div>
@@ -35,7 +35,7 @@
                         }
                 ?>
 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>

+ 3 - 3
web/templates/user/list_stats.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -43,7 +43,7 @@
                                         <tr>
                                             <td class="chart1" colspan=2 style="padding: 14px 0 0 0px;">
                                                 <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
@@ -51,7 +51,7 @@
                                         <tr>
                                             <td class="chart1" colspan=2>
                                                 <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:8px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:8px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 4 - 4
web/templates/user/list_user.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                         </div>
@@ -40,7 +40,7 @@
                             $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
                         }
                     ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
@@ -67,14 +67,14 @@
                                         <tr><td colspan=2 class="counter-name" style="padding: 2px 0 14px 0;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
                                         <tr>
                                             <td class="chart1" colspan=2><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="chart1" colspan=2 style="padding: 0px 0 0 0;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>

+ 5 - 5
web/templates/user/list_web.html

@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 14px 10px">
+                    <td class="wrapper">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                         </div>
@@ -71,7 +71,7 @@
                             $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
                         }
                     ?> 
-                <tr class="data-row">
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
@@ -108,7 +108,7 @@
                         ?> 
                         <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
                             <span>
-                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <img src="/images/stats.png" width="8px" height="8px">
                                 <?php print __('open webstats');?> 
                             </span>
                         </a>
@@ -132,14 +132,14 @@
                                         <tr>
                                             <td class="chart1" style="padding: 8px 0 0 0">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                             </div>
                                             </td>