2sxc 14 migration

2sic · Jul 4, 2022 · af9c0cf · af9c0cf
1 parent 6c29313
commit af9c0cf
Show file tree

Hide file tree

Showing 21 changed files with 2,696 additions and 1,268 deletions.
diff --git a/.data/app.xml b/.data/app.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.04.02" ModuleVersion="13.10.02" ExportDate="2022-05-10T14:05:43.9606936+02:00">
+<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.04.02" ModuleVersion="14.07.02" ExportDate="2022-07-04T12:44:25.4701182+02:00">
   <Header>
     <App Guid="8551a815-e9c1-4827-ae4f-c602ad441def" />
     <Language Default="en-us" />
@@ -623,13 +623,13 @@
       <Value Key="RequiredOqtaneVersion" Value="03.01.00" Type="String">
         <Dimension DimensionID="81" ReadOnly="false" />
       </Value>
-      <Value Key="RequiredVersion" Value="13.10.00" Type="String">
+      <Value Key="RequiredVersion" Value="14.07.00" Type="String">
         <Dimension DimensionID="81" ReadOnly="false" />
       </Value>
       <Value Key="SupportsAjaxReload" Value="True" Type="Boolean">
         <Dimension DimensionID="81" ReadOnly="false" />
       </Value>
-      <Value Key="Version" Value="03.02.00" Type="String">
+      <Value Key="Version" Value="03.03.00" Type="String">
         <Dimension DimensionID="81" ReadOnly="false" />
       </Value>
     </Entity>

diff --git a/.temp_cache/default-production/0.pack.gz b/.temp_cache/default-production/0.pack.gz
diff --git a/.temp_cache/default-production/index.pack.gz b/.temp_cache/default-production/index.pack.gz
diff --git a/bs4/_Popup.PartAssets.cshtml b/bs4/_Popup.PartAssets.cshtml
@@ -1,12 +1,9 @@
-@inherits Custom.Hybrid.Razor12
-@using ToSic.Sxc.Services;
+@inherits Custom.Hybrid.Razor14
 @{
   // Activate turnOn - see https://r.2sxc.org/turnon
-  GetService<IPageService>().Activate("turnOn");
-
-  var pageSvc = GetService<IPageService>();
+  Kit.Page.Activate("turnOn");
 }
 
 <turnOn turn-on='{ "run": "window.appPopupMessage3.init()", "data": { "domId": "@DynamicModel.DomId", "duration": @DynamicModel.Duration }}'></turnOn>
-<link rel="stylesheet" href="@App.Path/bs4/dist/styles.min.css" @pageSvc.AssetAttributes()>
-<script type="text/javascript" src="@App.Path/bs4/dist/scripts.min.js" @pageSvc.AssetAttributes(position:"bottom" )></script>
+<link rel="stylesheet" href="@App.Path/bs4/dist/styles.min.css" @Kit.Page.AssetAttributes()>
+<script type="text/javascript" src="@App.Path/bs4/dist/scripts.min.js" @Kit.Page.AssetAttributes(position:"bottom" )></script>
diff --git a/bs4/_Popup.PartModal.cshtml b/bs4/_Popup.PartModal.cshtml
@@ -1,8 +1,6 @@
-@inherits Custom.Hybrid.Razor12
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
-@using ToSic.Sxc.Services;
 @{
-  var imgSvc = GetService<IImageService>();
   var popup = DynamicModel.Popup;
 }
 
@@ -11,7 +9,7 @@
     <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="modal-1-title">
       @if (Text.Has(popup.Image)) {
         <header class="modal__header">
-            @imgSvc.Picture(popup.Field("Image"), settings: "Content", factor: 0.5)
+            @Kit.Image.Picture(popup.Field("Image"), settings: "Content", factor: 0.5)
           <button class="modal__close" type='button' aria-label="Close modal" data-micromodal-close></button>
         </header>
       }

diff --git a/bs4/_Popup.cshtml b/bs4/_Popup.cshtml
@@ -1,17 +1,19 @@
-@inherits Custom.Hybrid.Razor12
+@inherits Custom.Hybrid.Razor14
 @{
   var showPopup = Content.Presentation.Activated == true          // popup activated?
     && Content.Presentation.ActiveFrom.Date <= DateTime.Now.Date  // showFrom <= today?
     && Content.Presentation.ActiveTo.Date >= DateTime.Now.Date;    // showTo >= today?
   var domId = "app-popup3-js-modal-" + CmsContext.Module.Id;
+
+  var contentToolbar = Kit.Toolbar.Default().Settings(hover: "left", autoAddMore:"start", show:"always");
 }
 
 @* Do not delete warning and demo popup for admin *@
 @if(Edit.Enabled){
   <div class="alert alert-info d-flex justify-content-between">
     <div class="d-flex align-items-center">
       @Resources.DoNotDeleteWarning
-      @Edit.Toolbar(Content, toolbar: "settings&hover=left&autoAddMore=start")
+      @contentToolbar.AsTag(Content)
     </div>
     <a data-micromodal-trigger="@domId" class="btn btn-primary btn-sm text-white">@Resources.TestPopup</a>
   </div>

diff --git a/bs4/dist/scripts.min.js b/bs4/dist/scripts.min.js
diff --git a/bs4/dist/scripts.min.js.map b/bs4/dist/scripts.min.js.map
diff --git a/bs4/dist/styles.min.css b/bs4/dist/styles.min.css