Просмотр исходного кода

refactoring package section: new html formating

Serghey Rodin 13 лет назад
Родитель
Сommit
f1253a0fd3

+ 0 - 1
web/add/package/index.php

@@ -155,7 +155,6 @@ if ($_SESSION['user'] == 'admin') {
     if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd';
 
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_package.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_package.html');
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);

+ 0 - 1
web/edit/package/index.php

@@ -181,7 +181,6 @@ if ($_SESSION['user'] == 'admin') {
         }
     }
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_package.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_package.html');
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);

+ 0 - 2
web/list/backup/index.php

@@ -19,8 +19,6 @@ top_panel($user,$TAB);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_backup.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html');
 //}
 

+ 0 - 3
web/list/package/index.php

@@ -13,14 +13,11 @@ top_panel($user,$TAB);
 
 // Data
 if ($_SESSION['user'] == 'admin') {
-
     exec (VESTA_CMD."v_list_user_packages json", $output, $return_var);
     check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_packages.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_packages.html');
 }
 

+ 235 - 83
web/templates/admin/add_package.html

@@ -1,85 +1,237 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
 
-        <table class="data-col2" width="830px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Package Name</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package;  ?> ></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Default Template</td></tr>
-            <tr><td><select class="add-list" name="v_template">
-            <?php
-                foreach ($templates as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    if ((!empty($v_template)) && ( $value == $v_template)){
-                        echo 'selected' ;
-                    }
-                    if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
-                        echo 'selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">System Shell</td></tr>
-            <tr><td><select class="add-list" name="v_shell">
-            <?php
-                foreach ($shells as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    if ((!empty($v_shell)) && ( $value == $v_shell)){
-                        echo 'selected' ;
-                    }
-                    if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
-                        echo 'selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Package</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Domains</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Aliases <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">DNS Domains</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">DNS Records <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Mail Domains</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Mail Accounts <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Databases</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Cron Jobs</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Backups</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Disk Quota <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Bandwidth <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Name Servers</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>></tr>
-
-
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="ok" value="OK" class="add-button">
-                </form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/package/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                    <form id="vstobjects" name="v_add_package" method="post">
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Package Name
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package;  ?> >
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Default Template
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_template">
+                                                    <?php
+                                                        foreach ($templates as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            if ((!empty($v_template)) && ( $value == $v_template)){
+                                                                echo 'selected' ;
+                                                            }
+                                                            if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                System Shell
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_shell">
+                                                    <?php
+                                                        foreach ($shells as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            if ((!empty($v_shell)) && ( $value == $v_shell)){
+                                                            echo 'selected' ;
+                                                        }
+                                                        if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
+                                                            echo 'selected' ;
+                                                        }
+                                                        echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Web Domains
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Web Aliases <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                DNS Domains
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                DNS Records <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Mail Domains
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Mail Accounts <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Databases
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Cron Jobs
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Backups
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Disk Quota <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Bandwidth <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Name Servers
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" name="ok" value="OK" class="button">
+                                                <input type="button" class="button" value="Cancel" onclick="location.href='/list/package/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>

+ 237 - 85
web/templates/admin/edit_package.html

@@ -1,87 +1,239 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
-            <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-            <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
 
-        <table class="data-col2" width="830px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Package Name</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package;  ?> ></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Default Template</td></tr>
-            <tr><td><select class="add-list" name="v_template">
-            <?php
-                foreach ($templates as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    if ((!empty($v_template)) && ( $value == $v_template)){
-                        echo 'selected' ;
-                    }
-                    if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
-                        echo 'selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">System Shell</td></tr>
-            <tr><td><select class="add-list" name="v_shell">
-            <?php
-                foreach ($shells as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    if ((!empty($v_shell)) && ( $value == $v_shell)){
-                        echo 'selected' ;
-                    }
-                    if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
-                        echo 'selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Package</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Domains</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Aliases <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">DNS Domains</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">DNS Records <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Mail Domains</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Mail Accounts <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Databases</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Cron Jobs</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Backups</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Disk Quota <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Bandwidth <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Name Servers</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>></tr>
-
-
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="save" value="Save" class="add-button">
-                </form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/package/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                    <form id="vstobjects" name="v_edit_package" method="post">
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Package Name
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package;  ?> >
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Default Template
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_template">
+                                                    <?php
+                                                        foreach ($templates as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            if ((!empty($v_template)) && ( $value == $v_template)){
+                                                                echo 'selected' ;
+                                                            }
+                                                            if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                System Shell
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_shell">
+                                                    <?php
+                                                        foreach ($shells as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            if ((!empty($v_shell)) && ( $value == $v_shell)){
+                                                                echo 'selected' ;
+                                                            }
+                                                            if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Web Domains
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Web Aliases <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                DNS Domains
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                DNS Records <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Mail Domains
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Mail Accounts <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(per domain)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
+                                            <td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Databases
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Cron Jobs
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Backups
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Disk Quota <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Bandwidth <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(in Mb)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Name Servers
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" name="save" value="Save" class="button">
+                                                <input type="button" class="button" value="Cancel" onclick="location.href='/list/package/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>

+ 236 - 128
web/templates/admin/list_backup.html

@@ -1,135 +1,243 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    $web = 'no';
-    $dns = 'no';
-    $mail = 'no';
-    $db = 'no';
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" > Create Backup </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-    if (!empty($data[$key]['WEB'])) $web = 'yes ¨';
-    if (!empty($data[$key]['DNS'])) $dns = 'yes ¨';
-    if (!empty($data[$key]['MAIL'])) $mail = 'yes ¨';
-    if (!empty($data[$key]['DB'])) $db = 'yes ¨';
-?>
-<script type="text/javascript">
-    $(function(){
-        $('#restore_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                    $(this).dialog("close");
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#restore_link_<?php echo "$i" ?>').click(function(){
-            $('#restore_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
+                    <form id="vstobjects">
+                        <table class="data">
 
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/backup/?backup=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    $web = 'no';
+                                    $dns = 'no';
+                                    $mail = 'no';
+                                    $db = 'no';
 
-    });
-</script>
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
-            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-            <tr><td class="data-active"><b>active</b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-            <td class="data-controls" width="80px"><img src="/images/download.png" width="8px" height="8px"><a href="/download/backup/?backup=<?php echo $key ?>" target="_blank"> download</a></td>
-            <td class="data-controls" width="80px">
-                <img src="/images/restore.png" width="6px" height="8px">
-                <a href="#" id="restore_link_<?php echo "$i"?>"> restore</a>
-                <div id="restore_dialog_<?php echo "$i" ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to restore <b><?php echo "$key" ?></b> backup?</p>
-                </div>
-            </td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> backup?</p>
-                </div>
-            </td>
-        </tr></table>
+                                    if (!empty($data[$key]['WEB'])) $web = 'yes ¨';
+                                    if (!empty($data[$key]['DNS'])) $dns = 'yes ¨';
+                                    if (!empty($data[$key]['MAIL'])) $mail = 'yes ¨';
+                                    if (!empty($data[$key]['DB'])) $db = 'yes ¨';
+                            ?>
 
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b></td></tr>
-            <tr>
-                <td style="vertical-align:top;" >
-                    <table>
-                        <tr><td class="counter-name" style="padding: 2px 0 0 0"> <?php echo $data[$key]['TYPE'] ?></td></tr>
-                        <tr><td class="chart1">Run Time: <?php echo humanize_time($data[$key]['RUNTIME']) ?> </td></tr>
-                        <tr><td class="chart1">Backup Size: <?php echo humanize_usage($data[$key]['SIZE']) ?> </td></tr>
-                    </table>
-                </td>
-                <td style="vertical-align:top;" width="250">
-                    <table>
-                        <tr><td class="counter-name" width="48">SYS: </td><td><a class="counter-value" title="<?php echo $data[$key]['VESTA'] ?>"> <?php echo $data[$key]['VESTA'] ?></a></td></tr>
-                        <tr><td class="counter-name" width="48">WEB: </td><td><a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['WEB']) ?>"> <?php echo $web ?></a></td></tr>
-                        <tr><td class="counter-name" width="48">DNS: </td><td><a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['DNS']) ?>"> <?php echo $dns ?></a></td></tr>
-                    </table>
-                </td>
-                <td rowspan=4 style="vertical-align:top;" width="300">
-                    <table>
-                        <tr><td class="counter-name" width="48">MAIL:</td><td><a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['MAIL']) ?>"> <?php echo $mail ?></a></td></tr>
-                        <tr><td class="counter-name" width="48">DB: </td> <td><a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['DB']) ?>"><?php echo $db ?></a></td></tr>
-                        <tr><td class="counter-name" width="48">CRON:</td><td><a class="counter-value" title="<?php echo $data[$key]['CRON'] ?>"> <?php echo $data[$key]['CRON'] ?></td></tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+                            <script type="text/javascript">
+                                $(function(){
+                                    $('#restore_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                $(this).dialog("close");
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#restore_link_<?php echo "$i" ?>').click(function(){
+                                        $('#restore_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+
+                                    $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/delete/backup/?backup=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                });
+                            </script>
+
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td class="data-active"><b>active</b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="80px"><img src="/images/download.png" width="8px" height="8px"><a href="/download/backup/?backup=<?php echo $key ?>" target="_blank"> download</a></td>
+                                            <td class="data-controls" width="80px">
+                                                <img src="/images/restore.png" width="6px" height="8px">
+                                                <a href="#" id="restore_link_<?php echo "$i"?>"> restore</a>
+                                                <div id="restore_dialog_<?php echo "$i" ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to restore <b><?php echo "$key" ?></b> backup?</p>
+                                                </div>
+                                            </td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> backup?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $key ?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 2px 0 0 0">
+        	                                            <?php echo $data[$key]['TYPE'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1">
+                                                            Run Time: <?php echo humanize_time($data[$key]['RUNTIME']) ?> 
+                                                        </td>
+	                                            </tr>
+                                                    <tr>
+                                                        <td class="chart1">
+                                                            Backup Size: <?php echo humanize_usage($data[$key]['SIZE']) ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="250">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" width="48">
+                                                            SYS:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value" title="<?php echo $data[$key]['VESTA'] ?>">
+                                                                <?php echo $data[$key]['VESTA'] ?> 
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name" width="48">
+                                                            WEB:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['WEB']) ?>">
+                                                                <?php echo $web ?> 
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name" width="48">
+                                                            DNS: 
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['DNS']) ?>"> 
+                                                                <?php echo $dns ?> 
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" width="48">
+                                                            MAIL:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['MAIL']) ?>"> 
+                                                                <?php echo $mail ?> 
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name" width="48">
+                                                            DB: 
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['DB']) ?>">
+                                                                <?php echo $db ?> 
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name" width="48">
+                                                            CRON:
+                                                        </td>
+                                                        <td>
+                                                            <a class="counter-value" title="<?php echo $data[$key]['CRON'] ?>">
+                                                                <?php echo $data[$key]['CRON'] ?> 
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <?php
+                                }
+                            ?> 
+    
+                        </table>
+
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
 
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 backup archive ";
+                                        } else {
+                                            echo "$i backup archives ";
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 backup archive ";
-        } else {
-            echo "$i backup archives ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:153px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:17px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:153px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:17px\"><tr><td></td></tr></table>"; ?>

+ 236 - 111
web/templates/admin/list_packages.html

@@ -1,117 +1,242 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-?>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/package/'"> Add Package </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-<tr class="data-row">
-    <script type="text/javascript">
-    $(function(){
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/package/?package=<?php echo $key; ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-    });
-    </script>
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
-            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-            <tr><td class="data-active"><b>active</b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/package/?package=<?php echo $key ?>"> edit</a></td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <?php echo $key?> package?</p>
-                </div>
-            </td>
-        </tr></table>
+                    <form id="vstobjects">
+                        <table class='data'>
 
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="username" style="padding: 10 0 0 4px;"><b><?php echo $key?></b></td></tr>
-            <td style="vertical-align:top;" >
-                <table>
-                    <tr><td class="counter-name" style="padding: 4px 0px 0px 0;" width="68%">Defaul Template:</td>
-                    <td class="counter-value" style="padding: 4px 0px 0px 0;"><?php echo $data[$key]['TEMPLATE'] ?></td></tr>
-                    <tr><td class="counter-name" style="padding: 0px 0px 6px 0;"> System Shell:</td>
-                    <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td></tr>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                            ?>
 
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 2px;">Bandwidth: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?>
-                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 2px;">Disk: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?>
-                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                </table>
-            </td>
-            <td style="vertical-align:top;" width="320">
-                <table width="300">
-                    <tr><td class="counter-name" width="37%">Web Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['WEB_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Web Aliases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Dns Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['DNS_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Dns Records:</td>
-                    <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Name Servers:</td>
-                    <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td></tr>
-                </table></td>
-            <td style="vertical-align:top;" width="250">
-                <table class="data-col4" width="250">
-                    <tr><td class="counter-name" width="43%">Mail Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['MAIL_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Mail Accounts:</td>
-                    <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Databases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['DATABASES'] ?></td></tr>
-                    <tr><td class="counter-name">Cron Jobs:</td>
-                    <td class="counter-value"><?php echo $data[$key]['CRON_JOBS'] ?></td></tr>
-                    <tr><td class="counter-name">Backups:</td>
-                    <td class="counter-value"><?php echo $data[$key]['BACKUPS'] ?></td></tr>
-                </table>
-            </td>
-        </tr>
-        </table>
-    </td>
-</tr>
+                            <tr class="data-row">
+                                <script type="text/javascript">
+                                    $(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                            modal: true,
+                                            autoOpen: false,
+                                            width: 360,
+                                            buttons: {
+                                                "Ok": function(event, ui) {
+                                                     location.href = '/delete/package/?package=<?php echo $key; ?>';
+                                                },
+                                                "Cancel": function() {
+                                                    $(this).dialog("close");
+                                                }
+                                            }
+                                        });
+                                        $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                            return false;
+                                        });
+                                    });
+                                </script>
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td class="data-active"><b>active</b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/package/?package=<?php echo $key ?>"> edit</a></td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete <?php echo $key?> package?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                </table>
+                                <table class="data-col2" width="830px">
+                                    <tr>
+                                        <td colspan=3 class="username" style="padding: 10 0 0 4px;">
+                                            <b><?php echo $key?></b>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="vertical-align:top;" >
+                                            <table>
+                                                <tr>
+                                                    <td class="counter-name" style="padding: 4px 0px 0px 0;" width="68%">
+                                                        Defaul Template:
+                                                    </td>
+                                                    <td class="counter-value" style="padding: 4px 0px 0px 0;">
+                                                        <?php echo $data[$key]['TEMPLATE'] ?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name" style="padding: 0px 0px 6px 0;">
+                                                        System Shell:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['SHELL'] ?> 
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                        Bandwidth: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
+                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                            <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                        Disk: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?>
+                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                            <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                        <td style="vertical-align:top;" width="320">
+                                            <table width="300">
+                                                <tr>
+                                                    <td class="counter-name" width="37%">
+                                                        Web Domains:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['WEB_DOMAINS'] ?> 
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Web Aliases:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['WEB_ALIASES'] ?> per domain
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Dns Domains:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['DNS_DOMAINS'] ?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Dns Records:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['DNS_RECORDS'] ?> per domain
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Name Servers:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo str_replace(',', ', ',$data[$key]['NS']) ?> 
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                        <td style="vertical-align:top;" width="250">
+                                            <table class="data-col4" width="250">
+                                                <tr>
+                                                    <td class="counter-name" width="43%">
+                                                        Mail Domains:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['MAIL_DOMAINS'] ?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Mail Accounts:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['MAIL_ACCOUNTS'] ?> per domain
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Databases:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['DATABASES'] ?> 
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Cron Jobs:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['CRON_JOBS'] ?> 
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="counter-name">
+                                                        Backups:
+                                                    </td>
+                                                    <td class="counter-value">
+                                                        <?php echo $data[$key]['BACKUPS'] ?> 
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
+                        <?php
+                            }
+                        ?>
+                    </table>
 
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 month ";
-        } else {
-            echo "$i months ";
-        }
-    ?>
-    listed</td>
-</tr>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:123px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
+
+                    <table class="data-count">
+                        <tr>
+                            <td width="160px"></td>
+                            <td>
+                                <?php
+                                    if ( $i == 1) {
+                                        echo "1 package ";
+                                    } else {
+                                        echo "$i packages ";
+                                    }
+                                ?>
+                            </td>
+                        </tr>
+                    </table>
+                </form>
+
+                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?> 
+                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:123px\"><tr><td></td></tr></table>"; ?>

+ 0 - 15
web/templates/admin/menu_add_package.html

@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 2px 24px 0;" ><a class="add-name"><b>Adding User Package</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>

+ 0 - 15
web/templates/admin/menu_edit_package.html

@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 0 24px 0;" ><a class="add-name"><b>Editing User Package</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>

+ 0 - 39
web/templates/admin/menu_packages.html

@@ -1,39 +0,0 @@
-<?php
-    if (!empty($_SESSION['error_msg'])) {
-?>
-        <script type="text/javascript">
-            $(function() {
-                $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                $( "#dialog-message" ).dialog({
-                    modal: true,
-                    buttons: {
-                        Ok: function() {
-                            $( this ).dialog( "close" );
-                        }
-                    }
-                });
-            });
-        </script>
-        <div id="dialog-message" title="Error">
-        <p><?php echo $_SESSION['error_msg'] ?>.</p>
-        </div>
-<?php
-        unset($_SESSION['error_msg']);
-    }
-?>
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/package/'">Add Package</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
-        <option>apply to selected</option>
-        <option>propagate again</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">