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

Replace checkbox with umb-checkbox in listview publish and unpu… (#6544)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2019-10-14 17:06:36 +02:00
committed by Sebastiaan Janssen
parent 7d5d424045
commit d7b25fc4dc
10 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Overlays.PublishController as vm">
<div style="margin-bottom: 15px;">
<div class="mb3">
<p>{{vm.headline}}</p>
</div>
@@ -48,14 +48,14 @@
</div>
<div class="umb-list umb-list--condensed" ng-if="!vm.loading && vm.hasPristineVariants">
<div style="margin-bottom: 15px; font-weight: bold;">
<div class="bold mb3">
<p><localize key="content_publishedLanguages"></localize></p>
</div>
<div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.pristineVariantFilter">
<div>
<div style="margin-bottom: 2px;">
<span>{{ variant.language.name }}</span>
<span>{{variant.language.name}}</span>
<strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
View File

@@ -49,8 +49,8 @@
server-validation-field="{{variant.htmlId}}"/>
<div>
<label for="{{variant.htmlId}}" style="margin-bottom: 0;">
<span>{{ variant.language.name }}</span>
<label for="{{variant.htmlId}}" class="mb0">
<span>{{variant.language.name}}</span>
<span class="db umb-list-item__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state variant="variant"></umb-variant-state>

6
src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
View File

@@ -1,13 +1,11 @@
<div ng-controller="Umbraco.Overlays.SaveContentController as vm">
<div ng-if="vm.loading" style="min-height: 50px; position: relative;">
<umb-load-indicator></umb-load-indicator>
</div>
<div ng-if="!vm.loading">
<div style="margin-bottom: 15px;">
<div class="mb3">
<p>
<localize ng-if="!vm.isNew" key="content_languagesToSave"></localize>
<localize ng-if="vm.isNew" key="content_languagesToSaveForFirstTime"></localize>
@@ -53,7 +51,7 @@
</div>
<div class="umb-list umb-list--condensed" ng-if="vm.hasPristineVariants">
<div style="margin-bottom: 15px; font-weight: bold;">
<div class="bold mb3">
<p>
<localize ng-if="!vm.isNew" key="content_unmodifiedLanguages"></localize>
<localize ng-if="vm.isNew" key="content_untouchedLanguagesForFirstTime"></localize>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
View File

@@ -3,7 +3,7 @@
<!-- invariant nodes -->
<div ng-if="vm.variants.length === 1">
<div style="margin-bottom: 15px;">
<div class="mb3">
<p><localize key="content_schedulePublishHelp"></localize></p>
</div>
@@ -78,7 +78,7 @@
<!-- nodes with variants -->
<div ng-if="vm.variants.length > 1">
<div style="margin-bottom: 15px;">
<div class="mb3">
<p><localize key="content_languagesToSchedule"></localize></p>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Overlays.SendToPublishController as vm">
<div style="margin-bottom: 15px;">
<div class="mb3">
<p><localize key="content_languagesToSendForApproval"></localize></p>
</div>
@@ -46,7 +46,7 @@
</div>
<div class="umb-list umb-list--condensed" ng-if="!vm.loading && (vm.variants | filter:vm.unmodifiedVariantFilter).length > 0">
<div style="margin-bottom: 15px; font-weight: bold;">
<div class="bold mb3">
<p><localize key="content_unmodifiedLanguages"></localize></p>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Overlays.UnpublishController as vm">
<!-- 1 language -->
<!-- Single language -->
<div ng-if="vm.variants.length === 1">
<p><localize key="prompt_confirmUnpublish"></localize></p>
</div>
@@ -43,7 +43,7 @@
</div>
<div class="umb-list umb-list--condensed" ng-if="!vm.loading && (vm.variants | filter:vm.unpublishedVariantFilter).length > 0">
<div style="margin-bottom: 15px; font-weight: bold;">
<div class="bold mb3">
<p><localize key="content_unpublishedLanguages"></localize></p>
</div>

1
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -489,6 +489,7 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
const dialog = {
view: "views/propertyeditors/listview/overlays/listviewunpublish.html",
submitButtonLabelKey: "actions_unpublish",
submitButtonStyle: "warning",
submit: function (model) {
// create a comma separated array of selected cultures

45
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
View File

@@ -1,41 +1,46 @@
<div ng-controller="Umbraco.Overlays.ListViewPublishController as vm">
<!-- Single language -->
<div ng-if="!vm.languages">
<p><localize key="prompt_confirmListViewPublish"></localize></p>
</div>
<div ng-if="vm.languages.length > 1">
<div ng-if="vm.loading" style="min-height: 50px; position: relative;">
<umb-load-indicator></umb-load-indicator>
</div>
<!-- Multiple languages -->
<div ng-if="vm.languages.length > 1 && !vm.loading">
<div class="mb3">
<p><localize key="content_languagesToPublish"></localize></p>
</div>
<div ng-if="vm.loading" style="min-height: 50px; position: relative;">
<umb-load-indicator></umb-load-indicator>
</div>
<div class="umb-list umb-list--condensed">
<div class="umb-list umb-list--condensed" ng-if="!vm.loading">
<div class="bold mb1">
<localize key="treeHeaders_languages"></localize>
</div>
<div class="umb-list-item" ng-repeat="language in vm.languages track by language.id">
<ng-form name="publishLanguageSelectorForm">
<div class="flex">
<input
id="{{language.culture}}"
name="publishLanguageSelector"
type="checkbox"
ng-model="language.publish"
ng-change="vm.changeSelection(language)"
style="margin-right: 8px;" />
<umb-checkbox input-id="publishLanguage_{{language.culture}}"
name="publishLanguageSelector"
model="language.publish"
on-change="vm.changeSelection(language)" />
<div>
<label for="{{language.culture}}" style="margin-bottom: 2px;">
<span>{{ language.name }}</span>
<label for="publishLanguage_{{language.culture}}" class="mb0">
<span>{{language.name}}</span>
<span class="db umb-list-item__description">
<span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
</span>
</label>
</div>
<div class="umb-list-item__description">
<span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
</div>
</div>
</div>
</ng-form>

1
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
View File

@@ -56,7 +56,6 @@
}
vm.loading = false;
}
onInit();

39
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
View File

@@ -1,12 +1,16 @@
<div ng-controller="Umbraco.Overlays.ListViewUnpublishController as vm">
<!-- 1 language -->
<!-- Single language -->
<div ng-if="!vm.languages">
<p><localize key="prompt_confirmListViewUnpublish"></localize></p>
</div>
<div ng-if="vm.loading" style="min-height: 50px; position: relative;">
<umb-load-indicator></umb-load-indicator>
</div>
<!-- Multiple languages -->
<div ng-if="vm.languages.length > 0">
<div ng-if="vm.languages.length > 1 && !vm.loading">
<div class="mb3">
<p><localize key="content_languagesToUnpublish"></localize></p>
@@ -14,26 +18,29 @@
<div class="umb-list umb-list--condensed">
<div class="bold mb1">
<localize key="treeHeaders_languages"></localize>
</div>
<div class="umb-list-item" ng-repeat="language in vm.languages track by language.id">
<ng-form name="unpublishLanguageSelectorForm">
<div class="flex">
<input id="{{language.culture}}"
name="unpublishLanguageSelector"
type="checkbox"
ng-model="language.unpublish"
ng-change="vm.changeSelection(language)"
ng-disabled="language.disabled"
style="margin-right: 8px;" />
<umb-checkbox input-id="unpublishLanguage_{{language.culture}}"
name="unpublishLanguageSelector"
model="language.unpublish"
on-change="vm.changeSelection(language)" />
<div>
<label for="{{language.culture}}" style="margin-bottom: 2px;">
<span>{{ language.name }}</span>
<label for="unpublishLanguage_{{language.culture}}" class="mb0">
<span>{{language.name}}</span>
<span class="db umb-list-item__description">
<span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
</span>
</label>
<div class="umb-list-item__description">
<span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
</div>
</div>
</div>
</ng-form>