Jackson Dou 1 gadu atpakaļ
vecāks
revīzija
03b76efc30
56 mainītis faili ar 2248 papildinājumiem un 2330 dzēšanām
  1. 1 1
      src/admin/accounts.php
  2. 1 1
      src/admin/clients.php
  3. 1 0
      src/admin/domain-provider.php
  4. 1 0
      src/admin/hosting-hostname.php
  5. 1 1
      src/admin/hosting-provider.php
  6. 1 1
      src/admin/index.php
  7. 1 1
      src/admin/knowledgebase.php
  8. 1 1
      src/admin/news.php
  9. 1 1
      src/admin/profile.php
  10. 1 2
      src/admin/settings.php
  11. 1 0
      src/admin/ssl-provider.php
  12. 1 0
      src/admin/ssl.php
  13. 1 1
      src/admin/tickets.php
  14. 86 88
      src/admin/views/accounts/add.php
  15. 139 141
      src/admin/views/accounts/details.php
  16. 94 96
      src/admin/views/accounts/edit.php
  17. 66 68
      src/admin/views/accounts/list.php
  18. 18 20
      src/admin/views/accounts/login.php
  19. 71 73
      src/admin/views/clients/add.php
  20. 71 73
      src/admin/views/clients/details.php
  21. 82 84
      src/admin/views/clients/edit.php
  22. 56 58
      src/admin/views/clients/list.php
  23. 143 146
      src/admin/views/dashboard/view.php
  24. 15 17
      src/admin/views/domain-provider/list.php
  25. 3 0
      src/admin/views/footer.php
  26. 45 47
      src/admin/views/hosting-hostname/list.php
  27. 93 95
      src/admin/views/hosting-provider/add.php
  28. 99 101
      src/admin/views/hosting-provider/details.php
  29. 94 96
      src/admin/views/hosting-provider/edit.php
  30. 46 48
      src/admin/views/hosting-provider/list.php
  31. 33 35
      src/admin/views/knowledgebase/add.php
  32. 30 32
      src/admin/views/knowledgebase/details.php
  33. 37 39
      src/admin/views/knowledgebase/edit.php
  34. 41 43
      src/admin/views/knowledgebase/list.php
  35. 80 75
      src/admin/views/navbar.php
  36. 39 41
      src/admin/views/news/add.php
  37. 46 48
      src/admin/views/news/edit.php
  38. 43 46
      src/admin/views/news/list.php
  39. 26 28
      src/admin/views/news/view.php
  40. 36 38
      src/admin/views/profile/edit.php
  41. 46 48
      src/admin/views/profile/password.php
  42. 35 37
      src/admin/views/profile/view.php
  43. 17 19
      src/admin/views/settings/view.php
  44. 23 58
      src/admin/views/sidebar.php
  45. 34 36
      src/admin/views/sitepro/view.php
  46. 43 45
      src/admin/views/ssl-provider/add.php
  47. 48 50
      src/admin/views/ssl-provider/details.php
  48. 49 51
      src/admin/views/ssl-provider/edit.php
  49. 46 48
      src/admin/views/ssl-provider/list.php
  50. 71 73
      src/admin/views/ssl/details.php
  51. 49 51
      src/admin/views/ssl/list.php
  52. 69 71
      src/admin/views/tickets/details.php
  53. 50 52
      src/admin/views/tickets/list.php
  54. 10 3
      src/assets/css/common.css
  55. 7 2
      src/assets/theme.switcher/css/dark.css
  56. 6 0
      src/public/views/common/header.php

+ 1 - 1
src/admin/accounts.php

@@ -11,6 +11,6 @@ if (!in_array($action, array('list', 'add', 'edit', 'details', 'goftp', 'login',
 require __DIR__ . '/controllers/accounts/' . $action . '.php';
 require __DIR__ . '/controllers/accounts/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/accounts/' . $action . '.php';
 require __DIR__ . '/views/accounts/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/clients.php

@@ -11,6 +11,6 @@ if (!in_array($action, array('list', 'add', 'edit', 'details', 'login'))) {
 require __DIR__ . '/controllers/clients/' . $action . '.php';
 require __DIR__ . '/controllers/clients/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/clients/' . $action . '.php';
 require __DIR__ . '/views/clients/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 0
src/admin/domain-provider.php

@@ -13,5 +13,6 @@ $PageInfo['title'] = 'Domain Provider ' . ucfirst($action);
 // require __DIR__ . '/controllers/domain-provider/' . $action . '.php';
 // require __DIR__ . '/controllers/domain-provider/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/domain-provider/' . $action . '.php';
 require __DIR__ . '/views/domain-provider/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 0
src/admin/hosting-hostname.php

@@ -13,5 +13,6 @@ $PageInfo['title'] = 'Hosting Hostname ' . ucfirst($action);
 require __DIR__ . '/controllers/hosting-hostname/' . $action . '.php';
 require __DIR__ . '/controllers/hosting-hostname/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/hosting-hostname/' . $action . '.php';
 require __DIR__ . '/views/hosting-hostname/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/hosting-provider.php

@@ -13,6 +13,6 @@ $PageInfo['title'] = 'Hosting Provider ' . ucfirst($action);
 require __DIR__ . '/controllers/hosting-provider/' . $action . '.php';
 require __DIR__ . '/controllers/hosting-provider/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/hosting-provider/' . $action . '.php';
 require __DIR__ . '/views/hosting-provider/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/index.php

@@ -4,6 +4,6 @@ require_once __DIR__ . '/application.php';
 require_once __DIR__ . '/controllers/dashboard/view.php';
 require_once __DIR__ . '/controllers/dashboard/view.php';
 require_once __DIR__ . '/views/header.php';
 require_once __DIR__ . '/views/header.php';
 require_once __DIR__ . '/views/navbar.php';
 require_once __DIR__ . '/views/navbar.php';
-// require_once __DIR__ . '/views/sidebar.php';
+require_once __DIR__ . '/views/sidebar.php';
 require_once __DIR__ . '/views/dashboard/view.php';
 require_once __DIR__ . '/views/dashboard/view.php';
 require_once __DIR__ . '/views/footer.php';
 require_once __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/knowledgebase.php

@@ -13,6 +13,6 @@ $PageInfo['title'] = 'Knowledgebase ' . ucfirst($action);
 require __DIR__ . '/controllers/knowledgebase/' . $action . '.php';
 require __DIR__ . '/controllers/knowledgebase/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/knowledgebase/' . $action . '.php';
 require __DIR__ . '/views/knowledgebase/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/news.php

@@ -11,6 +11,6 @@ if (!in_array($action, array('list', 'add', 'edit', 'view'))) {
 require __DIR__ . '/controllers/news/' . $action . '.php';
 require __DIR__ . '/controllers/news/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/news/' . $action . '.php';
 require __DIR__ . '/views/news/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/profile.php

@@ -11,6 +11,6 @@ if (!in_array($action, array('edit', 'view', 'password'))) {
 require __DIR__ . '/controllers/profile/' . $action . '.php';
 require __DIR__ . '/controllers/profile/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/profile/' . $action . '.php';
 require __DIR__ . '/views/profile/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 2
src/admin/settings.php

@@ -16,7 +16,6 @@ if (!in_array($action, array('edit', 'view'))) {
 require __DIR__ . '/controllers/' . $section . '/' . $action . '.php';
 require __DIR__ . '/controllers/' . $section . '/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
-
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/' . $section . '/' . $action . '.php';
 require __DIR__ . '/views/' . $section . '/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 0
src/admin/ssl-provider.php

@@ -13,5 +13,6 @@ $PageInfo['title'] = $lang->I18N('SSL Provider') . $lang->I18N($action);
 require __DIR__ . '/controllers/ssl-provider/' . $action . '.php';
 require __DIR__ . '/controllers/ssl-provider/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/ssl-provider/' . $action . '.php';
 require __DIR__ . '/views/ssl-provider/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 0
src/admin/ssl.php

@@ -13,5 +13,6 @@ $PageInfo['title'] = 'SSL ' . $lang->I18N($action);
 require __DIR__ . '/controllers/ssl/' . $action . '.php';
 require __DIR__ . '/controllers/ssl/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/ssl/' . $action . '.php';
 require __DIR__ . '/views/ssl/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 1 - 1
src/admin/tickets.php

@@ -14,6 +14,6 @@ $PageInfo['title'] = 'Ticket ' . ucfirst($action);
 require __DIR__ . '/controllers/tickets/' . $action . '.php';
 require __DIR__ . '/controllers/tickets/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 require __DIR__ . '/views/navbar.php';
-// require __DIR__ . '/views/sidebar.php';
+require __DIR__ . '/views/sidebar.php';
 require __DIR__ . '/views/tickets/' . $action . '.php';
 require __DIR__ . '/views/tickets/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
 require __DIR__ . '/views/footer.php';

+ 86 - 88
src/admin/views/accounts/add.php

@@ -1,104 +1,102 @@
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('add'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/accounts', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('add'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/accounts', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Name</label>
-                            <input type="text" value="<?php echo $ClientInfo['client_fname'] . ' ' . $ClientInfo['client_lname']; ?>" class="form-control disabled" readonly>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Email</label>
-                            <input type="text" value="<?php echo $ClientInfo['client_email']; ?>" class="form-control disabled" readonly>
-                        </div>
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required">Name</label>
+                        <input type="text" value="<?php echo $ClientInfo['client_fname'] . ' ' . $ClientInfo['client_lname']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
-                            <input type="text" value="<?php echo $ClientInfo['client_phone']; ?>" class="form-control disabled" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required">Email</label>
+                        <input type="text" value="<?php echo $ClientInfo['client_email']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Billing Address</label>
-                            <input type="text" value="<?php echo $ClientInfo['client_address']; ?>" class="form-control disabled" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
+                        <input type="text" value="<?php echo $ClientInfo['client_phone']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-md-12"><hr /></div>
-            <?php if ($AccountInfo['account_status'] == '1'): ?>
-                <form class="row" action="controllers/accounts/password.php" method="post">
-                    <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
-                    <div class="col-md-6">
-                        <div class="pb-10 px-10">
-                            <label class="form-label required">New Password</label>
-                            <input type="password" name="new_password" placeholder="New password here..." class="form-control">
-                        </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required">Billing Address</label>
+                        <input type="text" value="<?php echo $ClientInfo['client_address']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">&nbsp;</label>
-                            <button type="submit" name="submit" class="form-control btn btn-primary btn-sm text-white">Change Password</button>
-                        </div>
+                </div>
+            </div>
+            <div class="col-md-12"><hr /></div>
+        <?php if ($AccountInfo['account_status'] == '1'): ?>
+            <form class="row" action="controllers/accounts/password.php" method="post">
+                <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
+                <div class="col-md-6">
+                    <div class="pb-10 px-10">
+                        <label class="form-label required">New Password</label>
+                        <input type="password" name="new_password" placeholder="New password here..." class="form-control">
                     </div>
                     </div>
-                    <!-- <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <input type="submit" name="submit" value="Change Password" class="btn btn-primary btn-sm text-white">
-                        </div>
-                    </div> -->
-                </form>
-                <hr>
-                <form
-                    action="controllers/accounts/deactivate.php"
-                    method="post"
-                    onsubmit="
-                        var reason = document.getElementsByName('reason')[0].value;
-                        if (reason.length < 8) {
-                            alert('Reason must be 8 characters long...');
-                            return false;
-                        }
-                        return true;
-                ">
+                </div>
+                <div class="col-md-6">
                     <div class="mb-10 px-10">
                     <div class="mb-10 px-10">
-                        <label class="form-label required">Deacivation Reason</label>
-                        <textarea name="reason" placeholder="Deactivation reason here..." class="form-control" id="reason"></textarea>
-                        <div class="text-muted my-10 alert alert-secondary">Your account will be deleted after 30 days of your account deactivation and all of the account data will be removed completely(This action cannot be undo).</div>
-                        <input type="hidden" name="account_id" value="<?php echo $AccountInfo['account_id']; ?>">
+                        <label class="form-label">&nbsp;</label>
+                        <button type="submit" name="submit" class="form-control btn btn-primary btn-sm text-white">Change Password</button>
                     </div>
                     </div>
+                </div>
+                <!-- <div class="col-md-12">
                     <div class="mb-10 px-10">
                     <div class="mb-10 px-10">
-                        <input type="submit" name="submit" value="Deactivate Account" class="btn btn-danger btn-sm text-white">
+                        <input type="submit" name="submit" value="Change Password" class="btn btn-primary btn-sm text-white">
                     </div>
                     </div>
-                </form>
-            <?php else: ?>
-                <form class="row" action="controllers/accounts/reactivate.php" method="post">
-                    <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Activate Account</label>
-                            <button type="submit" name="submit" class="btn btn-success text-white btn-block my-5">Activate Account</button>
-                        </div>
+                </div> -->
+            </form>
+            <hr>
+            <form
+                action="controllers/accounts/deactivate.php"
+                method="post"
+                onsubmit="
+                    var reason = document.getElementsByName('reason')[0].value;
+                    if (reason.length < 8) {
+                        alert('Reason must be 8 characters long...');
+                        return false;
+                    }
+                    return true;
+            ">
+                <div class="mb-10 px-10">
+                    <label class="form-label required">Deacivation Reason</label>
+                    <textarea name="reason" placeholder="Deactivation reason here..." class="form-control" id="reason"></textarea>
+                    <div class="text-muted my-10 alert alert-secondary">Your account will be deleted after 30 days of your account deactivation and all of the account data will be removed completely(This action cannot be undo).</div>
+                    <input type="hidden" name="account_id" value="<?php echo $AccountInfo['account_id']; ?>">
+                </div>
+                <div class="mb-10 px-10">
+                    <input type="submit" name="submit" value="Deactivate Account" class="btn btn-danger btn-sm text-white">
+                </div>
+            </form>
+        <?php else: ?>
+            <form class="row" action="controllers/accounts/reactivate.php" method="post">
+                <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Activate Account</label>
+                        <button type="submit" name="submit" class="btn btn-success text-white btn-block my-5">Activate Account</button>
                     </div>
                     </div>
-                </form>
-            <?php endif;?>
-            </div>
+                </div>
+            </form>
+        <?php endif;?>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 139 - 141
src/admin/views/accounts/details.php

@@ -1,168 +1,166 @@
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Account Details'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                    <span class="label label-default"> ID <?php echo $account_id; ?></span>
-                </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Account Details'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+                <span class="label label-default"> ID <?php echo $account_id; ?></span>
             </div>
             </div>
-            <div class="panel-body">
-            <?php if ($AccountInfo['account_status'] == '0'): ?>
-                <div class="alert alert-secondary col-md-12">This account is inactive.</div>
-            <?php elseif ($AccountInfo['account_status'] == '2'): ?>
-                <div class="alert alert-secondary col-md-12">This account has been suspended.</div>
-            <?php elseif ($AccountInfo['account_status'] == '3'): ?>
-                <div class="alert alert-secondary col-md-12">This account has been deleted.</div>
-            <?php endif;?>
-                <div class="row pb-10">
-                    <div class="col-md-12 pb-10 mb-10">
-                        <div class="row">
-                            <div class="col-md-6 px-5 text-center py-15">
-                                <i class="fa fa-laptop fa-10x"></i>
-                            </div>
-                            <div class="col-md-6 py-5 text-center text-md-right">
-                            <?php if ($AccountInfo['account_status'] == '1'): ?>
-                                <a href="accounts.php?action=login&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-success btn-block"><?php echo $lang->I18N('Control Panel'); ?></a>
-                                <a href="accounts.php?action=goftp&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-primary btn-block"><?php echo $lang->I18N('File Manager'); ?></a>
-                            <?php endif;?>
-                                <a href="accounts.php?action=edit&account_id=<?php echo $account_id; ?>" class="btn btn-secondary btn-block"><?php echo $lang->I18N('Edit Settings'); ?></a>
-                            </div>
+        </div>
+        <div class="panel-body">
+        <?php if ($AccountInfo['account_status'] == '0'): ?>
+            <div class="alert alert-secondary col-md-12">This account is inactive.</div>
+        <?php elseif ($AccountInfo['account_status'] == '2'): ?>
+            <div class="alert alert-secondary col-md-12">This account has been suspended.</div>
+        <?php elseif ($AccountInfo['account_status'] == '3'): ?>
+            <div class="alert alert-secondary col-md-12">This account has been deleted.</div>
+        <?php endif;?>
+            <div class="row pb-10">
+                <div class="col-md-12 pb-10 mb-10">
+                    <div class="row">
+                        <div class="col-md-6 px-5 text-center py-15">
+                            <i class="fa fa-laptop fa-10x"></i>
                         </div>
                         </div>
-                    </div>
-                    <hr />
-                    <div class="col-md-4 col-sm-6">
-                        <div class="m-5">
-                            <b>Control Panel Username:</b>
-                            <span><?php echo $AccountInfo['account_username']; ?></span>
+                        <div class="col-md-6 py-5 text-center text-md-right">
+                        <?php if ($AccountInfo['account_status'] == '1'): ?>
+                            <a href="accounts.php?action=login&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-success btn-block"><?php echo $lang->I18N('Control Panel'); ?></a>
+                            <a href="accounts.php?action=goftp&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-primary btn-block"><?php echo $lang->I18N('File Manager'); ?></a>
+                        <?php endif;?>
+                            <a href="accounts.php?action=edit&account_id=<?php echo $account_id; ?>" class="btn btn-secondary btn-block"><?php echo $lang->I18N('Edit Settings'); ?></a>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Control Panel Password:</b>
-                            <span><kbd><?php echo $AccountInfo['account_password']; ?></kbd></span>
-                        </div>
+                </div>
+                <hr />
+                <div class="col-md-4 col-sm-6">
+                    <div class="m-5">
+                        <b>Control Panel Username:</b>
+                        <span><?php echo $AccountInfo['account_username']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Main Domain:</b>
-                            <span><?php echo $AccountInfo['account_domain']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Control Panel Password:</b>
+                        <span><kbd><?php echo $AccountInfo['account_password']; ?></kbd></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Control Panel Domain:</b>
-                            <span><?php echo $AccountApi['api_cpanel_url']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Main Domain:</b>
+                        <span><?php echo $AccountInfo['account_domain']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6 col-md-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Status:</b>
-                            <span><?php if ($AccountInfo['account_status'] == '0'): ?>
-                                <span class="label label-info"><?php echo $lang->I18N('Inactive'); ?></span>
-                            <?php elseif ($AccountInfo['account_status'] == '1'): ?>
-                                <span class="label label-success"><?php echo $lang->I18N('Active'); ?></span>
-                            <?php elseif ($AccountInfo['account_status'] == '2'): ?>
-                                <span class="label label-warning"><?php echo $lang->I18N('Suspended'); ?></span>
-                            <?php elseif ($AccountInfo['account_status'] == '3'): ?>
-                                <span class="label label-default"><?php echo $lang->I18N('Deleted'); ?></span>
-                            <?php endif; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Control Panel Domain:</b>
+                        <span><?php echo $AccountApi['api_cpanel_url']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Creation Date:</b>
-                            <span><?php echo $AccountInfo['account_addtime']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6 col-md-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Status:</b>
+                        <span><?php if ($AccountInfo['account_status'] == '0'): ?>
+                            <span class="label label-info"><?php echo $lang->I18N('Inactive'); ?></span>
+                        <?php elseif ($AccountInfo['account_status'] == '1'): ?>
+                            <span class="label label-success"><?php echo $lang->I18N('Active'); ?></span>
+                        <?php elseif ($AccountInfo['account_status'] == '2'): ?>
+                            <span class="label label-warning"><?php echo $lang->I18N('Suspended'); ?></span>
+                        <?php elseif ($AccountInfo['account_status'] == '3'): ?>
+                            <span class="label label-default"><?php echo $lang->I18N('Deleted'); ?></span>
+                        <?php endif; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Server IP:</b>
-                            <span><?php echo $AccountApi['api_server_ip']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Creation Date:</b>
+                        <span><?php echo $AccountInfo['account_addtime']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Your IP:</b>
-                            <span><?php echo get_client_ip(); ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Server IP:</b>
+                        <span><?php echo $AccountApi['api_server_ip']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>FTP Hostname:</b>
-                            <span><?php echo $AccountApi['api_server_ftp_domain']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Your IP:</b>
+                        <span><?php echo get_client_ip(); ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>FTP Port:</b>
-                            <span>21</span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>FTP Hostname:</b>
+                        <span><?php echo $AccountApi['api_server_ftp_domain']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>MySQL Hostname:</b>
-                            <span><?php echo $AccountInfo['account_sql'] . '.' . $AccountApi['api_server_sql_domain']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>FTP Port:</b>
+                        <span>21</span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Mysql Port:</b>
-                            <span>3306</span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>MySQL Hostname:</b>
+                        <span><?php echo $AccountInfo['account_sql'] . '.' . $AccountApi['api_server_sql_domain']; ?></span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Nameserver 1:</b>
-                            <span><?php echo $AccountApi['api_ns_1']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Mysql Port:</b>
+                        <span>3306</span>
                     </div>
                     </div>
-                    <div class="col-md-4 col-sm-6">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <b>Nameserver 2:</b>
-                            <span><?php echo $AccountApi['api_ns_2']; ?></span>
-                        </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Nameserver 1:</b>
+                        <span><?php echo $AccountApi['api_ns_1']; ?></span>
+                    </div>
+                </div>
+                <div class="col-md-4 col-sm-6">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <b>Nameserver 2:</b>
+                        <span><?php echo $AccountApi['api_ns_2']; ?></span>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="panel-footer">
-            <?php if ($AccountInfo['account_status'] == '1'): ?>
-                <a href="accounts.php?action=login&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-success"><?php echo $lang->I18N('Control Panel'); ?></a>
-                <a href="accounts.php?action=goftp&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-primary"><?php echo $lang->I18N('File Manager'); ?></a>
-            <?php endif;?>
-                <a href="accounts.php?action=edit&account_id=<?php echo $account_id; ?>" class="btn btn-default"><?php echo $lang->I18N('Account Settings'); ?></a>
-            </div>
         </div>
         </div>
+        <div class="panel-footer">
+        <?php if ($AccountInfo['account_status'] == '1'): ?>
+            <a href="accounts.php?action=login&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-success"><?php echo $lang->I18N('Control Panel'); ?></a>
+            <a href="accounts.php?action=goftp&account_id=<?php echo $account_id; ?>" target="_blank" class="btn btn-primary"><?php echo $lang->I18N('File Manager'); ?></a>
+        <?php endif;?>
+            <a href="accounts.php?action=edit&account_id=<?php echo $account_id; ?>" class="btn btn-default"><?php echo $lang->I18N('Account Settings'); ?></a>
+        </div>
+    </div>
 
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="accounts.php?action=sync&type=domain&account_id=<?php echo $account_id; ?>" class="btn btn-xs btn-primary">
-                        <i class="fa fa-sync"></i> <?php echo $lang->I18N('Sync'); ?>
-                    </a>
-                </div>
-                <span class="panel-title">Account Domains</span>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="accounts.php?action=sync&type=domain&account_id=<?php echo $account_id; ?>" class="btn btn-xs btn-primary">
+                    <i class="fa fa-sync"></i> <?php echo $lang->I18N('Sync'); ?>
+                </a>
             </div>
             </div>
-            <?php if (count($AccountDomainList) > 0): ?>
-                <ul class="list-group">
-                <?php foreach ($AccountDomainList as $domain): ?>
-                    <li class="list-group-item">
-                        <span class="pull-right"><a href="accounts.php?action=goftp&account_id=<?php echo $account_id; ?>&domain=<?php echo $domain['domain_name']; ?>" target="_blank"><i class="fa fa-file-import"></i></a></span>
-                        <a href="http://<?php echo $domain['domain_name']; ?>" target="_blank" ref="noreferrer noopener"><?php echo $domain['domain_name']; ?></a>
-                    </li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php else: ?>
-            <div class="panel-body">
-                <p class='text-center'>No Domain Found</p>
-            </div>
-            <?php endif; ?>
+            <span class="panel-title">Account Domains</span>
+        </div>
+        <?php if (count($AccountDomainList) > 0): ?>
+            <ul class="list-group">
+            <?php foreach ($AccountDomainList as $domain): ?>
+                <li class="list-group-item">
+                    <span class="pull-right"><a href="accounts.php?action=goftp&account_id=<?php echo $account_id; ?>&domain=<?php echo $domain['domain_name']; ?>" target="_blank"><i class="fa fa-file-import"></i></a></span>
+                    <a href="http://<?php echo $domain['domain_name']; ?>" target="_blank" ref="noreferrer noopener"><?php echo $domain['domain_name']; ?></a>
+                </li>
+                <?php endforeach; ?>
+            </ul>
+        <?php else: ?>
+        <div class="panel-body">
+            <p class='text-center'>No Domain Found</p>
         </div>
         </div>
+        <?php endif; ?>
     </div>
     </div>
 </div>
 </div>

+ 94 - 96
src/admin/views/accounts/edit.php

@@ -1,112 +1,110 @@
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
-            <li><a href="accounts.php?action=details&account_id=<?php echo $account_id; ?>"><?php echo $lang->I18N('Account Details'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Account Settings'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/accounts', '', array('action' => 'details', 'account_id' => $account_id)); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/accounts', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/accounts', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                    <span class="label label-default"> ID <?php echo $account_id; ?></span>
-                </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
+        <li><a href="accounts.php?action=details&account_id=<?php echo $account_id; ?>"><?php echo $lang->I18N('Account Details'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Account Settings'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/accounts', '', array('action' => 'details', 'account_id' => $account_id)); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/accounts', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/accounts', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Name</label>
-                            <input type="text" value="<?php echo $ClientInfo['client_fname'] . ' ' . $ClientInfo['client_lname']; ?>" class="form-control disabled" readonly>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Email</label>
-                            <input type="text" value="<?php echo $ClientInfo['client_email']; ?>" class="form-control disabled" readonly>
-                        </div>
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+                <span class="label label-default"> ID <?php echo $account_id; ?></span>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required">Name</label>
+                        <input type="text" value="<?php echo $ClientInfo['client_fname'] . ' ' . $ClientInfo['client_lname']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
-                            <input type="text" value="<?php echo $ClientInfo['client_phone']; ?>" class="form-control disabled" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required">Email</label>
+                        <input type="text" value="<?php echo $ClientInfo['client_email']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Billing Address</label>
-                            <input type="text" value="<?php echo $ClientInfo['client_address']; ?>" class="form-control disabled" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
+                        <input type="text" value="<?php echo $ClientInfo['client_phone']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-md-12"><hr /></div>
-            <?php if ($AccountInfo['account_status'] == '1'): ?>
-                <form class="row" action="controllers/accounts/password.php" method="post">
-                    <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
-                    <div class="col-md-6">
-                        <div class="pb-10 px-10">
-                            <label class="form-label required">New Password</label>
-                            <input type="password" name="new_password" placeholder="New password here..." class="form-control">
-                        </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required">Billing Address</label>
+                        <input type="text" value="<?php echo $ClientInfo['client_address']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">&nbsp;</label>
-                            <button type="submit" name="submit" class="form-control btn btn-primary btn-sm text-white">Change Password</button>
-                        </div>
+                </div>
+            </div>
+            <div class="col-md-12"><hr /></div>
+        <?php if ($AccountInfo['account_status'] == '1'): ?>
+            <form class="row" action="controllers/accounts/password.php" method="post">
+                <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
+                <div class="col-md-6">
+                    <div class="pb-10 px-10">
+                        <label class="form-label required">New Password</label>
+                        <input type="password" name="new_password" placeholder="New password here..." class="form-control">
                     </div>
                     </div>
-                    <!-- <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <input type="submit" name="submit" value="Change Password" class="btn btn-primary btn-sm text-white">
-                        </div>
-                    </div> -->
-                </form>
-                <hr>
-                <form
-                    action="controllers/accounts/deactivate.php"
-                    method="post"
-                    onsubmit="
-                        var reason = document.getElementsByName('reason')[0].value;
-                        if (reason.length < 8) {
-                            alert('Reason must be 8 characters long...');
-                            return false;
-                        }
-                        return true;
-                ">
+                </div>
+                <div class="col-md-6">
                     <div class="mb-10 px-10">
                     <div class="mb-10 px-10">
-                        <label class="form-label required">Deacivation Reason</label>
-                        <textarea name="reason" placeholder="Deactivation reason here..." class="form-control" id="reason"></textarea>
-                        <div class="text-muted my-10 alert alert-secondary">Your account will be deleted after 30 days of your account deactivation and all of the account data will be removed completely(This action cannot be undo).</div>
-                        <input type="hidden" name="account_id" value="<?php echo $AccountInfo['account_id']; ?>">
+                        <label class="form-label">&nbsp;</label>
+                        <button type="submit" name="submit" class="form-control btn btn-primary btn-sm text-white">Change Password</button>
                     </div>
                     </div>
+                </div>
+                <!-- <div class="col-md-12">
                     <div class="mb-10 px-10">
                     <div class="mb-10 px-10">
-                        <input type="submit" name="submit" value="Deactivate Account" class="btn btn-danger btn-sm text-white">
+                        <input type="submit" name="submit" value="Change Password" class="btn btn-primary btn-sm text-white">
                     </div>
                     </div>
-                </form>
-            <?php else: ?>
-                <form class="row" action="controllers/accounts/reactivate.php" method="post">
-                    <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Activate Account</label>
-                            <button type="submit" name="submit" class="btn btn-success text-white btn-block my-5">Activate Account</button>
-                        </div>
+                </div> -->
+            </form>
+            <hr>
+            <form
+                action="controllers/accounts/deactivate.php"
+                method="post"
+                onsubmit="
+                    var reason = document.getElementsByName('reason')[0].value;
+                    if (reason.length < 8) {
+                        alert('Reason must be 8 characters long...');
+                        return false;
+                    }
+                    return true;
+            ">
+                <div class="mb-10 px-10">
+                    <label class="form-label required">Deacivation Reason</label>
+                    <textarea name="reason" placeholder="Deactivation reason here..." class="form-control" id="reason"></textarea>
+                    <div class="text-muted my-10 alert alert-secondary">Your account will be deleted after 30 days of your account deactivation and all of the account data will be removed completely(This action cannot be undo).</div>
+                    <input type="hidden" name="account_id" value="<?php echo $AccountInfo['account_id']; ?>">
+                </div>
+                <div class="mb-10 px-10">
+                    <input type="submit" name="submit" value="Deactivate Account" class="btn btn-danger btn-sm text-white">
+                </div>
+            </form>
+        <?php else: ?>
+            <form class="row" action="controllers/accounts/reactivate.php" method="post">
+                <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Activate Account</label>
+                        <button type="submit" name="submit" class="btn btn-success text-white btn-block my-5">Activate Account</button>
                     </div>
                     </div>
-                </form>
-            <?php endif;?>
-            </div>
+                </div>
+            </form>
+        <?php endif;?>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 66 - 68
src/admin/views/accounts/list.php

@@ -1,77 +1,75 @@
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Hosting Accounts'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="accounts.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Hosting Accounts'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="accounts.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th>ID</th>
-                        <th><?php echo $lang->I18N('Clients'); ?></th>
-                        <th><?php echo $lang->I18N('Provider'); ?></th>
-                        <th><?php echo $lang->I18N('Username'); ?></th>
-                        <th><?php echo $lang->I18N('Domain'); ?></th>
-                        <th><?php echo $lang->I18N('Deploy Date'); ?></th>
-                        <th><?php echo $lang->I18N('Status'); ?></th>
-                        <th><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+            </div>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th>ID</th>
+                    <th><?php echo $lang->I18N('Clients'); ?></th>
+                    <th><?php echo $lang->I18N('Provider'); ?></th>
+                    <th><?php echo $lang->I18N('Username'); ?></th>
+                    <th><?php echo $lang->I18N('Domain'); ?></th>
+                    <th><?php echo $lang->I18N('Deploy Date'); ?></th>
+                    <th><?php echo $lang->I18N('Status'); ?></th>
+                    <th><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
 <?php if ($count > 0): ?>
 <?php if ($count > 0): ?>
-    <?php foreach ($rows as $row): ?>
-                    <tr>
-                        <td><?php echo $row['account_id'];?></td>
-                        <td><?php echo $row['account_client_id']; ?></td>
-                        <td>
-                            <a href="hosting-provider.php?action=details&api_key=<?php echo $row['account_api_key']; ?>">
-                                <?php echo $row['account_api_key']; ?>
-                            </a>
-                        </td>
-                        <td><?php echo $row['account_username']; ?></td>
-                        <td><?php echo $row['account_domain']; ?></td>
-                        <td><?php echo $row['account_addtime']; ?></td>
-                        <td><?php if ($row['account_status'] == '0'): ?>
-                            <span class="label label-info"><?php echo $lang->I18N('Inactive'); ?></span>
-                        <?php elseif ($row['account_status'] == '1'): ?>
-                            <span class="label label-success"><?php echo $lang->I18N('Active'); ?></span>
-                        <?php elseif ($row['account_status'] == '2'): ?>
-                            <span class="label label-warning"><?php echo $lang->I18N('Suspended'); ?></span>
-                        <?php elseif ($row['account_status'] == '3'): ?>
-                            <span class="label label-default"><?php echo $lang->I18N('Deleted'); ?></span>
-                        <?php endif; ?></td>
-                        <td>
-                            <a href="accounts.php?action=edit&account_id=<?php echo $row['account_id']; ?>" class="btn btn-success btn-xs">
-                                <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                            </a>
-                            <a href="accounts.php?action=details&account_id=<?php echo $row['account_id']; ?>" class="btn btn-primary btn-xs">
-                                <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                            </a>
-                        </td>
-                    </tr>
-    <?php endforeach;?>
+<?php foreach ($rows as $row): ?>
+                <tr>
+                    <td><?php echo $row['account_id'];?></td>
+                    <td><?php echo $row['account_client_id']; ?></td>
+                    <td>
+                        <a href="hosting-provider.php?action=details&api_key=<?php echo $row['account_api_key']; ?>">
+                            <?php echo $row['account_api_key']; ?>
+                        </a>
+                    </td>
+                    <td><?php echo $row['account_username']; ?></td>
+                    <td><?php echo $row['account_domain']; ?></td>
+                    <td><?php echo $row['account_addtime']; ?></td>
+                    <td><?php if ($row['account_status'] == '0'): ?>
+                        <span class="label label-info"><?php echo $lang->I18N('Inactive'); ?></span>
+                    <?php elseif ($row['account_status'] == '1'): ?>
+                        <span class="label label-success"><?php echo $lang->I18N('Active'); ?></span>
+                    <?php elseif ($row['account_status'] == '2'): ?>
+                        <span class="label label-warning"><?php echo $lang->I18N('Suspended'); ?></span>
+                    <?php elseif ($row['account_status'] == '3'): ?>
+                        <span class="label label-default"><?php echo $lang->I18N('Deleted'); ?></span>
+                    <?php endif; ?></td>
+                    <td>
+                        <a href="accounts.php?action=edit&account_id=<?php echo $row['account_id']; ?>" class="btn btn-success btn-xs">
+                            <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                        </a>
+                        <a href="accounts.php?action=details&account_id=<?php echo $row['account_id']; ?>" class="btn btn-primary btn-xs">
+                            <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                        </a>
+                    </td>
+                </tr>
+<?php endforeach;?>
 <?php else: ?>
 <?php else: ?>
-                    <tr>
-                        <td colspan="8" class="text-center">Nothing found</td>
-                    </tr>
+                <tr>
+                    <td colspan="8" class="text-center">Nothing found</td>
+                </tr>
 <?php endif;?>
 <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer">
-                <?php echo $count; ?> Records Founds
-            </div>
+                </tbody>
+            </table>
+        </div>
+        <div class="panel-footer">
+            <?php echo $count; ?> Records Founds
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 18 - 20
src/admin/views/accounts/login.php

@@ -1,24 +1,22 @@
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container-fluid">
-        <div class="card">
-            <div class="card-header d-flex justify-content-between align-items-center">
-                <h3 class="m-0"><?php echo $lang->I18N('Login to Control Panel'); ?></h3>
-            </div>
-            <hr />
-            <div class="card-body">
-                <p>Now you are going to be redirected to the control panel. It can take upto 5 seconds based on your internet connecion speed.</p>
-                <form name="login" action="https://<?php echo $AccountApi['api_cpanel_url'] ?>/login.php" id="account_ogin" method="post">
-                    <input type="hidden" name="uname" value="<?php echo $AccountInfo['account_username']; ?>">
-                    <input type="hidden" name="passwd" value="<?php echo $AccountInfo['account_password']; ?>">
-                    <input type="hidden" name="language" value="<?php echo $lang->get_language_value(); ?>">
-                    <div class="text-center">
-                        <a class="btn btn-danger btn-sm" href="accounts.php?action=view&account_id=<?php echo $account_id; ?>">
-                            <i class="fa fa-backward"></i> <?php echo $lang->I18N('Cancel'); ?>
-                        </a>
-                        <input type="submit" name="Submit" value="Click here to Redirect" class="btn btn-primary btn-sm text-white">
-                    </div>
-                </form>
-            </div>
+    <div class="card">
+        <div class="card-header d-flex justify-content-between align-items-center">
+            <h3 class="m-0"><?php echo $lang->I18N('Login to Control Panel'); ?></h3>
+        </div>
+        <hr />
+        <div class="card-body">
+            <p>Now you are going to be redirected to the control panel. It can take upto 5 seconds based on your internet connecion speed.</p>
+            <form name="login" action="https://<?php echo $AccountApi['api_cpanel_url'] ?>/login.php" id="account_ogin" method="post">
+                <input type="hidden" name="uname" value="<?php echo $AccountInfo['account_username']; ?>">
+                <input type="hidden" name="passwd" value="<?php echo $AccountInfo['account_password']; ?>">
+                <input type="hidden" name="language" value="<?php echo $lang->get_language_value(); ?>">
+                <div class="text-center">
+                    <a class="btn btn-danger btn-sm" href="accounts.php?action=view&account_id=<?php echo $account_id; ?>">
+                        <i class="fa fa-backward"></i> <?php echo $lang->I18N('Cancel'); ?>
+                    </a>
+                    <input type="submit" name="Submit" value="Click here to Redirect" class="btn btn-primary btn-sm text-white">
+                </div>
+            </form>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 71 - 73
src/admin/views/clients/add.php

@@ -1,79 +1,77 @@
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('add'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
-            </div>
-            <div class="panel-body">
-                <form id="form-client-add" class="row" onsubmit="return saveSubmit();" method="post">
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Status'); ?></label>
-                        <select class="form-control" name="client_status">
-                            <option value="0"><?php echo $lang->I18N('Inactive'); ?></option>
-                            <option value="1"><?php echo $lang->I18N('Active'); ?></option>
-                            <option value="2"><?php echo $lang->I18N('Suspended'); ?></option>
-                        </select>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Password'); ?></label>
-                        <input type="text" name="client_password" value="123456" class="form-control" placeholder="默认密码 123456">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
-                        <input type="text" name="client_fname" value="" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
-                        <input type="text" name="client_lname" value="" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Email Address'); ?></label>
-                        <input type="text" name="client_email" value="" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
-                        <input type="text" name="client_phone" value="" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Billing Address'); ?></label>
-                        <input type="text" name="client_address" value="" class="form-control">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Company'); ?></label>
-                        <input type="text" name="client_company" value="" class="form-control">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Country'); ?></label>
-                        <input type="text" name="client_country" value="" class="form-control">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('State'); ?></label>
-                        <input type="text" name="client_state" value="" class="form-control">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('City'); ?></label>
-                        <input type="text" name="client_city" value="" class="form-control">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Postal Code'); ?></label>
-                        <input type="text" name="client_pcode" value="" class="form-control">
-                    </div>
-                </form>
-            </div>
-            <div class="panel-footer">
-                <button class="btn btn-primary btn-sm" onclick="saveSubmit();"><?php echo $lang->I18N('Save') ?></button>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('add'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="panel-body">
+            <form id="form-client-add" class="row" onsubmit="return saveSubmit();" method="post">
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Status'); ?></label>
+                    <select class="form-control" name="client_status">
+                        <option value="0"><?php echo $lang->I18N('Inactive'); ?></option>
+                        <option value="1"><?php echo $lang->I18N('Active'); ?></option>
+                        <option value="2"><?php echo $lang->I18N('Suspended'); ?></option>
+                    </select>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Password'); ?></label>
+                    <input type="text" name="client_password" value="123456" class="form-control" placeholder="默认密码 123456">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
+                    <input type="text" name="client_fname" value="" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
+                    <input type="text" name="client_lname" value="" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Email Address'); ?></label>
+                    <input type="text" name="client_email" value="" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
+                    <input type="text" name="client_phone" value="" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Billing Address'); ?></label>
+                    <input type="text" name="client_address" value="" class="form-control">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Company'); ?></label>
+                    <input type="text" name="client_company" value="" class="form-control">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Country'); ?></label>
+                    <input type="text" name="client_country" value="" class="form-control">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('State'); ?></label>
+                    <input type="text" name="client_state" value="" class="form-control">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('City'); ?></label>
+                    <input type="text" name="client_city" value="" class="form-control">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Postal Code'); ?></label>
+                    <input type="text" name="client_pcode" value="" class="form-control">
+                </div>
+            </form>
+        </div>
+        <div class="panel-footer">
+            <button class="btn btn-primary btn-sm" onclick="saveSubmit();"><?php echo $lang->I18N('Save') ?></button>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 71 - 73
src/admin/views/clients/details.php

@@ -1,80 +1,78 @@
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('details'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'edit', 'id' => $ClientInfo['client_id'])); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                    <span class="label label-default">ID <?php echo $ClientInfo['client_id']; ?></span>
-                </span>
-            </div>
-            <div class="panel-body">
-                <table class="table table-stripped table-bordered table-hover">
-                    <tr>
-                        <td width="200"><?php echo $lang->I18N('First Name'); ?></td>
-                        <td><?php echo $ClientInfo['client_fname']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Last Name'); ?></b></td><td><?php echo $ClientInfo['client_lname']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Email Address'); ?></b></td><td><?php echo $ClientInfo['client_email']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Phone Number'); ?></b></td><td><?php echo $ClientInfo['client_phone']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Billing Address'); ?></b></td><td><?php echo $ClientInfo['client_address']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Company'); ?></b></td><td><?php echo $ClientInfo['client_company']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Country'); ?></b></td><td><?php echo $CountryName; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('City'); ?></b></td><td><?php echo $ClientInfo['client_city']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b>Postal Code</b></td><td><?php echo $ClientInfo['client_pcode']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('Hosting Accounts'); ?></b></td><td><?php echo $count_account; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $lang->I18N('SSL Certificates'); ?></b></td><td><?php echo $count_ssl; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b>Support Tickets</b></td><td><?php echo $count_tickets; ?></td>
-                    </tr>
-                </table>
-            </div>
-            <div class="panel-footer">
-                <a href="clients.php?action=login&id=<?php echo $ClientInfo['client_id'] ?>" target="_blank" class="btn btn-primary btn-sm">
-                    <i class="fa fa-sign-in-alt"></i> Login as <?php echo $ClientInfo['client_fname'] ?>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('details'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'edit', 'id' => $ClientInfo['client_id'])); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
                 </a>
                 </a>
-                <?php if ($ClientInfo['client_status'] !== '1'): ?>
-                <a href="controllers/clients/activate.php?client_id=<?php echo $ClientInfo['client_id']; ?>" class="btn btn-success btn-sm">Mark as Active</a>
-                <?php else: ?>
-                <a href="controllers/clients/suspend.php?client_id=<?php echo $ClientInfo['client_id']; ?>" class="btn btn-default btn-sm">Mark as Suspended</a>
-                <?php endif; ?>
             </div>
             </div>
+            <span class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+                <span class="label label-default">ID <?php echo $ClientInfo['client_id']; ?></span>
+            </span>
+        </div>
+        <div class="panel-body">
+            <table class="table table-stripped table-bordered table-hover">
+                <tr>
+                    <td width="200"><?php echo $lang->I18N('First Name'); ?></td>
+                    <td><?php echo $ClientInfo['client_fname']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Last Name'); ?></b></td><td><?php echo $ClientInfo['client_lname']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Email Address'); ?></b></td><td><?php echo $ClientInfo['client_email']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Phone Number'); ?></b></td><td><?php echo $ClientInfo['client_phone']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Billing Address'); ?></b></td><td><?php echo $ClientInfo['client_address']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Company'); ?></b></td><td><?php echo $ClientInfo['client_company']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Country'); ?></b></td><td><?php echo $CountryName; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('City'); ?></b></td><td><?php echo $ClientInfo['client_city']; ?></td>
+                </tr>
+                <tr>
+                    <td><b>Postal Code</b></td><td><?php echo $ClientInfo['client_pcode']; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('Hosting Accounts'); ?></b></td><td><?php echo $count_account; ?></td>
+                </tr>
+                <tr>
+                    <td><b><?php echo $lang->I18N('SSL Certificates'); ?></b></td><td><?php echo $count_ssl; ?></td>
+                </tr>
+                <tr>
+                    <td><b>Support Tickets</b></td><td><?php echo $count_tickets; ?></td>
+                </tr>
+            </table>
+        </div>
+        <div class="panel-footer">
+            <a href="clients.php?action=login&id=<?php echo $ClientInfo['client_id'] ?>" target="_blank" class="btn btn-primary btn-sm">
+                <i class="fa fa-sign-in-alt"></i> Login as <?php echo $ClientInfo['client_fname'] ?>
+            </a>
+            <?php if ($ClientInfo['client_status'] !== '1'): ?>
+            <a href="controllers/clients/activate.php?client_id=<?php echo $ClientInfo['client_id']; ?>" class="btn btn-success btn-sm">Mark as Active</a>
+            <?php else: ?>
+            <a href="controllers/clients/suspend.php?client_id=<?php echo $ClientInfo['client_id']; ?>" class="btn btn-default btn-sm">Mark as Suspended</a>
+            <?php endif; ?>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 82 - 84
src/admin/views/clients/edit.php

@@ -1,90 +1,88 @@
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
-            <li><a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $ClientInfo['client_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('edit'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $ClientInfo['client_id'])); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                    <span class="label label-default">ID <?php echo $ClientInfo['client_id']; ?></span>
-                </span>
-            </div>
-            <div class="panel-body">
-                <form id="form-client-edit" class="row" onsubmit="return saveSubmit();" method="post">
-                    <input type="hidden" name="client_id" value="<?php echo $ClientInfo['client_id']; ?>" />
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Status'); ?></label>
-                        <select class="form-control" name="client_status" default="<?php echo $ClientInfo['client_status']; ?>">
-                            <option value="0"><?php echo $lang->I18N('Inactive'); ?></option>
-                            <option value="1"><?php echo $lang->I18N('Active'); ?></option>
-                            <option value="2"><?php echo $lang->I18N('Suspended'); ?></option>
-                        </select>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('Password'); ?></label>
-                        <input type="text" name="client_password" value="" class="form-control" placeholder="留空白则不修改">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
-                        <input type="text" name="client_fname" value="<?php echo $ClientInfo['client_fname']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
-                        <input type="text" name="client_lname" value="<?php echo $ClientInfo['client_lname']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Email Address'); ?></label>
-                        <input type="text" name="client_email" value="<?php echo $ClientInfo['client_email']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
-                        <input type="text" name="client_phone" value="<?php echo $ClientInfo['client_phone']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Billing Address'); ?></label>
-                        <input type="text" name="client_address" value="<?php echo $ClientInfo['client_address']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Company'); ?></label>
-                        <input type="text" name="client_company" value="<?php echo $ClientInfo['client_company']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Country'); ?></label>
-                        <input type="text" name="country_name" value="<?php echo $CountryName; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label"><?php echo $lang->I18N('State'); ?></label>
-                        <input type="text" name="client_state" value="<?php echo $ClientInfo['client_state']; ?>" class="form-control">
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('City'); ?></label>
-                        <input type="text" name="client_city" value="<?php echo $ClientInfo['client_city']; ?>" class="form-control" required>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <label class="form-label required"><?php echo $lang->I18N('Postal Code'); ?></label>
-                        <input type="text" name="client_pcode" value="<?php echo $ClientInfo['client_pcode']; ?>" class="form-control" required>
-                    </div>
-                </form>
-            </div>
-            <div class="panel-footer">
-                <button class="btn btn-primary btn-sm" onclick="saveSubmit();"><?php echo $lang->I18N('Save') ?></button>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
+        <li><a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $ClientInfo['client_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('edit'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $ClientInfo['client_id'])); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'list')); ?>" class="btn btn-info btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
+            <span class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+                <span class="label label-default">ID <?php echo $ClientInfo['client_id']; ?></span>
+            </span>
+        </div>
+        <div class="panel-body">
+            <form id="form-client-edit" class="row" onsubmit="return saveSubmit();" method="post">
+                <input type="hidden" name="client_id" value="<?php echo $ClientInfo['client_id']; ?>" />
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Status'); ?></label>
+                    <select class="form-control" name="client_status" default="<?php echo $ClientInfo['client_status']; ?>">
+                        <option value="0"><?php echo $lang->I18N('Inactive'); ?></option>
+                        <option value="1"><?php echo $lang->I18N('Active'); ?></option>
+                        <option value="2"><?php echo $lang->I18N('Suspended'); ?></option>
+                    </select>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('Password'); ?></label>
+                    <input type="text" name="client_password" value="" class="form-control" placeholder="留空白则不修改">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
+                    <input type="text" name="client_fname" value="<?php echo $ClientInfo['client_fname']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
+                    <input type="text" name="client_lname" value="<?php echo $ClientInfo['client_lname']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Email Address'); ?></label>
+                    <input type="text" name="client_email" value="<?php echo $ClientInfo['client_email']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Phone Number'); ?></label>
+                    <input type="text" name="client_phone" value="<?php echo $ClientInfo['client_phone']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Billing Address'); ?></label>
+                    <input type="text" name="client_address" value="<?php echo $ClientInfo['client_address']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Company'); ?></label>
+                    <input type="text" name="client_company" value="<?php echo $ClientInfo['client_company']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Country'); ?></label>
+                    <input type="text" name="country_name" value="<?php echo $CountryName; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label"><?php echo $lang->I18N('State'); ?></label>
+                    <input type="text" name="client_state" value="<?php echo $ClientInfo['client_state']; ?>" class="form-control">
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('City'); ?></label>
+                    <input type="text" name="client_city" value="<?php echo $ClientInfo['client_city']; ?>" class="form-control" required>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <label class="form-label required"><?php echo $lang->I18N('Postal Code'); ?></label>
+                    <input type="text" name="client_pcode" value="<?php echo $ClientInfo['client_pcode']; ?>" class="form-control" required>
+                </div>
+            </form>
+        </div>
+        <div class="panel-footer">
+            <button class="btn btn-primary btn-sm" onclick="saveSubmit();"><?php echo $lang->I18N('Save') ?></button>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 56 - 58
src/admin/views/clients/list.php

@@ -1,68 +1,66 @@
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Clients List'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/clients', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Clients List'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/clients', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th>ID</th>
-                        <th><?php echo $lang->I18N('Name'); ?></th>
-                        <th><?php echo $lang->I18N('Email'); ?></th>
-                        <th><?php echo $lang->I18N('Phone'); ?></th>
-                        <th><?php echo $lang->I18N('Date'); ?></th>
-                        <th><?php echo $lang->I18N('Status'); ?></th>
-                        <th><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th>ID</th>
+                    <th><?php echo $lang->I18N('Name'); ?></th>
+                    <th><?php echo $lang->I18N('Email'); ?></th>
+                    <th><?php echo $lang->I18N('Phone'); ?></th>
+                    <th><?php echo $lang->I18N('Date'); ?></th>
+                    <th><?php echo $lang->I18N('Status'); ?></th>
+                    <th><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
 <?php if ($count > 0): ?>
 <?php if ($count > 0): ?>
 <?php foreach ($rows as $value): ?>
 <?php foreach ($rows as $value): ?>
-                    <tr>
-                        <td><?php echo $value['client_id']; ?></td>
-                        <td><?php echo $value['client_fname'] . " " . $value['client_lname']; ?></td>
-                        <td><?php echo $value['client_email']; ?></td>
-                        <td><?php echo $value['client_phone']; ?></td>
-                        <td><?php echo $value['client_addtime']; ?></td>
-                        <td><?php if ($value['client_status'] == '0'): ?>
-                            <span class="label label-warning"><?php echo $lang->I18N('Inactive'); ?></span>
-                        <?php elseif ($value['client_status'] == '1'): ?>
-                            <span class="label label-success"><?php echo $lang->I18N('Active'); ?></span>
-                        <?php elseif ($value['client_status'] == '2'): ?>
-                            <span class="label label-default"><?php echo $lang->I18N('Suspended'); ?></span>
-                        <?php endif; ?>
-                        </td>
-                        <td>
-                            <a href="<?php echo setURL('admin/clients', '', array('action' => 'edit', 'id' => $value['client_id'])); ?>" class="btn btn-success btn-xs">
-                                <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                            </a>
-                            <a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $value['client_id'])); ?>" class="btn btn-primary btn-xs">
-                                <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                            </a>
-                            <a href="clients.php?action=login&id=<?php echo $value['client_id'] ?>" target="_blank" class="btn btn-info btn-xs">
-                                <i class="fa fa-sign-in-alt"></i> <?php echo $lang->I18N('login'); ?>
-                            </a>
-                        </td>
-                    </tr>
+                <tr>
+                    <td><?php echo $value['client_id']; ?></td>
+                    <td><?php echo $value['client_fname'] . " " . $value['client_lname']; ?></td>
+                    <td><?php echo $value['client_email']; ?></td>
+                    <td><?php echo $value['client_phone']; ?></td>
+                    <td><?php echo $value['client_addtime']; ?></td>
+                    <td><?php if ($value['client_status'] == '0'): ?>
+                        <span class="label label-warning"><?php echo $lang->I18N('Inactive'); ?></span>
+                    <?php elseif ($value['client_status'] == '1'): ?>
+                        <span class="label label-success"><?php echo $lang->I18N('Active'); ?></span>
+                    <?php elseif ($value['client_status'] == '2'): ?>
+                        <span class="label label-default"><?php echo $lang->I18N('Suspended'); ?></span>
+                    <?php endif; ?>
+                    </td>
+                    <td>
+                        <a href="<?php echo setURL('admin/clients', '', array('action' => 'edit', 'id' => $value['client_id'])); ?>" class="btn btn-success btn-xs">
+                            <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                        </a>
+                        <a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $value['client_id'])); ?>" class="btn btn-primary btn-xs">
+                            <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                        </a>
+                        <a href="clients.php?action=login&id=<?php echo $value['client_id'] ?>" target="_blank" class="btn btn-info btn-xs">
+                            <i class="fa fa-sign-in-alt"></i> <?php echo $lang->I18N('login'); ?>
+                        </a>
+                    </td>
+                </tr>
 <?php endforeach;?>
 <?php endforeach;?>
 <?php else: ?>
 <?php else: ?>
-                    <tr>
-                        <td colspan="7" class="text-center">Nothing found</td>
-                    </tr>
+                <tr>
+                    <td colspan="7" class="text-center">Nothing found</td>
+                </tr>
 <?php endif;?>
 <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer"><?php echo $count; ?> Records Founds.</div>
+                </tbody>
+            </table>
         </div>
         </div>
+        <div class="panel-footer"><?php echo $count; ?> Records Founds.</div>
     </div>
     </div>
 </div>
 </div>

+ 143 - 146
src/admin/views/dashboard/view.php

@@ -1,180 +1,177 @@
 
 
-
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container" style="margin-top: 20px;">
-        <div class="row">
-            <div class="col-lg-3 col-md-6">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <div class="row">
-                            <div class="col-xs-3">
-                                <i class="fa fa-users fa-5x"></i>
-                            </div>
-                            <div class="col-xs-9 text-right">
-                                <div class="huge">
-                                    <span id="count_client"><?php echo $count_client; ?></span>/<span class="count-all" id="count_clients"><?php echo $count_clients; ?></span>
-                                </div>
-                                <div>客户数量</div>
+    <div class="row">
+        <div class="col-lg-3 col-md-6">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-xs-3">
+                            <i class="fa fa-users fa-5x"></i>
+                        </div>
+                        <div class="col-xs-9 text-right">
+                            <div class="huge">
+                                <span id="count_client"><?php echo $count_client; ?></span>/<span class="count-all" id="count_clients"><?php echo $count_clients; ?></span>
                             </div>
                             </div>
+                            <div>客户数量</div>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <a href="clients.php">
-                        <div class="panel-footer">
-                            <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
-                            <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
-                            <div class="clearfix"></div>
-                        </div>
-                    </a>
                 </div>
                 </div>
+                <a href="clients.php">
+                    <div class="panel-footer">
+                        <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
+                        <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                        <div class="clearfix"></div>
+                    </div>
+                </a>
             </div>
             </div>
-            <div class="col-lg-3 col-md-6">
-                <div class="panel panel-yellow">
-                    <div class="panel-heading">
-                        <div class="row">
-                            <div class="col-xs-3">
-                                <i class="fa fa-server fa-5x"></i>
-                            </div>
-                            <div class="col-xs-9 text-right">
-                                <div class="huge">
-                                    <span id="count_account"><?php echo $count_account; ?></span>/<span class="count-all" id="count_accounts"><?php echo $count_accounts; ?></span>
-                                </div>
-                                <div>账户数量</div>
+        </div>
+        <div class="col-lg-3 col-md-6">
+            <div class="panel panel-yellow">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-xs-3">
+                            <i class="fa fa-server fa-5x"></i>
+                        </div>
+                        <div class="col-xs-9 text-right">
+                            <div class="huge">
+                                <span id="count_account"><?php echo $count_account; ?></span>/<span class="count-all" id="count_accounts"><?php echo $count_accounts; ?></span>
                             </div>
                             </div>
+                            <div>账户数量</div>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <a href="accounts.php">
-                        <div class="panel-footer">
-                            <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
-                            <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
-                            <div class="clearfix"></div>
-                        </div>
-                    </a>
                 </div>
                 </div>
+                <a href="accounts.php">
+                    <div class="panel-footer">
+                        <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
+                        <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                        <div class="clearfix"></div>
+                    </div>
+                </a>
             </div>
             </div>
-            <div class="col-lg-3 col-md-6">
-                <div class="panel panel-red">
-                    <div class="panel-heading">
-                        <div class="row">
-                            <div class="col-xs-3">
-                                <i class="fa fa-ticket-alt fa-5x"></i>
-                            </div>
-                            <div class="col-xs-9 text-right">
-                                <div class="huge">
-                                    <span id="count_ticket"><?php echo $count_ticket; ?></span>/<span class="count-all" id="count_tickets"><?php echo $count_tickets; ?></span>
-                                </div>
-                                <div>工单数量</div>
+        </div>
+        <div class="col-lg-3 col-md-6">
+            <div class="panel panel-red">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-xs-3">
+                            <i class="fa fa-ticket-alt fa-5x"></i>
+                        </div>
+                        <div class="col-xs-9 text-right">
+                            <div class="huge">
+                                <span id="count_ticket"><?php echo $count_ticket; ?></span>/<span class="count-all" id="count_tickets"><?php echo $count_tickets; ?></span>
                             </div>
                             </div>
+                            <div>工单数量</div>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <a href="tickets.php">
-                        <div class="panel-footer">
-                            <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
-                            <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
-                            <div class="clearfix"></div>
-                        </div>
-                    </a>
                 </div>
                 </div>
+                <a href="tickets.php">
+                    <div class="panel-footer">
+                        <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
+                        <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                        <div class="clearfix"></div>
+                    </div>
+                </a>
             </div>
             </div>
-            <div class="col-lg-3 col-md-6">
-                <div class="panel panel-green">
-                    <div class="panel-heading">
-                        <div class="row">
-                            <div class="col-xs-3">
-                                <i class="fa fa-shield-alt fa-5x"></i>
-                            </div>
-                            <div class="col-xs-9 text-right">
-                                <div class="huge">
-                                    <span id="count_ssl"><?php echo $count_ssl; ?></span>/<span class="count-all" id="count_ssls"><?php echo $count_ssls; ?></span>
-                                </div>
-                                <div>证书数量</div>
+        </div>
+        <div class="col-lg-3 col-md-6">
+            <div class="panel panel-green">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-xs-3">
+                            <i class="fa fa-shield-alt fa-5x"></i>
+                        </div>
+                        <div class="col-xs-9 text-right">
+                            <div class="huge">
+                                <span id="count_ssl"><?php echo $count_ssl; ?></span>/<span class="count-all" id="count_ssls"><?php echo $count_ssls; ?></span>
                             </div>
                             </div>
+                            <div>证书数量</div>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <a href="ssl.php">
-                        <div class="panel-footer">
-                            <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
-                            <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
-                            <div class="clearfix"></div>
-                        </div>
-                    </a>
                 </div>
                 </div>
+                <a href="ssl.php">
+                    <div class="panel-footer">
+                        <span class="pull-left"><?php echo $lang->I18N('View details'); ?></span>
+                        <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                        <div class="clearfix"></div>
+                    </div>
+                </a>
             </div>
             </div>
         </div>
         </div>
-        <div class="panel panel-danger">
-            <div class="list-group">
-                <div class="list-group-item">
-                    <span class="fa fa-paper-plane fa-fw"></span> <b><?php echo $lang->I18N('Quick Link'); ?></b>&nbsp;
-                    <a href="settings.php" class="btn btn-danger btn-xs">Settings</a>&nbsp;&nbsp;
-                    <a href="javascript:cleanRecord(1)" class="btn btn-xs btn-danger">删除1天前的记录</a>&nbsp;&nbsp;
-                    <a href="javascript:cleanRecord(30)" class="btn btn-xs btn-danger">删除30天前的发送记录</a>&nbsp;&nbsp;
-                </div>
+    </div>
+    <div class="panel panel-danger">
+        <div class="list-group">
+            <div class="list-group-item">
+                <span class="fa fa-paper-plane fa-fw"></span> <b><?php echo $lang->I18N('Quick Link'); ?></b>&nbsp;
+                <a href="settings.php" class="btn btn-danger btn-xs">Settings</a>&nbsp;&nbsp;
+                <a href="javascript:cleanRecord(1)" class="btn btn-xs btn-danger">删除1天前的记录</a>&nbsp;&nbsp;
+                <a href="javascript:cleanRecord(30)" class="btn btn-xs btn-danger">删除30天前的发送记录</a>&nbsp;&nbsp;
             </div>
             </div>
         </div>
         </div>
-        <div class="row">
-            <div class="col-md-8 col-sm-12">
-                <div class="panel panel-info">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">服务器信息</h3>
-                    </div>
-                    <ul class="list-group">
-                        <li class="list-group-item">
-                            <b>服务器时间:</b><?php echo $date; ?>
-                        </li>
-                        <li class="list-group-item">
-                            <b>PHP 版本:</b><?php echo PHP_VERSION; ?>-<?php echo ini_get('safe_mode') ? '线程安全' : '非线程安全'; ?>
-                        </li>
-                        <li class="list-group-item">
-                            <b>MySQL 版本:</b><?php echo $mysqlversion ?>
-                        </li>
-                        <li class="list-group-item">
-                            <b>WEB软件:</b><?php echo $_SERVER['SERVER_SOFTWARE'] ?>
-                        </li>
-                        <li class="list-group-item">
-                            <b>操作系统:</b><?php echo php_uname(); ?>
-                        </li>
-                        <li class="list-group-item">
-                            <b>POST许可:</b><?php echo ini_get('post_max_size'); ?>
-                        </li>
-                        <li class="list-group-item">
-                            <b>文件上传许可:</b><?php echo ini_get('upload_max_filesize'); ?>
-                        </li>
-                    </ul>
+    </div>
+    <div class="row">
+        <div class="col-md-8 col-sm-12">
+            <div class="panel panel-info">
+                <div class="panel-heading">
+                    <h3 class="panel-title">服务器信息</h3>
                 </div>
                 </div>
+                <ul class="list-group">
+                    <li class="list-group-item">
+                        <b>服务器时间:</b><?php echo $date; ?>
+                    </li>
+                    <li class="list-group-item">
+                        <b>PHP 版本:</b><?php echo PHP_VERSION; ?>-<?php echo ini_get('safe_mode') ? '线程安全' : '非线程安全'; ?>
+                    </li>
+                    <li class="list-group-item">
+                        <b>MySQL 版本:</b><?php echo $mysqlversion ?>
+                    </li>
+                    <li class="list-group-item">
+                        <b>WEB软件:</b><?php echo $_SERVER['SERVER_SOFTWARE'] ?>
+                    </li>
+                    <li class="list-group-item">
+                        <b>操作系统:</b><?php echo php_uname(); ?>
+                    </li>
+                    <li class="list-group-item">
+                        <b>POST许可:</b><?php echo ini_get('post_max_size'); ?>
+                    </li>
+                    <li class="list-group-item">
+                        <b>文件上传许可:</b><?php echo ini_get('upload_max_filesize'); ?>
+                    </li>
+                </ul>
             </div>
             </div>
-            <div class="col-md-4 col-sm-12">
-                <div class="panel panel-success">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">版本信息</h3>
-                    </div>
-                    <ul class="list-group text-dark">
-                        <li class="list-group-item">当前版本:V<?php echo APP_VERSION; ?> (Build <?php echo APP_BUILD; ?>, DB <?php echo DB_VERSION; ?>)</li>
-                        <li class="list-group-item">官网网站:<a href="https://uiisc.org/" target="_blank">https://uiisc.org</a></li>
-                        <li class="list-group-item">Github:<a href="https://github.com/uiisc/uiisc/" target="_blank">https://github.com/uiisc/uiisc</a></li>
-                        <li class="list-group-item"><span class="fa fa-copyright fa-fw"></span> Powered by <a href="https://uiisc.org/" target="_blank">UIISC</a></li>
-                    </ul>
-                    <ul class="list-group text-dark" id="checkupdate"></ul>
+        </div>
+        <div class="col-md-4 col-sm-12">
+            <div class="panel panel-success">
+                <div class="panel-heading">
+                    <h3 class="panel-title">版本信息</h3>
                 </div>
                 </div>
+                <ul class="list-group text-dark">
+                    <li class="list-group-item">当前版本:V<?php echo APP_VERSION; ?> (Build <?php echo APP_BUILD; ?>, DB <?php echo DB_VERSION; ?>)</li>
+                    <li class="list-group-item">官网网站:<a href="https://uiisc.org/" target="_blank">https://uiisc.org</a></li>
+                    <li class="list-group-item">Github:<a href="https://github.com/uiisc/uiisc/" target="_blank">https://github.com/uiisc/uiisc</a></li>
+                    <li class="list-group-item"><span class="fa fa-copyright fa-fw"></span> Powered by <a href="https://uiisc.org/" target="_blank">UIISC</a></li>
+                </ul>
+                <ul class="list-group text-dark" id="checkupdate"></ul>
             </div>
             </div>
         </div>
         </div>
-        <div class="row">
-            <div class="col-md-12 col-sm-12">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">配置信息</h3>
-                    </div>
-                    <ul class="list-group">
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Site Status'); ?></b>&nbsp;:&nbsp;<?php if ($SiteConfig['site_status'] == 1) {echo '<span class="label label-success">Live</span>';} elseif ($SiteConfig['site_status'] == 0) {echo '<span class="label label-danger">Maintaince</span>';}?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Site Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_name']; ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Brand Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_brand']; ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Company Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_company']; ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Contact Email'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_email']; ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Server Protocol'); ?></b>&nbsp;:&nbsp;<?php echo strtoupper(HTTP_PROTOCOL); ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Site URL'); ?></b>&nbsp;:&nbsp;<?php echo $site_url; ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Site Path'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_path']; ?></li>
-                        <li class="list-group-item"><b><?php echo $lang->I18N('Site Root'); ?></b>&nbsp;:&nbsp;<?php echo $_SERVER['DOCUMENT_ROOT'] ?></li>
-                    </ul>
+    </div>
+    <div class="row">
+        <div class="col-md-12 col-sm-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">配置信息</h3>
                 </div>
                 </div>
+                <ul class="list-group">
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Status'); ?></b>&nbsp;:&nbsp;<?php if ($SiteConfig['site_status'] == 1) {echo '<span class="label label-success">Live</span>';} elseif ($SiteConfig['site_status'] == 0) {echo '<span class="label label-danger">Maintaince</span>';}?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_name']; ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Brand Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_brand']; ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Company Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_company']; ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Contact Email'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_email']; ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Server Protocol'); ?></b>&nbsp;:&nbsp;<?php echo strtoupper(HTTP_PROTOCOL); ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Site URL'); ?></b>&nbsp;:&nbsp;<?php echo $site_url; ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Path'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_path']; ?></li>
+                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Root'); ?></b>&nbsp;:&nbsp;<?php echo $_SERVER['DOCUMENT_ROOT'] ?></li>
+                </ul>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
-</div>
+</div>

+ 15 - 17
src/admin/views/domain-provider/list.php

@@ -4,24 +4,22 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Domain Provider'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="domain-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Domain Provider'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="domain-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                
-            </div>
-            <div class="panel-footer"></div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="panel-body">
+            
         </div>
         </div>
+        <div class="panel-footer"></div>
     </div>
     </div>
 </div>
 </div>

+ 3 - 0
src/admin/views/footer.php

@@ -1,3 +1,6 @@
+</div><!-- col-sm-9 col-md-9 col-lg-10 end -->
+</div><!-- row page-wrapper end -->
+</div><!-- container-fluid end -->
 
 
     <footer class="footer navbar navbar-default navbar-fixed-bottom">
     <footer class="footer navbar navbar-default navbar-fixed-bottom">
         <div class="container">
         <div class="container">

+ 45 - 47
src/admin/views/hosting-hostname/list.php

@@ -5,54 +5,52 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <input type="hidden" value="<?php echo $api_id; ?>" name="api_id" />
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-            <li><a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $api_id)); ?>"><?php echo $lang->I18N('details'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Hostname'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a class="btn btn-primary btn-xs" onclick="add_hostname();">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
-            </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th>ID</th>
-                        <th><?php echo $lang->I18N('Hosting Provider'); ?></th>
-                        <th><?php echo $lang->I18N('Hostname'); ?></th>
-                        <th><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
-                    <?php if ($count > 0): ?>
-                    <?php foreach ($rows as $value): ?>
-                        <tr>
-                            <td><?php echo $value['host_id']; ?></td>
-                            <td><?php echo $value['api_id']; ?></td>
-                            <td><?php echo $value['host_name']; ?></td>
-                            <td>
-                                <button class="btn btn-danger btn-xs" onclick="delete_hostname('<?php echo $value['host_id']; ?>');"><i class="fa fa-trash"></i></button>
-                            </td>
-                        </tr>
-                    <?php endforeach;?>
-                    <?php else: ?>
-                        <tr>
-                            <td colspan="4" class="text-center">No Data Found</td>
-                        </tr>
-                    <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer">
-                <div><?php echo $count; ?> Records Found</div>
+    <input type="hidden" value="<?php echo $api_id; ?>" name="api_id" />
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
+        <li><a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $api_id)); ?>"><?php echo $lang->I18N('details'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Hostname'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a class="btn btn-primary btn-xs" onclick="add_hostname();">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th>ID</th>
+                    <th><?php echo $lang->I18N('Hosting Provider'); ?></th>
+                    <th><?php echo $lang->I18N('Hostname'); ?></th>
+                    <th><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
+                <?php if ($count > 0): ?>
+                <?php foreach ($rows as $value): ?>
+                    <tr>
+                        <td><?php echo $value['host_id']; ?></td>
+                        <td><?php echo $value['api_id']; ?></td>
+                        <td><?php echo $value['host_name']; ?></td>
+                        <td>
+                            <button class="btn btn-danger btn-xs" onclick="delete_hostname('<?php echo $value['host_id']; ?>');"><i class="fa fa-trash"></i></button>
+                        </td>
+                    </tr>
+                <?php endforeach;?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="4" class="text-center">No Data Found</td>
+                    </tr>
+                <?php endif;?>
+                </tbody>
+            </table>
+        </div>
+        <div class="panel-footer">
+            <div><?php echo $count; ?> Records Found</div>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 93 - 95
src/admin/views/hosting-provider/add.php

@@ -4,118 +4,116 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('add'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="hosting-provider.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('Hosting Provider'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('add'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="hosting-provider.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('Hosting Provider'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/hosting/add.php" method="post">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('Provider Type'); ?></label>
-                                <select name="api_type" class="form-control" required>
-                                    <option value="myownfreehost" selected>MyOwnFreeHost</option>
-                                </select>
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <form action="controllers/hosting/add.php" method="post">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('Provider Type'); ?></label>
+                            <select name="api_type" class="form-control" required>
+                                <option value="myownfreehost" selected>MyOwnFreeHost</option>
+                            </select>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Hosting Key</label>
-                                <input type="text" name="api_key" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Hosting Key</label>
+                            <input type="text" name="api_key" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">API Username</label>
-                                <input type="text" name="api_username" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">API Username</label>
+                            <input type="text" name="api_username" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">API Password</label>
-                                <input type="text" name="api_password" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">API Password</label>
+                            <input type="text" name="api_password" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Server domain</label>
-                                <input type="text" name="api_server_domain" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Server domain</label>
+                            <input type="text" name="api_server_domain" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Server IP</label>
-                                <input type="text" name="api_server_ip" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Server IP</label>
+                            <input type="text" name="api_server_ip" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">FTP Server</label>
-                                <input type="text" name="api_server_ftp_domain" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">FTP Server</label>
+                            <input type="text" name="api_server_ftp_domain" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">SQL Server</label>
-                                <input type="text" name="api_server_sql_domain" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">SQL Server</label>
+                            <input type="text" name="api_server_sql_domain" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Control Panel URL</label>
-                                <input type="text" name="api_cpanel_url" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Control Panel URL</label>
+                            <input type="text" name="api_cpanel_url" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Hosting Package</label>
-                                <input type="text" name="api_package" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Hosting Package</label>
+                            <input type="text" name="api_package" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Nameserver 1</label>
-                                <input type="text" name="api_ns_1" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Nameserver 1</label>
+                            <input type="text" name="api_ns_1" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Nameserver 2</label>
-                                <input type="text" name="api_ns_2" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Nameserver 2</label>
+                            <input type="text" name="api_ns_2" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">API Callback Token</label>
-                                <input type="text" name="api_callback_token" class="form-control" maxlength="32" required>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">API Callback Token</label>
+                            <input type="text" name="api_callback_token" class="form-control" maxlength="32" required>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label">API Callback URL</label>
-                                <input type="text" class="form-control" value="<?php echo $site_url ?>/callback/[Hosting Key]/[API Callback Token]" readonly>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label">API Callback URL</label>
+                            <input type="text" class="form-control" value="<?php echo $site_url ?>/callback/[Hosting Key]/[API Callback Token]" readonly>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <div class="my-10 px-10">
-                        <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
-                    </div>
+            </div>
+            <div class="panel-footer">
+                <div class="my-10 px-10">
+                    <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
                 </div>
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 99 - 101
src/admin/views/hosting-provider/details.php

@@ -4,124 +4,122 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('details'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="hosting-hostname.php?id=<?php echo $data['api_id']; ?>" class="btn btn-info btn-xs">
-                        <i class="fa fa-ethernet"></i> <?php echo $lang->I18N('Hostname'); ?>
-                    </a>
-                    <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                    </a>
-                    <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="hosting-provider.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['api_id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('details'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="hosting-hostname.php?id=<?php echo $data['api_id']; ?>" class="btn btn-info btn-xs">
+                    <i class="fa fa-ethernet"></i> <?php echo $lang->I18N('Hostname'); ?>
+                </a>
+                <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                </a>
+                <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="hosting-provider.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label"><?php echo $lang->I18N('Provider Type'); ?></label>
-                            <input type="text" name="api_type" value="<?php echo $data['api_type']; ?>" class="form-control" readonly>
-                        </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['api_id']; ?></span>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label"><?php echo $lang->I18N('Provider Type'); ?></label>
+                        <input type="text" name="api_type" value="<?php echo $data['api_type']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Hosting Key</label>
-                            <input type="text" name="api_key" value="<?php echo $data['api_key']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Hosting Key</label>
+                        <input type="text" name="api_key" value="<?php echo $data['api_key']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">MOFH API Username</label>
-                            <input type="text" name="api_username" value="<?php echo $data['api_username']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">MOFH API Username</label>
+                        <input type="text" name="api_username" value="<?php echo $data['api_username']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">MOFH API Password</label>
-                            <input type="text" name="api_password" value="<?php echo $data['api_password']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">MOFH API Password</label>
+                        <input type="text" name="api_password" value="<?php echo $data['api_password']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Hosting Server</label>
-                            <input type="text" name="api_server_domain" value="<?php echo $data['api_server_domain']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Hosting Server</label>
+                        <input type="text" name="api_server_domain" value="<?php echo $data['api_server_domain']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Server IP</label>
-                            <input type="text" name="api_server_ip" value="<?php echo $data['api_server_ip']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Server IP</label>
+                        <input type="text" name="api_server_ip" value="<?php echo $data['api_server_ip']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">FTP Server</label>
-                            <input type="text" name="api_server_ftp_domain" value="<?php echo $data['api_server_ftp_domain']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">FTP Server</label>
+                        <input type="text" name="api_server_ftp_domain" value="<?php echo $data['api_server_ftp_domain']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">SQL Server</label>
-                            <input type="text" name="api_server_sql_domain" value="<?php echo $data['api_server_sql_domain']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">SQL Server</label>
+                        <input type="text" name="api_server_sql_domain" value="<?php echo $data['api_server_sql_domain']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Control Panel URL</label>
-                            <input type="text" name="api_cpanel_url" value="<?php echo $data['api_cpanel_url']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Control Panel URL</label>
+                        <input type="text" name="api_cpanel_url" value="<?php echo $data['api_cpanel_url']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Hosting Package</label>
-                            <input type="text" name="api_package" value="<?php echo $data['api_package']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Hosting Package</label>
+                        <input type="text" name="api_package" value="<?php echo $data['api_package']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Nameserver 1</label>
-                            <input type="text" name="api_ns_1" value="<?php echo $data['api_ns_1']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Nameserver 1</label>
+                        <input type="text" name="api_ns_1" value="<?php echo $data['api_ns_1']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">Nameserver 2</label>
-                            <input type="text" name="api_ns_2" value="<?php echo $data['api_ns_2']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">Nameserver 2</label>
+                        <input type="text" name="api_ns_2" value="<?php echo $data['api_ns_2']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">API Callback Token</label>
-                            <input type="text" name="api_callback_token" value="<?php echo $data['api_callback_token']; ?>" class="form-control" maxlength="32" readonly>
-                        </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">API Callback Token</label>
+                        <input type="text" name="api_callback_token" value="<?php echo $data['api_callback_token']; ?>" class="form-control" maxlength="32" readonly>
                     </div>
                     </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label">API Callback URL</label>
-                            <input type="text" class="form-control" value="<?php echo $api_callback_url; ?>" readonly>
-                        </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label">API Callback URL</label>
+                        <input type="text" class="form-control" value="<?php echo $api_callback_url; ?>" readonly>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="panel-footer">
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="mb-20 px-10">
-                            <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
-                        </div>
+        </div>
+        <div class="panel-footer">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="mb-20 px-10">
+                        <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

+ 94 - 96
src/admin/views/hosting-provider/edit.php

@@ -4,118 +4,116 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-            <li><a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $data['api_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('edit'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                    </a>
-                    <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="hosting-provider.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['api_id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
+        <li><a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $data['api_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('edit'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                </a>
+                <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="hosting-provider.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/hosting/edit.php" method="post">
-                <input type="hidden" name="api_id" value="<?php echo $data['api_id']; ?>" style="display:none;">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('Provider Type'); ?></label>
-                                <input type="text" name="api_type" value="<?php echo $data['api_type']; ?>" class="form-control" required readonly>
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['api_id']; ?></span>
+        </div>
+        <form action="controllers/hosting/edit.php" method="post">
+            <input type="hidden" name="api_id" value="<?php echo $data['api_id']; ?>" style="display:none;">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('Provider Type'); ?></label>
+                            <input type="text" name="api_type" value="<?php echo $data['api_type']; ?>" class="form-control" required readonly>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Hosting Key</label>
-                                <input type="text" name="api_key" value="<?php echo $data['api_key']; ?>" class="form-control" required readonly>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Hosting Key</label>
+                            <input type="text" name="api_key" value="<?php echo $data['api_key']; ?>" class="form-control" required readonly>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">MOFH API Username</label>
-                                <input type="text" name="api_username" value="<?php echo $data['api_username']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">MOFH API Username</label>
+                            <input type="text" name="api_username" value="<?php echo $data['api_username']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">MOFH API Password</label>
-                                <input type="text" name="api_password" value="<?php echo $data['api_password']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">MOFH API Password</label>
+                            <input type="text" name="api_password" value="<?php echo $data['api_password']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Server domain</label>
-                                <input type="text" name="api_server_domain" value="<?php echo $data['api_server_domain']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Server domain</label>
+                            <input type="text" name="api_server_domain" value="<?php echo $data['api_server_domain']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Server IP</label>
-                                <input type="text" name="api_server_ip" value="<?php echo $data['api_server_ip']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Server IP</label>
+                            <input type="text" name="api_server_ip" value="<?php echo $data['api_server_ip']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">FTP Server</label>
-                                <input type="text" name="api_server_ftp_domain" value="<?php echo $data['api_server_ftp_domain']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">FTP Server</label>
+                            <input type="text" name="api_server_ftp_domain" value="<?php echo $data['api_server_ftp_domain']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">SQL Server</label>
-                                <input type="text" name="api_server_sql_domain" value="<?php echo $data['api_server_sql_domain']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">SQL Server</label>
+                            <input type="text" name="api_server_sql_domain" value="<?php echo $data['api_server_sql_domain']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Control Panel URL</label>
-                                <input type="text" name="api_cpanel_url" value="<?php echo $data['api_cpanel_url']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Control Panel URL</label>
+                            <input type="text" name="api_cpanel_url" value="<?php echo $data['api_cpanel_url']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Hosting Package</label>
-                                <input type="text" name="api_package" value="<?php echo $data['api_package']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Hosting Package</label>
+                            <input type="text" name="api_package" value="<?php echo $data['api_package']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Nameserver 1</label>
-                                <input type="text" name="api_ns_1" value="<?php echo $data['api_ns_1']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Nameserver 1</label>
+                            <input type="text" name="api_ns_1" value="<?php echo $data['api_ns_1']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Nameserver 2</label>
-                                <input type="text" name="api_ns_2" value="<?php echo $data['api_ns_2']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Nameserver 2</label>
+                            <input type="text" name="api_ns_2" value="<?php echo $data['api_ns_2']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">API Callback Token</label>
-                                <input type="text" name="api_callback_token" value="<?php echo $data['api_callback_token']; ?>" class="form-control" maxlength="32" required>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">API Callback Token</label>
+                            <input type="text" name="api_callback_token" value="<?php echo $data['api_callback_token']; ?>" class="form-control" maxlength="32" required>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <div class="my-10 px-10">
-                        <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
-                    </div>
+            </div>
+            <div class="panel-footer">
+                <div class="my-10 px-10">
+                    <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
                 </div>
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 46 - 48
src/admin/views/hosting-provider/list.php

@@ -4,55 +4,53 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Hosting Provider'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Hosting Provider'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th>ID</th>
-                        <th>Key</th>
-                        <th><?php echo $lang->I18N('Type'); ?></th>
-                        <th>Panel URL</th>
-                        <th><?php echo $lang->I18N('Package'); ?></th>
-                        <th><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
-                    <?php if ($count > 0): ?>
-                    <?php foreach ($rows as $value): ?>
-                        <tr>
-                            <td><?php echo $value['api_id']; ?></td>
-                            <td><?php echo $value['api_key']; ?></td>
-                            <td><?php echo $value['api_type']; ?></td>
-                            <td><?php echo $value['api_cpanel_url']; ?></td>
-                            <td><?php echo $value['api_package']; ?></td>
-                            <td>
-                                <a href="hosting-provider.php?action=edit&id=<?php echo $value['api_id']; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
-                                <a href="hosting-provider.php?action=details&id=<?php echo $value['api_id']; ?>" class="btn btn-primary btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
-                                <a href="hosting-hostname.php?id=<?php echo $value['api_id']; ?>" class="btn btn-info btn-xs"><i class="fa fa-ethernet"></i> <?php echo $lang->I18N('Hostname'); ?></a>
-                            </td>
-                        </tr>
-                    <?php endforeach;?>
-                    <?php else: ?>
-                        <tr>
-                            <td colspan="6" class="text-center">Nothing found</td>
-                        </tr>
-                    <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer"><?php echo $count; ?> Records Found</div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th>ID</th>
+                    <th>Key</th>
+                    <th><?php echo $lang->I18N('Type'); ?></th>
+                    <th>Panel URL</th>
+                    <th><?php echo $lang->I18N('Package'); ?></th>
+                    <th><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
+                <?php if ($count > 0): ?>
+                <?php foreach ($rows as $value): ?>
+                    <tr>
+                        <td><?php echo $value['api_id']; ?></td>
+                        <td><?php echo $value['api_key']; ?></td>
+                        <td><?php echo $value['api_type']; ?></td>
+                        <td><?php echo $value['api_cpanel_url']; ?></td>
+                        <td><?php echo $value['api_package']; ?></td>
+                        <td>
+                            <a href="hosting-provider.php?action=edit&id=<?php echo $value['api_id']; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
+                            <a href="hosting-provider.php?action=details&id=<?php echo $value['api_id']; ?>" class="btn btn-primary btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
+                            <a href="hosting-hostname.php?id=<?php echo $value['api_id']; ?>" class="btn btn-info btn-xs"><i class="fa fa-ethernet"></i> <?php echo $lang->I18N('Hostname'); ?></a>
+                        </td>
+                    </tr>
+                <?php endforeach;?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="6" class="text-center">Nothing found</td>
+                    </tr>
+                <?php endif;?>
+                </tbody>
+            </table>
         </div>
         </div>
+        <div class="panel-footer"><?php echo $count; ?> Records Found</div>
     </div>
     </div>
 </div>
 </div>

+ 33 - 35
src/admin/views/knowledgebase/add.php

@@ -4,48 +4,46 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('add'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="knowledgebase.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('add'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="knowledgebase.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/knowledgebase/add.php" method="post">
-                <div class="panel-body">
-                    <div class="row pb-20">
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required" for="input_subject">Subject</label>
-                                <input type="text" name="subject" id="input_subject" placeholder="knowledgebase subject..." class="form-control">
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <form action="controllers/knowledgebase/add.php" method="post">
+            <div class="panel-body">
+                <div class="row pb-20">
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required" for="input_subject">Subject</label>
+                            <input type="text" name="subject" id="input_subject" placeholder="knowledgebase subject..." class="form-control">
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Content</label>
-                                <textarea name="editor" id="content" placeholder="Enter ticket content..." class="form-control" style="height: 200px;"></textarea> 
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Content</label>
+                            <textarea name="editor" id="content" placeholder="Enter ticket content..." class="form-control" style="height: 200px;"></textarea> 
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <div class="row pb-20">
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <button name="submit" class="btn btn-sm btn-primary">Create Knowledgebase</button>
-                            </div>
+            </div>
+            <div class="panel-footer">
+                <div class="row pb-20">
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <button name="submit" class="btn btn-sm btn-primary">Create Knowledgebase</button>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 30 - 32
src/admin/views/knowledgebase/details.php

@@ -4,43 +4,41 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('details'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="knowledgebase.php?action=edit&id=<?php echo $knowledgebase_id; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
-                    <a href="knowledgebase.php?action=add" class="btn btn-info btn-xs"><i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?></a>
-                    <a href="knowledgebase.php" class="btn btn-primary btn-xs"><i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?></a>
-                </div>
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                    <span class="label label-default"> ID <?php echo $knowledgebase_id; ?></span>
-                </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('details'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="knowledgebase.php?action=edit&id=<?php echo $knowledgebase_id; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
+                <a href="knowledgebase.php?action=add" class="btn btn-info btn-xs"><i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?></a>
+                <a href="knowledgebase.php" class="btn btn-primary btn-xs"><i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?></a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="page-header">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <b>Subject :</b>
-                            <span><?php echo $Knowledgebase['knowledgebase_subject']; ?></span>
-                        </div>
-                        <div class="col-md-6">
-                            <b>Date :</b>
-                            <span><?php echo $Knowledgebase['knowledgebase_date']; ?></span>
-                        </div>
-                    </div>
-                </div>
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+                <span class="label label-default"> ID <?php echo $knowledgebase_id; ?></span>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="page-header">
                 <div class="row">
                 <div class="row">
-                    <div class="col-md-12">
-                        <?php echo htmlspecialchars_decode($Knowledgebase['knowledgebase_content']); ?>
+                    <div class="col-md-6">
+                        <b>Subject :</b>
+                        <span><?php echo $Knowledgebase['knowledgebase_subject']; ?></span>
+                    </div>
+                    <div class="col-md-6">
+                        <b>Date :</b>
+                        <span><?php echo $Knowledgebase['knowledgebase_date']; ?></span>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <?php echo htmlspecialchars_decode($Knowledgebase['knowledgebase_content']); ?>
+                </div>
+            </div>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 37 - 39
src/admin/views/knowledgebase/edit.php

@@ -4,53 +4,51 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
-            <li><a href="knowledgebase.php?action=details&id=<?php echo $id; ?>"><?php echo $lang->I18N('details'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('edit'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="knowledgebase.php?action=details&id=<?php echo $id; ?>" class="btn btn-success btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
-                    <a href="knowledgebase.php?action=add" class="btn btn-info btn-xs"><i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?></a>
-                    <a href="knowledgebase.php" class="btn btn-primary btn-xs"><i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?></a>
-                </div>
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?> <span class="label label-default"> ID <?php echo $id; ?></span>
-                </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
+        <li><a href="knowledgebase.php?action=details&id=<?php echo $id; ?>"><?php echo $lang->I18N('details'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('edit'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="knowledgebase.php?action=details&id=<?php echo $id; ?>" class="btn btn-success btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
+                <a href="knowledgebase.php?action=add" class="btn btn-info btn-xs"><i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?></a>
+                <a href="knowledgebase.php" class="btn btn-primary btn-xs"><i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?></a>
             </div>
             </div>
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?> <span class="label label-default"> ID <?php echo $id; ?></span>
+            </div>
+        </div>
 
 
-            <form action="controllers/knowledgebase/edit.php" method="post">
-                <div class="panel-body">
-                    <div class="row pb-20">
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Knowledgebase Subject</label>
-                                <input type="text" name="subject" placeholder="<?php echo $lang->I18N('Enter knowledgebase subject'); ?>" value="<?php echo $Knowledgebase['knowledgebase_subject']; ?>" class="form-control">
-                            </div>
+        <form action="controllers/knowledgebase/edit.php" method="post">
+            <div class="panel-body">
+                <div class="row pb-20">
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Knowledgebase Subject</label>
+                            <input type="text" name="subject" placeholder="<?php echo $lang->I18N('Enter knowledgebase subject'); ?>" value="<?php echo $Knowledgebase['knowledgebase_subject']; ?>" class="form-control">
                         </div>
                         </div>
-                        <input type="hidden" name="id" value="<?php echo $id; ?>">
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Knowledgebase Content</label>
-                                <textarea name="editor" id="content" placeholder="<?php echo $lang->I18N('Enter Knowledgebase Content'); ?>" class="form-control" style="height: 200px;"><?php echo $Knowledgebase['knowledgebase_content']; ?></textarea>
-                            </div>
+                    </div>
+                    <input type="hidden" name="id" value="<?php echo $id; ?>">
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Knowledgebase Content</label>
+                            <textarea name="editor" id="content" placeholder="<?php echo $lang->I18N('Enter Knowledgebase Content'); ?>" class="form-control" style="height: 200px;"><?php echo $Knowledgebase['knowledgebase_content']; ?></textarea>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <button name="submit" class="btn btn-sm btn-primary"><?php echo $lang->I18N('Save'); ?></button>
-                            </div>
+            </div>
+            <div class="panel-footer">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <button name="submit" class="btn btn-sm btn-primary"><?php echo $lang->I18N('Save'); ?></button>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-            </form>
-        </div>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 41 - 43
src/admin/views/knowledgebase/list.php

@@ -4,50 +4,48 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Knowledgebase'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="knowledgebase.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Knowledgebase'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="knowledgebase.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th>ID</th>
-                        <th>Subject</th>
-                        <th width="160">Date</th>
-                        <th width="150">Action</th>
-                    </thead>
-                    <tbody>
-                    <?php if ($count > 0): ?>
-                    <?php foreach ($rows as $value): ?>
-                        <tr>
-                            <td><?php echo $value['knowledgebase_id']; ?></td>
-                            <td><?php echo $value['knowledgebase_subject']; ?></td>
-                            <td><?php echo $value['knowledgebase_date']; ?></td>
-                            <td>
-                                <a href="knowledgebase.php?action=edit&id=<?php echo $value['knowledgebase_id']; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
-                                <a href="knowledgebase.php?action=details&id=<?php echo $value['knowledgebase_id']; ?>" class="btn btn-primary btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
-                            </td>
-                        </tr>
-                    <?php endforeach;?>
-                    <?php else: ?>
-                        <tr>
-                            <td colspan="5" class="text-center">Nothing found</td>
-                        </tr>
-                    <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer"><?php echo $count; ?> Records Found</div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th>ID</th>
+                    <th>Subject</th>
+                    <th width="160">Date</th>
+                    <th width="150">Action</th>
+                </thead>
+                <tbody>
+                <?php if ($count > 0): ?>
+                <?php foreach ($rows as $value): ?>
+                    <tr>
+                        <td><?php echo $value['knowledgebase_id']; ?></td>
+                        <td><?php echo $value['knowledgebase_subject']; ?></td>
+                        <td><?php echo $value['knowledgebase_date']; ?></td>
+                        <td>
+                            <a href="knowledgebase.php?action=edit&id=<?php echo $value['knowledgebase_id']; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
+                            <a href="knowledgebase.php?action=details&id=<?php echo $value['knowledgebase_id']; ?>" class="btn btn-primary btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
+                        </td>
+                    </tr>
+                <?php endforeach;?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="5" class="text-center">Nothing found</td>
+                    </tr>
+                <?php endif;?>
+                </tbody>
+            </table>
         </div>
         </div>
+        <div class="panel-footer"><?php echo $count; ?> Records Found</div>
     </div>
     </div>
 </div>
 </div>

+ 80 - 75
src/admin/views/navbar.php

@@ -1,79 +1,81 @@
-<nav class="navbar navbar-fixed-top navbar-default">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">navbar</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="./"><?php echo $lang->I18N('Admin Area'); ?></a>
+<div class="container-fluid">
+    <nav class="navbar navbar-fixed-top navbar-default">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                    <span class="sr-only">navbar</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="./"><?php echo $lang->I18N('Admin Area'); ?></a>
+            </div>
+            <div id="navbar" class="collapse navbar-collapse">
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="<?php echo checkIfActive('index,') ?>">
+                        <a href="./"><i class="fa fa-tachometer-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Dashboard'); ?></a>
+                    </li>
+                    <li class="<?php echo checkIfActive('clients') ?>">
+                        <a href="clients.php"><i class="fa fa-users fa-fw"></i> <?php echo $lang->I18N('Clients List'); ?></a>
+                    </li>
+                    <li class="<?php echo checkIfActive('accounts') ?>">
+                        <a href="accounts.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Accounts'); ?></a>
+                    </li>
+                    <li class="<?php echo checkIfActive('tickets') ?>">
+                        <a href="tickets.php"><i class="fa fa-ticket-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Tickets List'); ?></a>
+                    </li>
+                    <li class="<?php echo checkIfActive('ssl') ?>">
+                        <a href="ssl.php"><i class="fa fa-shield-alt" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Certificates'); ?></a>
+                    </li>
+                    <li class="<?php echo checkIfActive('settings'); ?>">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                            <i class="fa fa-cog fa-fw"></i> <?php echo $lang->I18N('Settings'); ?> <b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="knowledgebase.php"><i class="fa fa-book fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Knowledgebase'); ?></a></li>
+                            <li><a href="news.php"><i class="fa fa-newspaper fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('News List'); ?></a></li>
+                            <li><a href="hosting-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Provider'); ?></a></li>
+                            <li><a href="ssl-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Provider'); ?></a></li>
+                            <li><a href="domain-provider.php"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Domain Provider'); ?></a></li>
+                            <li><a href="settings.php"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('System Settings'); ?></a></li>
+                        </ul>
+                    </li>
+                    <li class="<?php echo checkIfActive('profile'); ?>">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                            <i class="fa fa-user-cog fa-fw"></i>
+                            <i class="caret"></i>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li>
+                                <a href="profile.php" class="text-center">
+                                    <p><img class="img-rounded" src="<?php echo $AdminInfo['avatar']; ?>" height="80px" width="80px"></p>
+                                    <!-- <i class="fa fa-user-circle fa-5x"></i> -->
+                                    <div><?php echo $AdminInfo['admin_fname'] . " " . $AdminInfo['admin_lname']; ?></div>
+                                </a>
+                            </li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="profile.php"><i class="fa fa-user-alt fa-fw"></i> <?php echo $lang->I18N('Profile'); ?></a></li>
+                            <li><a href="profile.php?action=password"><i class="fa fa-user-shield fa-fw"></i> <?php echo $lang->I18N('Change Password'); ?></a></li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="<?php echo $site_url; ?>" target="_blank"><i class="fa fa-external-link-alt fa-fw"></i> <?php echo $lang->I18N('home'); ?></a></li>
+                            <li><a href="<?php echo $site_url; ?>/clientarea/" target="_blank"><i class="fa fa-house-user fa-fw"></i> <?php echo $lang->I18N('Client Area'); ?></a></li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="#" onclick="return logout();"><i class="fa fa-sign-out-alt fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('logout'); ?></a></li>
+                        </ul>
+                    </li>
+                    <li>
+                        <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
+                        <script type="text/javascript">
+                            var sel = document.getElementById('theme-selector');
+                            sel.className = getThemeClasses(getTheme());
+                            sel.onclick = themeSelectorClicked;
+                        </script>
+                    </li>
+                </ul>
+            </div>
         </div>
         </div>
-        <div id="navbar" class="collapse navbar-collapse">
-            <ul class="nav navbar-nav navbar-right">
-                <li class="<?php echo checkIfActive('index,') ?>">
-                    <a href="./"><i class="fa fa-tachometer-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Dashboard'); ?></a>
-                </li>
-                <li class="<?php echo checkIfActive('clients') ?>">
-                    <a href="clients.php"><i class="fa fa-users fa-fw"></i> <?php echo $lang->I18N('Clients List'); ?></a>
-                </li>
-                <li class="<?php echo checkIfActive('accounts') ?>">
-                    <a href="accounts.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Accounts'); ?></a>
-                </li>
-                <li class="<?php echo checkIfActive('tickets') ?>">
-                    <a href="tickets.php"><i class="fa fa-ticket-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Tickets List'); ?></a>
-                </li>
-                <li class="<?php echo checkIfActive('ssl') ?>">
-                    <a href="ssl.php"><i class="fa fa-shield-alt" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Certificates'); ?></a>
-                </li>
-                <li class="<?php echo checkIfActive('settings'); ?>">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <i class="fa fa-cog fa-fw"></i> <?php echo $lang->I18N('Settings'); ?> <b class="caret"></b>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <li><a href="knowledgebase.php"><i class="fa fa-book fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Knowledgebase'); ?></a></li>
-                        <li><a href="news.php"><i class="fa fa-newspaper fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('News List'); ?></a></li>
-                        <li><a href="hosting-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-                        <li><a href="ssl-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Provider'); ?></a></li>
-                        <li><a href="domain-provider.php"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Domain Provider'); ?></a></li>
-                        <li><a href="settings.php"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('System Settings'); ?></a></li>
-                    </ul>
-                </li>
-                <li class="<?php echo checkIfActive('profile'); ?>">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <i class="fa fa-user-cog fa-fw"></i>
-                        <i class="caret"></i>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <li>
-                            <a href="profile.php" class="text-center">
-                                <p><img class="img-rounded" src="<?php echo $AdminInfo['avatar']; ?>" height="80px" width="80px"></p>
-                                <!-- <i class="fa fa-user-circle fa-5x"></i> -->
-                                <div><?php echo $AdminInfo['admin_fname'] . " " . $AdminInfo['admin_lname']; ?></div>
-                            </a>
-                        </li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="profile.php"><i class="fa fa-user-alt fa-fw"></i> <?php echo $lang->I18N('Profile'); ?></a></li>
-                        <li><a href="profile.php?action=password"><i class="fa fa-user-shield fa-fw"></i> <?php echo $lang->I18N('Change Password'); ?></a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="<?php echo $site_url; ?>" target="_blank"><i class="fa fa-external-link-alt fa-fw"></i> <?php echo $lang->I18N('home'); ?></a></li>
-                        <li><a href="<?php echo $site_url; ?>/clientarea/" target="_blank"><i class="fa fa-house-user fa-fw"></i> <?php echo $lang->I18N('Client Area'); ?></a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="#" onclick="return logout();"><i class="fa fa-sign-out-alt fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('logout'); ?></a></li>
-                    </ul>
-                </li>
-                <li>
-                    <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
-                    <script type="text/javascript">
-                        var sel = document.getElementById('theme-selector');
-                        sel.className = getThemeClasses(getTheme());
-                        sel.onclick = themeSelectorClicked;
-                    </script>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>
+    </nav>
+</div>
 <script>
 <script>
     function logout() {
     function logout() {
         layer.confirm('确定退出登录 ?', {
         layer.confirm('确定退出登录 ?', {
@@ -106,3 +108,6 @@
         });
         });
     }
     }
 </script>
 </script>
+
+<div class="container-fluid">
+<div class="row page-wrapper">

+ 39 - 41
src/admin/views/news/add.php

@@ -5,53 +5,51 @@ if (!defined('IN_CRONLITE')) {
 ?>
 ?>
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('add'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="news.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('add'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="news.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
 
 
-            <form action="controllers/news/add.php" method="post">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required" for="subject">Subject</label>
-                                <input type="text" name="subject" id="subject" class="form-control" placeholder="news subject..." maxlength="255">
-                            </div>
+        <form action="controllers/news/add.php" method="post">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required" for="subject">Subject</label>
+                            <input type="text" name="subject" id="subject" class="form-control" placeholder="news subject..." maxlength="255">
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required" for="status">Status</label>
-                                <select name="status" id="status" class="form-control">
-                                    <?php foreach ($status_types as $key => $value): ?>
-                                        <option value="<?php echo $key; ?>"><?php echo $value; ?></option>
-                                    <?php endforeach;?>
-                                </select>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required" for="status">Status</label>
+                            <select name="status" id="status" class="form-control">
+                                <?php foreach ($status_types as $key => $value): ?>
+                                    <option value="<?php echo $key; ?>"><?php echo $value; ?></option>
+                                <?php endforeach;?>
+                            </select>
                         </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required" for="content">Content</label>
-                                <textarea name="content" id="content" class="form-control" rows="10" maxlength="5000" placeholder="Enter news content..."></textarea>
-                            </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required" for="content">Content</label>
+                            <textarea name="content" id="content" class="form-control" rows="10" maxlength="5000" placeholder="Enter news content..."></textarea>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <button name="submit" class="btn btn-sm btn-primary">Create News</button>
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="panel-footer">
+                <button name="submit" class="btn btn-sm btn-primary">Create News</button>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 46 - 48
src/admin/views/news/edit.php

@@ -5,61 +5,59 @@ if (!defined('IN_CRONLITE')) {
 ?>
 ?>
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
-            <li><a href="<?php echo setURL('admin/news', '', array('action' => 'view', 'id' => $id)); ?>"><?php echo $lang->I18N('details'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('edit'); ?></li>
-        </ol>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
+        <li><a href="<?php echo setURL('admin/news', '', array('action' => 'view', 'id' => $id)); ?>"><?php echo $lang->I18N('details'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('edit'); ?></li>
+    </ol>
 
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/news', '', array('action' => 'view', 'id' => $id)); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                    </a>
-                    <a href="news.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="news.php?action=list" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $id; ?></span>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/news', '', array('action' => 'view', 'id' => $id)); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                </a>
+                <a href="news.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="news.php?action=list" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-        <form action="controllers/news/edit.php" method="post">
-            <input type="hidden" name="id" value="<?php echo $news['news_id']; ?>">
-            <div class="panel-body">
-                <div class="row pb-20">
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required" for="subject">Subject</label>
-                            <input type="text" name="subject" id="subject" class="form-control" value="<?php echo $news['news_subject']; ?>" placeholder="news subject..." maxlength="255">
-                        </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $id; ?></span>
+        </div>
+    <form action="controllers/news/edit.php" method="post">
+        <input type="hidden" name="id" value="<?php echo $news['news_id']; ?>">
+        <div class="panel-body">
+            <div class="row pb-20">
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required" for="subject">Subject</label>
+                        <input type="text" name="subject" id="subject" class="form-control" value="<?php echo $news['news_subject']; ?>" placeholder="news subject..." maxlength="255">
                     </div>
                     </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required" for="status">Status</label>
-                            <select name="status" id="status" class="form-control">
-                            <?php foreach ($status_types as $key => $value): ?>
-                                <option value="<?php echo $key; ?>" <?php echo $key == $news['news_status'] ? 'selected' : ''; ?> ><?php echo $value; ?></option>
-                            <?php endforeach;?>
-                        </select>
-                        </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required" for="status">Status</label>
+                        <select name="status" id="status" class="form-control">
+                        <?php foreach ($status_types as $key => $value): ?>
+                            <option value="<?php echo $key; ?>" <?php echo $key == $news['news_status'] ? 'selected' : ''; ?> ><?php echo $value; ?></option>
+                        <?php endforeach;?>
+                    </select>
                     </div>
                     </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required" for="content">Content</label>
-                            <textarea name="content" id="content" class="form-control" rows="10" maxlength="5000" placeholder="Enter news content..."><?php echo $news['news_content']; ?></textarea>
-                        </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required" for="content">Content</label>
+                        <textarea name="content" id="content" class="form-control" rows="10" maxlength="5000" placeholder="Enter news content..."><?php echo $news['news_content']; ?></textarea>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="panel-footer">
-                <button name="submit" class="btn btn-sm btn-primary">Update</button>
-            </div>
-        </form>
         </div>
         </div>
+        <div class="panel-footer">
+            <button name="submit" class="btn btn-sm btn-primary">Update</button>
+        </div>
+    </form>
     </div>
     </div>
 </div>
 </div>

+ 43 - 46
src/admin/views/news/list.php

@@ -5,53 +5,50 @@ if (!defined('IN_CRONLITE')) {
 ?>
 ?>
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('News List'); ?></li>
-        </ol>
-
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                <a href="news.php?action=add" class="btn btn-primary btn-xs">
-                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
-            </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th width="100">ID</th>
-                        <th><?php echo $lang->I18N('Title'); ?></th>
-                        <th><?php echo $lang->I18N('Status'); ?></th>
-                        <th style="width: 160px;"><?php echo $lang->I18N('Date'); ?></th>
-                        <th><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
-                    <?php if ($count > 0): ?>
-                    <?php foreach ($rows as $value): ?>
-                        <tr>
-                            <td><?php echo $value['news_id']; ?></td>
-                            <td><?php echo $value["news_subject"]; ?></td>
-                            <td><?php echo $status_types[$value['news_status']]; ?></td>
-                            <td style="width: 150px;"><?php echo $value["news_date"]; ?></td>
-                            <td style="width: 150px;">
-                                <a href="news.php?action=edit&id=<?php echo $value['news_id']; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
-                                <a href="news.php?action=view&id=<?php echo $value['news_id']; ?>" class="btn btn-primary btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
-                            </td>
-                        </tr>
-                    <?php endforeach;?>
-                    <?php else: ?>
-                        <tr>
-                            <td colspan="5" class="text-center">Nothing found</td>
-                        </tr>
-                    <?php endif;?>
-                    </tbody>
-                </table>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('News List'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+            <a href="news.php?action=add" class="btn btn-primary btn-xs">
+                <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+            </a>
             </div>
             </div>
-            <div class="panel-footer"><?php echo $count; ?> Records Found, Page 1 of 1</div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th width="100">ID</th>
+                    <th><?php echo $lang->I18N('Title'); ?></th>
+                    <th><?php echo $lang->I18N('Status'); ?></th>
+                    <th style="width: 160px;"><?php echo $lang->I18N('Date'); ?></th>
+                    <th><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
+                <?php if ($count > 0): ?>
+                <?php foreach ($rows as $value): ?>
+                    <tr>
+                        <td><?php echo $value['news_id']; ?></td>
+                        <td><?php echo $value["news_subject"]; ?></td>
+                        <td><?php echo $status_types[$value['news_status']]; ?></td>
+                        <td style="width: 150px;"><?php echo $value["news_date"]; ?></td>
+                        <td style="width: 150px;">
+                            <a href="news.php?action=edit&id=<?php echo $value['news_id']; ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
+                            <a href="news.php?action=view&id=<?php echo $value['news_id']; ?>" class="btn btn-primary btn-xs"><i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?></a>
+                        </td>
+                    </tr>
+                <?php endforeach;?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="5" class="text-center">Nothing found</td>
+                    </tr>
+                <?php endif;?>
+                </tbody>
+            </table>
         </div>
         </div>
+        <div class="panel-footer"><?php echo $count; ?> Records Found, Page 1 of 1</div>
     </div>
     </div>
 </div>
 </div>

+ 26 - 28
src/admin/views/news/view.php

@@ -6,36 +6,34 @@ if (!defined('IN_CRONLITE')) {
 
 
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('details'); ?></li>
-        </ol>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('details'); ?></li>
+    </ol>
 
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/news', '', array('action' => 'edit', 'id' => $id)); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                    </a>
-                    <a href="news.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="news.php?action=list" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $id; ?></span>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/news', '', array('action' => 'edit', 'id' => $id)); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                </a>
+                <a href="news.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="news.php?action=list" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="page-header text-center">
-                    <h2><?php echo $data['news_subject']; ?></h2>
-                    <p><?php echo $data['news_date']; ?></p>
-                </div>
-                <div class="news-content">
-                    <?php echo htmlspecialchars_decode($data['news_content']); ?>
-                </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $id; ?></span>
+        </div>
+        <div class="panel-body">
+            <div class="page-header text-center">
+                <h2><?php echo $data['news_subject']; ?></h2>
+                <p><?php echo $data['news_date']; ?></p>
+            </div>
+            <div class="news-content">
+                <?php echo htmlspecialchars_decode($data['news_content']); ?>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

+ 36 - 38
src/admin/views/profile/edit.php

@@ -5,49 +5,47 @@ if (!defined('IN_CRONLITE')) {
 ?>
 ?>
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="profile.php"><?php echo $lang->I18N('My Profile'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Profile Edit'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="profile.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-id-card"></i> <?php echo $lang->I18N('My Profile'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="profile.php"><?php echo $lang->I18N('My Profile'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Profile Edit'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="profile.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-id-card"></i> <?php echo $lang->I18N('My Profile'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/profile/edit.php" method="post">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
-                                <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" required>
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+        </div>
+        <form action="controllers/profile/edit.php" method="post">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
+                            <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
-                                <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
+                            <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">Email Address</label>
-                                <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" required readonly>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">Email Address</label>
+                            <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" required readonly>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save Changes'); ?></button>
-                    <!-- <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a> -->
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="panel-footer">
+                <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save Changes'); ?></button>
+                <!-- <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a> -->
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 46 - 48
src/admin/views/profile/password.php

@@ -5,59 +5,57 @@ if (!defined('IN_CRONLITE')) {
 ?>
 ?>
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="profile.php"><?php echo $lang->I18N('My Profile'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Change Password'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="profile.php?action=edit" class="btn btn-primary btn-xs">
-                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('Profile Edit'); ?>
-                    </a>
-                    <a href="profile.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-id-card"></i> <?php echo $lang->I18N('My Profile'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="profile.php"><?php echo $lang->I18N('My Profile'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Change Password'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="profile.php?action=edit" class="btn btn-primary btn-xs">
+                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('Profile Edit'); ?>
+                </a>
+                <a href="profile.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-id-card"></i> <?php echo $lang->I18N('My Profile'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/profile/password.php" method="post" onsubmit="
-                    var password = document.getElementById('password').value;
-                    var cpassword = document.getElementById('cpassword').value;
-                    if(password != cpassword){
-                        alert('Password not match');
-                        return false;
-                    }
-                    return true;
-                ">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('New Password'); ?></label>
-                                <input type="password" name="new_password" id="password" placeholder="<?php echo $lang->I18N('Input New Password'); ?>" class="form-control">
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+        </div>
+        <form action="controllers/profile/password.php" method="post" onsubmit="
+                var password = document.getElementById('password').value;
+                var cpassword = document.getElementById('cpassword').value;
+                if(password != cpassword){
+                    alert('Password not match');
+                    return false;
+                }
+                return true;
+            ">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('New Password'); ?></label>
+                            <input type="password" name="new_password" id="password" placeholder="<?php echo $lang->I18N('Input New Password'); ?>" class="form-control">
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('Confirm Password'); ?></label>
-                                <input type="password" name="confirm_password" id="cpassword" placeholder="<?php echo $lang->I18N('Input Confirm Password'); ?>" class="form-control">
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('Confirm Password'); ?></label>
+                            <input type="password" name="confirm_password" id="cpassword" placeholder="<?php echo $lang->I18N('Input Confirm Password'); ?>" class="form-control">
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('Old Password'); ?></label>
-                                <input type="password" name="old_password" placeholder="<?php echo $lang->I18N('Input Old Password'); ?>" class="form-control">
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('Old Password'); ?></label>
+                            <input type="password" name="old_password" placeholder="<?php echo $lang->I18N('Input Old Password'); ?>" class="form-control">
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <input type="submit" name="submit" value="<?php echo $lang->I18N('Save Changes'); ?>" class="btn btn-sm btn-primary text-white">
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="panel-footer">
+                <input type="submit" name="submit" value="<?php echo $lang->I18N('Save Changes'); ?>" class="btn btn-sm btn-primary text-white">
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 35 - 37
src/admin/views/profile/view.php

@@ -5,50 +5,48 @@ if (!defined('IN_CRONLITE')) {
 ?>
 ?>
 
 
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('My Profile'); ?></li>
-        </ol>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('My Profile'); ?></li>
+    </ol>
 
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="profile.php?action=edit" class="btn btn-primary btn-xs">
-                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                    </a>
-                    <a href="profile.php?action=password" class="btn btn-primary btn-xs">
-                        <i class="fa fa-user-shield"></i> <?php echo $lang->I18N('Change Password'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="profile.php?action=edit" class="btn btn-primary btn-xs">
+                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                </a>
+                <a href="profile.php?action=password" class="btn btn-primary btn-xs">
+                    <i class="fa fa-user-shield"></i> <?php echo $lang->I18N('Change Password'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label"><?php echo $lang->I18N('First Name'); ?></label>
-                            <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" readonly>
-                        </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label"><?php echo $lang->I18N('First Name'); ?></label>
+                        <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label"><?php echo $lang->I18N('Last Name'); ?></label>
-                            <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label"><?php echo $lang->I18N('Last Name'); ?></label>
+                        <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label"><?php echo $lang->I18N('Email Address'); ?></label>
-                            <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label"><?php echo $lang->I18N('Email Address'); ?></label>
+                        <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" readonly>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="panel-footer">
-                <a href="profile.php?action=edit" class="btn btn-primary"><?php echo $lang->I18N('Update Profile'); ?></a>
-                <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a>
-            </div>
+        </div>
+        <div class="panel-footer">
+            <a href="profile.php?action=edit" class="btn btn-primary"><?php echo $lang->I18N('Update Profile'); ?></a>
+            <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 17 - 19
src/admin/views/settings/view.php

@@ -4,26 +4,25 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('System Settings'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-body">
-                <?php require __DIR__ . '/menu.php'; ?>
-            </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('System Settings'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <?php require __DIR__ . '/menu.php'; ?>
         </div>
         </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="./" class="btn btn-primary btn-xs">
-                        <i class="fa fa-home"></i> <?php echo $lang->I18N('Return'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $lang->I18N('System Settings'); ?></span>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="./" class="btn btn-primary btn-xs">
+                    <i class="fa fa-home"></i> <?php echo $lang->I18N('Return'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
+            <span class="panel-title"><?php echo $lang->I18N('System Settings'); ?></span>
+        </div>
+        <div class="panel-body">
 
 
         <form action="controllers/settings/edit.php" method="post">
         <form action="controllers/settings/edit.php" method="post">
             <div class="card-body">
             <div class="card-body">
@@ -128,4 +127,3 @@ foreach ($Statuses as $Status) {
         </form>
         </form>
     </div>
     </div>
 </div>
 </div>
-</div>

+ 23 - 58
src/admin/views/sidebar.php

@@ -1,71 +1,36 @@
-<?php
-$avatar_path = $AdminInfo['admin_email'] ? md5($AdminInfo['admin_email']) : 'default';
-?>
-
-<!-- Sidebar Start -->
-<div class="sidebar-overlay" onclick="halfmoon.toggleSidebar()"></div>
-<div class="sidebar">
-    <div class="sidebar-menu">
-        <h5 class="sidebar-title"><?php echo $lang->I18N('Logged in as'); ?>:</h5>
-        <div class="sidebar-divider"></div>
+<div class="col-sm-3 col-md-3 col-lg-2">
+    <!-- <div class="page-header">
         <a href="profile.php" class="sidebar-link sidebar-link-with-icon">
         <a href="profile.php" class="sidebar-link sidebar-link-with-icon">
             <span class="sidebar-icon bg-transparent text-dark rounded-circle">
             <span class="sidebar-icon bg-transparent text-dark rounded-circle">
                 <img class="rounded-circle" src="https://dn-qiniu-avatar.qbox.me/avatar/<?php echo $avatar_path; ?>?s=30" height="30px" width="30px">
                 <img class="rounded-circle" src="https://dn-qiniu-avatar.qbox.me/avatar/<?php echo $avatar_path; ?>?s=30" height="30px" width="30px">
             </span>
             </span>
             <?php echo $AdminInfo['admin_fname'] . " " . $AdminInfo['admin_lname']; ?>
             <?php echo $AdminInfo['admin_fname'] . " " . $AdminInfo['admin_lname']; ?>
-
-        </a>
-        <h5 class="sidebar-title"><?php echo $lang->I18N('Main Menu'); ?></h5>
-        <div class="sidebar-divider"></div>
-        <a href="./" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-home" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Dashboard'); ?>
-        </a>
-        <a href="clients.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-users" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Clients List'); ?>
-        </a>
-        <a href="tickets.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-ticket-alt" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Tickets List'); ?>
-        </a>
-        <a href="ssl.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-shield-alt" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('SSL Certificates'); ?>
-        </a>
-        <a href="accounts.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-shopping-cart" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Hosting Accounts'); ?>
-        </a>
-        <a href="knowledgebase.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-book" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Knowledgebase'); ?>
-        </a>
-        <a href="news.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-newspaper" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('News List'); ?>
-        </a>
-        <a href="hosting-provider.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-server" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Hosting Provider'); ?>
-        </a>
-        <a href="hosting-provider.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-globe" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Domain Provider'); ?>
-        </a>
-        <a href="settings.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-cog" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('Settings'); ?>
-        </a>
-        <a href="logout.php" class="sidebar-link sidebar-link-with-icon">
-            <span class="sidebar-icon bg-transparent"><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('logout'); ?>
         </a>
         </a>
+    </div> -->
+    <div class="sidebar">
+        <div class="panel panel-default">
+            <div class="panel-heading"><span class="panel-title">菜单</span></div>
+            <div class="list-group">
+                <a class="list-group-item <?php echo checkIfActive('index,') ?>" href="index.php"><i class="fa fa-tachometer-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Dashboard'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('clients') ?>" href="clients.php"><i class="fa fa-users fa-fw"></i> <?php echo $lang->I18N('Clients List'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('accounts') ?>" href="accounts.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Accounts'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('tickets') ?>" href="tickets.php"><i class="fa fa-ticket-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Tickets List'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('ssl') ?>" href="ssl.php"><i class="fa fa-shield-alt" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Certificates'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('knowledgebase') ?>" href="knowledgebase.php"><i class="fa fa-book fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Knowledgebase'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('news') ?>" href="news.php"><i class="fa fa-newspaper fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('News List'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('hosting-provider') ?>" href="hosting-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Provider'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('ssl-provider') ?>" href="ssl-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Provider'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('domain-provider') ?>" href="domain-provider.php"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Domain Provider'); ?></a>
+                <a class="list-group-item <?php echo checkIfActive('settings') ?>" href="settings.php"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('System Settings'); ?></a>
+                <a class="list-group-item" href="#" onclick="return logout();"><i class="fa fa-sign-out-alt fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('logout'); ?></a>
+            </div>
+        </div>
     </div>
     </div>
+
     <div class="sidebar-footer">
     <div class="sidebar-footer">
         <p class="copyright text-center">
         <p class="copyright text-center">
             &copy; <?php echo date("Y") ?> <a target="_blank" href="https://uiisc.org">UIISC</a> All rights reserved.
             &copy; <?php echo date("Y") ?> <a target="_blank" href="https://uiisc.org">UIISC</a> All rights reserved.
         </p>
         </p>
     </div>
     </div>
 </div>
 </div>
-<!-- Sidebar End -->
+<div class="col-sm-9 col-md-9 col-lg-10">

+ 34 - 36
src/admin/views/sitepro/view.php

@@ -4,47 +4,45 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="settings.php"><?php echo $lang->I18N('System Settings'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('SitePro'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-body">
-                <?php require __DIR__ . '/menu.php'; ?>
-            </div>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="settings.php"><?php echo $lang->I18N('System Settings'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('SitePro'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <?php require __DIR__ . '/menu.php'; ?>
         </div>
         </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="settings.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('Return'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="settings.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('Return'); ?>
+                </a>
             </div>
             </div>
-            <form class="card-body" action="controllers/sitepro/edit.php" method="post">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">SitePro API Username</label>
-                                <input type="text" name="username" value="<?php echo $SitePro['builder_username']; ?>" class="form-control" required>
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <form class="card-body" action="controllers/sitepro/edit.php" method="post">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">SitePro API Username</label>
+                            <input type="text" name="username" value="<?php echo $SitePro['builder_username']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required">SitePro API Password</label>
-                                <input type="text" name="password" value="<?php echo $SitePro['builder_password']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required">SitePro API Password</label>
+                            <input type="text" name="password" value="<?php echo $SitePro['builder_password']; ?>" class="form-control" required>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="panel-footer">
+                <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 43 - 45
src/admin/views/ssl-provider/add.php

@@ -4,58 +4,56 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('add'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="ssl-provider.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('add'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="ssl-provider.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/ssl-provider/add.php" method="post">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('Provider Type'); ?></label>
-                                <select name="api_type" class="form-control" required>
-                                    <option value="gogetssl" selected>GoGetSSL</option>
-                                </select>
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <form action="controllers/ssl-provider/add.php" method="post">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('Provider Type'); ?></label>
+                            <select name="api_type" class="form-control" required>
+                                <option value="gogetssl" selected>GoGetSSL</option>
+                            </select>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label"><?php echo $lang->I18N('API Name'); ?></label>
-                                <input type="text" name="api_name" class="form-control">
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label"><?php echo $lang->I18N('API Name'); ?></label>
+                            <input type="text" name="api_name" class="form-control">
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('API Username'); ?></label>
-                                <input type="text" name="username" class="form-control" required>
-                            </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('API Username'); ?></label>
+                            <input type="text" name="username" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('API Password'); ?></label>
-                                <input type="text" name="password" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('API Password'); ?></label>
+                            <input type="text" name="password" class="form-control" required>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <button name="submit" class="btn btn-primary btn-xs"><?php echo $lang->I18N('Save'); ?></button>
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="panel-footer">
+                <button name="submit" class="btn btn-primary btn-xs"><?php echo $lang->I18N('Save'); ?></button>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 48 - 50
src/admin/views/ssl-provider/details.php

@@ -4,64 +4,62 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('details'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/ssl-provider', '', array('action' => 'edit', 'id' => $data['id'])); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                    </a>
-                    <a href="ssl-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="ssl-provider.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('details'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/ssl-provider', '', array('action' => 'edit', 'id' => $data['id'])); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                </a>
+                <a href="ssl-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="ssl-provider.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label"><?php echo $lang->I18N('Provider Type'); ?></label>
-                            <select name="api_type" class="form-control" value="<?php echo $data['api_type']; ?>" readonly>
-                                <option value="gogetssl" selected>GoGetSSL</option>
-                            </select>
-                        </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['id']; ?></span>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label"><?php echo $lang->I18N('Provider Type'); ?></label>
+                        <select name="api_type" class="form-control" value="<?php echo $data['api_type']; ?>" readonly>
+                            <option value="gogetssl" selected>GoGetSSL</option>
+                        </select>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label"><?php echo $lang->I18N('API Name'); ?></label>
-                            <input type="text" name="api_name" value="<?php echo $data['api_name']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label"><?php echo $lang->I18N('API Name'); ?></label>
+                        <input type="text" name="api_name" value="<?php echo $data['api_name']; ?>" class="form-control" readonly>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required"><?php echo $lang->I18N('API Username'); ?></label>
-                            <input type="text" value="<?php echo $data['api_username']; ?>" class="form-control" readonly>
-                        </div>
+            </div>
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required"><?php echo $lang->I18N('API Username'); ?></label>
+                        <input type="text" value="<?php echo $data['api_username']; ?>" class="form-control" readonly>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required"><?php echo $lang->I18N('API Password'); ?></label>
-                            <input type="text" value="<?php echo $data['api_password']; ?>" class="form-control" readonly>
-                        </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-10 px-10">
+                        <label class="form-label required"><?php echo $lang->I18N('API Password'); ?></label>
+                        <input type="text" value="<?php echo $data['api_password']; ?>" class="form-control" readonly>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="panel-footer">
-                <a href="<?php echo setURL('admin/ssl-provider', '', array('action' => 'edit', 'id' => $data['id'])); ?>" class="btn btn-success btn-xs">
-                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                </a>
-            </div>
+        </div>
+        <div class="panel-footer">
+            <a href="<?php echo setURL('admin/ssl-provider', '', array('action' => 'edit', 'id' => $data['id'])); ?>" class="btn btn-success btn-xs">
+                <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+            </a>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 49 - 51
src/admin/views/ssl-provider/edit.php

@@ -4,64 +4,62 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('details'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/ssl-provider', '', array('action' => 'details', 'id' => $data['id'])); ?>" class="btn btn-success btn-xs">
-                        <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                    </a>
-                    <a href="ssl-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="ssl-provider.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('details'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/ssl-provider', '', array('action' => 'details', 'id' => $data['id'])); ?>" class="btn btn-success btn-xs">
+                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                </a>
+                <a href="ssl-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="ssl-provider.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <form action="controllers/ssl-provider/edit.php" method="post">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label"><?php echo $lang->I18N('Provider Type'); ?></label>
-                                <select name="api_type" class="form-control" value="<?php echo $data['api_type']; ?>" required>
-                                    <option value="gogetssl" selected>GoGetSSL</option>
-                                </select>
-                            </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $data['id']; ?></span>
+        </div>
+        <form action="controllers/ssl-provider/edit.php" method="post">
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label"><?php echo $lang->I18N('Provider Type'); ?></label>
+                            <select name="api_type" class="form-control" value="<?php echo $data['api_type']; ?>" required>
+                                <option value="gogetssl" selected>GoGetSSL</option>
+                            </select>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label"><?php echo $lang->I18N('API Name'); ?></label>
-                                <input type="text" name="api_name" value="<?php echo $data['api_name']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label"><?php echo $lang->I18N('API Name'); ?></label>
+                            <input type="text" name="api_name" value="<?php echo $data['api_name']; ?>" class="form-control" required>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('API Username'); ?></label>
-                                <input type="text" name="username" value="<?php echo $data['api_username']; ?>" class="form-control" required>
-                            </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('API Username'); ?></label>
+                            <input type="text" name="username" value="<?php echo $data['api_username']; ?>" class="form-control" required>
                         </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="mb-10 px-10">
-                                <label class="form-label required"><?php echo $lang->I18N('API Password'); ?></label>
-                                <input type="text" name="password" value="<?php echo $data['api_password']; ?>" class="form-control" required>
-                            </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label required"><?php echo $lang->I18N('API Password'); ?></label>
+                            <input type="text" name="password" value="<?php echo $data['api_password']; ?>" class="form-control" required>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="panel-footer">
-                    <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="panel-footer">
+                <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
+            </div>
+        </form>
     </div>
     </div>
 </div>
 </div>

+ 46 - 48
src/admin/views/ssl-provider/list.php

@@ -4,60 +4,58 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('SSL Provider'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="ssl-provider.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('SSL Provider'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="ssl-provider.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th width="100">ID</th>
-                        <th width="100"><?php echo $lang->I18N('Type'); ?></th>
-                        <th width="100">Name</th>
-                        <th><?php echo $lang->I18N('API Username'); ?></th>
-                        <th><?php echo $lang->I18N('API Password'); ?></th>
-                        <th width="100"><?php echo $lang->I18N('Status'); ?></th>
-                        <th width="150"><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th width="100">ID</th>
+                    <th width="100"><?php echo $lang->I18N('Type'); ?></th>
+                    <th width="100">Name</th>
+                    <th><?php echo $lang->I18N('API Username'); ?></th>
+                    <th><?php echo $lang->I18N('API Password'); ?></th>
+                    <th width="100"><?php echo $lang->I18N('Status'); ?></th>
+                    <th width="150"><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
 <?php if ($count > 0): ?>
 <?php if ($count > 0): ?>
 <?php foreach ($rows as $row): ?>
 <?php foreach ($rows as $row): ?>
-                        <tr>
-                            <td><?php echo $row['id']; ?></td>
-                            <td><?php echo $row['api_type']; ?></td>
-                            <td><?php echo $row['api_name']; ?></td>
-                            <td><?php echo $row['api_username']; ?></td>
-                            <td><?php echo $row['api_password']; ?></td>
-                            <td>Status</td>
-                            <td>
-                                <a href="<?php echo setRouter('ssl-provider', '', array('action' => 'edit', 'id' => $row['id'])); ?>" class="btn btn-success btn-xs">
-                                    <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
-                                </a>
-                                <a href="<?php echo setRouter('ssl-provider', '', array('action' => 'details', 'id' => $row['id'])); ?>" class="btn btn-primary btn-xs">
-                                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                                </a>
-                            </td>
-                        </tr>
+                    <tr>
+                        <td><?php echo $row['id']; ?></td>
+                        <td><?php echo $row['api_type']; ?></td>
+                        <td><?php echo $row['api_name']; ?></td>
+                        <td><?php echo $row['api_username']; ?></td>
+                        <td><?php echo $row['api_password']; ?></td>
+                        <td>Status</td>
+                        <td>
+                            <a href="<?php echo setRouter('ssl-provider', '', array('action' => 'edit', 'id' => $row['id'])); ?>" class="btn btn-success btn-xs">
+                                <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                            </a>
+                            <a href="<?php echo setRouter('ssl-provider', '', array('action' => 'details', 'id' => $row['id'])); ?>" class="btn btn-primary btn-xs">
+                                <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                            </a>
+                        </td>
+                    </tr>
 <?php endforeach;?>
 <?php endforeach;?>
 <?php else: ?>
 <?php else: ?>
-                        <tr>
-                            <td colspan="7" class="text-center">Nothing found</td>
-                        </tr>
+                    <tr>
+                        <td colspan="7" class="text-center">Nothing found</td>
+                    </tr>
 <?php endif;?>
 <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer"><?php echo $count; ?> Records Founds.</div>
+                </tbody>
+            </table>
         </div>
         </div>
+        <div class="panel-footer"><?php echo $count; ?> Records Founds.</div>
     </div>
     </div>
 </div>
 </div>

+ 71 - 73
src/admin/views/ssl/details.php

@@ -4,95 +4,93 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('SSL Provider'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="ssl.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                    <a href="ssl.php" class="btn btn-primary btn-xs">
-                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $SSLInfo['ssl_id']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('SSL Provider'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="ssl.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
+                <a href="ssl.php" class="btn btn-primary btn-xs">
+                    <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                </a>
             </div>
             </div>
-            <div class="panel-body">
-                <div class="row mb-10">
-                    <div class="col-md-6"><b><?php echo $lang->I18N('Status'); ?> : </b><?php echo $Status;?></div>
-                    <div class="col-md-6"><b><?php echo $lang->I18N('Domain Name'); ?> : </b><?php echo $SSLInfo['ssl_domain'];?></div>
-                </div>
-                <div class="row mb-10">
-                    <div class="col-md-6"><b><?php echo $lang->I18N('Start Date'); ?></b> : <?php echo $SSLInfo['ssl_begin_date'];?></span></div>
-                    <div class="col-md-6"><b><?php echo $lang->I18N('End Date'); ?></b> : <span><?php echo $SSLInfo['ssl_end_date'];?></span></div>
-                </div>
-                <div class="row mb-10">
-                    <div class="col-md-6">
-                        <div class="d-flex justify-content-between align-items-center mx-10 my-5">
-                            <b>Method:</b>
-                            <span>DNS</span>
-                        </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $SSLInfo['ssl_id']; ?></span>
+        </div>
+        <div class="panel-body">
+            <div class="row mb-10">
+                <div class="col-md-6"><b><?php echo $lang->I18N('Status'); ?> : </b><?php echo $Status;?></div>
+                <div class="col-md-6"><b><?php echo $lang->I18N('Domain Name'); ?> : </b><?php echo $SSLInfo['ssl_domain'];?></div>
+            </div>
+            <div class="row mb-10">
+                <div class="col-md-6"><b><?php echo $lang->I18N('Start Date'); ?></b> : <?php echo $SSLInfo['ssl_begin_date'];?></span></div>
+                <div class="col-md-6"><b><?php echo $lang->I18N('End Date'); ?></b> : <span><?php echo $SSLInfo['ssl_end_date'];?></span></div>
+            </div>
+            <div class="row mb-10">
+                <div class="col-md-6">
+                    <div class="d-flex justify-content-between align-items-center mx-10 my-5">
+                        <b>Method:</b>
+                        <span>DNS</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="row mb-10">
-                    <?php if($SSLInfo['ssl_status']=='processing') {
-                        // 处理中
-                        $Record = explode(' ',$SSLInfo['approver_method']['dns']['record']);
-                    ?>
-                        <div class="col-md-12 mb-10">
-                            <div class="my-5 mx-10">
-                                <b>CSR Code:</b>
-                                <pre class="my-0"><?php echo htmlspecialchars_decode($SSLInfo['ssl_csr_code']); ?></pre>
-                            </div>
-                            <div class="my-10 mx-10">
-                                <b>CNAME Record:</b>
-                                <pre class="my-0"><input type="text" class="form-control" value="<?php echo $Record['0'];?>" readonly></pre>
-                            </div>
-                            <div class="my-10 mx-10">
-                                <b>Record Content:</b>
-                                <pre class="my-0"><?php echo $Record['2'];?></pre>
-                            </div>
-                        </div>
-                    <?php } elseif($SSLInfo['ssl_status']=='active') { ?>
-                        <div class="col-lg-12 mb-10">
-                            <div class="my-5 mx-10">
-                                <p><b>Certificate Code:</b></p>
-                                <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['ssl_crt_code'];?></textarea></pre>
-                            </div>
-                        </div>
-                        <div class="col-lg-12">
-                            <div class="my-5 mx-10">
-                                <b>CA Bundle:</b>
-                                <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['ssl_ca_code'];?></textarea></pre>
-                            </div>
-                        </div>
-                    <?php } elseif($SSLInfo['ssl_status']=='cancelled'){ ?>
-                    <div class="col-lg-12">
+            </div>
+            <div class="row mb-10">
+                <?php if($SSLInfo['ssl_status']=='processing') {
+                    // 处理中
+                    $Record = explode(' ',$SSLInfo['approver_method']['dns']['record']);
+                ?>
+                    <div class="col-md-12 mb-10">
                         <div class="my-5 mx-10">
                         <div class="my-5 mx-10">
                             <b>CSR Code:</b>
                             <b>CSR Code:</b>
-                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['csr_code'];?></textarea></pre>
+                            <pre class="my-0"><?php echo htmlspecialchars_decode($SSLInfo['ssl_csr_code']); ?></pre>
+                        </div>
+                        <div class="my-10 mx-10">
+                            <b>CNAME Record:</b>
+                            <pre class="my-0"><input type="text" class="form-control" value="<?php echo $Record['0'];?>" readonly></pre>
+                        </div>
+                        <div class="my-10 mx-10">
+                            <b>Record Content:</b>
+                            <pre class="my-0"><?php echo $Record['2'];?></pre>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <?php } elseif($SSLInfo['ssl_status']=='expired'){ ?>
-                    <div class="col-lg-12">
+                <?php } elseif($SSLInfo['ssl_status']=='active') { ?>
+                    <div class="col-lg-12 mb-10">
                         <div class="my-5 mx-10">
                         <div class="my-5 mx-10">
-                            <b>Certificate Code:</b>
-                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly>-----</textarea></pre>
+                            <p><b>Certificate Code:</b></p>
+                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['ssl_crt_code'];?></textarea></pre>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-lg-12">
                     <div class="col-lg-12">
                         <div class="my-5 mx-10">
                         <div class="my-5 mx-10">
                             <b>CA Bundle:</b>
                             <b>CA Bundle:</b>
-                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly>-----</textarea></pre>
+                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['ssl_ca_code'];?></textarea></pre>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <?php } ?>
+                <?php } elseif($SSLInfo['ssl_status']=='cancelled'){ ?>
+                <div class="col-lg-12">
+                    <div class="my-5 mx-10">
+                        <b>CSR Code:</b>
+                        <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['csr_code'];?></textarea></pre>
+                    </div>
                 </div>
                 </div>
+                <?php } elseif($SSLInfo['ssl_status']=='expired'){ ?>
+                <div class="col-lg-12">
+                    <div class="my-5 mx-10">
+                        <b>Certificate Code:</b>
+                        <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly>-----</textarea></pre>
+                    </div>
+                </div>
+                <div class="col-lg-12">
+                    <div class="my-5 mx-10">
+                        <b>CA Bundle:</b>
+                        <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly>-----</textarea></pre>
+                    </div>
+                </div>
+                <?php } ?>
+            </div>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
-</div>

+ 49 - 51
src/admin/views/ssl/list.php

@@ -4,69 +4,67 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('SSL Certificates'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="ssl.php?action=add" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('SSL Certificates'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="ssl.php?action=add" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                </a>
             </div>
             </div>
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th width="100">ID</th>
-                        <th width="100"><?php echo $lang->I18N('Third ID'); ?></th>
-                        <th><?php echo $lang->I18N('Domain Name'); ?></th>
-                        <th width="100"><?php echo $lang->I18N('Method'); ?></th>
-                        <th width="100"><?php echo $lang->I18N('Status'); ?></th>
-                        <th width="150"><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th width="100">ID</th>
+                    <th width="100"><?php echo $lang->I18N('Third ID'); ?></th>
+                    <th><?php echo $lang->I18N('Domain Name'); ?></th>
+                    <th width="100"><?php echo $lang->I18N('Method'); ?></th>
+                    <th width="100"><?php echo $lang->I18N('Status'); ?></th>
+                    <th width="150"><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
 <?php if ($count > 0): ?>
 <?php if ($count > 0): ?>
 <?php foreach ($rows as $row): ?>
 <?php foreach ($rows as $row): ?>
-                        <tr>
-                            <td><?php echo $row['ssl_id']; ?></td>
-                            <td><?php echo $row['ssl_third_id']; ?></td>
-                            <td><?php echo $row['ssl_domain']; ?></td>
-                            <td><?php echo $row['ssl_dcv_method']; ?></td>
-                            <td><?php
+                    <tr>
+                        <td><?php echo $row['ssl_id']; ?></td>
+                        <td><?php echo $row['ssl_third_id']; ?></td>
+                        <td><?php echo $row['ssl_domain']; ?></td>
+                        <td><?php echo $row['ssl_dcv_method']; ?></td>
+                        <td><?php
 if ($row['ssl_status'] == 'processing') {
 if ($row['ssl_status'] == 'processing') {
-    $btn = ['primary', 'cog'];
-    echo '<span class="badge bg-primary badge-pill">Processing</span>';
+$btn = ['primary', 'cog'];
+echo '<span class="badge bg-primary badge-pill">Processing</span>';
 } elseif ($row['ssl_status'] == 'active') {
 } elseif ($row['ssl_status'] == 'active') {
-    $btn = ['success', 'globe'];
-    echo '<span class="badge bg-success badge-pill">Active</span>';
+$btn = ['success', 'globe'];
+echo '<span class="badge bg-success badge-pill">Active</span>';
 } elseif ($row['ssl_status'] == 'cancelled') {
 } elseif ($row['ssl_status'] == 'cancelled') {
-    $btn = ['danger', 'lock'];
-    echo '<span class="badge bg-danger badge-pill">Cancelled</span>';
+$btn = ['danger', 'lock'];
+echo '<span class="badge bg-danger badge-pill">Cancelled</span>';
 } elseif ($row['ssl_status'] == 'expired') {
 } elseif ($row['ssl_status'] == 'expired') {
-    $btn = ['danger', 'lock'];
-    echo '<span class="badge bg-danger badge-pill">Expired</span>';
+$btn = ['danger', 'lock'];
+echo '<span class="badge bg-danger badge-pill">Expired</span>';
 }
 }
 ?></td>
 ?></td>
-                            <td>
-                                <a href="<?php echo setRouter('ssl', '', array('action' => 'details', 'id' => $row['ssl_id'])); ?>" class="btn btn-primary btn-xs">
-                                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
-                                </a>
-                            </td>
-                        </tr>
+                        <td>
+                            <a href="<?php echo setRouter('ssl', '', array('action' => 'details', 'id' => $row['ssl_id'])); ?>" class="btn btn-primary btn-xs">
+                                <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                            </a>
+                        </td>
+                    </tr>
 <?php endforeach;?>
 <?php endforeach;?>
 <?php else: ?>
 <?php else: ?>
-                        <tr>
-                            <td colspan="6" class="text-center">Nothing found</td>
-                        </tr>
+                    <tr>
+                        <td colspan="6" class="text-center">Nothing found</td>
+                    </tr>
 <?php endif;?>
 <?php endif;?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer"><?php echo $count; ?> Records Founds.</div>
+                </tbody>
+            </table>
         </div>
         </div>
+        <div class="panel-footer"><?php echo $count; ?> Records Founds.</div>
     </div>
     </div>
 </div>
 </div>

+ 69 - 71
src/admin/views/tickets/details.php

@@ -4,89 +4,87 @@ if (!defined('IN_CRONLITE')) {
 }
 }
 ?>
 ?>
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li><a href="tickets.php"><?php echo $lang->I18N('Tickets List'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Ticket Details'); ?></li>
-        </ol>
-        <div class="panel panel-info">
-            <div class="panel-heading">
-                <div class="pull-right">
-                <?php if ($TicketInfo['ticket_status'] != '3'): ?>
-                    <a href="controllers/tickets/close.php?ticket_id=<?php echo $ticket_id; ?>" class="btn btn-danger btn-xs"><?php echo $lang->I18N('close'); ?></a>
-                <?php endif; ?>
-                    <!-- <a href="tickets.php?action=add" class="btn btn-info btn-xs"><i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?></a> -->
-                    <a href="tickets.php" class="btn btn-primary btn-xs"><i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?></a>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li><a href="tickets.php"><?php echo $lang->I18N('Tickets List'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Ticket Details'); ?></li>
+    </ol>
+    <div class="panel panel-info">
+        <div class="panel-heading">
+            <div class="pull-right">
+            <?php if ($TicketInfo['ticket_status'] != '3'): ?>
+                <a href="controllers/tickets/close.php?ticket_id=<?php echo $ticket_id; ?>" class="btn btn-danger btn-xs"><?php echo $lang->I18N('close'); ?></a>
+            <?php endif; ?>
+                <!-- <a href="tickets.php?action=add" class="btn btn-info btn-xs"><i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?></a> -->
+                <a href="tickets.php" class="btn btn-primary btn-xs"><i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?></a>
+            </div>
+            <div class="panel-title">
+                <?php echo $PageInfo['title']; ?>
+                <span class="label label-default"> ID <?php echo $ticket_id; ?></span>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-6 mb-10">
+                    <b>Subject:</b>
+                    <span><?php echo $TicketInfo['ticket_subject']; ?></span>
                 </div>
                 </div>
-                <div class="panel-title">
-                    <?php echo $PageInfo['title']; ?>
-                    <span class="label label-default"> ID <?php echo $ticket_id; ?></span>
+                <div class="col-md-6 mb-10">
+                    <b>Status:</b>
+                    <span><?php echo get_ticket_status_span($TicketInfo['ticket_status']); ?></span>
                 </div>
                 </div>
-            </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-md-6 mb-10">
-                        <b>Subject:</b>
-                        <span><?php echo $TicketInfo['ticket_subject']; ?></span>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <b>Status:</b>
-                        <span><?php echo get_ticket_status_span($TicketInfo['ticket_status']); ?></span>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <b>Department:</b>
-                        <span><?php echo get_ticket_department($TicketInfo['ticket_department']); ?></span>
-                    </div>
-                    <div class="col-md-6 mb-10">
-                        <b>Date:</b>
-                        <span><?php echo $TicketInfo['ticket_date']; ?></span>
-                    </div>
+                <div class="col-md-6 mb-10">
+                    <b>Department:</b>
+                    <span><?php echo get_ticket_department($TicketInfo['ticket_department']); ?></span>
+                </div>
+                <div class="col-md-6 mb-10">
+                    <b>Date:</b>
+                    <span><?php echo $TicketInfo['ticket_date']; ?></span>
                 </div>
                 </div>
-                <!-- <hr /> -->
-                <p><b>Ticket content :</b></p>
-                <?php echo $TicketInfo['ticket_content']; ?>
             </div>
             </div>
+            <!-- <hr /> -->
+            <p><b>Ticket content :</b></p>
+            <?php echo $TicketInfo['ticket_content']; ?>
         </div>
         </div>
+    </div>
 <?php if ($ReplyCount > 0): ?>
 <?php if ($ReplyCount > 0): ?>
-    <?php foreach ($ReplyInfo as $value): ?>
-        <div class="panel <?php echo $value['reply_from'] == 999999 ? 'panel-default' : 'panel-success'; ?>">
-            <div class="panel-heading">
-                <strong><?php echo $value['reply_from'] == 999999 ? 'Support Staff' : 'Client Reply'; ?></strong>
-                <span><?php echo $value['reply_date']; ?></span>
-            </div>
-            <div class="panel-body">
-                <?php echo $value['reply_content']; ?>
-            </div>
+<?php foreach ($ReplyInfo as $value): ?>
+    <div class="panel <?php echo $value['reply_from'] == 999999 ? 'panel-default' : 'panel-success'; ?>">
+        <div class="panel-heading">
+            <strong><?php echo $value['reply_from'] == 999999 ? 'Support Staff' : 'Client Reply'; ?></strong>
+            <span><?php echo $value['reply_date']; ?></span>
         </div>
         </div>
-    <?php endforeach;?>
-<?php else: ?>
-        <div class="panel panel-default">
-            <div class="panel-body text-center">No replies to this ticket yet.</div>
+        <div class="panel-body">
+            <?php echo $value['reply_content']; ?>
         </div>
         </div>
+    </div>
+<?php endforeach;?>
+<?php else: ?>
+    <div class="panel panel-default">
+        <div class="panel-body text-center">No replies to this ticket yet.</div>
+    </div>
 <?php endif;?>
 <?php endif;?>
 
 
 <?php if ($TicketInfo['ticket_status'] == '3'): ?>
 <?php if ($TicketInfo['ticket_status'] == '3'): ?>
-        <div class="panel panel-default">
-            <div class="panel-body text-center">You can't reply to this ticket anymore open new ticket for any further questions.</div>
-        </div>
+    <div class="panel panel-default">
+        <div class="panel-body text-center">You can't reply to this ticket anymore open new ticket for any further questions.</div>
+    </div>
 <?php else: ?>
 <?php else: ?>
-        <form action="controllers/tickets/reply.php" method="post">
-            <input type="hidden" name="ticket_id" value="<?php echo $TicketInfo['ticket_id']; ?>">
-            <input type="hidden" name="ticket_email" value="<?php echo $TicketInfo['ticket_email']; ?>">
-            <div class="panel panel-default" id="reply">
-                <div class="panel-heading">
-                    Reply content
-                </div>
-                <div class="panel-body">
-                    <textarea class="form-control" name="content" id="content"></textarea>
-                </div>
-                <div class="panel-footer">
-                    <button class="btn btn-sm btn-primary" name="submit">Add Reply</button>
-                    <a href="controllers/tickets/close.php?ticket_id=<?php echo $ticket_id; ?>" class="btn btn-danger btn-sm">Close Ticket</a>
-                </div>
+    <form action="controllers/tickets/reply.php" method="post">
+        <input type="hidden" name="ticket_id" value="<?php echo $TicketInfo['ticket_id']; ?>">
+        <input type="hidden" name="ticket_email" value="<?php echo $TicketInfo['ticket_email']; ?>">
+        <div class="panel panel-default" id="reply">
+            <div class="panel-heading">
+                Reply content
+            </div>
+            <div class="panel-body">
+                <textarea class="form-control" name="content" id="content"></textarea>
             </div>
             </div>
-        </form>
+            <div class="panel-footer">
+                <button class="btn btn-sm btn-primary" name="submit">Add Reply</button>
+                <a href="controllers/tickets/close.php?ticket_id=<?php echo $ticket_id; ?>" class="btn btn-danger btn-sm">Close Ticket</a>
+            </div>
+        </div>
+    </form>
 <?php endif;?>
 <?php endif;?>
-    </div>
 </div>
 </div>

+ 50 - 52
src/admin/views/tickets/list.php

@@ -1,62 +1,60 @@
 <div class="content-wrapper">
 <div class="content-wrapper">
-    <div class="container">
-        <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
-            <li class="active"><?php echo $lang->I18N('Tickets List'); ?></li>
-        </ol>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div class="pull-right">
-                    <a href="<?php echo setURL('admin/tickets', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
-                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+    <ol class="breadcrumb page-breadcrumb">
+        <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+        <li class="active"><?php echo $lang->I18N('Tickets List'); ?></li>
+    </ol>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div class="pull-right">
+                <a href="<?php echo setURL('admin/tickets', '', array('action' => 'add')); ?>" class="btn btn-primary btn-xs">
+                    <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
 
 
-                    </a>
-                </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+                </a>
             </div>
             </div>
+            <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+        </div>
 
 
-            <div class="table-responsive">
-                <table class="table table-stripped table-bordered table-hover">
-                    <thead>
-                        <th>ID</th>
-                        <th><?php echo $lang->I18N('Subject'); ?></th>
-                        <th><?php echo $lang->I18N('Department'); ?></th>
-                        <th><?php echo $lang->I18N('Client Email'); ?></th>
-                        <th><?php echo $lang->I18N('Date'); ?></th>
-                        <th><?php echo $lang->I18N('Status'); ?></th>
-                        <th><?php echo $lang->I18N('Action'); ?></th>
-                    </thead>
-                    <tbody>
-                    <?php if ($count > 0): ?>
-                    <?php foreach ($rows as $value): ?>
+        <div class="table-responsive">
+            <table class="table table-stripped table-bordered table-hover">
+                <thead>
+                    <th>ID</th>
+                    <th><?php echo $lang->I18N('Subject'); ?></th>
+                    <th><?php echo $lang->I18N('Department'); ?></th>
+                    <th><?php echo $lang->I18N('Client Email'); ?></th>
+                    <th><?php echo $lang->I18N('Date'); ?></th>
+                    <th><?php echo $lang->I18N('Status'); ?></th>
+                    <th><?php echo $lang->I18N('Action'); ?></th>
+                </thead>
+                <tbody>
+                <?php if ($count > 0): ?>
+                <?php foreach ($rows as $value): ?>
 
 
-                        <tr>
-                            <td><?php echo $value['ticket_id']; ?></td>
-                            <td><?php echo $value['ticket_subject']; ?></td>
-                            <td><?php echo get_ticket_department($value['ticket_department']); ?></td>
-                            <td><?php echo $value['ticket_email']; ?></td>
-                            <td><?php echo $value['ticket_date']; ?></td>
-                            <td><?php echo get_ticket_status_span($value['ticket_status']); ?></td>
-                            <td>
-                                <a href="tickets.php?action=details&ticket_id=<?php echo $value['ticket_id']; ?>#reply" class="btn btn-primary btn-xs">
-                                    <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
+                    <tr>
+                        <td><?php echo $value['ticket_id']; ?></td>
+                        <td><?php echo $value['ticket_subject']; ?></td>
+                        <td><?php echo get_ticket_department($value['ticket_department']); ?></td>
+                        <td><?php echo $value['ticket_email']; ?></td>
+                        <td><?php echo $value['ticket_date']; ?></td>
+                        <td><?php echo get_ticket_status_span($value['ticket_status']); ?></td>
+                        <td>
+                            <a href="tickets.php?action=details&ticket_id=<?php echo $value['ticket_id']; ?>#reply" class="btn btn-primary btn-xs">
+                                <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
 
 
-                                </a>
-                            </td>
-                        </tr>
-                    <?php endforeach;?>
-                    <?php else: ?>
-                        <tr>
-                            <td colspan="7" class="text-center">Nothing found</td>
-                        </tr>
-                    <?php endif;?>
+                            </a>
+                        </td>
+                    </tr>
+                <?php endforeach;?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="7" class="text-center">Nothing found</td>
+                    </tr>
+                <?php endif;?>
 
 
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer">
-                <span><?php echo $count; ?> Records Founds</span>
-            </div>
+                </tbody>
+            </table>
+        </div>
+        <div class="panel-footer">
+            <span><?php echo $count; ?> Records Founds</span>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 10 - 3
src/assets/css/common.css

@@ -33,10 +33,17 @@ button {
     border: 1px solid #ddd;
     border: 1px solid #ddd;
 }
 }
 
 
-.page-breadcrumb {
+.page-wrapper {
     margin-top: 20px;
     margin-top: 20px;
 }
 }
 
 
+.sidebar {
+    max-width: 100%;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+
 .mb-10 {
 .mb-10 {
     margin-bottom: 10px;
     margin-bottom: 10px;
 }
 }
@@ -141,7 +148,7 @@ button {
 .footer .co {
 .footer .co {
     display: inline-block;
     display: inline-block;
 }
 }
-
+/* 
 pre,
 pre,
 .badge,
 .badge,
 .breadcrumb,
 .breadcrumb,
@@ -156,4 +163,4 @@ pre,
     border-top-right-radius: 0;
     border-top-right-radius: 0;
     border-bottom-left-radius: 0;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
     border-bottom-right-radius: 0;
-}
+} */

+ 7 - 2
src/assets/theme.switcher/css/dark.css

@@ -23,13 +23,16 @@ fieldset[disabled] .form-control {
 .panel-footer,
 .panel-footer,
 .table,
 .table,
 .list-group-item {
 .list-group-item {
-    background-color: #2b2b2b !important;
+    background-color: #2b2b2b;
 }
 }
 
 
 .table-hover > tbody > tr:hover {
 .table-hover > tbody > tr:hover {
     background-color: #585858 !important;
     background-color: #585858 !important;
 }
 }
 
 
+.list-group-item.active,
+.list-group-item.active:focus,
+.list-group-item.active:hover,
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:focus,
 .navbar-default .navbar-nav > .active > a:focus,
@@ -55,7 +58,9 @@ span,
 .breadcrumb > .active,
 .breadcrumb > .active,
 .dropdown-menu > li > a,
 .dropdown-menu > li > a,
 .panel-title,
 .panel-title,
-.navbar-default .navbar-nav>li>a,
+.navbar-default .navbar-nav > li > a,
+a.list-group-item,
+button.list-group-item,
 .panel-footer {
 .panel-footer {
     color: #fff;
     color: #fff;
 }
 }

+ 6 - 0
src/public/views/common/header.php

@@ -10,6 +10,7 @@ if (!defined('IN_CRONLITE')) {
     <meta charset="utf-8" />
     <meta charset="utf-8" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta http-equiv="x-dns-prefetch-control" content="on">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta name="robots" content="index, follow" />
     <meta name="robots" content="index, follow" />
     <meta name="format-detection" content="telephone=no,email=no" />
     <meta name="format-detection" content="telephone=no,email=no" />
@@ -17,6 +18,11 @@ if (!defined('IN_CRONLITE')) {
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta name="keywords" content="<?php echo $page_keywords; ?>" />
     <meta name="keywords" content="<?php echo $page_keywords; ?>" />
     <meta name="description" content="<?php echo $page_description; ?>" />
     <meta name="description" content="<?php echo $page_description; ?>" />
+    <meta name="og:site_name" content="<?php echo $page_title; ?>" />
+    <meta property="og:title" content="<?php echo $page_title; ?>" />
+    <meta property="og:description" content="<?php echo $page_description; ?>">
+    <meta property="og:url" content="<?php echo $site_url; ?>" />
+    <meta name="twitter:title" content="<?php echo $page_title; ?>" />
     <meta name="author" content="<?php echo $page_author; ?>" />
     <meta name="author" content="<?php echo $page_author; ?>" />
     <meta name="copyright" content="<?php echo $page_copyright; ?>" />
     <meta name="copyright" content="<?php echo $page_copyright; ?>" />
     <title><?php echo $page_title; ?></title>
     <title><?php echo $page_title; ?></title>