Skip to content

RE1-T112 Fixes #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucswift merged 1 commit into from
Apr 11, 2026
Merged

RE1-T112 Fixes #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Web/Resgrid.Web/Areas/User/Views/Dispatch/Dashboard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@{
ViewBag.Title = "Resgrid | " + @commonLocalizer["CallsModule"];
Layout = "~/Areas/User/Views/Shared/_UserLayout.cshtml";
ViewBag.LoadAngular = true;
}
@section Styles
{
Expand Down
1 change: 1 addition & 0 deletions Web/Resgrid.Web/Areas/User/Views/Mapping/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@inject IStringLocalizer<Resgrid.Localization.Areas.User.Mapping.Mapping> localizer
@{
ViewBag.Title = "Resgrid | " + localizer["MappingHeader"];
ViewBag.LoadAngular = true;
}
@section Styles
{
Expand Down
30 changes: 18 additions & 12 deletions Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@

<link rel="stylesheet" href="/css/int-bundle.css" />

<link rel="stylesheet" href="/js/ng/styles.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
@if (ViewBag.LoadAngular == true)
{
<link rel="stylesheet" href="/js/ng/styles.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
}

<link rel="shortcut icon" href="~/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="~/images/apple-touch-icon.png">
Expand Down Expand Up @@ -127,16 +130,19 @@
localStorage.setItem("RgWebApp.auth-tokens", '@Html.Raw(await JavasriptHelpers.GetApiToken())');
</script>

<environment names="Release,Staging,Production,Docker">
<script src="/js/ng/app.js"></script>
</environment>

<environment names="Development">
<script src="/js/ng/runtime.js" asp-append-version="false"></script>
<script src="/js/ng/polyfills.js" asp-append-version="false"></script>
<script src="/js/ng/vendor.js" asp-append-version="false"></script>
<script src="/js/ng/main.js" asp-append-version="false"></script>
</environment>
@if (ViewBag.LoadAngular == true)
{
<environment names="Release,Staging,Production,Docker">
<script src="/js/ng/app.js"></script>
</environment>

<environment names="Development">
<script src="/js/ng/runtime.js" asp-append-version="false"></script>
<script src="/js/ng/polyfills.js" asp-append-version="false"></script>
<script src="/js/ng/vendor.js" asp-append-version="false"></script>
<script src="/js/ng/main.js" asp-append-version="false"></script>
</environment>
}

@if (IsSectionDefined("Scripts"))
{
Expand Down
1 change: 1 addition & 0 deletions Web/Resgrid.Web/Areas/User/Views/Shifts/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@{
ViewBag.Title = "Resgrid | " + localizer["ShiftsHeader"];
Layout = "~/Areas/User/Views/Shared/_UserLayout.cshtml";
ViewBag.LoadAngular = true;
}

@section Styles
Expand Down
Loading