Skip to content

Commit dc41002

Browse files
jcdcdevjcdcdev
committed
feature: v10 support
1 parent 11287d5 commit dc41002

File tree

150 files changed

+3433
-6399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+3433
-6399
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
with:
1717
project-name: ${{ needs.metadata.outputs.project-name}}
1818
project-path: ${{ needs.metadata.outputs.project-path }}
19-
umbraco-version: UMBRACO_VERSION
19+
umbraco-version: 10

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
project-name: ${{ needs.metadata.outputs.project-name}}
2121
project-path: ${{ needs.metadata.outputs.project-path }}
22-
umbraco-version: UMBRACO_VERSION
22+
umbraco-version: 10
2323
- name: Release
2424
uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main
2525
with:

‎src/TestSite.10/Composer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Umbraco.Cms.Core.Composing;
22
using Umbraco.Community.BackOfficeOrganiser;
3+
using Umbraco.Community.BackOfficeOrganiser.Composing;
34

45
namespace TestSite.Ten;
56

‎src/TestSite.10/TestSite.10.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="10.8.5"/>
10+
<PackageReference Include="Umbraco.Cms" Version="10.8.6"/>
1111
<PackageReference Include="uSync" Version="10.7.3"/>
1212
</ItemGroup>
1313

1414
<ItemGroup>
1515
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
16-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3"/>
16+
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9"/>
1717
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))"/>
1818
</ItemGroup>
1919

@@ -25,11 +25,6 @@
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\Umbraco.Community.BackOfficeOrganiser\Umbraco.Community.BackOfficeOrganiser.csproj" />
28-
<ProjectReference Include="..\Umbraco.Community.SimpleDashboards\Umbraco.Community.SimpleDashboards.csproj"/>
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<_ContentIncludedByDefault Remove="Views\Dashboards\Basic.cshtml" />
3328
</ItemGroup>
3429

3530
<PropertyGroup>

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoHeadlineBlock.cshtml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
2+
3+
<h2 style="padding: 20px">@Model.Content.Value("headline")</h2>

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoImageBlock.cshtml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@using Umbraco.Cms.Core.Models
2+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
3+
4+
@{
5+
var typedMediaPickerSingle = Model.Content.Value<MediaWithCrops>("image");
6+
if (typedMediaPickerSingle != null)
7+
{
8+
<img src="@typedMediaPickerSingle.GetCropUrl("1x1")" style="object-fit:cover; width:100%; height:100%;"/>
9+
}
10+
else
11+
{
12+
<p>Missing image</p>
13+
}
14+
}

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoRichTextBlock.cshtml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
2+
3+
<div style="padding: 20px">
4+
@Model.Content.Value("richText")
5+
</div>

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoTwoColumnLayoutBlock.cshtml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
2+
3+
<div>
4+
@await Html.GetBlockGridItemAreasHtmlAsync(Model)
5+
</div>

‎src/TestSite.10/Views/Partials/blockgrid/area.cshtml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
@using Umbraco.Extensions
2-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridArea>
3-
4-
<div class="umb-block-grid__area"
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridArea>
2+
@{
3+
var bsClass = $"col-{Model.ColumnSpan}";
4+
}
5+
<div class="umb-block-grid__area @bsClass"
56
data-area-col-span="@Model.ColumnSpan"
67
data-area-row-span="@Model.RowSpan"
78
data-area-alias="@Model.Alias"

‎src/TestSite.10/Views/Partials/blockgrid/areas.cshtml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
@using Umbraco.Extensions
2-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
32
@{
4-
if (Model?.Areas.Any() != true) { return; }
3+
if (Model?.Areas.Any() != true)
4+
{
5+
return;
6+
}
57
}
68

7-
<div class="umb-block-grid__area-container"
9+
<div class="umb-block-grid__area-container row"
810
style="--umb-block-grid--area-grid-columns: @(Model.AreaGridColumns?.ToString() ?? Model.GridColumns?.ToString() ?? "12");">
911
@foreach (var area in Model.Areas)
1012
{

0 commit comments

Comments
 (0)