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

fix gravatars not showing

Browse Source 
fix web config not saving Uri
fix issue with token login
This commit is contained in:
RaidMax
2019-04-14 10:55:05 -05:00
parent b9c4a1b5f6
commit b134cd4728
21 changed files with 187 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
WebfrontCore/Views/Shared/EditorTemplates/ServerConfiguration.cshtml
View File

@ -1,6 +1,52 @@
@model List<SharedLibraryCore.Configuration.ServerConfiguration>
@Html.EditorFor(s => s)
@*@foreach (var server in Model)
@model IList<SharedLibraryCore.Configuration.ServerConfiguration>
@{
string labelClass = "mb-2 mt-1";
string editorClass = "form-control bg-dark text-white-50 text-box single-line mb-2 mt-0";
string addText = SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CONFIGURATION_ADD"];
string optionalText = SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex["COMMAND_HELP_OPTIONAL"];
int startAt = ViewBag.AddNew ?? false ? Model.Count - 1 : 0;
}
@for (int i = startAt; i < Model.Count; i++)
{
@Html.EditorFor(s => server.EventParserVersion);
}*@
<div class="h4 text-white mb-0">@Model[i].IPAddress:@Model[i].Port</div>
<div class="border-bottom mb-3">
@Html.LabelFor(model => model[i].IPAddress, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].IPAddress, new { htmlAttributes = new { @class = editorClass } })
@Html.LabelFor(model => model[i].Port, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].Port, new { htmlAttributes = new { @class = editorClass } })
@Html.LabelFor(model => model[i].Password, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].Password, new { htmlAttributes = new { @class = editorClass } })
@Html.LabelFor(model => model[i].ManualLogPath, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].ManualLogPath, new { htmlAttributes = new { @class = editorClass, placeholder = optionalText } })
@Html.LabelFor(model => model[i].GameLogServerUrl, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].GameLogServerUrl, new { htmlAttributes = new { @class = editorClass, placeholder = optionalText } })
@Html.LabelFor(model => model[i].RConParserVersion, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].RConParserVersion, new { htmlAttributes = new { @class = editorClass } })
@Html.LabelFor(model => model[i].EventParserVersion, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].EventParserVersion, new { htmlAttributes = new { @class = editorClass } })
@Html.LabelFor(model => model[i].ReservedSlotNumber, null, new { @class = labelClass })
@Html.EditorFor(model => model[i].ReservedSlotNumber, new { htmlAttributes = new { @class = editorClass } })
<div>
@Html.LabelFor(model => model[i].Rules, null, new { @class = "bg-primary pl-3 pr-3 p-2 w-100 mt-3" })
@Html.EditorFor(model => model[i].Rules, new { htmlAttributes = new { @class = editorClass } })
<a asp-controller="Configuration" asp-action="GetNewListItem" asp-route-propertyName="@($"Servers[{i}].Rules")" class="btn btn-primary configuration-add-new mt-2">@addText</a>
</div>
<div class="mb-3">
@Html.LabelFor(model => model[i].AutoMessages, null, new { @class = "bg-primary pl-3 pr-3 p-2 w-100 mt-3" })
@Html.EditorFor(model => model[i].AutoMessages, new { htmlAttributes = new { @class = editorClass } })
<a asp-controller="Configuration" asp-action="GetNewListItem" asp-route-propertyName="@($"Servers[{i}].Automessages")" class="btn btn-primary configuration-add-new mt-2">@addText</a>
</div>
</div>
}
@*<button asp-controller="Configuration" asp-action="Edit" asp-route-addNewServer="true" class="btn btn-primary">@addServerText</button>*@

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

@ -55,22 +55,11 @@
<a href="#" class="nav-link oi oi-person dropdown-toggle oi-fix-navbar w-100" id="account_dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
<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-lg-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-lg-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-lg-left",
title = "Logout of account"
})
<a class="dropdown-item bg-dark text-muted text-center text-lg-left profile-action" href="#" data-action="GenerateLoginToken" aria-hidden="true" title="@loc["WEBFRONT_ACTION_TOKEN"]">@loc["WEBFRONT_ACTION_TOKEN"]</a>
<a asp-controller="Console" asp-action="Index" class="dropdown-item bg-dark text-muted text-center text-lg-left">@loc["WEBFRONT_NAV_CONSOLE"]</a>
<a asp-controller="Client" asp-action="ProfileAsync" asp-route-id="@ViewBag.User.ClientId" class="dropdown-item bg-dark text-muted text-center text-lg-left">@loc["WEBFRONT_NAV_PROFILE"]</a>
<a asp-controller="Configuration" asp-action="Edit" class="dropdown-item bg-dark text-muted text-center text-lg-left">@loc["WEBFRONT_NAV_EDIT_CONFIGURATION"]</a>
<a class="dropdown-item bg-dark text-muted text-center text-lg-left profile-action" href="#" data-action="GenerateLoginToken" title="@loc["WEBFRONT_ACTION_TOKEN"]">@loc["WEBFRONT_ACTION_TOKEN"]</a>
<a asp-controller="Account" asp-action="LogoutAsync" class="dropdown-item bg-dark text-muted text-center text-lg-left">@loc["WEBFRONT_NAV_LOGOUT"]</a>
</div>
</li>
}