Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 01:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Admin panel fixes (#62)

Browse Source 
* Admin Panel

* fixes

-Code Clean Up
-Remove dist folder and merged into tools.
This commit is contained in:
Lee 2018-11-24 14:42:20 +00:00 committed by slawkens
parent 6dab50cbd8
commit d1e6061541
54 changed files with 604 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/template/template.php
View File

@ -4,13 +4,13 @@
<head>
<?php echo template_header(true); ?>
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<link rel="stylesheet" href="dist/css/bootstrap.min.css">
<link rel="stylesheet" href="dist/css/AdminLTE.min.css">
<link rel="stylesheet" href="dist/css/skins/skin-blue.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/AdminLTE.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/skins/skin-blue.min.css">
<link rel="stylesheet" href="dist/css/font-awesome.min.css">
<link rel="stylesheet" href="dist/css/ionicons.min.css">
<link rel="stylesheet" href="dist/css/dataTables.bootstrap.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/ionicons.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/dataTables.bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="<?php echo $template_path; ?>style.css" />
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
@ -211,11 +211,11 @@
}
?>
<script src="dist/js/bootstrap.min.js"></script>
<script src="dist/js/jquery.min.js"></script>
<script src="dist/js/jquery-ui.min.js"></script>
<script src="dist/js/jquery.dataTables.min.js"></script>
<script src="dist/js/dataTables.bootstrap.min.js"></script>
<script src="dist/js/adminlte.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/bootstrap.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/jquery.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/jquery-ui.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/jquery.dataTables.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/dataTables.bootstrap.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/adminlte.min.js"></script>
</body>
</html>

2
install/template/template.php
View File

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $locale['encoding']; ?>" />
<title>MyAAC - <?php echo $locale['installation']; ?></title>
<link rel="stylesheet" type="text/css" href="template/style.css" />
<script type="text/javascript" src="<?php echo BASE_URL; ?>tools/jquery.js"></script>
<script type="text/javascript" src="<?php echo BASE_URL; ?>tools/js/jquery.js"></script>
</head>
<body>
<div id="wrapper">

4
system/functions.php
View File

@ -481,8 +481,8 @@ function template_header($is_admin = false)
<meta name="description" content="' . $config['meta_description'] . '" />
<meta name="keywords" content="' . $config['meta_keywords'] . ', myaac, wodzaac" />
<meta name="generator" content="MyAAC" />
<link rel="stylesheet" type="text/css" href="' . BASE_URL . 'tools/messages.css" />
<script type="text/javascript" src="' . BASE_URL . 'tools/jquery.js"></script>
<link rel="stylesheet" type="text/css" href="' . BASE_URL . 'tools/css/messages.css" />
<script type="text/javascript" src="' . BASE_URL . 'tools/js/jquery.js"></script>
<noscript>
<div class="warning" style="text-align: center; font-size: 14px;">Your browser does not support JavaScript or its disabled!<br/>
Please turn it on, or be aware that some features on this website will not work correctly.</div>

61
system/pages/admin/accounts.php
View File

@ -36,8 +36,8 @@ function verify_number($number, $name, $max_length)
?>
<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/jquery.datetimepicker.css"/ >
<script src="<?php echo BASE_URL; ?>tools/jquery.datetimepicker.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/css/jquery.datetimepicker.css"/ >
<script src="<?php echo BASE_URL; ?>tools/js/jquery.datetimepicker.js"></script>
<?php
$id = 0;
@ -327,7 +327,7 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
value="<?php echo $account->getCustomField('web_lastlogin'); ?>"/>
</div>
</div>
<!-- nav-tabs-custom -->
<input type="hidden" name="save" value="yes"/>
<div class="box-footer">
<a href="<?php echo ADMIN_URL; ?>?p=accounts"><span class="btn btn-danger">Cancel</span></a>
@ -349,9 +349,7 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<form action="<?php echo $base; ?>" method="post">
@ -364,9 +362,7 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
</div>
</form>
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
<?php
if (isset($account) && $account->isLoaded()) {
$account_players = array();
@ -377,7 +373,6 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
<div class="box-header">
<h3 class="box-title">Character List:</h3>
</div>
<!-- /.box-header -->
<div class="box-body no-padding">
<table class="table table-striped">
<tbody><tr>
@ -401,7 +396,6 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
</tbody>
</table>
</div>
<!-- /.box-body -->
</div>
<?php
@ -409,55 +403,16 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
};
?>
</div>
<div class="row">
<?php if (isset($accoun1t) && $account->isLoaded()) {
?>
<div class="col-md-4">
<?php
$tableToDescribe = 'accounts';
$statement = $db->query('DESCRIBE ' . $tableToDescribe);
$result = $statement->fetchAll(PDO::FETCH_ASSOC);
$val = 0;
foreach ($result as $column) {
// IF val = 2 MAKE <TR> TODO
($val == 2) ? "<tr>" : "";
?>
<td><?php echo $column['Field'] ?></td>
<td><input type="text" name="lastip" size="8" maxlength="10"
value="<?php echo $account->getCustomField($column['Field']); ?>"/></td>
<?php
echo $column['Field'] . ' - ' . $column['Type'], '<br>';
if ($val == 2) {
echo "</tr>";
$val = 1;
} else {
++$val;
}
} ?>
</div>
<?php } ?>
</div>
<script type="text/javascript">
$('#lastlogin').datetimepicker({
format: 'unixtime'
});
$('#lastlogout').datetimepicker({
format: 'unixtime'
});
$('#created').datetimepicker({
format: 'unixtime'
});
$('#web_lastlogin').datetimepicker({
format: 'unixtime'
});
$('#lastlogin').datetimepicker({ format: 'unixtime' });
$('#lastlogout').datetimepicker({ format: 'unixtime' });
$('#created').datetimepicker({ format: 'unixtime' });
$('#web_lastlogin').datetimepicker({ format: 'unixtime' });
$(document).ready(function () {
$('.input_control').change(function () {
$('input[name=pass]')[0].disabled = !this.checked;
$('input[name=pass]')[0].value = '';
}).change();
});
</script>
</script>

5
system/pages/admin/dashboard.php
View File

@ -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()
{

4
system/pages/admin/players.php
View File

@ -45,8 +45,8 @@ $skills = array(
);
?>
<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/jquery.datetimepicker.css"/ >
<script src="<?php echo BASE_URL; ?>tools/jquery.datetimepicker.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/css/jquery.datetimepicker.css"/ >
<script src="<?php echo BASE_URL; ?>tools/js/jquery.datetimepicker.js"></script>
<?php
$id = 0;

4
system/pages/creatures.php
View File

@ -12,8 +12,8 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = "Creatures";
?>
<script type="text/javascript" src="tools/tipped.js"></script>
<link rel="stylesheet" type="text/css" href="tools/tipped.css"/>
<script type="text/javascript" src="tools/js/tipped.js"></script>
<link rel="stylesheet" type="text/css" href="tools/css/tipped.css"/>
<script>
$(document).ready(function() {
Tipped.create('.tooltip');

27
system/templates/admin.dashboardstats.html.twig
View File

@ -96,33 +96,6 @@
</div>
{% endif %}
<div class="col-md-3">
<div class="box">
<div class="box-header">
<h3 class="box-title">Top 10 - Most wealthly accounts</h3>
</div>
<div class="box-body no-padding">
<table class="table table-condensed">
<tbody>
<tr>
<th>#</th>
<th>Account {{ account_type }}</th>
<th>Tibia coins</th>
</tr>
{% set i = 0 %}
{% for result in coins %}
{% set i = i + 1 %}
<tr>
<td>{{ i }}</td>
<td>{{ result.name }}</td>
<td>{{ result.coins }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
<div class="col-md-3">
<div class="box">
<div class="box-header">

2
system/templates/admin.login.html.twig
View File

@ -17,7 +17,7 @@
<div class="form-group input-group">
<span class="input-group-addon"><i class="fa fa-lock"></i></span>
<input type="password" class="form-control" id="account-name-input" name="account_login"
placeholder="Username" required autofocus>
placeholder="Account Name" required autofocus>
</div>
<div class="form-group input-group">
<span class="input-group-addon"><i class="fa fa-key"></i></span>

8
system/templates/admin.menus.js.html.twig
View File

@ -1,5 +1,5 @@
<link type="text/css" rel="stylesheet" href="{{ constant('BASE_URL') }}tools/jquery-ui.min.css">
<script src="{{ constant('BASE_URL') }}tools/jquery-ui.min.js"></script>
<link type="text/css" rel="stylesheet" href="{{ constant('BASE_URL') }}tools/css/jquery-ui.min.css">
<script src="{{ constant('BASE_URL') }}tools/js/jquery-ui.min.js"></script>
<script>
var last_id = [];
{% for cat, menu in menus %}
@ -44,8 +44,8 @@
cursor: pointer;
}
</style>
<script type="text/javascript" src="{{ constant('BASE_URL') }}tools/spectrum.js"></script>
<link type="text/css" rel="stylesheet" href="{{ constant('BASE_URL') }}tools/spectrum.css" />
<script type="text/javascript" src="{{ constant('BASE_URL') }}tools/js/spectrum.js"></script>
<link type="text/css" rel="stylesheet" href="{{ constant('BASE_URL') }}tools/css/spectrum.css" />
<script type="text/javascript">
initialiceSpectrum();
function initialiceSpectrum() {

4
system/templates/characters.html.twig
View File

@ -1,5 +1,5 @@
<script type="text/javascript" src="tools/tipped.js"></script>
<link rel="stylesheet" type="text/css" href="tools/tipped.css"/>
<script type="text/javascript" src="tools/js/tipped.js"></script>
<link rel="stylesheet" type="text/css" href="tools/css/tipped.css"/>
<script>
$(document).ready(function() {
Tipped.create('.tooltip');

0
admin/dist/css/AdminLTE.min.css → tools/css/AdminLTE.min.css vendored
View File

0
admin/dist/css/adminlte.min.css.map → tools/css/adminlte.min.css.map
View File

0
admin/dist/css/bootstrap.min.css → tools/css/bootstrap.min.css vendored
View File

0
admin/dist/css/bootstrap.min.css.map → tools/css/bootstrap.min.css.map
View File

0
admin/dist/css/dataTables.bootstrap.min.css → tools/css/dataTables.bootstrap.min.css vendored
View File

0
admin/dist/css/font-awesome.min.css → tools/css/font-awesome.min.css vendored
View File

0
admin/dist/css/ionicons.min.css → tools/css/ionicons.min.css vendored
View File

0
tools/jquery-ui.min.css → tools/css/jquery-ui.min.css vendored
View File

0
tools/jquery.datetimepicker.css → tools/css/jquery.datetimepicker.css
View File

0
tools/messages.css → tools/css/messages.css
View File

0
admin/dist/css/skins/skin-blue.css → tools/css/skins/skin-blue.css
View File

0
admin/dist/css/skins/skin-blue.min.css → tools/css/skins/skin-blue.min.css vendored
View File

0
tools/spectrum.css → tools/css/spectrum.css
View File

1136
tools/tipped.css → tools/css/tipped.css Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

0
admin/dist/fonts/FontAwesome.otf → tools/fonts/FontAwesome.otf
View File

0
admin/dist/fonts/fontawesome-webfont.eot → tools/fonts/fontawesome-webfont.eot
View File

0
admin/dist/fonts/fontawesome-webfont.svg → tools/fonts/fontawesome-webfont.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 434 KiB

0
admin/dist/fonts/fontawesome-webfont.ttf → tools/fonts/fontawesome-webfont.ttf
View File

0
admin/dist/fonts/fontawesome-webfont.woff → tools/fonts/fontawesome-webfont.woff
View File

0
admin/dist/fonts/fontawesome-webfont.woff2 → tools/fonts/fontawesome-webfont.woff2
View File

0
admin/dist/fonts/glyphicons-halflings-regular.eot → tools/fonts/glyphicons-halflings-regular.eot
View File

0
admin/dist/fonts/glyphicons-halflings-regular.svg → tools/fonts/glyphicons-halflings-regular.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

0
admin/dist/fonts/glyphicons-halflings-regular.ttf → tools/fonts/glyphicons-halflings-regular.ttf
View File

0
admin/dist/fonts/glyphicons-halflings-regular.woff → tools/fonts/glyphicons-halflings-regular.woff
View File

0
admin/dist/fonts/glyphicons-halflings-regular.woff2 → tools/fonts/glyphicons-halflings-regular.woff2
View File

0
admin/dist/fonts/ionicons.eot → tools/fonts/ionicons.eot
View File

0
admin/dist/fonts/ionicons.svg → tools/fonts/ionicons.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 326 KiB

After

Width:  |  Height:  |  Size: 326 KiB

0
admin/dist/fonts/ionicons.ttf → tools/fonts/ionicons.ttf
View File

0
admin/dist/fonts/ionicons.woff → tools/fonts/ionicons.woff
View File

13
tools/jquery-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

0
admin/dist/js/adminlte.min.js → tools/js/adminlte.min.js vendored
View File

0
admin/dist/js/bootstrap.min.js → tools/js/bootstrap.min.js vendored
View File

0
admin/dist/js/core.js → tools/js/core.js
View File

0
admin/dist/js/dataTables.bootstrap.min.js → tools/js/dataTables.bootstrap.min.js vendored
View File

0
admin/dist/js/jquery-ui.min.js → tools/js/jquery-ui.min.js vendored
View File

0
admin/dist/js/jquery.dataTables.min.js → tools/js/jquery.dataTables.min.js vendored
View File

0
tools/jquery.datetimepicker.js → tools/js/jquery.datetimepicker.js
View File

0
tools/jquery.js → tools/js/jquery.js vendored
View File

0
admin/dist/js/jquery.min.js → tools/js/jquery.min.js vendored
View File

0
admin/dist/js/jquery.min.map → tools/js/jquery.min.map
View File

0
tools/jquery.qtip.js → tools/js/jquery.qtip.js
View File

0
tools/spectrum.js → tools/js/spectrum.js
View File

0
tools/tipped.js → tools/js/tipped.js Executable file → Normal file
View File