Cleanup Archive/Publish Later and remove unnecessary assets and resou…

…rces (#14441)

src/OrchardCore.Modules/OrchardCore.ArchiveLater/Drivers/ArchiveLaterPartDisplayDriver.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -37,7 +36,7 @@ public override IDisplayResult Display(ArchiveLaterPart part, BuildPartDisplayCo
     public override IDisplayResult Edit(ArchiveLaterPart part, BuildPartEditorContext context)
         => Initialize<ArchiveLaterPartViewModel>(
             GetEditorShapeType(context),
-            model => PopulateViewModel(part, model)).Location("Actions:10");
+            model => PopulateViewModel(part, model)).Location("Actions:10.5");
 
     public override async Task<IDisplayResult> UpdateAsync(ArchiveLaterPart part, IUpdateModel updater, UpdatePartEditorContext context)
     {
@@ -68,6 +67,6 @@ private async ValueTask PopulateViewModel(ArchiveLaterPart part, ArchiveLaterPar
         viewModel.ScheduledArchiveUtc = part.ScheduledArchiveUtc;
         viewModel.ScheduledArchiveLocalDateTime = part.ScheduledArchiveUtc.HasValue
             ? (await _localClock.ConvertToLocalAsync(part.ScheduledArchiveUtc.Value)).DateTime
-            : (DateTime?)null;
+            : null;
     }
 }

src/OrchardCore.Modules/OrchardCore.ArchiveLater/Views/ArchiveLaterPart.Edit.cshtml

@@ -4,18 +4,19 @@
 
 @inject IAuthorizationService AuthorizationService
 
-<style asp-src="~/OrchardCore.ArchiveLater/Styles/archive-later.min.css" debug-src="~/OrchardCore.ArchiveLater/Styles/archive-later.css"></style>
-
 @if (await AuthorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, Model.ContentItem))
 {
-    <div class="btn-group">
-        <input asp-for="ScheduledArchiveLocalDateTime" type="datetime-local" class="form-control content-preview-select" />
-        <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+    <div class="btn-group mb-1">
+        <div class="input-group">
+            <input asp-for="ScheduledArchiveLocalDateTime" type="datetime-local" class="form-control content-preview-select" />
+            <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+        </div>
     </div>
+
     @if (Model.ScheduledArchiveUtc.HasValue)
     {
-        <div class="btn-group">
-            <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+        <div class="btn-group mb-1">
+            <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
         </div>
     }
 }

src/OrchardCore.Modules/OrchardCore.ContentPreview/Views/ContentPreview.Button.cshtml

@@ -10,7 +10,7 @@
 
 @if (hasPreviewPermission)
 {
-    <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+    <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 }
 
 <div id="renderPreviewUrl" style="display:none" data-value="@Url.Action("Render", "Preview", new { area = "OrchardCore.ContentPreview" })"></div>

src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml

@@ -32,7 +32,7 @@
 
                     @if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
                     {
-                        <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+                        <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
                     }
                 </div>
             </div>

src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.PublishButton.cshtml

@@ -4,11 +4,11 @@
 
 @if (string.IsNullOrWhiteSpace(returnUrl))
 {
-    <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+    <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 }
 else
 {
-    <div class="btn-group">
+    <div class="btn-group mb-1">
         <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
         <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-reference="parent" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="visually-hidden">@T["Toggle Dropdown"]</span>

src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.SaveDraftButton.cshtml

@@ -4,11 +4,11 @@
 
 @if (string.IsNullOrWhiteSpace(returnUrl))
 {
-    <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+    <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 }
 else
 {
-    <div class="btn-group">
+    <div class="btn-group mb-1">
         <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
         <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-reference="parent" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="visually-hidden">@T["Toggle Dropdown"]</span>

src/OrchardCore.Modules/OrchardCore.PublishLater/Views/PublishLaterPart.Edit.cshtml

@@ -4,20 +4,19 @@
 
 @inject IAuthorizationService AuthorizationService
 
-<style asp-src="~/OrchardCore.PublishLater/Styles/publish-later.min.css" debug-src="~/OrchardCore.PublishLater/Styles/publish-later.css"></style>
-
 @if (await AuthorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, Model.ContentItem))
 {
-    <div class="btn-group">
+    <div class="btn-group mb-1">
         <div class="input-group">
             <input asp-for="ScheduledPublishLocalDateTime" type="datetime-local" class="form-control content-preview-select" />
-            <button class="btn btn-outline-success btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+            <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
         </div>
     </div>
+
     @if (Model.ScheduledPublishUtc.HasValue)
     {
-        <div class="btn-group">
-            <button class="btn btn-warning btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+        <div class="btn-group mb-1">
+            <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
         </div>
     }
 }