Final work for 1.12.0

rickbutterfield · Jan 24, 2025 · 9e32512 · 9e32512
1 parent 8202a4d
commit 9e32512
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 56 deletions.
diff --git a/src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/heroBlock.cshtml b/src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/heroBlock.cshtml
@@ -5,6 +5,9 @@
     var hasBrightContrast = Model.Content.Value<string>("contrast") == "ffffff";
 }
 
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+<pre>Dropdown: @Model.Content.Dropdown</pre>
+
 <div 
     class="hero"
     style="background-color:#@backgroundColor"

diff --git a/src/Umbraco.Community.BlockPreview/BlockPreviewManifestFilter.cs b/src/Umbraco.Community.BlockPreview/BlockPreviewManifestFilter.cs
@@ -16,9 +16,12 @@ public void Filter(List<PackageManifest> manifests)
                 Scripts = new string[]
                 {
                     $"/{Constants.Configuration.AppPluginsRoot}/js/controllers/block-preview.controller.js",
-                    $"/{Constants.Configuration.AppPluginsRoot}/js/directives/published-check.directive.js",
                     $"/{Constants.Configuration.AppPluginsRoot}/js/directives/bind-compile.directive.js",
                     $"/{Constants.Configuration.AppPluginsRoot}/js/resources/preview.resource.js"
+                },
+                Stylesheets = new string[]
+                {
+                    $"/{Constants.Configuration.AppPluginsRoot}/css/block-preview.css"
                 }
             });
         }

diff --git a/...ity.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css b/...ity.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css
@@ -6,6 +6,9 @@
     padding: 8px 35px 8px 14px;
     position: relative;
 }
+    .preview-alert uui-loader {
+        margin-right: 16px;
+    }
 
     .preview-alert, .preview-alert a, .preview-alert h4 {
         color: #fff;

diff --git a/...oot/App_Plugins/Umbraco.Community.BlockPreview/js/controllers/block-preview.controller.js b/...oot/App_Plugins/Umbraco.Community.BlockPreview/js/controllers/block-preview.controller.js
@@ -78,7 +78,7 @@
             }
 
             function loadPreview() {
-                $scope.markup = $sce.trustAsHtml('<div class="preview-alert preview-alert-info">Loading preview</div>');
+                $scope.markup = $sce.trustAsHtml('<div class="preview-alert preview-alert-info"><uui-loader style="color: #fff"></uui-loader>Loading preview...</div>');
                 $scope.loading = true;
 
                 if ($scope.isGrid) {

diff --git a/...oot/App_Plugins/Umbraco.Community.BlockPreview/js/directives/published-check.directive.js b/...oot/App_Plugins/Umbraco.Community.BlockPreview/js/directives/published-check.directive.js
diff --git a/....BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html b/....BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html
@@ -4,11 +4,12 @@
         @import '/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css?umb__rnd={{cacheBuster}}';
     </style>
 
-    <div ng-if="loading === false"
-         ng-bind-compile="markup"
-         publication-check
+    <div ng-bind-compile="markup"
          settings="block.settingsData">
-        <div class="preview-alert preview-alert-info">Loading preview...</div>
+        <div class="preview-alert preview-alert-info">
+            <uui-loader style="color: #fff"></uui-loader>
+            Loading preview...
+        </div>
     </div>
 
 </div>