From 23f45a063e4b047a4d12c4ae3b105693046214b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Edling?= Date: Tue, 8 Sep 2020 10:40:27 +0200 Subject: [PATCH] Updated Primary Image & Excerpt. Fixes #1290 --- .../Piranha.AspNetCore.SimpleSecurity.csproj | 4 +- .../Piranha.AspNetCore.csproj | 5 +- .../Piranha.AttributeBuilder.csproj | 4 +- .../Piranha.Azure.BlobStorage.csproj | 4 +- .../Piranha.Azure.Search.csproj | 2 +- .../Piranha.ImageSharp.csproj | 4 +- .../Piranha.Local.FileStorage.csproj | 4 +- .../Piranha.Manager.Localization.csproj | 4 +- .../Piranha.Manager.Summernote.csproj | 4 +- .../Piranha.Manager.TinyMCE.csproj | 4 +- .../Areas/Manager/Pages/PageEdit.cshtml | 43 +-- .../Pages/Partial/_PageSettings.cshtml | 280 ++++++++++-------- .../Pages/Partial/_PostSettings.cshtml | 263 ++++++++-------- .../Areas/Manager/Pages/PostEdit.cshtml | 41 --- core/Piranha.Manager/Models/PageEditModel.cs | 5 + core/Piranha.Manager/Piranha.Manager.csproj | 4 +- core/Piranha.Manager/Services/PageService.cs | 20 +- .../assets/dist/css/full.min.css | 4 +- .../assets/dist/css/slim.min.css | 4 +- .../Piranha.Manager/assets/dist/js/piranha.js | 5 + .../assets/dist/js/piranha.min.js | 2 +- .../assets/dist/js/piranha.pageedit.js | 11 +- .../assets/dist/js/piranha.pageedit.min.js | 2 +- .../assets/src/js/piranha.pageedit.js | 11 +- .../assets/src/js/piranha.utils.js | 5 + .../assets/src/scss/inc/_blocks.scss | 16 +- .../assets/src/scss/inc/_modals.scss | 5 + core/Piranha.WebApi/Piranha.WebApi.csproj | 4 +- core/Piranha/Piranha.csproj | 4 +- .../Piranha.Data.EF.MySql.csproj | 4 +- .../Piranha.Data.EF.PostgreSql.csproj | 4 +- .../Piranha.Data.EF.SQLServer.csproj | 4 +- .../Piranha.Data.EF.SQLite.csproj | 4 +- data/Piranha.Data.EF/Piranha.Data.EF.csproj | 4 +- examples/RazorWeb/Models/TeaserPage.cs | 2 +- .../Piranha.AspNetCore.Identity.MySQL.csproj | 4 +- ...anha.AspNetCore.Identity.PostgreSQL.csproj | 4 +- ...ranha.AspNetCore.Identity.SQLServer.csproj | 4 +- .../Piranha.AspNetCore.Identity.SQLite.csproj | 4 +- .../Piranha.AspNetCore.Identity.csproj | 4 +- 40 files changed, 423 insertions(+), 387 deletions(-) diff --git a/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj b/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj index 929104bd4..a94015033 100644 --- a/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj +++ b/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 8.4.0 + 9.0.0-alpha1 Piranha CMS Piranha.AspNetCore bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -13,7 +13,7 @@ snupkg Piranha.AspNetCore.SimpleSecurity - 8.4.0 + 9.0.0-alpha1 Piranha CMS Piranha CMS simple security provider for AspNetCore Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj b/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj index 6cbd82963..61ff8c785 100644 --- a/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj +++ b/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj @@ -2,17 +2,16 @@ netcoreapp3.1 - 8.4.1 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - $(NoWarn);1591 true true true snupkg Piranha.AspNetCore - 8.4.1 + 9.0.0-alpha1 Piranha CMS Piranha CMS middleware components for AspNetCore Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj b/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj index e402c212f..ec407298c 100644 --- a/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj +++ b/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml true @@ -11,7 +11,7 @@ snupkg Piranha.AttributeBuilder - 8.4.0 + 9.0.0-alpha1 Piranha CMS Library for defining content types with Attributes Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj b/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj index a5355db4e..c10ebc7e2 100644 --- a/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj +++ b/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 8.4.0 + 9.0.0-alpha1 Piranha CMS Piranha.Azure bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -13,7 +13,7 @@ snupkg Piranha.Azure.BlobStorage - 8.4.0 + 9.0.0-alpha1 Piranha CMS Package for storing uploaded media assets on Azure Blob Storage Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj b/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj index ab6bda273..a2d993951 100644 --- a/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj +++ b/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn);1591 diff --git a/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj b/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj index d35cfe29c..f0b4ddee7 100644 --- a/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj +++ b/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn);1591 @@ -12,7 +12,7 @@ snupkg Piranha.ImageSharp - 8.4.0 + 9.0.0-alpha1 Piranha CMS Package for processing uploaded images using ImageSharp Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj b/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj index 11b7dd2ab..f3c09e4e9 100644 --- a/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj +++ b/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn);1591 @@ -12,7 +12,7 @@ snupkg Piranha.Local.FileStorage - 8.4.0 + 9.0.0-alpha1 Piranha CMS Package for storing uploaded media assets on disc Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj b/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj index dfc543f5b..7b6c5931c 100644 --- a/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj +++ b/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn);1591 @@ -12,7 +12,7 @@ snupkg Piranha.Manager.Localization - 8.4.0 + 9.0.0-alpha1 Piranha CMS Localization for the Piranha CMS manager panel Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Manager.Summernote/Piranha.Manager.Summernote.csproj b/core/Piranha.Manager.Summernote/Piranha.Manager.Summernote.csproj index 6606a30a8..c3b0a489e 100644 --- a/core/Piranha.Manager.Summernote/Piranha.Manager.Summernote.csproj +++ b/core/Piranha.Manager.Summernote/Piranha.Manager.Summernote.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 true - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn);1591 @@ -13,7 +13,7 @@ snupkg Piranha.Manager.Summernote - 8.4.0 + 9.0.0-alpha1 Piranha CMS Summernote WYSIWYG Editor for Piranha CMS Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Manager.TinyMCE/Piranha.Manager.TinyMCE.csproj b/core/Piranha.Manager.TinyMCE/Piranha.Manager.TinyMCE.csproj index 87c0d3edf..8598e2e9c 100644 --- a/core/Piranha.Manager.TinyMCE/Piranha.Manager.TinyMCE.csproj +++ b/core/Piranha.Manager.TinyMCE/Piranha.Manager.TinyMCE.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 true - 8.4.0 + 9.0.0-alpha1 Piranha CMS bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn);1591 @@ -13,7 +13,7 @@ snupkg Piranha.Manager.TinyMCE - 8.4.0 + 9.0.0-alpha1 Piranha CMS TinyMCE WYSIWYG Editor for Piranha CMS Copyright (c) .NET Foundation and Contributors diff --git a/core/Piranha.Manager/Areas/Manager/Pages/PageEdit.cshtml b/core/Piranha.Manager/Areas/Manager/Pages/PageEdit.cshtml index 278b44bfa..ff3266fb8 100644 --- a/core/Piranha.Manager/Areas/Manager/Pages/PageEdit.cshtml +++ b/core/Piranha.Manager/Areas/Manager/Pages/PageEdit.cshtml @@ -58,7 +58,7 @@
  • @Localizer.Menu["Content"]
  • @Localizer.Menu["Pages"]
  • @Localizer.General["Edit"]
    • -
  • @Localizer.General["Copy"]
    • +
  • @Localizer.General["Copy"]
  • @Localizer.General["Draft"]
    • @@ -132,47 +132,6 @@
    -
    -
    -
    -
    -
    - -
    -
    - - -
    -
    -
    -   -
    -
    - {{ primaryImage.media.filename }} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    diff --git a/core/Piranha.Manager/Areas/Manager/Pages/Partial/_PageSettings.cshtml b/core/Piranha.Manager/Areas/Manager/Pages/Partial/_PageSettings.cshtml index 0cc2cf7a8..d6a19f571 100644 --- a/core/Piranha.Manager/Areas/Manager/Pages/Partial/_PageSettings.cshtml +++ b/core/Piranha.Manager/Areas/Manager/Pages/Partial/_PageSettings.cshtml @@ -1,7 +1,7 @@ @inject ManagerLocalizer Localizer -