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

umbraco · Oct 14, 2019 · d7b25fc · d7b25fc
1 parent 7d5d424
commit d7b25fc
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 52 deletions.
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
@@ -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>
 

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
@@ -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>

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -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>

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -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>
 

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
@@ -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>
 

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
@@ -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>
 

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -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

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
@@ -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>
+                                <label for="publishLanguage_{{language.culture}}" class="mb0">
+                                    <span>{{language.name}}</span>
 
-                                <div class="umb-list-item__description">
-                                    <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
-                                </div>
+                                    <span class="db umb-list-item__description">
+                                        <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
+                                    </span>
+                                </label>
+                            </div>    
 
-                            </div>
                         </div>
 
                     </ng-form>

diff --git a/...Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js b/...Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
@@ -56,7 +56,6 @@
             }
 
             vm.loading = false;
-
         }
 
         onInit();

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
@@ -1,39 +1,46 @@
 <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>
             </div>
 
             <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;" />
-                            <div>
-                                <label for="{{language.culture}}" style="margin-bottom: 2px;">
-                                    <span>{{ language.name }}</span>
-                                </label>
 
-                                <div class="umb-list-item__description">
-                                    <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
-                                </div>
+                            <umb-checkbox input-id="unpublishLanguage_{{language.culture}}"
+                                          name="unpublishLanguageSelector"
+                                          model="language.unpublish"
+                                          on-change="vm.changeSelection(language)" />
+
+                            <div>
+                                <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>
+
                         </div>
 
                     </ng-form>
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ @@
                 }
                 vm.loading = false;
             }
             onInit();
@@ Expand Down @@