Skip to content

Commit 68929a8

Browse files
committed
Integration updates: banner and declaration scripts; removed references
1 parent 960b0f8 commit 68929a8

File tree

6 files changed

+29
-41
lines changed

6 files changed

+29
-41
lines changed

src/Umbraco.Cms.Integrations.Script.Cookiebot/Constants.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/Umbraco.Cms.Integrations.Script.Cookiebot/Umbraco.Cms.Integrations.Script.Cookiebot.csproj

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
87
</PropertyGroup>
98

10-
<ItemGroup>
11-
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.3.0,12)" />
12-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.3.0,12)" />
13-
</ItemGroup>
14-
159
<ItemGroup>
1610
<Content Include="Views\Partials\UmbracoCms.Integrations\Scripts\Cookiebot\**\*.*">
1711
<Pack>true</Pack>
@@ -23,12 +17,5 @@
2317
</None>
2418
</ItemGroup>
2519

26-
<ItemGroup>
27-
<Content Remove="Views\Partials\UmbracoCms.Integrations\Scripts\Cookiebot\Cookiebot.cshtml~RF11f2acff.TMP" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<None Remove="Views\Partials\UmbracoCms.Integrations\Scripts\Cookiebot\Cookiebot.cshtml~RF11f2acff.TMP" />
32-
</ItemGroup>
3320

3421
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
2+
3+
@{
4+
var cbid = Configuration["Umbraco:Cookiebot:Settings:Id"];
5+
}
6+
7+
<script id="Cookiebot" src="https://consent.cookiebot.com/uc.js"
8+
data-cbid="@cbid"
9+
data-blockingmode="auto"
10+
type="text/javascript">
11+
</script>
12+

src/Umbraco.Cms.Integrations.Script.Cookiebot/Views/Partials/UmbracoCms.Integrations/Scripts/Cookiebot/Cookiebot.cshtml

Lines changed: 0 additions & 14 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
2+
3+
@{
4+
var scriptSrc = "https://consent.cookiebot.com/" + Configuration["Umbraco:Cookiebot:Settings:Id"] + "/cd.js";
5+
}
6+
7+
<script id="CookieDeclaration"
8+
src="@scriptSrc"
9+
type="text/javascript" async>
10+
</script>
11+

src/Umbraco.Cms.Integrations.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Cr
7979
EndProject
8080
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{54684516-D990-41C7-885E-96A064A55BB1}"
8181
EndProject
82-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Script.Cookiebot", "Umbraco.Cms.Integrations.Script.Cookiebot\Umbraco.Cms.Integrations.Script.Cookiebot.csproj", "{B6830012-7233-41D5-8CD5-E67635388806}"
82+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Script.Cookiebot", "Umbraco.Cms.Integrations.Script.Cookiebot\Umbraco.Cms.Integrations.Script.Cookiebot.csproj", "{5CB587DB-D6AD-4AA9-A2FE-52976C5F66C3}"
8383
EndProject
8484
Global
8585
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -155,10 +155,10 @@ Global
155155
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
156156
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
157157
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2}.Release|Any CPU.Build.0 = Release|Any CPU
158-
{B6830012-7233-41D5-8CD5-E67635388806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159-
{B6830012-7233-41D5-8CD5-E67635388806}.Debug|Any CPU.Build.0 = Debug|Any CPU
160-
{B6830012-7233-41D5-8CD5-E67635388806}.Release|Any CPU.ActiveCfg = Release|Any CPU
161-
{B6830012-7233-41D5-8CD5-E67635388806}.Release|Any CPU.Build.0 = Release|Any CPU
158+
{5CB587DB-D6AD-4AA9-A2FE-52976C5F66C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159+
{5CB587DB-D6AD-4AA9-A2FE-52976C5F66C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
160+
{5CB587DB-D6AD-4AA9-A2FE-52976C5F66C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
161+
{5CB587DB-D6AD-4AA9-A2FE-52976C5F66C3}.Release|Any CPU.Build.0 = Release|Any CPU
162162
EndGlobalSection
163163
GlobalSection(SolutionProperties) = preSolution
164164
HideSolutionNode = FALSE
@@ -186,7 +186,7 @@ Global
186186
{54A624E5-5321-4CC8-B74B-11ABF3605242} = {F2CAA1F7-9BED-4EB6-8875-D176B92D393A}
187187
{904B3CF6-1015-465E-8244-70FC90466F22} = {B5D14B4B-0E39-4C01-9021-D9A75F358DE1}
188188
{14303AD9-B64B-4DE1-AB4E-B0979277EAC2} = {1A4D3D38-F5B2-4528-92A1-318A7D09949D}
189-
{B6830012-7233-41D5-8CD5-E67635388806} = {54684516-D990-41C7-885E-96A064A55BB1}
189+
{5CB587DB-D6AD-4AA9-A2FE-52976C5F66C3} = {54684516-D990-41C7-885E-96A064A55BB1}
190190
EndGlobalSection
191191
GlobalSection(ExtensibilityGlobals) = postSolution
192192
SolutionGuid = {2FB51E08-A3C8-4DFF-B3CB-E99C2ED021D5}

0 commit comments

Comments
 (0)