diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index f6fadc9a43..174f9f41d7 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -138,6 +138,7 @@ @import "components/tooltip/umb-tooltip-list.less"; @import "components/overlays/umb-overlay-backdrop.less"; @import "components/overlays/umb-itempicker.less"; +@import "components/overlays/umb-variant-selector-overlay"; @import "components/umb-grid.less"; @import "components/umb-empty-state.less"; @import "components/umb-property-editor.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-variant-selector-overlay.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-variant-selector-overlay.less new file mode 100644 index 0000000000..2b38d31633 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-variant-selector-overlay.less @@ -0,0 +1,19 @@ +.umb-variant-selector-overlay { + + + .umb-variant-selector-entry { + .umb_check_info { + margin-top: 2px; + } + } + .umb-variant-selector-entry__title { + + } + .umb-variant-selector-entry__description { + display: block; + font-size: 13px; + color: @gray-4; + } + + +} diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less index 94cfa6f62c..44955e8f8e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less @@ -1,15 +1,18 @@ .umb-list--condensed { .umb-list-item { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 7px; + padding-bottom: 7px; } } .umb-list-item { - border-bottom: 1px solid @gray-9; + border-bottom: 1px solid @gray-11; padding-top: 15px; padding-bottom: 15px; display: flex; + &:last-of-type { + border-bottom: none; + } } a.umb-list-item:hover, diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js index de4d4847fb..d1b17021b6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js @@ -11,6 +11,7 @@ vm.changeSelection = changeSelection; vm.dirtyVariantFilter = dirtyVariantFilter; vm.pristineVariantFilter = pristineVariantFilter; + vm.notPublishedMandatoryFilter = notPublishedMandatoryFilter; /** Returns true if publishing is possible based on if there are un-published mandatory languages */ function canPublish() { @@ -63,12 +64,10 @@ function dirtyVariantFilter(variant) { //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's - // * the active one // * it's editor is in a $dirty state // * it has pending saves // * it is unpublished - // * it is in NotCreated state - return (variant.active || variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges" || variant.state === "NotCreated"); + return (variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges"); } function hasAnyData(variant) { @@ -100,6 +99,9 @@ function pristineVariantFilter(variant) { return !(dirtyVariantFilter(variant)); } + function notPublishedMandatoryFilter(variant) { + return !dirtyVariantFilter(variant) && variant.isMandatory === true; + } function onInit() { @@ -184,9 +186,7 @@ $scope.model.disableSubmitButton = true; } - var labelKey = vm.isNew ? "content_languagesToPublishForFirstTime" : "content_languagesToPublish"; - - localizationService.localize(labelKey).then(function (value) { + localizationService.localize("content_variantsToPublish").then(function (value) { vm.headline = value; vm.loading = false; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html index e9e179c64f..619efa6d40 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html @@ -1,4 +1,4 @@ -
+

{{vm.headline}}

@@ -13,7 +13,7 @@
-
+
-
- - - - - - + > + + + + - + + + + {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} + + - - {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} - + - -
@@ -45,10 +44,10 @@
-

+

-
+
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 7d174e73fc..00a4a3af05 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -302,6 +302,14 @@ Unpublished Languages Unmodified Languages These languages haven't been created + + Which variants you would like to publish? + Choose which variants to be saved. + Pick variants to send for approval. + Set scheduled publishing... + Select the variants to unpublish. Unpublishing a mandatory language will unpublish all variants. + Unpublished mandatory variants + Ready to Publish? Ready to Save? Send for approval @@ -1854,7 +1862,7 @@ To manage your website, simply open the Umbraco back office and start adding con Reset password Your password has been changed! Password changed - Please confirm the new password + Please confirm the new password Enter your new password Your new password cannot be blank! Current password 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 fd3d6ac70c..2bbfc22c70 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -306,6 +306,14 @@ Unpublished Languages Unmodified Languages These languages haven't been created + + Which variants you would like to publish? + Choose which variants to be saved. + Pick variants to send for approval. + Set scheduled publishing... + Select the variants to unpublish. Unpublishing a mandatory language will unpublish all variants. + Unpublished mandatory variants + Ready to Publish? Ready to Save? Send for approval