From d1e60615415ec6b8c7fb311191ec4149a9bdddcd Mon Sep 17 00:00:00 2001 From: Lee <42119604+Leesneaks@users.noreply.github.com> Date: Sat, 24 Nov 2018 14:42:20 +0000 Subject: [PATCH] Admin panel fixes (#62) * Admin Panel * fixes -Code Clean Up -Remove dist folder and merged into tools. --- admin/template/template.php | 24 +- install/template/template.php | 2 +- system/functions.php | 4 +- system/pages/admin/accounts.php | 61 +- system/pages/admin/dashboard.php | 5 +- system/pages/admin/players.php | 4 +- system/pages/creatures.php | 4 +- .../templates/admin.dashboardstats.html.twig | 27 - system/templates/admin.login.html.twig | 2 +- system/templates/admin.menus.js.html.twig | 8 +- system/templates/characters.html.twig | 4 +- {admin/dist => tools}/css/AdminLTE.min.css | 0 .../dist => tools}/css/adminlte.min.css.map | 0 {admin/dist => tools}/css/bootstrap.min.css | 0 .../dist => tools}/css/bootstrap.min.css.map | 0 .../css/dataTables.bootstrap.min.css | 0 .../dist => tools}/css/font-awesome.min.css | 0 {admin/dist => tools}/css/ionicons.min.css | 0 tools/{ => css}/jquery-ui.min.css | 0 tools/{ => css}/jquery.datetimepicker.css | 0 tools/{ => css}/messages.css | 0 {admin/dist => tools}/css/skins/skin-blue.css | 0 .../css/skins/skin-blue.min.css | 0 tools/{ => css}/spectrum.css | 0 tools/{ => css}/tipped.css | 1136 ++++++++--------- {admin/dist => tools}/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin {admin/dist => tools}/fonts/ionicons.eot | Bin {admin/dist => tools}/fonts/ionicons.svg | 0 {admin/dist => tools}/fonts/ionicons.ttf | Bin {admin/dist => tools}/fonts/ionicons.woff | Bin tools/jquery-ui.min.js | 13 - {admin/dist => tools}/js/adminlte.min.js | 0 {admin/dist => tools}/js/bootstrap.min.js | 0 {admin/dist => tools}/js/core.js | 0 .../js/dataTables.bootstrap.min.js | 0 {admin/dist => tools}/js/jquery-ui.min.js | 0 .../js/jquery.dataTables.min.js | 0 tools/{ => js}/jquery.datetimepicker.js | 0 tools/{ => js}/jquery.js | 0 {admin/dist => tools}/js/jquery.min.js | 0 {admin/dist => tools}/js/jquery.min.map | 0 tools/{ => js}/jquery.qtip.js | 0 tools/{ => js}/spectrum.js | 0 tools/{ => js}/tipped.js | 0 54 files changed, 604 insertions(+), 690 deletions(-) rename {admin/dist => tools}/css/AdminLTE.min.css (100%) rename {admin/dist => tools}/css/adminlte.min.css.map (100%) rename {admin/dist => tools}/css/bootstrap.min.css (100%) rename {admin/dist => tools}/css/bootstrap.min.css.map (100%) rename {admin/dist => tools}/css/dataTables.bootstrap.min.css (100%) rename {admin/dist => tools}/css/font-awesome.min.css (100%) rename {admin/dist => tools}/css/ionicons.min.css (100%) rename tools/{ => css}/jquery-ui.min.css (100%) rename tools/{ => css}/jquery.datetimepicker.css (100%) rename tools/{ => css}/messages.css (100%) rename {admin/dist => tools}/css/skins/skin-blue.css (100%) rename {admin/dist => tools}/css/skins/skin-blue.min.css (100%) rename tools/{ => css}/spectrum.css (100%) rename tools/{ => css}/tipped.css (95%) mode change 100755 => 100644 rename {admin/dist => tools}/fonts/FontAwesome.otf (100%) rename {admin/dist => tools}/fonts/fontawesome-webfont.eot (100%) rename {admin/dist => tools}/fonts/fontawesome-webfont.svg (100%) rename {admin/dist => tools}/fonts/fontawesome-webfont.ttf (100%) rename {admin/dist => tools}/fonts/fontawesome-webfont.woff (100%) rename {admin/dist => tools}/fonts/fontawesome-webfont.woff2 (100%) rename {admin/dist => tools}/fonts/glyphicons-halflings-regular.eot (100%) rename {admin/dist => tools}/fonts/glyphicons-halflings-regular.svg (100%) rename {admin/dist => tools}/fonts/glyphicons-halflings-regular.ttf (100%) rename {admin/dist => tools}/fonts/glyphicons-halflings-regular.woff (100%) rename {admin/dist => tools}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {admin/dist => tools}/fonts/ionicons.eot (100%) rename {admin/dist => tools}/fonts/ionicons.svg (100%) rename {admin/dist => tools}/fonts/ionicons.ttf (100%) rename {admin/dist => tools}/fonts/ionicons.woff (100%) delete mode 100644 tools/jquery-ui.min.js rename {admin/dist => tools}/js/adminlte.min.js (100%) rename {admin/dist => tools}/js/bootstrap.min.js (100%) rename {admin/dist => tools}/js/core.js (100%) rename {admin/dist => tools}/js/dataTables.bootstrap.min.js (100%) rename {admin/dist => tools}/js/jquery-ui.min.js (100%) rename {admin/dist => tools}/js/jquery.dataTables.min.js (100%) rename tools/{ => js}/jquery.datetimepicker.js (100%) rename tools/{ => js}/jquery.js (100%) rename {admin/dist => tools}/js/jquery.min.js (100%) rename {admin/dist => tools}/js/jquery.min.map (100%) rename tools/{ => js}/jquery.qtip.js (100%) rename tools/{ => js}/spectrum.js (100%) rename tools/{ => js}/tipped.js (100%) mode change 100755 => 100644 diff --git a/admin/template/template.php b/admin/template/template.php index 36ea0233..d5ce7caa 100644 --- a/admin/template/template.php +++ b/admin/template/template.php @@ -4,13 +4,13 @@ - - - + + + - - - + + + + - -
@@ -364,9 +362,7 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
- - isLoaded()) { $account_players = array(); @@ -377,7 +373,6 @@ else if ($id > 0 && isset($account) && $account->isLoaded())

Character List:

-
@@ -401,7 +396,6 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
- 0 && isset($account) && $account->isLoaded()) }; ?> -
-isLoaded()) { - ?> -
- query('DESCRIBE ' . $tableToDescribe); - $result = $statement->fetchAll(PDO::FETCH_ASSOC); - $val = 0; - foreach ($result as $column) { - // IF val = 2 MAKE TODO - ($val == 2) ? "" : ""; - ?> - - - - '; - - if ($val == 2) { - echo ""; - $val = 1; - } else { - ++$val; - } - - } ?> -
- -
+ \ No newline at end of file diff --git a/system/pages/admin/dashboard.php b/system/pages/admin/dashboard.php index 30d8611d..9d6c201c 100644 --- a/system/pages/admin/dashboard.php +++ b/system/pages/admin/dashboard.php @@ -65,7 +65,7 @@ $query = $query->fetch(); $total_houses = $query['how_much']; $points = $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;'); -$coins = $db->query('SELECT `coins`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;'); + $twig->display('admin.statistics.html.twig', array( 'total_accounts' => $total_accounts, @@ -79,8 +79,7 @@ $twig->display('admin.dashboard.html.twig', array( 'closed_message' => $closed_message, 'status' => $status, 'account_type' => (USE_ACCOUNT_NAME ? 'name' : 'number'), - 'points' => $points, - 'coins' => $coins + 'points' => $points )); function clearCache() { diff --git a/system/pages/admin/players.php b/system/pages/admin/players.php index 327292bf..217f79e6 100644 --- a/system/pages/admin/players.php +++ b/system/pages/admin/players.php @@ -45,8 +45,8 @@ $skills = array( ); ?> - - + + - - + + + + - + + - + +