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

Merge branch 'netcore/feature/non-static-iohelper' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Tests/Composing/CompositionTests.cs
This commit is contained in:
Bjarke Berg
2019-11-08 07:55:23 +01:00
parent 4529cd408a 13507c0e13
commit 2ce67dcf9a
142 changed files with 3140 additions and 2729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -432,4 +432,4 @@
<Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
<Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
</Target>
</Project>
</Project>

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
View File

@@ -9,7 +9,7 @@
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
View File

@@ -11,7 +11,7 @@
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
}

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
View File

@@ -33,7 +33,7 @@
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");

3
src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
View File

@@ -7,6 +7,7 @@
@using Microsoft.Owin.Security
@using Newtonsoft.Json
@using Newtonsoft.Json.Linq
@using Umbraco.Core.Composing
@using Umbraco.Core.IO
@using Umbraco.Web
@using Umbraco.Web.Editors
@@ -32,7 +33,7 @@
<title>Umbraco</title>
@Html.RenderCssHere(
new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
@*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
<style>

2
src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
View File

@@ -41,7 +41,7 @@
<title ng-bind="$root.locationTitle">Umbraco</title>
@Html.RenderCssHere(
new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
</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">

3
src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
View File

@@ -1,6 +1,7 @@
@using Umbraco.Core
@using ClientDependency.Core
@using ClientDependency.Core.Mvc
@using Umbraco.Core.Composing
@using Umbraco.Core.IO
@using Umbraco.Web
@using Umbraco.Core.Configuration
@@ -21,7 +22,7 @@
<meta name="pinterest" content="nopin" />
@Html.RenderCssHere(
new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
</head>
<body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController">

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

@@ -514,6 +514,10 @@
<key alias="tools">Værktøjer</key>
<key alias="toolsDescription">Værktøjer til at administrere indekset</key>
<key alias="fields">felter</key>
<key alias="indexCannotRead">Indexet skal bygges igen, for at kunne læses</key>
<key alias="processIsTakingLonger">Processen tager længere tid end forventet. Kontrollér Umbraco loggen for at se om der er sket fejl under operationen</key>
<key alias="indexCannotRebuild">Dette index kan ikke genbygess for det ikke har nogen</key>
<key alias="iIndexPopulator">IIndexPopulator</key>
</area>
<area alias="placeholders">
<key alias="username">Indtast dit brugernavn</key>
@@ -1411,6 +1415,7 @@ Mange hilsner fra Umbraco robotten
<key alias="noFallbackLanguageOption">Intet fallback-sprog</key>
<key alias="fallbackLanguageDescription">For at tillade flersproget indhold, som ikke er tilgængeligt i det anmodede sprog, skal du her vælge et sprog at falde tilbage på.</key>
<key alias="fallbackLanguage">Fallback-sprog</key>
<key alias="none">ingen</key>
</area>
<area alias="macro">
<key alias="addParameter">Tilføj parameter</key>

4526
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

File diff suppressed because it is too large Load Diff

86
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -523,6 +523,10 @@
<key alias="tools">Tools</key>
<key alias="toolsDescription">Tools to manage the index</key>
<key alias="fields">fields</key>
<key alias="indexCannotRead">The index cannot be read and will need to be rebuilt</key>
<key alias="processIsTakingLonger">The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation</key>
<key alias="indexCannotRebuild">This index cannot be rebuilt because it has no assigned</key>
<key alias="iIndexPopulator">IIndexPopulator</key>
</area>
<area alias="placeholders">
<key alias="username">Enter your username</key>
@@ -1649,6 +1653,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noFallbackLanguageOption">No fall back language</key>
<key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
<key alias="fallbackLanguage">Fall back language</key>
<key alias="none">none</key>
</area>
<area alias="macro">
<key alias="addParameter">Add parameter</key>
@@ -2233,4 +2238,85 @@ To manage your website, simply open the Umbraco back office and start adding con
<area alias="propertyActions">
<key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
</area>
<area alias="nuCache">
<key alias="wait">Wait</key>
<key alias="refreshStatus">Refresh status</key>
<key alias="memoryCache">Memory Cache</key>
<key alias="memoryCacheDescription">
<![CDATA[
This button lets you reload the in-memory cache, by entirely reloading it from the database
cache (but it does not rebuild that database cache). This is relatively fast.
Use it when you think that the memory cache has not been properly refreshed, after some events
triggered&mdash;which would indicate a minor Umbraco issue.
(note: triggers the reload on all servers in an LB environment).
]]>
</key>
<key alias="reload">Reload</key>
<key alias="databaseCache">Database Cache</key>
<key alias="databaseCacheDescription">
<![CDATA[
This button lets you rebuild the database cache, ie the content of the cmsContentNu table.
<strong>Rebuilding can be expensive.</strong>
Use it when reloading is not enough, and you think that the database cache has not been
properly generated&mdash;which would indicate some critical Umbraco issue.
]]>
</key>
<key alias="rebuild">Rebuild</key>
<key alias="internals">Internals</key>
<key alias="internalsDescription">
<![CDATA[
This button lets you trigger a NuCache snapshots collection (after running a fullCLR GC).
Unless you know what that means, you probably do <em>not</em> need to use it.
]]>
</key>
<key alias="collect">Collect</key>
<key alias="publishedCacheStatus">Published Cache Status</key>
<key alias="caches">Caches</key>
</area>
<area alias="profiling">
<key alias="performanceProfiling">Performance profiling</key>
<key alias="performanceProfilingDescription">
<![CDATA[
<p>
Umbraco currently runs in debug mode. This means you can use the built-in performance profiler to assess the performance when rendering pages.
</p>
<p>
If you want to activate the profiler for a specific page rendering, simply add <b>umbDebug=true</b> to the querystring when requesting the page.
</p>
<p>
If you want the profiler to be activated by default for all page renderings, you can use the toggle below.
It will set a cookie in your browser, which then activates the profiler automatically.
In other words, the profiler will only be active by default in <i>your</i> browser - not everyone else's.
</p>
]]>
</key>
<key alias="activateByDefault">Activate the profiler by default</key>
<key alias="reminder">Friendly reminder</key>
<key alias="reminderDescription">
<![CDATA[
<p>
You should never let a production site run in debug mode. Debug mode is turned off by setting <b>debug="false"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
</p>
]]>
</key>
<key alias="profilerEnabledDescription">
<![CDATA[
<p>
Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.
</p>
<p>
Debug mode is turned on by setting <b>debug="true"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
</p>
]]>
</key>
</area>
<area alias="settingsDashboardVideos">
<key alias="trainingHeadline">Hours of Umbraco training videos are only a click away</key>
<key alias="trainingDescription">
<![CDATA[
<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
]]>
</key>
<key alias="getStarted">To get you started</key>
</area>
</language>

9
src/Umbraco.Web.UI/config/splashes/noNodes.aspx
View File

@@ -1,4 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Config.Splashes.NoNodes" CodeBehind="NoNodes.aspx.cs" %>
<%@ Import Namespace="Umbraco.Core.Composing" %>
<%@ Import Namespace="Umbraco.Core.Configuration" %>
<%@ Import Namespace="Umbraco.Core.IO" %>
@@ -11,7 +12,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title></title>
<meta name="description" content="">
<meta name="author" content="">
@@ -30,7 +31,7 @@
<h3>You're seeing this wonderful page because your website doesn't contain any published content yet.</h3>
<div class="cta">
<a href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>" class="button">Open Umbraco</a>
<a href="<%= Current.IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>" class="button">Open Umbraco</a>
</div>
@@ -38,14 +39,14 @@
<div class="col">
<h2>Easy start with Umbraco.tv</h2>
<p>We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.</p>
<a href="https://umbraco.tv?ref=tvFromInstaller" target="_blank">Umbraco.tv &rarr;</a>
</div>
<div class="col">
<h2>Be a part of the community</h2>
<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
<a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank">our.Umbraco &rarr;</a>
</div>
</div>