Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

add index to time sent in EFCLientMessage, so we can retrieve faster in context view

Browse Source 
set the maximum height of the
add link to profile on client chat
move change history into a seperate service
move around AC penalty processing
This commit is contained in:
RaidMax
2018-09-16 15:34:16 -05:00
parent 7c708f06f3
commit 4a46abc46d
30 changed files with 2662 additions and 1174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebfrontCore/Controllers/BaseController.cs
View File

@ -37,6 +37,8 @@ namespace WebfrontCore.Controllers
SocialLink = Manager.GetApplicationSettings().Configuration().SocialLinkAddress;
SocialTitle = Manager.GetApplicationSettings().Configuration().SocialLinkTitle;
}
ViewBag.Version = Manager.Version;
}
public override void OnActionExecuting(ActionExecutingContext context)

43
WebfrontCore/Views/Shared/_Layout.cshtml
View File

@ -38,7 +38,7 @@
<li class="nav-item text-center text-md-left">@Html.ActionLink(loc["WEBFRONT_NAV_HOME"], "Index", "Home", new { area = "" }, new { @class = "nav-link" })</li>
<li class="nav-item text-center text-md-left">@Html.ActionLink(loc["WEBFRONT_NAV_PENALTIES"], "List", "Penalty", new { area = "" }, new { @class = "nav-link" })</li>
<li class="nav-item text-center text-md-left">@Html.ActionLink(loc["WEBFRONT_NAV_PRIVILEGED"], "PrivilegedAsync", "Client", new { area = "" }, new { @class = "nav-link" })</li>
@foreach (var _page in ViewBag.Pages)
@foreach (var _page in ViewBag.Pages)
{
<li class="nav-item text-center text-md-left">
<a class="nav-link" href="@_page.Location">@_page.Name</a>
@ -56,20 +56,20 @@
<div class="dropdown-menu p-0" aria-labelledby="account_dropdown">
@Html.ActionLink(loc["WEBFRONT_NAV_CONSOLE"], "Index", "Console", new { area = "" }, new
{
@class = "dropdown-item bg-dark text-muted text-center text-md-left",
title = "Web Console"
})
{
@class = "dropdown-item bg-dark text-muted text-center text-md-left",
title = "Web Console"
})
@Html.ActionLink(loc["WEBFRONT_NAV_PROFILE"], "ProfileAsync", "Client", new { id = ViewBag.User.ClientId }, new
{
@class = "dropdown-item bg-dark text-muted text-center text-md-left",
title = "Client Profile",
})
{
@class = "dropdown-item bg-dark text-muted text-center text-md-left",
title = "Client Profile",
})
@Html.ActionLink(loc["WEBFRONT_NAV_LOGOUT"], "LogoutAsync", "Account", new { area = "" }, new
{
@class = "dropdown-item bg-dark text-muted text-center text-md-left",
title = "Logout of account"
})
{
@class = "dropdown-item bg-dark text-muted text-center text-md-left",
title = "Logout of account"
})
</div>
</li>
<li class="nav-item text-center text-md-left"></li>
@ -135,7 +135,22 @@
<div class="container p-4">
@RenderBody()
<footer></footer>
<footer id="footer_text">
<div class="d-lg-none d-block text-center pt-4 pb-4">
<a href="https://github.com/RaidMax/IW4M-Admin/releases" target="_blank">
@Program.Manager.Version
</a>
<br />
<span class="text-muted">Developed by RaidMax</span>
</div>
<div class="footer-mobile d-lg-block d-none text-center">
<a href="https://github.com/RaidMax/IW4M-Admin/releases" target="_blank">
@Program.Manager.Version
</a>
<br />
<span class="text-muted">Developed by RaidMax</span>
</div>
</footer>
</div>
<environment include="Development">
<script type="text/javascript" src="~/lib/jQuery/dist/jquery.js"></script>

8
WebfrontCore/wwwroot/css/bootstrap-custom.css vendored
View File

@ -6409,3 +6409,11 @@ form *, select {
.client-message, .automated-penalty-info-detailed {
cursor: pointer; }
#footer_text {
font-size: 0.85rem; }
.footer-mobile {
position: fixed;
bottom: 1em;
right: 1em; }

10
WebfrontCore/wwwroot/css/bootstrap-custom.scss vendored
View File

@ -209,3 +209,13 @@ form *, select {
.client-message, .automated-penalty-info-detailed {
cursor: pointer;
}
#footer_text {
font-size: 0.85rem;
}
.footer-mobile {
position: fixed;
bottom: 1em;
right: 1em;
}

8
WebfrontCore/wwwroot/js/server.js
View File

@ -1,4 +1,4 @@
function getPlayerHistoryChart(playerHistory, i, width, color) {
function getPlayerHistoryChart(playerHistory, i, width, color, maxClients) {
///////////////////////////////////////
// thanks to canvasjs :(
playerHistory.forEach(function (item, i) {
@ -29,6 +29,7 @@
lineThickness: 0,
tickThickness: 0,
minimum: 0,
maximum: maxClients + 1,
margin: 0,
valueFormatString: " ",
labelMaxWidth: 0
@ -53,9 +54,10 @@ var charts = {};
$('.server-history-row').each(function (index, element) {
let clientHistory = $(this).data('clienthistory');
let serverId = $(this).data('serverid');
let maxClients = parseInt($('#server_header_' + serverId + ' .server-maxclients').text());
let color = $(this).data('online') === 'True' ? 'rgba(0, 122, 204, 0.432)' : '#ff6060'
let width = $('.server-header').first().width();
let historyChart = getPlayerHistoryChart(clientHistory, serverId, width, color);
let historyChart = getPlayerHistoryChart(clientHistory, serverId, width, color, maxClients);
historyChart.render();
charts[serverId] = historyChart;
});
@ -82,7 +84,7 @@ function refreshClientActivity() {
$('#server_clientactivity_' + serverId).html(response);
})
.fail(function (jqxhr, textStatus, error) {
$('#server_clientactivity_' + serverId).html("Could not load client activity - " + error);
$('#server_clientactivity_' + serverId).html(" Could not load client activity - " + error);
});
});
}