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

post merge

Browse Source
This commit is contained in:
Bjarke Berg
2020-08-17 11:41:50 +02:00
parent 9ae878a185 dde735f75c
commit 6371fdbf4d
99 changed files with 1140 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml Normal file
View File

@@ -0,0 +1,128 @@
@using Umbraco.Core
@using Umbraco.Web.WebAssets
@using Umbraco.Web.Common.Security
@using Umbraco.Core.WebAssets
@using Umbraco.Core.Configuration
@using Umbraco.Core.Hosting
@using Umbraco.Extensions
@using Umbraco.Core.Logging
@using Umbraco.Web.BackOffice.Controllers
@inject BackOfficeSignInManager signInManager
@inject BackOfficeServerVariables backOfficeServerVariables
@inject IUmbracoVersion umbracoVersion
@inject IHostingEnvironment hostingEnvironment
@inject IGlobalSettings globalSettings
@inject IRuntimeMinifier runtimeMinifier
@inject IProfilerHtml profilerHtml
@{
var isDebug = false;
var qryDebug = Context.Request.Query["umbDebug"].TryConvertTo<bool>();
isDebug = qryDebug.Success && qryDebug.Result;
var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
}
<!DOCTYPE html>
<html lang="en">
<head>
<base href="@backOfficePath.EnsureEndsWith('/')" />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="robots" content="noindex, nofollow">
<meta name="pinterest" content="nopin" />
<title ng-bind="$root.locationTitle">Umbraco</title>
@Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoInitCssBundleName))
</head>
<body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
<noscript>
<div style="margin: 10px;">
<h3><img src="assets/img/application/logo.png" alt="Umbraco logo" style="vertical-align: text-bottom;" /> Umbraco</h3>
<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" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
</div>
</noscript>
<div ng-hide="!authenticated" ng-cloak>
<div style="display: none;" id="mainwrapper" class="clearfix">
<umb-app-header></umb-app-header>
<div class="umb-app-content">
<umb-navigation></umb-navigation>
<section id="contentwrapper">
<div id="contentcolumn">
<div class="umb-editor" ng-view></div>
</div>
</section>
</div>
<umb-notifications></umb-notifications>
</div>
<umb-tour ng-if="tour.show"
model="tour">
</umb-tour>
<!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px -->
<umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>
<umb-search ng-if="search.show" on-close="closeSearch()"></umb-search>
</div>
<umb-backdrop ng-if="backdrop.show || infiniteMode"
backdrop-opacity="backdrop.opacity"
highlight-element="backdrop.element"
highlight-prevent-click="backdrop.elementPreventClick"
disable-events-on-click="backdrop.disableEventsOnClick">
</umb-backdrop>
<umb-overlay ng-if="overlay.show"
model="overlay"
position="{{overlay.position}}"
view="overlay.view"
parent-scope="overlay.parentScope">
</umb-overlay>
<umb-editors ng-show="infiniteMode"></umb-editors>
<umb-login ng-if="login.show"
on-login="hideLoginScreen()">
</umb-login>
@await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables)
<script>
document.angularReady = function(app) {
@await Html.AngularValueExternalLoginInfoScriptAsync(signInManager, ViewData.GetExternalSignInError())
@Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
@await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
//required for the noscript trick
document.getElementById("mainwrapper").style.display = "inherit";
}
</script>
<script src="lib/lazyload-js/LazyLoad.min.js"></script>
<script src="@Url.GetUrlWithCacheBust("Application", "BackOffice", null, hostingEnvironment, umbracoVersion, runtimeMinifier)"></script>
@if (isDebug)
{
@Html.Raw(profilerHtml.Render())
}
</body>
</html>

8
src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
View File

@@ -69,14 +69,14 @@
</div>
<umb-tour ng-if="tour.show"
model="tour">
</umb-tour>
<umb-notifications></umb-notifications>
</div>
<umb-tour ng-if="tour.show"
model="tour">
</umb-tour>
<!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px -->
<umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>

5
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
View File

@@ -285,7 +285,7 @@
<key alias="addTextBox">Tilføj en ny tekstboks</key>
<key alias="removeTextBox">Fjern denne tekstboks</key>
<key alias="contentRoot">Indholdsrod</key>
<key alias="includeUnpublished">Inkluder ikke-udgivet indhold.</key>
<key alias="includeUnpublished">Medtag udkast: udgiv også ikke-publicerede sider.</key>
<key alias="isSensitiveValue">Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator.</key>
<key alias="isSensitiveValue_short">Denne værdi er skjult.</key>
<key alias="languagesToPublishForFirstTime">Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes!</key>
@@ -647,6 +647,7 @@
<key alias="design">Design</key>
<key alias="dictionary">Ordbog</key>
<key alias="dimensions">Dimensioner</key>
<key alias="discard">Kassér</key>
<key alias="down">Ned</key>
<key alias="download">Hent</key>
<key alias="edit">Rediger</key>
@@ -668,6 +669,7 @@
<key alias="icon">Ikon</key>
<key alias="id">Id</key>
<key alias="import">Importer</key>
<key alias="includeFromsubFolders">Inkludér undermapper i søgning</key>
<key alias="excludeFromSubFolders">Søg kun i denne mappe</key>
<key alias="info">Info</key>
<key alias="innerMargin">Indre margen</key>
@@ -1850,6 +1852,7 @@ Mange hilsner fra Umbraco robotten
<key alias="tabBlockSettings">Indstillinger</key>
<key alias="headlineAdvanced">Avanceret</key>
<key alias="forceHideContentEditor">Skjuld indholds editoren</key>
<key alias="blockHasChanges">Du har lavet ændringer til dette indhold. Er du sikker på at du vil kassere dem?</key>
</area>
</language>

4
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
View File

@@ -295,7 +295,7 @@
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
<key alias="includeUnpublished">Include unpublished content items.</key>
<key alias="includeUnpublished">Include drafts and unpublished content items.</key>
<key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
<key alias="isSensitiveValue_short">This value is hidden.</key>
<key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
@@ -675,6 +675,7 @@
<key alias="design">Design</key>
<key alias="dictionary">Dictionary</key>
<key alias="dimensions">Dimensions</key>
<key alias="discard">Discard</key>
<key alias="down">Down</key>
<key alias="download">Download</key>
<key alias="edit">Edit</key>
@@ -2467,6 +2468,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="tabBlockSettings">Settings</key>
<key alias="headlineAdvanced">Advanced</key>
<key alias="forceHideContentEditor">Force hide content editor</key>
<key alias="blockHasChanges">You have made changes to this content. Are you sure you want to discard them?</key>
</area>
<area alias="contentTemplatesDashboard">
<key alias="whatHeadline">What are Content Templates?</key>

4
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
View File

@@ -300,7 +300,7 @@
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
<key alias="includeUnpublished">Include unpublished content items.</key>
<key alias="includeUnpublished">Include drafts and unpublished content items.</key>
<key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
<key alias="isSensitiveValue_short">This value is hidden.</key>
<key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
@@ -682,6 +682,7 @@
<key alias="design">Design</key>
<key alias="dictionary">Dictionary</key>
<key alias="dimensions">Dimensions</key>
<key alias="discard">Discard</key>
<key alias="down">Down</key>
<key alias="download">Download</key>
<key alias="edit">Edit</key>
@@ -2487,6 +2488,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="tabBlockSettings">Settings</key>
<key alias="headlineAdvanced">Advanced</key>
<key alias="forceHideContentEditor">Force hide content editor</key>
<key alias="blockHasChanges">You have made changes to this content. Are you sure you want to discard them?</key>
</area>
<area alias="contentTemplatesDashboard">
<key alias="whatHeadline">What are Content Templates?</key>