From 1e29b5f8103389462d2f5c026e8e07b33c3f0de4 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 6 Aug 2020 08:10:51 +0100 Subject: [PATCH 1/4] Delete RichCode Navigation GitHub Action Will do testing in personal fork with MS team until this is ready to demo --- .github/workflows/rich-code-navigation.yml | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/rich-code-navigation.yml diff --git a/.github/workflows/rich-code-navigation.yml b/.github/workflows/rich-code-navigation.yml deleted file mode 100644 index a965dea768..0000000000 --- a/.github/workflows/rich-code-navigation.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Microsoft Rich Code Navigation - -on: - pull_request: - push: - branches: [ v8/dev ] - -jobs: - RichNavigation: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - - name: Run Umbraco Build Script with Powershell - working-directory: 'build' - run: .\build.ps1 - shell: powershell - - - name: Microsoft Rich Code Navigation Indexer - uses: microsoft/RichCodeNavIndexer@v0.1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - languages: csharp,typescript \ No newline at end of file From 4799f7377543d94b8b79ff5d4b093823e6bb4129 Mon Sep 17 00:00:00 2001 From: Claus Date: Thu, 6 Aug 2020 15:04:18 +0200 Subject: [PATCH 2/4] using label on umb-toggle instead of a separate element. updating localized texts to reflect what is happening. ensure the selected value is pushed back to scope and used for the action. --- .../components/content/edit.controller.js | 1 + .../overlays/publishdescendants.controller.js | 14 ++++++++++---- .../content/overlays/publishdescendants.html | 15 +++++++++------ src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 2 +- src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 2 +- src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml | 2 +- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js index e3c2913e4e..1d503dd3bc 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js @@ -562,6 +562,7 @@ view: "views/content/overlays/unpublish.html", variants: $scope.content.variants, //set a model property for the dialog skipFormValidation: true, //when submitting the overlay form, skip any client side validation + includeUnpublished: false, submitButtonLabelKey: "content_unpublish", submitButtonStyle: "warning", submit: function (model) { diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js index 095c4f3fe1..5d4cc7eec7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js @@ -5,23 +5,28 @@ var vm = this; - vm.includeUnpublished = false; + vm.includeUnpublished = $scope.model.includeUnpublished || false; vm.changeSelection = changeSelection; vm.toggleIncludeUnpublished = toggleIncludeUnpublished; - function onInit() { vm.variants = $scope.model.variants; - vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications). + vm.displayVariants = vm.variants.slice(0); // shallow copy, we don't want to share the array-object (because we will be performing a sort method) but each entry should be shared (because we need validation and notifications). vm.labels = {}; + // get localized texts for use in directives if (!$scope.model.title) { localizationService.localize("buttons_publishDescendants").then(function (value) { $scope.model.title = value; }); } + if (!vm.labels.includeUnpublished) { + localizationService.localize("content_includeUnpublished").then(function (value) { + vm.labels.includeUnpublished = value; + }); + } _.each(vm.variants, function (variant) { variant.isMandatory = isMandatoryFilter(variant); @@ -72,8 +77,9 @@ } function toggleIncludeUnpublished() { - console.log("toggleIncludeUnpublished") vm.includeUnpublished = !vm.includeUnpublished; + // make sure this value is pushed back to the scope + $scope.model.includeUnpublished = vm.includeUnpublished; } /** Returns true if publishing is possible based on if there are un-published mandatory languages */ diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html index 92373d00ff..264d54108b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html @@ -6,12 +6,15 @@
- - + + +
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index e3d456dea7..5c1d54490c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -285,7 +285,7 @@ Tilføj en ny tekstboks Fjern denne tekstboks Indholdsrod - Medtag udkast: udgiv også ikke-publicerede sider. + Inkluder ikke-udgivet indhold. Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator. Denne værdi er skjult. Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes! diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 8355c36bd1..f42d6c7955 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -295,7 +295,7 @@ Add another text box Remove this text box Content root - Include drafts and unpublished content items. + Include unpublished content items. This value is hidden. If you need access to view this value please contact your website administrator. This value is hidden. What languages would you like to publish? All languages with content are saved! diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index fccd11a5aa..825db304e6 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -300,7 +300,7 @@ Add another text box Remove this text box Content root - Include drafts and unpublished content items. + Include unpublished content items. This value is hidden. If you need access to view this value please contact your website administrator. This value is hidden. What languages would you like to publish? All languages with content are saved! From c73f9bc2a59029bb303e7c34a2612481adab46c4 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 7 Aug 2020 09:52:19 +0200 Subject: [PATCH 3/4] fixing the other umb-toggle. --- .../content/overlays/publishdescendants.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html index 264d54108b..1cd829af38 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html @@ -6,15 +6,13 @@
- - + show-labels="true">
@@ -26,12 +24,13 @@
- - +
From 3c9bd45ea6fc0f9a8f40cc1b75c6c7b260b27cf1 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 11 Aug 2020 08:25:43 +0100 Subject: [PATCH 4/4] Delete rich-code-navigation.yml --- .github/workflows/rich-code-navigation.yml | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/rich-code-navigation.yml diff --git a/.github/workflows/rich-code-navigation.yml b/.github/workflows/rich-code-navigation.yml deleted file mode 100644 index a965dea768..0000000000 --- a/.github/workflows/rich-code-navigation.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Microsoft Rich Code Navigation - -on: - pull_request: - push: - branches: [ v8/dev ] - -jobs: - RichNavigation: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - - name: Run Umbraco Build Script with Powershell - working-directory: 'build' - run: .\build.ps1 - shell: powershell - - - name: Microsoft Rich Code Navigation Indexer - uses: microsoft/RichCodeNavIndexer@v0.1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - languages: csharp,typescript \ No newline at end of file