From 38e8a93b28ac610adcef1e919ca52a19c4ea7f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?=
Date: Tue, 30 Jun 2020 13:36:17 +0200
Subject: [PATCH 1/9] parse on contentType key
---
.../src/views/documenttypes/edit.controller.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index ad042842f5..8e80e89a40 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -359,6 +359,7 @@
if (infiniteMode && $scope.model.submit) {
$scope.model.documentTypeAlias = vm.contentType.alias;
+ $scope.model.documentTypeKey = vm.contentType.key;
$scope.model.submit($scope.model);
}
From 5173a7b58969e7bed38d1486e3ac801e8c2754af Mon Sep 17 00:00:00 2001
From: Warren Buckley
Date: Wed, 1 Jul 2020 08:07:30 +0100
Subject: [PATCH 2/9] Remove try/catch block as it will make it hard for people
to see what the issue when using the Razor view when building sites
---
.../Views/Partials/BlockList/Default.cshtml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml b/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
index 8e5de940c5..19ae842759 100644
--- a/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
@@ -8,13 +8,6 @@
{
if (layout?.Udi == null) { continue; }
var data = layout.Data;
- try
- {
- @Html.Partial("BlockList/Components/" + data.ContentType.Alias, layout)
- }
- catch (Exception ex)
- {
- global::Umbraco.Core.Composing.Current.Logger.Error(typeof(BlockListModel), ex, "Could not display block list component for content type {0}", data?.ContentType?.Alias);
- }
+ @Html.Partial("BlockList/Components/" + data.ContentType.Alias, layout)
}
From 5debb4a11ba05419d0c964bcc84e321c73f43f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?=
Date: Wed, 1 Jul 2020 10:28:02 +0200
Subject: [PATCH 3/9] option to hide content editor in overlay
---
.../inlineblock.editor.controller.js | 6 +-
.../labelblock/labelblock.editor.html | 2 +-
.../blocklist.blockconfiguration.overlay.html | 22 +
.../umbBlockListPropertyEditor.component.js | 14 +-
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 2 +
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 4968 +++++++++--------
.../Umbraco/config/lang/en_us.xml | 2 +
.../PropertyEditors/BlockListConfiguration.cs | 3 +
8 files changed, 2530 insertions(+), 2489 deletions(-)
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
index 29f8b1320c..c2c86ca824 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
@@ -13,9 +13,11 @@
$scope.$broadcast("formSubmitting", { scope: $scope });
// Some property editors need to performe an action after all property editors have reacted to the formSubmitting.
$scope.$broadcast("postFormSubmitting", { scope: $scope });
+
+ block.active = false;
+ } else {
+ $scope.api.activateBlock(block);
}
-
- block.active = !block.active;
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
index 892c9e4be8..60fd3eb7dc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
@@ -1,4 +1,4 @@
-
-
To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.
]]>
-
- Please contact your ISP if necessary.
- If you're installing on a local machine or server you might need information from your system administrator.]]>
-
- Press the upgrade button to upgrade your database to Umbraco %0%
-
- Don't worry - no content will be deleted and everything will continue working afterwards!
-
- ]]>
- Press Next to
- proceed. ]]>
- next to continue the configuration wizard]]>
- The Default users' password needs to be changed!]]>
- The Default user has been disabled or has no access to Umbraco!
No further actions needs to be taken. Click Next to proceed.]]>
- The Default user's password has been successfully changed since the installation!
No further actions needs to be taken. Click Next to proceed.]]>
- The password is changed!
- Get a great start, watch our introduction videos
- By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.
- Not installed yet.
- Affected files and folders
- More information on setting up permissions for Umbraco here
- You need to grant ASP.NET modify permissions to the following files/folders
- Your permission settings are almost perfect!
- You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]>
- How to Resolve
- Click here to read the text version
- video tutorial on setting up folder permissions for Umbraco or read the text version.]]>
- Your permission settings might be an issue!
-
- You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]>
- Your permission settings are not ready for Umbraco!
-
- In order to run Umbraco, you'll need to update your permission settings.]]>
- Your permission settings are perfect!
- You are ready to run Umbraco and install packages!]]>
- Resolving folder issue
- Follow this link for more information on problems with ASP.NET and creating folders
- Setting up folder permissions
-
- I want to start from scratch
- learn how)
- You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
- ]]>
- You've just set up a clean Umbraco platform. What do you want to do next?
- Runway is installed
-
- This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules
- ]]>
- Only recommended for experienced users
- I want to start with a simple website
-
- "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
- but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
- Runway offers an easy foundation based on best practices to get you started faster than ever.
- If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
-
-
- Included with Runway: Home page, Getting Started page, Installing Modules page.
- Optional Modules: Top Navigation, Sitemap, Contact, Gallery.
-
- ]]>
- What is Runway
- Step 1/5 Accept license
- Step 2/5: Database configuration
- Step 3/5: Validating File Permissions
- Step 4/5: Check Umbraco security
- Step 5/5: Umbraco is ready to get you started
- Thank you for choosing Umbraco
- Browse your new site
-You installed Runway, so why not see how your new website looks.]]>
- Further help and information
-Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]>
- Umbraco %0% is installed and ready for use
- /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]>
- started instantly by clicking the "Launch Umbraco" button below. If you are new to Umbraco,
-you can find plenty of resources on our getting started pages.]]>
- Launch Umbraco
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]>
- Connection to database failed.
- Umbraco Version 3
- Umbraco Version 4
- Watch
- Umbraco %0% for a fresh install or upgrading from version 3.0.
-