yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update backoffice submodule

Browse Source
This commit is contained in:
Jacob Overgaard
2024-05-22 09:11:06 +02:00
parent 365e3b39ca
commit 03be7b8f2c
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Index.cshtml
View File

@@ -1,6 +1,7 @@
@using Microsoft.Extensions.Options
@using Umbraco.Cms.Api.Management.Extensions
@using Umbraco.Cms.Core.Configuration.Models
@using Umbraco.Cms.Core.Logging
@using Umbraco.Cms.Core.Manifest
@using Umbraco.Cms.Core.Serialization
@using Umbraco.Cms.Web.Common.Hosting
@@ -8,23 +9,31 @@
@inject IBackOfficePathGenerator BackOfficePathGenerator
@inject IPackageManifestService PackageManifestService
@inject IJsonSerializer JsonSerializer
@inject IProfilerHtml ProfilerHtml
@inject IOptions<GlobalSettings> GlobalSettings
@inject IOptions<ContentSettings> ContentSettings
@{
bool.TryParse(Context.Request.Query["umbDebug"], out var isDebug);
var backOfficePath = BackOfficePathGenerator.BackOfficePath;
var backOfficeAssetsPath = BackOfficePathGenerator.BackOfficeAssetsPath;
var loginLogoImage = ContentSettings.Value.LoginLogoImage;
}
<!DOCTYPE html>
<html lang="@GlobalSettings.Value.DefaultUILanguage">
<head>
<base href="@backOfficePath.EnsureEndsWith('/')" />
<meta charset="UTF-8" />
<base href="@backOfficePath.EnsureEndsWith('/')" />
<link rel="icon" type="image/svg+xml" href="@backOfficeAssetsPath/assets/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="robots" content="noindex, nofollow"/>
<meta name="pinterest" content="nopin"/>
<title>Umbraco</title>
<link rel="stylesheet" href="@backOfficeAssetsPath/css/user-defined.css" />
<link rel="stylesheet" href="@backOfficeAssetsPath/css/umb-css.css" />
<link rel="stylesheet" href="@backOfficeAssetsPath/css/uui-css.css" />
@await Html.BackOfficeImportMapScriptAsync(JsonSerializer, BackOfficePathGenerator, PackageManifestService)
@@ -32,7 +41,33 @@
</head>
<body class="uui-font uui-text" style="margin: 0; padding: 0; overflow: hidden">
<umb-app></umb-app>
<noscript>
<style>
#noscript-container {
display: flex;
flex-wrap: wrap;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh;
padding: 0 20px;
text-align: center;
}
</style>
<div id="noscript-container">
<h1 class="uui-h3" style="display: inline-flex; align-items: center; gap: 10px">
<img aria-hidden="true" alt="logo" src="@loginLogoImage" style="width: 100%" />
</h1>
<p>For full functionality of Umbraco CMS it is necessary to enable JavaScript.</p>
<p>Here are the <a href="https://www.enable-javascript.com/" target="_blank" rel="noopener" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
</div>
</noscript>
<umb-app></umb-app>
@if (isDebug)
{
@Html.Raw(ProfilerHtml.Render())
}
</body>
</html>

2
src/Umbraco.Web.UI.Client

Submodule src/Umbraco.Web.UI.Client updated: 0dbf2ff477...60e362b6db