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

Merge branch 'v8/dev' into v8/contrib

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
This commit is contained in:
Sebastiaan Janssen
2020-09-02 14:23:40 +02:00
parent 703037195a 79ac19bff8
commit 10281cb0e6
104 changed files with 1497 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,6 +648,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>
@@ -1854,6 +1855,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>

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

@@ -679,6 +679,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>
@@ -2484,6 +2485,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>

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

@@ -688,6 +688,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>
@@ -2506,6 +2507,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>

10
src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
View File

@@ -1,13 +1,13 @@
@inherits UmbracoViewPage<BlockListModel>
@using Umbraco.Core.Models.Blocks
@{
if (Model?.Layout == null || !Model.Layout.Any()) { return; }
if (!Model.Any()) { return; }
}
<div class="umb-block-list">
@foreach (var layout in Model.Layout)
@foreach (var block in Model)
{
if (layout?.Udi == null) { continue; }
var data = layout.Data;
@Html.Partial("BlockList/Components/" + data.ContentType.Alias, layout)
if (block?.ContentUdi == null) { continue; }
var data = block.Content;
@Html.Partial("BlockList/Components/" + data.ContentType.Alias, block)
}
</div>

2
src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
View File

@@ -200,7 +200,7 @@
"event": "click"
},
{
"element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea'] > a",
"element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea']",
"title": "Editor settings",
"content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed.",
"event": "click"