From b72d98390728839680ee58056625e7b0bb82282a Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Thu, 21 Apr 2022 13:19:22 +0800
Subject: [PATCH 01/52] Only collapse main primary tabs in Page editor

This fixes an issue with the primary tab collapse feature in the Page Editor that also collapses nested forms that contain tabs, effectively hiding the entire nested form.
---
 assets/js/pages-page.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/pages-page.js b/assets/js/pages-page.js
index d892a23..247ce41 100644
--- a/assets/js/pages-page.js
+++ b/assets/js/pages-page.js
@@ -455,8 +455,8 @@
 
             var $collapseIcon = $('<a href="javascript:;" class="tab-collapse-icon tabless"><i class="icon-chevron-up"></i></a>'),
                 $panel = $('.form-tabless-fields', data.pane),
-                $secondaryPanel = $('.control-tabs.secondary-tabs', data.pane),
-                $primaryPanel = $('.control-tabs.primary-tabs', data.pane),
+                $secondaryPanel = $(data.pane).find('.control-tabs.secondary-tabs').first(),
+                $primaryPanel = $(data.pane).find('.control-tabs.primary-tabs').first(),
                 hasSecondaryTabs = $secondaryPanel.length > 0
 
             $secondaryPanel.addClass('secondary-content-tabs')

From f78acf171711e123d52f57c809268fedbaca0862 Mon Sep 17 00:00:00 2001
From: Romain 'Maz' BILLOIR <romainb@octobercms.fr>
Date: Sun, 22 May 2022 19:44:54 +0200
Subject: [PATCH 02/52] Fix link (#10)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8ea7e33..65b6633 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,6 @@ The Code field allows to assign the API code that you can use to set the active
 
 ## See also
 
-Read the [Getting started with Static Pages](https://wintercms.com/blog/post/getting-started-static-pages) tutorial in the Blog.
+Read the [Getting started with Static Pages](https://octobercms.com/blog/post/getting-started-static-pages) tutorial in the October CMS Blog.
 
 Read the [documentation](/docs/documentation.md).

From 81cd3c22d7515c12733fa0a5bf4970b0050638fa Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Sat, 16 Jul 2022 08:44:30 +0800
Subject: [PATCH 03/52] Add support for Winter v1.2 (#15)

Co-authored-by: Luke Towers <luke@luketowers.ca>
---
 classes/Controller.php          | 2 +-
 components/staticmenu/items.htm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Controller.php b/classes/Controller.php
index c45eec2..50fa854 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -75,7 +75,7 @@ public function injectPageTwig($page, $loader, $twig)
 
         CmsException::mask($staticPage, 400);
         $loader->setObject($staticPage);
-        $template = $twig->loadTemplate($staticPage->getFilePath());
+        $template = $twig->load($staticPage->getFilePath());
         $template->render([]);
         CmsException::unmask();
     }
diff --git a/components/staticmenu/items.htm b/components/staticmenu/items.htm
index dea0107..7d2f355 100644
--- a/components/staticmenu/items.htm
+++ b/components/staticmenu/items.htm
@@ -1,4 +1,4 @@
-{% for item in items if not item.viewBag.isHidden %}
+{% for item in items | filter(item => not item.viewBag.isHidden) %}
     <li role="presentation" class="{{ item.isActive ? 'active' : '' }} {{ item.isChildActive ? 'child-active' : '' }} {{ item.viewBag.cssClass }}">
         {% if item.url %}
             <a href="{{ item.url }}" {{ item.viewBag.isExternal ? 'target="_blank"' }}>

From f339262f0df1e8705289d0e7b5e3168468abea58 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Sat, 16 Jul 2022 08:46:57 +0800
Subject: [PATCH 04/52] 2.0.2: Add support for Winter 1.2

---
 updates/version.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/updates/version.yaml b/updates/version.yaml
index 49ca062..fe79f5d 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -62,3 +62,4 @@
   - "Fixes rich editor usage inside repeaters."
   - "Fixes a lifecycle issue when switching the page layout."
   - "Fixes maintenance mode when using static pages."
+"2.0.2": "Add support for Winter 1.2"
\ No newline at end of file

From e1c29729492de0ff46bd9edb80fd2e95854b0fa4 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Aug 2022 10:25:25 -0400
Subject: [PATCH 05/52] add composer replace config.

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 7d0a8b5..d29cf72 100644
--- a/composer.json
+++ b/composer.json
@@ -31,6 +31,9 @@
         "php": ">=7.2",
         "composer/installers": "~1.0"
     },
+    "replace": {
+        "rainlab/pages-plugin": "~1.4"
+    },
     "extra": {
         "installer-name": "pages"
     }

From 98887fcc146aebe7d4cdfeed5842cdad8978cc59 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Aug 2022 11:52:44 -0400
Subject: [PATCH 06/52] include 1.3.x releases

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d29cf72..4d3266c 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "composer/installers": "~1.0"
     },
     "replace": {
-        "rainlab/pages-plugin": "~1.4"
+        "rainlab/pages-plugin": "~1.3"
     },
     "extra": {
         "installer-name": "pages"

From 240b82a799c21d34d3f6a350baeb347b97cf7afb Mon Sep 17 00:00:00 2001
From: Robert Alexa <mail@robertalexa.me>
Date: Mon, 19 Sep 2022 18:06:33 +0100
Subject: [PATCH 07/52] Increase specificity of selector (#18)

Fixes an issue when you switch from a Menu tab to a Page tab
---
 assets/js/pages-page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/pages-page.js b/assets/js/pages-page.js
index 247ce41..4b28c06 100644
--- a/assets/js/pages-page.js
+++ b/assets/js/pages-page.js
@@ -464,7 +464,7 @@
             $panel.append($collapseIcon)
 
             if (!hasSecondaryTabs) {
-                $('.primary-tabs').parent().removeClass('min-size')
+                $(data.pane).find('.primary-tabs').parent().removeClass('min-size')
             }
 
             $collapseIcon.click(function(){

From 1d5d0abfcac61baaddc01bd4a6038aa25ef49f2f Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Sun, 25 Sep 2022 16:08:42 -0600
Subject: [PATCH 08/52] Reorder imports

---
 Plugin.php                       | 11 +++++++----
 classes/Controller.php           |  8 +++++---
 classes/Menu.php                 |  4 ++--
 classes/Page.php                 | 28 ++++++++++++++--------------
 classes/Router.php               |  6 +++---
 classes/Snippet.php              |  8 ++++----
 classes/SnippetManager.php       |  6 +++---
 components/StaticBreadcrumbs.php |  2 +-
 components/StaticMenu.php        |  2 +-
 components/StaticPage.php        |  2 +-
 formwidgets/MenuItemSearch.php   |  4 ++--
 formwidgets/MenuPicker.php       |  2 +-
 widgets/MenuList.php             |  8 ++++----
 widgets/PageList.php             |  6 +++---
 widgets/SnippetList.php          |  8 ++++----
 15 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index 64ed043..02ec90f 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -1,16 +1,19 @@
 <?php namespace Winter\Pages;
 
-use Event;
 use Backend;
+use Backend\Classes\Controller as BaseBackendController;
+use Backend\FormWidgets\RichEditor as FroalaFormWidget;
 use Backend\Models\UserRole;
+use BackendAuth;
+use Cms\Classes\Controller as CmsController;
+use Cms\Classes\Theme;
+use Event;
+use System\Classes\PluginBase;
 use Winter\Pages\Classes\Controller;
 use Winter\Pages\Classes\Page as StaticPage;
 use Winter\Pages\Classes\Router;
 use Winter\Pages\Classes\Snippet;
 use Winter\Pages\Classes\SnippetManager;
-use Cms\Classes\Theme;
-use Cms\Classes\Controller as CmsController;
-use System\Classes\PluginBase;
 
 class Plugin extends PluginBase
 {
diff --git a/classes/Controller.php b/classes/Controller.php
index 50fa854..8262662 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -1,11 +1,13 @@
 <?php namespace Winter\Pages\Classes;
 
-use Lang;
+use Cms\Classes\CmsException;
 use Cms\Classes\Page as CmsPage;
 use Cms\Classes\Theme;
-use Cms\Classes\CmsException;
-use Winter\Storm\Parse\Syntax\Parser as SyntaxParser;
 use Exception;
+use Lang;
+use Session;
+use Winter\Storm\Parse\Syntax\Parser as SyntaxParser;
+use Winter\Storm\Support\Str;
 
 /**
  * Represents a static page controller.
diff --git a/classes/Menu.php b/classes/Menu.php
index 63ba126..1ab8fc7 100644
--- a/classes/Menu.php
+++ b/classes/Menu.php
@@ -1,10 +1,10 @@
 <?php namespace Winter\Pages\Classes;
 
-use Url;
+use Cms\Classes\Meta;
 use Event;
 use Request;
 use SystemException;
-use Cms\Classes\Meta;
+use Url;
 use Winter\Storm\Support\Str;
 
 /**
diff --git a/classes/Page.php b/classes/Page.php
index dd7771d..5b13f7f 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -1,24 +1,24 @@
 <?php namespace Winter\Pages\Classes;
 
+use Cache;
 use Cms;
+use Cms\Classes\ComponentManager;
+use Cms\Classes\Content as ContentBase;
+use Cms\Classes\Layout;
+use Cms\Classes\Theme;
+use Config;
+use Event;
 use File;
 use Lang;
-use Cache;
-use Event;
-use Config;
+use System\Helpers\View as ViewHelper;
+use Twig\Node\Node as TwigNode;
 use Validator;
-use Winter\Pages\Classes\Snippet;
 use Winter\Pages\Classes\PageList;
-use Cms\Classes\Theme;
-use Cms\Classes\Layout;
-use Cms\Classes\Content as ContentBase;
-use Cms\Classes\ComponentManager;
-use System\Helpers\View as ViewHelper;
-use Winter\Storm\Support\Str;
-use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Pages\Classes\Snippet;
 use Winter\Storm\Parse\Bracket as TextParser;
 use Winter\Storm\Parse\Syntax\Parser as SyntaxParser;
-use Twig\Node\Node as TwigNode;
+use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Str;
 
 /**
  * Represents a static page.
@@ -241,14 +241,14 @@ public function delete()
         foreach ($this->getChildren() as $subPage) {
             $result = array_merge($result, $subPage->delete());
         }
-        
+
         /*
          * Delete the object
          */
         $result = array_merge($result, [$this->getBaseFileName()]);
 
         parent::delete();
-        
+
         /*
          * Remove from meta
          */
diff --git a/classes/Router.php b/classes/Router.php
index db909ff..51a5ade 100644
--- a/classes/Router.php
+++ b/classes/Router.php
@@ -1,12 +1,12 @@
 <?php namespace Winter\Pages\Classes;
 
 use Cache;
-use Event;
-use Config;
 use Cms\Classes\Theme;
+use Config;
+use Event;
 use Winter\Pages\Classes\Page;
-use Winter\Storm\Support\Str;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Str;
 
 /**
  * A router for static pages.
diff --git a/classes/Snippet.php b/classes/Snippet.php
index 676e698..cf16778 100644
--- a/classes/Snippet.php
+++ b/classes/Snippet.php
@@ -1,12 +1,12 @@
 <?php namespace Winter\Pages\Classes;
 
-use Event;
-use Lang;
-use Cache;
-use Config;
 use ApplicationException;
+use Cache;
 use Cms\Classes\ComponentHelpers;
 use Cms\Classes\Controller as CmsController;
+use Config;
+use Event;
+use Lang;
 use ValidationException;
 
 /**
diff --git a/classes/SnippetManager.php b/classes/SnippetManager.php
index cebb217..97a8596 100644
--- a/classes/SnippetManager.php
+++ b/classes/SnippetManager.php
@@ -1,11 +1,11 @@
 <?php namespace Winter\Pages\Classes;
 
-use Event;
 use Cache;
-use Config;
-use SystemException;
 use Cms\Classes\Partial;
+use Config;
+use Event;
 use System\Classes\PluginManager;
+use SystemException;
 use Winter\Pages\Classes\Snippet;
 
 /**
diff --git a/components/StaticBreadcrumbs.php b/components/StaticBreadcrumbs.php
index ee4c6b6..34d6529 100644
--- a/components/StaticBreadcrumbs.php
+++ b/components/StaticBreadcrumbs.php
@@ -2,9 +2,9 @@
 
 use Cms\Classes\ComponentBase;
 use Cms\Classes\Theme;
-use Winter\Pages\Classes\Router;
 use Winter\Pages\Classes\MenuItemReference;
 use Winter\Pages\Classes\Page as StaticPageClass;
+use Winter\Pages\Classes\Router;
 
 /**
  * The static breadcrumbs component.
diff --git a/components/StaticMenu.php b/components/StaticMenu.php
index c393cb1..42acf1a 100644
--- a/components/StaticMenu.php
+++ b/components/StaticMenu.php
@@ -16,7 +16,7 @@ class StaticMenu extends ComponentBase
      * @var string The menu name.
      */
     public $menuName;
-    
+
     /**
      * @var array A list of items generated by the menu.
      * Each item is an object of the Winter\Pages\Classes\MenuItemReference class.
diff --git a/components/StaticPage.php b/components/StaticPage.php
index 2e026b2..b7e4ecb 100644
--- a/components/StaticPage.php
+++ b/components/StaticPage.php
@@ -1,7 +1,7 @@
 <?php namespace Winter\Pages\Components;
 
-use Cms\Classes\Theme;
 use Cms\Classes\ComponentBase;
+use Cms\Classes\Theme;
 use Cms\Models\MaintenanceSetting;
 use Winter\Pages\Classes\Router;
 
diff --git a/formwidgets/MenuItemSearch.php b/formwidgets/MenuItemSearch.php
index 071e5bb..292ba45 100644
--- a/formwidgets/MenuItemSearch.php
+++ b/formwidgets/MenuItemSearch.php
@@ -1,8 +1,8 @@
 <?php namespace Winter\Pages\FormWidgets;
 
-use Str;
-use Input;
 use Backend\Classes\FormWidgetBase;
+use Input;
+use Str;
 use Winter\Pages\Classes\MenuItem;
 
 /**
diff --git a/formwidgets/MenuPicker.php b/formwidgets/MenuPicker.php
index dfc03c2..51a428c 100644
--- a/formwidgets/MenuPicker.php
+++ b/formwidgets/MenuPicker.php
@@ -1,8 +1,8 @@
 <?php namespace Winter\Pages\FormWidgets;
 
-use Cms\Classes\Theme;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
+use Cms\Classes\Theme;
 use Winter\Pages\Classes\Menu;
 
 /**
diff --git a/widgets/MenuList.php b/widgets/MenuList.php
index b60d14c..4d875da 100644
--- a/widgets/MenuList.php
+++ b/widgets/MenuList.php
@@ -1,10 +1,10 @@
 <?php namespace Winter\Pages\Widgets;
 
-use Str;
-use Input;
-use Winter\Pages\Classes\Menu;
 use Backend\Classes\WidgetBase;
 use Cms\Classes\Theme;
+use Input;
+use Str;
+use Winter\Pages\Classes\Menu;
 
 /**
  * Menu list widget.
@@ -112,7 +112,7 @@ protected function getSession($key = null, $default = null)
         return parent::getSession($key, $default);
     }
 
-    protected function putSession($key, $value) 
+    protected function putSession($key, $value)
     {
         return parent::putSession($this->getThemeSessionKey($key), $value);
     }
diff --git a/widgets/PageList.php b/widgets/PageList.php
index 97c5e23..521e08e 100644
--- a/widgets/PageList.php
+++ b/widgets/PageList.php
@@ -1,10 +1,10 @@
 <?php namespace Winter\Pages\Widgets;
 
-use Str;
-use Input;
 use Backend\Classes\WidgetBase;
-use Winter\Pages\Classes\PageList as StaticPageList;
 use Cms\Classes\Theme;
+use Input;
+use Str;
+use Winter\Pages\Classes\PageList as StaticPageList;
 
 /**
  * Static page list widget.
diff --git a/widgets/SnippetList.php b/widgets/SnippetList.php
index 51d81d4..7862a59 100644
--- a/widgets/SnippetList.php
+++ b/widgets/SnippetList.php
@@ -1,9 +1,9 @@
 <?php namespace Winter\Pages\Widgets;
 
-use Str;
-use Input;
 use Backend\Classes\WidgetBase;
 use Cms\Classes\Theme;
+use Input;
+use Str;
 use Winter\Pages\Classes\SnippetManager;
 
 /**
@@ -93,7 +93,7 @@ protected function updateList()
     protected function getThemeSessionKey($prefix)
     {
         return $prefix.$this->theme->getDirName();
-    }    
+    }
 
     protected function getSession($key = null, $default = null)
     {
@@ -102,7 +102,7 @@ protected function getSession($key = null, $default = null)
         return parent::getSession($key, $default);
     }
 
-    protected function putSession($key, $value) 
+    protected function putSession($key, $value)
     {
         return parent::putSession($this->getThemeSessionKey($key), $value);
     }

From 7d122fdc0e81ecb54e2ecc97f720910d1e1b3308 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Sun, 25 Sep 2022 16:11:02 -0600
Subject: [PATCH 09/52] Initial support for Preview tab for pages

---
 Plugin.php                     |  35 ++--
 classes/Controller.php         |  21 +-
 classes/ObjectHelper.php       | 197 ++++++++++++++++++
 classes/page/field.preview.php | 101 +++++++++
 classes/page/fields.yaml       |  17 ++
 controllers/Index.php          | 362 +++++++++++++--------------------
 6 files changed, 497 insertions(+), 236 deletions(-)
 create mode 100644 classes/ObjectHelper.php
 create mode 100644 classes/page/field.preview.php

diff --git a/Plugin.php b/Plugin.php
index 02ec90f..0db46e7 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -32,10 +32,10 @@ public function pluginDetails()
     public function registerComponents()
     {
         return [
-            '\Winter\Pages\Components\ChildPages' => 'childPages',
-            '\Winter\Pages\Components\StaticPage' => 'staticPage',
-            '\Winter\Pages\Components\StaticMenu' => 'staticMenu',
-            '\Winter\Pages\Components\StaticBreadcrumbs' => 'staticBreadcrumbs'
+            \Winter\Pages\Components\ChildPages::class => 'childPages',
+            \Winter\Pages\Components\StaticPage::class => 'staticPage',
+            \Winter\Pages\Components\StaticMenu::class => 'staticMenu',
+            \Winter\Pages\Components\StaticBreadcrumbs::class => 'staticBreadcrumbs'
         ];
     }
 
@@ -46,26 +46,26 @@ public function registerPermissions()
                 'tab'   => 'winter.pages::lang.page.tab',
                 'order' => 200,
                 'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
-                'label' => 'winter.pages::lang.page.manage_pages'
+                'label' => 'winter.pages::lang.page.manage_pages',
             ],
             'winter.pages.manage_menus' => [
                 'tab'   => 'winter.pages::lang.page.tab',
                 'order' => 200,
                 'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
-                'label' => 'winter.pages::lang.page.manage_menus'
+                'label' => 'winter.pages::lang.page.manage_menus',
                 ],
             'winter.pages.manage_content' => [
                 'tab'   => 'winter.pages::lang.page.tab',
                 'order' => 200,
                 'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
-                'label' => 'winter.pages::lang.page.manage_content'
+                'label' => 'winter.pages::lang.page.manage_content',
             ],
             'winter.pages.access_snippets' => [
                 'tab'   => 'winter.pages::lang.page.tab',
                 'order' => 200,
                 'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
-                'label' => 'winter.pages::lang.page.access_snippets'
-            ]
+                'label' => 'winter.pages::lang.page.access_snippets',
+            ],
         ];
     }
 
@@ -86,31 +86,31 @@ public function registerNavigation()
                         'icon'        => 'icon-files-o',
                         'url'         => 'javascript:;',
                         'attributes'  => ['data-menu-item'=>'pages'],
-                        'permissions' => ['winter.pages.manage_pages']
+                        'permissions' => ['winter.pages.manage_pages'],
                     ],
                     'menus' => [
                         'label'       => 'winter.pages::lang.menu.menu_label',
                         'icon'        => 'icon-sitemap',
                         'url'         => 'javascript:;',
                         'attributes'  => ['data-menu-item'=>'menus'],
-                        'permissions' => ['winter.pages.manage_menus']
+                        'permissions' => ['winter.pages.manage_menus'],
                     ],
                     'content' => [
                         'label'       => 'winter.pages::lang.content.menu_label',
                         'icon'        => 'icon-file-text-o',
                         'url'         => 'javascript:;',
                         'attributes'  => ['data-menu-item'=>'content'],
-                        'permissions' => ['winter.pages.manage_content']
+                        'permissions' => ['winter.pages.manage_content'],
                     ],
                     'snippets' => [
                         'label'       => 'winter.pages::lang.snippet.menu_label',
                         'icon'        => 'icon-newspaper-o',
                         'url'         => 'javascript:;',
                         'attributes'  => ['data-menu-item'=>'snippet'],
-                        'permissions' => ['winter.pages.access_snippets']
-                    ]
-                ]
-            ]
+                        'permissions' => ['winter.pages.access_snippets'],
+                    ],
+                ],
+            ],
         ];
     }
 
@@ -231,9 +231,8 @@ public function boot()
 
     /**
      * Register new Twig variables
-     * @return array
      */
-    public function registerMarkupTags()
+    public function registerMarkupTags(): array
     {
         return [
             'filters' => [
diff --git a/classes/Controller.php b/classes/Controller.php
index 8262662..ad29af2 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -43,7 +43,26 @@ public function initCmsPage($url)
         $page = $router->findByUrl($url);
 
         if (!$page) {
-            return null;
+            // Attempt to render a page preview if one exists
+            if (Str::startsWith($url, '/winter.pages/preview/')) {
+                $alias = Str::after($url, '/winter.pages/preview/');
+                $objectType = 'page';
+                $data = Session::pull("winter.pages.$objectType.preview:$alias");
+
+                try {
+                    $page = ObjectHelper::fillObject(
+                        $this->theme,
+                        'page',
+                        $data['objectPath'] ?? $data['fileName'],
+                        $data
+                    );
+                } catch (\Throwable $e) {
+                    throw $e;// @TODO: Hide this exception
+                    return null;
+                }
+            } else {
+                return null;
+            }
         }
 
         $viewBag = $page->viewBag;
diff --git a/classes/ObjectHelper.php b/classes/ObjectHelper.php
new file mode 100644
index 0000000..fc805fd
--- /dev/null
+++ b/classes/ObjectHelper.php
@@ -0,0 +1,197 @@
+<?php namespace Winter\Pages\Classes;
+
+use ApplicationException;
+use Cms\Classes\CmsCompoundObject;
+use Cms\Classes\CmsObject;
+use Cms\Classes\Theme;
+use Config;
+use Lang;
+
+class ObjectHelper
+{
+    protected static array $types = [
+        'page'    => \Winter\Pages\Classes\Page::class,
+        'menu'    => \Winter\Pages\Classes\Menu::class,
+        'content' => \Winter\Pages\Classes\Conten::class,
+    ];
+
+    /**
+     * Get the session key for the preview data.
+     */
+    public static function getTypePreviewSessionKeyPrefix(string $type,): string
+    {
+        return "winter.pages.$type.preview:";
+    }
+
+    /**
+     * Resolves an object's class name from the provided type
+     * @throws ApplicationException if the provided type couldn't be resolved
+     */
+    public static function resolveTypeClassName(string $type): string
+    {
+        $types = static::$types;
+
+        if (!array_key_exists($type, $types)) {
+            throw new ApplicationException(Lang::get('winter.pages::lang.object.invalid_type') . ' - type - ' . $type);
+        }
+
+        return $types[$type];
+    }
+
+    /**
+     * Resolves an object's type string from the provided class name
+     * @throws ApplicationException if the provided class couldn't be resolved
+     */
+    public static function resolveClassType(string $class): string
+    {
+        $classes = array_flip(static::$types);
+
+        if (!array_key_exists($class, $classes)) {
+            throw new ApplicationException(Lang::get('winter.pages::lang.object.invalid_type') . ' - class - ' . $class);
+        }
+
+        return $classes[$class];
+    }
+
+    /**
+     * Converts line endings based on the system's configuration
+     */
+    public static function convertLineEndings(string $markup): string
+    {
+        if (Config::get('cms.convertLineEndings', false) === true) {
+            $markup = str_replace("\r\n", "\n", $markup);
+            $markup = str_replace("\r", "\n", $markup);
+        }
+
+        return $markup;
+    }
+
+    /**
+     * Creates an object in the provided theme
+     * @throws ApplicationException if the object cannot be created in the theme
+     */
+    public static function createObject(Theme $theme, string $type): CmsObject
+    {
+        $class = static::resolveTypeClassName($type);
+
+        if (!($object = $class::inTheme($theme))) {
+            throw new ApplicationException(Lang::get('winter.pages::lang.object.not_found'));
+        }
+
+        return $object;
+    }
+
+    /**
+     * Gets the object by its type and path
+     * @throws ApplicationException if the object cannot be resolved and $ignoreNotFound is true
+     */
+    public static function loadObject(Theme $theme, string $type, string $path, bool $ignoreNotFound = false): ?CmsObject
+    {
+        $class = static::resolveTypeClassName($type);
+
+        if (!($object = call_user_func(array($class, 'load'), $theme, $path))) {
+            if (!$ignoreNotFound) {
+                throw new ApplicationException(Lang::get('winter.pages::lang.object.not_found'));
+            }
+
+            return null;
+        }
+
+        return $object;
+    }
+
+    /**
+     * Fills the provided Winter.Pages object with the provided data
+     */
+    public static function fillObject(Theme $theme, string $type, string $path, array $data): CmsObject
+    {
+        $objectData = [];
+
+        // Get the object to fill
+        $path = trim($path);
+        $object = !empty($path)
+            ? static::loadObject($theme, $type, $path)
+            : static::createObject($theme, $type);
+
+        // Set page layout super early because it cascades to other elements
+        if ($type === 'page' && ($layout = $data['viewBag']['layout'] ?? null)) {
+            $object->getViewBag()->setProperty('layout', $layout);
+        }
+
+        // Store viewBag data in the object's "settings" property
+        if ($viewBag = array_get($data, 'viewBag')) {
+            $objectData['settings'] = ['viewBag' => $viewBag];
+        }
+
+        // Store allowed properties on the object
+        $fields = ['markup', 'code', 'fileName', 'content', 'itemData', 'name'];
+        foreach ($fields as $field) {
+            if (array_key_exists($field, $data)) {
+                $objectData[$field] = $data[$field];
+            }
+        }
+
+        switch ($type) {
+            case 'page':
+                // Populate the parentFileName for page objects
+                $object->parentFileName = $data['parentFileName'] ?? null;
+
+                $placeholders = array_get($data, 'placeholders');
+                if (is_array($placeholders)) {
+                    $placeholders = array_map([static::class, 'convertLineEndings'], $placeholders);
+                }
+
+                $objectData['placeholders'] = $placeholders;
+                break;
+
+            case 'content':
+                $fileName = $objectData['fileName'];
+
+                if (dirname($fileName) == 'static-pages') {
+                    throw new ApplicationException(Lang::get('winter.pages::lang.content.cant_save_to_dir'));
+                }
+
+                $extension = pathinfo($fileName, PATHINFO_EXTENSION);
+
+                if ($extension === 'htm' || $extension === 'html' || !strlen($extension)) {
+                    $objectData['markup'] = array_get($data, 'markup_html');
+                }
+                break;
+
+            case 'menu':
+                // If no item data is sent through POST, this means the menu is empty
+                if (!isset($objectData['itemData'])) {
+                    $objectData['itemData'] = [];
+                } else {
+                    $objectData['itemData'] = json_decode($objectData['itemData'], true);
+                    if (json_last_error() !== JSON_ERROR_NONE || !is_array($objectData['itemData'])) {
+                        $objectData['itemData'] = [];
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+
+        if (!empty($objectData['markup'])) {
+            $objectData['markup'] = static::convertLineEndings($objectData['markup']);
+        }
+
+        if (!empty($data['objectForceSave']) && $object->mtime) {
+            if ($data['objectMtime'] != $object->mtime) {
+                throw new ApplicationException('mtime-mismatch');
+            }
+        }
+
+        $object->fill($objectData);
+
+        /*
+         * Rehydrate the object viewBag array property where values are sourced.
+         */
+        if ($object instanceof CmsCompoundObject && is_array($viewBag)) {
+            $object->viewBag = $viewBag + $object->viewBag;
+        }
+
+        return $object;
+    }
+}
\ No newline at end of file
diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
new file mode 100644
index 0000000..45abbb0
--- /dev/null
+++ b/classes/page/field.preview.php
@@ -0,0 +1,101 @@
+<div id="<?= $formField->getId() ?>">
+    <?php
+        // Find the alias of the current Form widget
+        foreach ($this->widget as $alias => $widget) {
+            if ($widget instanceof \Backend\Widgets\Form && !$widget->isNested) {
+                $formAlias = $alias;
+                break;
+            }
+        }
+        if (empty($formAlias)) {
+            return;
+        }
+        $prefix = \Winter\Pages\Classes\ObjectHelper::getTypePreviewSessionKeyPrefix(
+            \Winter\Pages\Classes\ObjectHelper::resolveClassType(get_class($formModel))
+        );
+        $sessionKey = $prefix . $formAlias;
+        if (!Session::has($sessionKey)) {
+            Session::put($sessionKey, $formModel->toArray());
+        }
+        $url = "/winter.pages/preview/$formAlias";
+    ?>
+    <ul class="devices" id="<?= $formField->getId() ?>DeviceSelector">
+        <li><a href="javascript:;" class="active" data-preview-device="Desktop" title="Desktop"><span class="icon-desktop"></span></a></li>
+        <li><a href="javascript:;" data-preview-device="Tablet" title="Tablet"><span class="icon-tablet"></span></a></li>
+        <li><a href="javascript:;" data-preview-device="Mobile" title="Mobile"><span class="icon-mobile"></span></a></li>
+    </ul>
+    <style>
+        #<?= $formField->getId() ?> {
+            margin: 0 auto;
+            padding: 0 1em 1em 1em;
+            background: #f2f2f2;
+            border-radius: 5px;
+        }
+        #<?= $formField->getId() ?> iframe {
+            background: #fff;
+            box-shadow: 0px 0px 7px -3px rgb(0 0 0 / 50%);
+            border-radius: 5px;
+        }
+        .devices {
+            margin: 0;
+            list-style: none;
+            display: flex;
+            justify-content: center;
+            background: #f2f2f2;
+            padding: 0.5em 1em;
+        }
+        .devices a {
+            padding: 0.5em 0.75em;
+            display: block;
+            margin-right: 1em;
+            border-radius: 3px;
+            background: #ddd;
+            transition: all .2s ease;
+        }
+        .devices a.active,
+        .devices a:hover {
+            font-weight: bold;
+            background: #333;
+            color: #fff;
+        }
+        .preview-desktop {
+            width: 100%;
+        }
+        .preview-tablet {
+            width: 768px;
+        }
+        .preview-mobile {
+            width: 320px;
+        }
+    </style>
+    <iframe
+        width="100%"
+        scrolling="no"
+        class="preview-desktop"
+        onload="this.style.height = this.contentWindow.document.documentElement.scrollHeight + 'px';"
+        src="<?= Url::to($url); ?>"
+    ></iframe>
+    <script>
+        var previewId = '#<?= $formField->getId(); ?>';
+        var deviceSelectorId = '#<?= $formField->getId(); ?>DeviceSelector';
+        $(deviceSelectorId).on('click', 'a', function () {
+            var $this = $(this),
+                $previewContainer = $(previewId),
+                device = $this.data('preview-device');
+            $(deviceSelectorId).find('a').removeClass('active');
+            $this.addClass('active');
+            $previewContainer.removeClass('preview-desktop preview-tablet preview-mobile');
+            $previewContainer.addClass('preview-' + device.toLowerCase());
+        });
+        $('.control-tabs:has(' + previewId + ')').on('shown.bs.tab', function (e) {
+            const tabBody = $($(e.target).attr('data-target'));
+            if (!tabBody.length) {
+                return
+            }
+            const iframe = tabBody.find(previewId + ' iframe');
+            if (iframe.length) {
+                iframe[0].style.height = iframe[0].contentWindow.document.documentElement.scrollHeight + 'px';
+            }
+        })
+    </script>
+</div>
\ No newline at end of file
diff --git a/classes/page/fields.yaml b/classes/page/fields.yaml
index ebfd0ab..fa1362f 100644
--- a/classes/page/fields.yaml
+++ b/classes/page/fields.yaml
@@ -59,9 +59,26 @@ tabs:
 
 secondaryTabs:
     stretch: true
+    icons:
+        winter.pages::lang.editor.content: icon-pencil
+        winter.pages::lang.editor.preview: icon-crosshairs
     fields:
         markup:
             tab: winter.pages::lang.editor.content
             type: richeditor
             stretch: true
             size: huge
+        _preview:
+            tab: winter.pages::lang.editor.preview
+            type: partial
+            span: full
+            path: $/winter/pages/classes/page/field.preview.php
+            dependsOn:
+                - viewBag[title]
+                - viewBag[url]
+                - viewBag[layout]
+                - viewBag[is_hidden]
+                - viewBag[navigation_hidden]
+                - viewBag[meta_title]
+                - viewBag[meta_description]
+                - markup
diff --git a/controllers/Index.php b/controllers/Index.php
index 519e61d..7de837b 100644
--- a/controllers/Index.php
+++ b/controllers/Index.php
@@ -1,28 +1,31 @@
 <?php namespace Winter\Pages\Controllers;
 
-use Url;
-use Lang;
-use Flash;
-use Event;
-use Config;
-use Request;
+use ApplicationException;
+use Backend\Classes\Controller;
 use BackendMenu;
-use Cms\Classes\Theme;
-use Cms\Classes\CmsObject;
 use Cms\Classes\CmsCompoundObject;
+use Cms\Classes\CmsObject;
+use Cms\Classes\Theme;
 use Cms\Widgets\TemplateList;
+use Config;
+use Event;
+use Exception;
+use Flash;
+use Lang;
+use Request;
+use Session;
 use System\Helpers\DateTime;
-use Backend\Classes\Controller;
-use Winter\Pages\Widgets\PageList;
-use Winter\Pages\Widgets\MenuList;
-use Winter\Pages\Widgets\SnippetList;
-use Winter\Pages\Classes\Page as StaticPage;
+use Url;
 use Winter\Pages\Classes\Content;
 use Winter\Pages\Classes\MenuItem;
-use Winter\Pages\Plugin as PagesPlugin;
+use Winter\Pages\Classes\Page as StaticPage;
 use Winter\Pages\Classes\SnippetManager;
-use ApplicationException;
-use Exception;
+use Winter\Pages\Plugin as PagesPlugin;
+use Winter\Pages\Widgets\MenuList;
+use Winter\Pages\Widgets\PageList;
+use Winter\Pages\Widgets\SnippetList;
+
+use Winter\Pages\Classes\ObjectHelper;
 
 /**
  * Pages and Menus index
@@ -88,10 +91,60 @@ public function __construct()
         BackendMenu::setContext('Winter.Pages', 'pages', @$context[$this->vars['activeWidgets'][0]]);
     }
 
+    //
+    // Helpers
+    //
+
+    /**
+     * Gets the object type for the current request
+     * @throws ApplicationException if the current user does not have permissions to manage the identified type
+     */
+    protected function getObjectType(): string
+    {
+        $type = Request::input('objectType');
+
+        $allowed = false;
+        if ($type === 'content') {
+            $allowed = $this->user->hasAccess('winter.pages.manage_content');
+        } else {
+            $allowed = $this->user->hasAccess("winter.pages.manage_{$type}s");
+        }
+
+        if (!$allowed) {
+            throw new ApplicationException(Lang::get('winter.pages::lang.object.unauthorized_type', ['type' => $type]));
+        }
+
+        return $type;
+    }
+
     //
     // Pages, menus and text blocks
     //
 
+    /**
+     * Hook into the controller after the page action has executed (widgets initialized)
+     * but before AJAX handlers are run
+     * @TODO: Generalize the preview logic so it can be used in other plugins
+     */
+    public function pageAction()
+    {
+        $result = parent::pageAction();
+
+        $formAlias = post('formWidgetAlias');
+
+        if (!empty($formAlias) && isset($this->widget->{$formAlias})) {
+            $widget = $this->widget->{$formAlias};
+
+            $widget->bindEvent('form.refreshFields', function ($allFields) use ($widget) {
+                $prefix = ObjectHelper::getTypePreviewSessionKeyPrefix($this->getObjectType());
+                $sessionKey = "$prefix{$widget->alias}";
+                Session::put($sessionKey, post());
+            });
+        }
+
+        return $result;
+    }
+
     public function index()
     {
         $this->addJs('/modules/backend/assets/js/winter.treeview.js', 'core');
@@ -117,7 +170,7 @@ public function index_onOpen()
         $this->validateRequestTheme();
 
         $type = Request::input('type');
-        $object = $this->loadObject($type, Request::input('path'));
+        $object = ObjectHelper::loadObject($this->theme, $type, Request::input('path'));
 
         return $this->pushObjectForm($type, $object);
     }
@@ -125,9 +178,14 @@ public function index_onOpen()
     public function onSave()
     {
         $this->validateRequestTheme();
-        $type = Request::input('objectType');
+        $type = $this->getObjectType();
 
-        $object = $this->fillObjectFromPost($type);
+        $object = ObjectHelper::fillObject(
+            $this->theme,
+            $type,
+            Request::input('objectPath'),
+            post()
+        );
         $object->save();
 
         /*
@@ -158,7 +216,7 @@ public function onCreateObject()
         $this->validateRequestTheme();
 
         $type = Request::input('type');
-        $object = $this->createObject($type);
+        $object = ObjectHelper::createObject($this->theme, $type);
         $parent = Request::input('parent');
         $parentPage = null;
 
@@ -171,6 +229,7 @@ public function onCreateObject()
         }
 
         $widget = $this->makeObjectFormWidget($type, $object);
+        $widget->bindToController();
         $this->vars['objectPath'] = '';
         $this->vars['canCommit'] = $this->canCommitObject($object);
         $this->vars['canReset'] = $this->canResetObject($object);
@@ -194,9 +253,11 @@ public function onDelete()
     {
         $this->validateRequestTheme();
 
-        $type = Request::input('objectType');
-
-        $deletedObjects = $this->loadObject($type, trim(Request::input('objectPath')))->delete();
+        $deletedObjects = ObjectHelper::loadObject(
+            $this->theme,
+            $this->getObjectType(),
+            trim(Request::input('objectPath', ''))
+        )->delete();
 
         $result = [
             'deletedObjects' => $deletedObjects,
@@ -225,7 +286,7 @@ public function onDeleteObjects()
                 if (!$selected) {
                     continue;
                 }
-                $object = $this->loadObject($type, $path, true);
+                $object = ObjectHelper::loadObject($this->theme, $type, $path, true);
                 if (!$object) {
                     continue;
                 }
@@ -268,9 +329,13 @@ public function onUpdatePageLayout()
     {
         $this->validateRequestTheme();
 
-        $type = Request::input('objectType');
-
-        $object = $this->fillObjectFromPost($type);
+        $type = $this->getObjectType();
+        $object = ObjectHelper::fillObject(
+            $this->theme,
+            $type,
+            Request::input('objectPath'),
+            post()
+        );
 
         return $this->pushObjectForm($type, $object, Request::input('formWidgetAlias'));
     }
@@ -285,7 +350,7 @@ public function onGetInspectorConfiguration()
         if (strlen($snippetCode)) {
             $snippet = SnippetManager::instance()->findByCodeOrComponent($this->theme, $snippetCode, $componentClass);
             if (!$snippet) {
-                throw new ApplicationException(trans('winter.pages::lang.snippet.not_found', ['code' => $snippetCode]));
+                throw new ApplicationException(Lang::get('winter.pages::lang.snippet.not_found', ['code' => $snippetCode]));
             }
 
             $configuration = $snippet->getProperties();
@@ -295,8 +360,8 @@ public function onGetInspectorConfiguration()
             'configuration' => [
                 'properties'  => $configuration,
                 'title'       => $snippet->getName(),
-                'description' => $snippet->getDescription()
-            ]
+                'description' => $snippet->getDescription(),
+            ],
         ];
     }
 
@@ -317,7 +382,7 @@ public function onGetSnippetNames()
             $snippet = SnippetManager::instance()->findByCodeOrComponent($this->theme, $snippetCode, $componentClass);
 
             if (!$snippet) {
-                $result[$snippetCode] = trans('winter.pages::lang.snippet.not_found', ['code' => $snippetCode]);
+                $result[$snippetCode] = Lang::get('winter.pages::lang.snippet.not_found', ['code' => $snippetCode]);
             }
             else {
                 $result[$snippetCode] =$snippet->getName();
@@ -325,7 +390,7 @@ public function onGetSnippetNames()
         }
 
         return [
-            'names' => $result
+            'names' => $result,
         ];
     }
 
@@ -336,7 +401,7 @@ public function onMenuItemReferenceSearch()
         $widget = $this->makeFormWidget(
             'Winter\Pages\FormWidgets\MenuItemSearch',
             [],
-            ['alias' => $alias]
+            ['alias' => $alias],
         );
 
         return $widget->onSearch();
@@ -350,8 +415,8 @@ public function onMenuItemReferenceSearch()
     public function onCommit()
     {
         $this->validateRequestTheme();
-        $type = Request::input('objectType');
-        $object = $this->loadObject($type, trim(Request::input('objectPath')));
+        $type = $this->getObjectType();
+        $object = ObjectHelper::loadObject($this->theme, $type, trim(Request::input('objectPath', '')));
 
         if ($this->canCommitObject($object)) {
             // Populate the filesystem with the object and then remove it from the db
@@ -373,8 +438,8 @@ public function onCommit()
     public function onReset()
     {
         $this->validateRequestTheme();
-        $type = Request::input('objectType');
-        $object = $this->loadObject($type, trim(Request::input('objectPath')));
+        $type = $this->getObjectType();
+        $object = ObjectHelper::loadObject($this->theme, $type, trim(Request::input('objectPath', '')));
 
         if ($this->canResetObject($object)) {
             // Remove the object from the DB
@@ -451,11 +516,8 @@ protected function canCommitObject(CmsObject $object)
     /**
      * Check to see if the provided object can be reset
      * Only available when the DB layer is enabled and the object exists in both the DB & Filesystem
-     *
-     * @param CmsObject $object
-     * @return boolean
      */
-    protected function canResetObject(CmsObject $object)
+    protected function canResetObject(CmsObject $object): bool
     {
         $result = false;
 
@@ -467,65 +529,17 @@ protected function canResetObject(CmsObject $object)
         return $result;
     }
 
-    protected function validateRequestTheme()
+    /**
+     * Validates that the theme provided in the AJAX request matches the current one
+     * @throws ApplicationException if the validation fails
+     */
+    protected function validateRequestTheme(): void
     {
         if ($this->theme->getDirName() != Request::input('theme')) {
-            throw new ApplicationException(trans('cms::lang.theme.edit.not_match'));
+            throw new ApplicationException(Lang::get('cms::lang.theme.edit.not_match'));
         }
     }
 
-    protected function loadObject($type, $path, $ignoreNotFound = false)
-    {
-        $class = $this->resolveTypeClassName($type);
-
-        if (!($object = call_user_func(array($class, 'load'), $this->theme, $path))) {
-            if (!$ignoreNotFound) {
-                throw new ApplicationException(trans('winter.pages::lang.object.not_found'));
-            }
-
-            return null;
-        }
-
-        return $object;
-    }
-
-    protected function createObject($type)
-    {
-        $class = $this->resolveTypeClassName($type);
-
-        if (!($object = $class::inTheme($this->theme))) {
-            throw new ApplicationException(trans('winter.pages::lang.object.not_found'));
-        }
-
-        return $object;
-    }
-
-    protected function resolveTypeClassName($type)
-    {
-        $types = [
-            'page'    => 'Winter\Pages\Classes\Page',
-            'menu'    => 'Winter\Pages\Classes\Menu',
-            'content' => 'Winter\Pages\Classes\Content'
-        ];
-
-        if (!array_key_exists($type, $types)) {
-            throw new ApplicationException(Lang::get('winter.pages::lang.object.invalid_type') . ' - type - ' . $type);
-        }
-
-        $allowed = false;
-        if ($type === 'content') {
-            $allowed = $this->user->hasAccess('winter.pages.manage_content');
-        } else {
-            $allowed = $this->user->hasAccess("winter.pages.manage_{$type}s");
-        }
-
-        if (!$allowed) {
-            throw new ApplicationException(Lang::get('winter.pages::lang.object.unauthorized_type', ['type' => $type]));
-        }
-
-        return $types[$type];
-    }
-
     protected function makeObjectFormWidget($type, $object, $alias = null)
     {
         $formConfigs = [
@@ -546,7 +560,7 @@ protected function makeObjectFormWidget($type, $object, $alias = null)
         $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
 
         if ($type == 'page') {
-            $widget->bindEvent('form.extendFieldsBefore', function() use ($widget, $object) {
+            $widget->bindEvent('form.extendFieldsBefore', function () use ($widget, $object) {
                 $this->checkContentField($widget, $object);
                 $this->addPagePlaceholders($widget, $object);
                 $this->addPageSyntaxFields($widget, $object);
@@ -658,136 +672,50 @@ protected function addPagePlaceholders($formWidget, $page)
         }
     }
 
-    protected function getTabTitle($type, $object)
-    {
-        if ($type == 'page') {
-            $viewBag = $object->getViewBag();
-            $result = $viewBag ? $viewBag->property('title') : false;
-            if (!$result) {
-                $result = trans('winter.pages::lang.page.new');
-            }
-
-            return $result;
-        }
-        elseif ($type == 'menu') {
-            $result = $object->name;
-            if (!strlen($result)) {
-                $result = trans('winter.pages::lang.menu.new');
-            }
-
-            return $result;
-        }
-        elseif ($type == 'content') {
-            $result = in_array($type, ['asset', 'content'])
-                ? $object->getFileName()
-                : $object->getBaseFileName();
-
-            if (!$result) {
-                $result = trans('cms::lang.'.$type.'.new');
-            }
-
-            return $result;
-        }
-
-        return $object->getFileName();
-    }
-
-    protected function fillObjectFromPost($type)
-    {
-        $objectPath = trim(Request::input('objectPath'));
-        $object = $objectPath ? $this->loadObject($type, $objectPath) : $this->createObject($type);
-
-        // Set page layout super early because it cascades to other elements
-        if ($type === 'page' && ($layout = post('viewBag[layout]'))) {
-            $object->getViewBag()->setProperty('layout', $layout);
-        }
-
-        $formWidget = $this->makeObjectFormWidget($type, $object, Request::input('formWidgetAlias'));
-
-        $saveData = $formWidget->getSaveData();
-        $postData = post();
-        $objectData = [];
-
-        if ($viewBag = array_get($saveData, 'viewBag')) {
-            $objectData['settings'] = ['viewBag' => $viewBag];
-        }
-
-        $fields = ['markup', 'code', 'fileName', 'content', 'itemData', 'name'];
-
-        if ($type != 'menu' && $type != 'content') {
-            $object->parentFileName = Request::input('parentFileName');
-        }
-
-        foreach ($fields as $field) {
-            if (array_key_exists($field, $saveData)) {
-                $objectData[$field] = $saveData[$field];
-            }
-            elseif (array_key_exists($field, $postData)) {
-                $objectData[$field] = $postData[$field];
-            }
-        }
-
-        if ($type == 'page') {
-            $placeholders = array_get($saveData, 'placeholders');
-
-            if (is_array($placeholders) && Config::get('cms.convertLineEndings', false) === true) {
-                $placeholders = array_map([$this, 'convertLineEndings'], $placeholders);
-            }
-
-            $objectData['placeholders'] = $placeholders;
-        }
-
-        if ($type == 'content') {
-            $fileName = $objectData['fileName'];
-
-            if (dirname($fileName) == 'static-pages') {
-                throw new ApplicationException(trans('winter.pages::lang.content.cant_save_to_dir'));
-            }
-
-            $extension = pathinfo($fileName, PATHINFO_EXTENSION);
-
-            if ($extension === 'htm' || $extension === 'html' || !strlen($extension)) {
-                $objectData['markup'] = array_get($saveData, 'markup_html');
-            }
-        }
-
-        if ($type == 'menu') {
-            // If no item data is sent through POST, this means the menu is empty
-            if (!isset($objectData['itemData'])) {
-                $objectData['itemData'] = [];
-            } else {
-                $objectData['itemData'] = json_decode($objectData['itemData'], true);
-                if (json_last_error() !== JSON_ERROR_NONE || !is_array($objectData['itemData'])) {
-                    $objectData['itemData'] = [];
+    /**
+     * Get the tab title the provided type & object
+     */
+    protected function getTabTitle(string $type, CmsObject $object): string
+    {
+        $result = '';
+        switch ($type) {
+            case 'page':
+                $viewBag = $object->getViewBag();
+                $result = $viewBag ? $viewBag->property('title') : false;
+                if (!$result) {
+                    $result = Lang::get('winter.pages::lang.page.new');
                 }
-            }
-        }
+                break;
 
-        if (!empty($objectData['markup']) && Config::get('cms.convertLineEndings', false) === true) {
-            $objectData['markup'] = $this->convertLineEndings($objectData['markup']);
-        }
+            case 'menu':
+                $result = $object->name;
+                if (!strlen($result)) {
+                    $result = Lang::get('winter.pages::lang.menu.new');
+                }
+                break;
 
-        if (!Request::input('objectForceSave') && $object->mtime) {
-            if (Request::input('objectMtime') != $object->mtime) {
-                throw new ApplicationException('mtime-mismatch');
-            }
-        }
+            case 'content':
+                $result = in_array($type, ['asset', 'content'])
+                    ? $object->getFileName()
+                    : $object->getBaseFileName();
 
-        $object->fill($objectData);
+                if (!$result) {
+                    $result = Lang::get('cms::lang.'.$type.'.new');
+                }
+                break;
 
-        /*
-         * Rehydrate the object viewBag array property where values are sourced.
-         */
-        if ($object instanceof CmsCompoundObject && is_array($viewBag)) {
-            $object->viewBag = $viewBag + $object->viewBag;
+            default:
+                $result = $object->getFileName();
+                break;
         }
 
-        return $object;
+        return $result;
     }
 
     protected function pushObjectForm($type, $object, $alias = null)
     {
         $widget = $this->makeObjectFormWidget($type, $object, $alias);
+        $widget->bindToController();
 
         $this->vars['canCommit'] = $this->canCommitObject($object);
         $this->vars['canReset'] = $this->canResetObject($object);
@@ -813,13 +741,13 @@ protected function pushObjectForm($type, $object, $alias = null)
     protected function bindFormWidgetToController()
     {
         $alias = Request::input('formWidgetAlias');
-        $type = Request::input('objectType');
+        $type = $this->getObjectType();
         $objectPath = trim(Request::input('objectPath'));
 
         if (!$objectPath) {
-            $object = $this->createObject($type);
+            $object = ObjectHelper::createObject($this->theme, $type);
         } else {
-            $object = $this->loadObject($type, $objectPath);
+            $object = ObjectHelper::loadObject($this->theme, $type, $objectPath);
         }
 
         // Set page layout super early because it cascades to other elements

From 452b20aa2804e97691a009e144e2ef96ebdfa70f Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 26 Sep 2022 00:43:19 -0600
Subject: [PATCH 10/52] Move PagePreview assets into dedicated files, general
 code cleanup

---
 Plugin.php                     | 219 +++++++++++++++++++--------------
 assets/css/page-preview.css    |  42 +++++++
 assets/js/page-preview.js      | 134 ++++++++++++++++++++
 classes/Controller.php         |   6 +-
 classes/ObjectHelper.php       |   2 +-
 classes/page/field.preview.php |  75 +----------
 6 files changed, 315 insertions(+), 163 deletions(-)
 create mode 100644 assets/css/page-preview.css
 create mode 100644 assets/js/page-preview.js

diff --git a/Plugin.php b/Plugin.php
index 0db46e7..9f4b430 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -1,10 +1,7 @@
 <?php namespace Winter\Pages;
 
 use Backend;
-use Backend\Classes\Controller as BaseBackendController;
-use Backend\FormWidgets\RichEditor as FroalaFormWidget;
 use Backend\Models\UserRole;
-use BackendAuth;
 use Cms\Classes\Controller as CmsController;
 use Cms\Classes\Theme;
 use Event;
@@ -29,7 +26,10 @@ public function pluginDetails()
         ];
     }
 
-    public function registerComponents()
+    /**
+     * Register the CMS components provided by this plugin
+     */
+    public function registerComponents(): array
     {
         return [
             \Winter\Pages\Components\ChildPages::class => 'childPages',
@@ -39,7 +39,10 @@ public function registerComponents()
         ];
     }
 
-    public function registerPermissions()
+    /**
+     * Register the permissions provided by this plugin
+     */
+    public function registerPermissions(): array
     {
         return [
             'winter.pages.manage_pages' => [
@@ -69,7 +72,10 @@ public function registerPermissions()
         ];
     }
 
-    public function registerNavigation()
+    /**
+     * Register the backend navigation items provided by this plugin
+     */
+    public function registerNavigation(): array
     {
         return [
             'pages' => [
@@ -114,7 +120,10 @@ public function registerNavigation()
         ];
     }
 
-    public function registerFormWidgets()
+    /**
+     * Register the backend FormWidgets provided by this plugin
+     */
+    public function registerFormWidgets(): array
     {
         return [
             FormWidgets\PagePicker::class => 'staticpagepicker',
@@ -122,12 +131,111 @@ public function registerFormWidgets()
         ];
     }
 
-    public function boot()
+    /**
+     * Register Twig extensions provided by this plugin
+     */
+    public function registerMarkupTags(): array
+    {
+        return [
+            'filters' => [
+                'staticPage' => ['Winter\Pages\Classes\Page', 'url']
+            ]
+        ];
+    }
+
+    /**
+     * Clear the caches used by this plugin
+     */
+    public static function clearCache(): void
+    {
+        $theme = Theme::getEditTheme();
+
+        $router = new Router($theme);
+        $router->clearCache();
+
+        StaticPage::clearMenuCache($theme);
+        SnippetManager::clearCache($theme);
+    }
+
+    /**
+     * Boot the plugin
+     */
+    public function boot(): void
+    {
+        $this->extendThemeSync();
+        $this->extendBackendForms();
+        $this->extendCmsTemplates();
+        $this->extendCmsRouter();
+        $this->extendCmsRenderer();
+
+        $this->registerMenuItemTypes();
+        $this->registerRichEditorLinkTypes();
+    }
+
+    /**
+     * Extend the theme:sync command to include Pages & Menus in the sync
+     */
+    protected function extendThemeSync(): void
+    {
+        Event::listen('system.console.theme.sync.getAvailableModelClasses', function () {
+            return [
+                Classes\Menu::class,
+                Classes\Page::class,
+            ];
+        });
+    }
+
+    /**
+     * Extend the backend forms
+     */
+    protected function extendBackendForms(): void
+    {
+        Event::listen('backend.form.extendFieldsBefore', function($formWidget) {
+            if ($formWidget->model instanceof \Cms\Classes\Partial) {
+                Snippet::extendPartialForm($formWidget);
+            }
+        });
+    }
+
+    /**
+     * Extend CMS templates
+     */
+    protected function extendCmsTemplates(): void
+    {
+        Event::listen('cms.template.save', function($controller, $template, $type) {
+            Plugin::clearCache();
+        });
+
+        Event::listen('cms.template.processSettingsBeforeSave', function($controller, $dataHolder) {
+            $dataHolder->settings = Snippet::processTemplateSettingsArray($dataHolder->settings);
+        });
+
+        Event::listen('cms.template.processSettingsAfterLoad', function($controller, $template) {
+            Snippet::processTemplateSettings($template);
+        });
+
+        Event::listen('cms.template.processTwigContent', function($template, $dataHolder) {
+            if ($template instanceof \Cms\Classes\Layout) {
+                $dataHolder->content = Controller::instance()->parseSyntaxFields($dataHolder->content);
+            }
+        });
+    }
+
+    /**
+     * Extend the CMS router
+     */
+    protected function extendCmsRouter(): void
     {
         Event::listen('cms.router.beforeRoute', function($url) {
             return Controller::instance()->initCmsPage($url);
         });
+    }
 
+    /**
+     * Extend the CMS renderer
+     */
+    protected function extendCmsRenderer(): void
+    {
         Event::listen('cms.page.beforeRenderPage', function($controller, $page) {
             /*
              * Before twig renders
@@ -161,7 +269,13 @@ public function boot()
                 return $contents;
             }
         });
+    }
 
+    /**
+     * Register the frontend Menu Item types provided by this plugin
+     */
+    protected function registerMenuItemTypes(): void
+    {
         Event::listen('pages.menuitem.listTypes', function() {
             return [
                 'static-page'      => 'winter.pages::lang.menuitem.static_page',
@@ -184,31 +298,13 @@ public function boot()
                 return StaticPage::resolveMenuItem($item, $url, $theme);
             }
         });
+    }
 
-        Event::listen('backend.form.extendFieldsBefore', function($formWidget) {
-            if ($formWidget->model instanceof \Cms\Classes\Partial) {
-                Snippet::extendPartialForm($formWidget);
-            }
-        });
-
-        Event::listen('cms.template.save', function($controller, $template, $type) {
-            Plugin::clearCache();
-        });
-
-        Event::listen('cms.template.processSettingsBeforeSave', function($controller, $dataHolder) {
-            $dataHolder->settings = Snippet::processTemplateSettingsArray($dataHolder->settings);
-        });
-
-        Event::listen('cms.template.processSettingsAfterLoad', function($controller, $template) {
-            Snippet::processTemplateSettings($template);
-        });
-
-        Event::listen('cms.template.processTwigContent', function($template, $dataHolder) {
-            if ($template instanceof \Cms\Classes\Layout) {
-                $dataHolder->content = Controller::instance()->parseSyntaxFields($dataHolder->content);
-            }
-        });
-
+    /**
+     * Register the link types provided by this plugin to the richeditor
+     */
+    protected function registerRichEditorLinkTypes(): void
+    {
         Event::listen('backend.richeditor.listTypes', function () {
             return [
                 'static-page' => 'winter.pages::lang.menuitem.static_page',
@@ -220,64 +316,5 @@ public function boot()
                 return StaticPage::getRichEditorTypeInfo($type);
             }
         });
-
-        Event::listen('system.console.theme.sync.getAvailableModelClasses', function () {
-            return [
-                Classes\Menu::class,
-                Classes\Page::class,
-            ];
-        });
-    }
-
-    /**
-     * Register new Twig variables
-     */
-    public function registerMarkupTags(): array
-    {
-        return [
-            'filters' => [
-                'staticPage' => ['Winter\Pages\Classes\Page', 'url']
-            ]
-        ];
-    }
-
-    public function registerClassAliases()
-    {
-        /**
-         * To allow compatibility with plugins that extend the original RainLab.Pages plugin,
-         * this will alias those classes to use the new Winter.Pages classes.
-         */
-        return [
-            \Winter\Pages\Plugin::class                       => \RainLab\Pages\Plugin::class,
-            \Winter\Pages\Classes\Content::class              => \RainLab\Pages\Classes\Content::class,
-            \Winter\Pages\Classes\Controller::class           => \RainLab\Pages\Classes\Controller::class,
-            \Winter\Pages\Classes\Menu::class                 => \RainLab\Pages\Classes\Menu::class,
-            \Winter\Pages\Classes\Page::class                 => \RainLab\Pages\Classes\Page::class,
-            \Winter\Pages\Classes\Router::class               => \RainLab\Pages\Classes\Router::class,
-            \Winter\Pages\Classes\Snippet::class              => \RainLab\Pages\Classes\Snippet::class,
-            \Winter\Pages\Classes\SnippetManager::class       => \RainLab\Pages\Classes\SnippetManager::class,
-            \Winter\Pages\Components\ChildPages::class        => \RainLab\Pages\Components\ChildPages::class,
-            \Winter\Pages\Components\StaticBreadcrumbs::class => \RainLab\Pages\Components\StaticBreadcrumbs::class,
-            \Winter\Pages\Components\StaticMenu::class        => \RainLab\Pages\Components\StaticMenu::class,
-            \Winter\Pages\Components\StaticPage::class        => \RainLab\Pages\Components\StaticPage::class,
-            \Winter\Pages\Controllers\Index::class            => \RainLab\Pages\Controllers\Index::class,
-            \Winter\Pages\FormWidgets\MenuItems::class        => \RainLab\Pages\FormWidgets\MenuItems::class,
-            \Winter\Pages\FormWidgets\MenuItemSearch::class   => \RainLab\Pages\FormWidgets\MenuItemSearch::class,
-            \Winter\Pages\FormWidgets\PagePicker::class       => \RainLab\Pages\FormWidgets\PagePicker::class,
-            \Winter\Pages\Widgets\MenuList::class             => \RainLab\Pages\Widgets\MenuList::class,
-            \Winter\Pages\Widgets\PageList::class             => \RainLab\Pages\Widgets\PageList::class,
-            \Winter\Pages\Widgets\SnippetList::class          => \RainLab\Pages\Widgets\SnippetList::class,
-        ];
-    }
-
-    public static function clearCache()
-    {
-        $theme = Theme::getEditTheme();
-
-        $router = new Router($theme);
-        $router->clearCache();
-
-        StaticPage::clearMenuCache($theme);
-        SnippetManager::clearCache($theme);
     }
 }
diff --git a/assets/css/page-preview.css b/assets/css/page-preview.css
new file mode 100644
index 0000000..087bff1
--- /dev/null
+++ b/assets/css/page-preview.css
@@ -0,0 +1,42 @@
+[data-control="page-preview"] {
+    margin: 0 auto;
+    padding: 0 1em 1em 1em;
+    background: #f2f2f2;
+    border-radius: 5px;
+}
+[data-control="page-preview"] iframe {
+    background: #fff;
+    box-shadow: 0px 0px 7px -3px rgb(0 0 0 / 50%);
+    border-radius: 5px;
+}
+[data-control="page-preview"] .devices {
+    margin: 0;
+    list-style: none;
+    display: flex;
+    justify-content: center;
+    background: #f2f2f2;
+    padding: 0.5em 1em;
+}
+[data-control="page-preview"] .devices a {
+    padding: 0.5em 0.75em;
+    display: block;
+    margin-right: 1em;
+    border-radius: 3px;
+    background: #ddd;
+    transition: all .2s ease;
+}
+[data-control="page-preview"] .devices a.active,
+[data-control="page-preview"] .devices a:hover {
+    font-weight: bold;
+    background: #333;
+    color: #fff;
+}
+[data-control="page-preview"].preview-desktop {
+    width: 100%;
+}
+[data-control="page-preview"].preview-tablet {
+    width: 768px;
+}
+[data-control="page-preview"].preview-mobile {
+    width: 320px;
+}
diff --git a/assets/js/page-preview.js b/assets/js/page-preview.js
new file mode 100644
index 0000000..a2fa9b2
--- /dev/null
+++ b/assets/js/page-preview.js
@@ -0,0 +1,134 @@
+/*
+ * PagePreview plugin
+ *
+ * Data attributes:
+ * - data-control="page-preview" - enables the plugin on an element
+ *
+ * JavaScript API:
+ * $('div#someElement').pagePreview()
+ */
+
++function ($) { "use strict";
+
+    // PREVIEW CLASS DEFINITION
+    // ============================
+
+    var Base = $.wn.foundation.base,
+        BaseProto = Base.prototype
+
+    var PagePreview = function(element, options) {
+        this.options   = options
+        this.$el       = $(element)
+
+        $.wn.foundation.controlUtils.markDisposable(element)
+        Base.call(this)
+
+        // Init
+        this.init()
+    }
+
+    PagePreview.DEFAULTS = {
+    }
+
+    PagePreview.prototype = Object.create(BaseProto)
+    PagePreview.prototype.constructor = PagePreview
+
+    /**
+     * Initialise the widget.
+     */
+    PagePreview.prototype.init = function() {
+        this.$deviceSelector = $('.devices', this.$el)
+        this.$iframe = $('iframe', this.$el)
+        this.$iframeTabContainer = this.$iframe.parent('.control-tabs')
+
+        // Set up events on various elements
+        this.$iframeTabContainer.on('shown.bs.tab', this.proxy(this.onTabShown))
+        this.$deviceSelector.on('click', 'a', this.proxy(this.onDeviceClick))
+    }
+
+    /**
+     * Disposes the element.
+     */
+    PagePreview.prototype.dispose = function () {
+        this.$iframeTabContainer.off('shown.bs.tab', this.proxy(this.onTabShown))
+        this.$deviceSelector.off('click', 'a', this.proxy(this.onDeviceClick))
+
+        this.$deviceSelector = null
+        this.$iframe = null
+        this.$iframeTabContainer = null
+        this.$el = null
+        BaseProto.dispose.call(this)
+    }
+
+    /**
+     * Resize the iframe to fit its content when displayed in a tab.
+     * @param {Event} e
+     */
+    PagePreview.prototype.onTabShown = function (e) {
+        const tabBody = $($(e.target).attr('data-target'));
+        if (!tabBody.length) {
+            return
+        }
+        const iframe = tabBody.find(this.$iframe);
+        if (iframe.length) {
+            iframe[0].style.height = iframe[0].contentWindow.document.documentElement.scrollHeight + 'px';
+        }
+    }
+
+    /**
+     * Resize the preview based on the selected device
+     * @param {Event} event
+     */
+    PagePreview.prototype.onDeviceClick = function (event) {
+        const $clicked = $(event.currentTarget)
+
+        // Remove active class from other options
+        this.$deviceSelector.find('a').removeClass('active')
+
+        // Add active class to the clicked option
+        $clicked.addClass('active')
+
+        // Remove all device classes from the preview
+        this.$el.removeClass('preview-desktop preview-tablet preview-mobile')
+
+        // Add the device class to the preview
+        this.$el.addClass('preview-' + $clicked.data('preview-device').toLowerCase())
+    }
+
+    // PagePreview PLUGIN DEFINITION
+    // ============================
+
+    var old = $.fn.PagePreview
+
+    $.fn.PagePreview = function (option) {
+        var args = Array.prototype.slice.call(arguments, 1), result
+        this.each(function () {
+            var $this   = $(this)
+            var data    = $this.data('wn.PagePreview')
+            var options = $.extend({}, PagePreview.DEFAULTS, $this.data(), typeof option == 'object' && option)
+            if (!data) $this.data('wn.PagePreview', (data = new PagePreview(this, options)))
+            if (typeof option == 'string') result = data[option].apply(data, args)
+            if (typeof result != 'undefined') return false
+        })
+
+        return result ? result : this
+    }
+
+    $.fn.PagePreview.Constructor = PagePreview
+
+    // PagePreview NO CONFLICT
+    // =================
+
+    $.fn.PagePreview.noConflict = function () {
+        $.fn.PagePreview = old
+        return this
+    }
+
+    // PagePreview DATA-API
+    // ===============
+
+    $(document).render(function() {
+        $('[data-control="page-preview"]').PagePreview()
+    })
+
+}(window.jQuery);
diff --git a/classes/Controller.php b/classes/Controller.php
index ad29af2..8194d19 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -47,7 +47,11 @@ public function initCmsPage($url)
             if (Str::startsWith($url, '/winter.pages/preview/')) {
                 $alias = Str::after($url, '/winter.pages/preview/');
                 $objectType = 'page';
-                $data = Session::pull("winter.pages.$objectType.preview:$alias");
+                $data = Session::get("winter.pages.$objectType.preview:$alias");
+
+                if (empty($data)) {
+                    return null;
+                }
 
                 try {
                     $page = ObjectHelper::fillObject(
diff --git a/classes/ObjectHelper.php b/classes/ObjectHelper.php
index fc805fd..d7af629 100644
--- a/classes/ObjectHelper.php
+++ b/classes/ObjectHelper.php
@@ -194,4 +194,4 @@ public static function fillObject(Theme $theme, string $type, string $path, arra
 
         return $object;
     }
-}
\ No newline at end of file
+}
diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
index 45abbb0..dba4b85 100644
--- a/classes/page/field.preview.php
+++ b/classes/page/field.preview.php
@@ -1,4 +1,4 @@
-<div id="<?= $formField->getId() ?>">
+<div data-control="page-preview">
     <?php
         // Find the alias of the current Form widget
         foreach ($this->widget as $alias => $widget) {
@@ -18,56 +18,14 @@
             Session::put($sessionKey, $formModel->toArray());
         }
         $url = "/winter.pages/preview/$formAlias";
+        $this->addJs('/plugins/winter/pages/assets/js/page-preview.js', 'Winter.Pages');
+        $this->addCss('/plugins/winter/pages/assets/css/page-preview.css', 'Winter.Pages');
     ?>
-    <ul class="devices" id="<?= $formField->getId() ?>DeviceSelector">
+    <ul class="devices">
         <li><a href="javascript:;" class="active" data-preview-device="Desktop" title="Desktop"><span class="icon-desktop"></span></a></li>
         <li><a href="javascript:;" data-preview-device="Tablet" title="Tablet"><span class="icon-tablet"></span></a></li>
         <li><a href="javascript:;" data-preview-device="Mobile" title="Mobile"><span class="icon-mobile"></span></a></li>
     </ul>
-    <style>
-        #<?= $formField->getId() ?> {
-            margin: 0 auto;
-            padding: 0 1em 1em 1em;
-            background: #f2f2f2;
-            border-radius: 5px;
-        }
-        #<?= $formField->getId() ?> iframe {
-            background: #fff;
-            box-shadow: 0px 0px 7px -3px rgb(0 0 0 / 50%);
-            border-radius: 5px;
-        }
-        .devices {
-            margin: 0;
-            list-style: none;
-            display: flex;
-            justify-content: center;
-            background: #f2f2f2;
-            padding: 0.5em 1em;
-        }
-        .devices a {
-            padding: 0.5em 0.75em;
-            display: block;
-            margin-right: 1em;
-            border-radius: 3px;
-            background: #ddd;
-            transition: all .2s ease;
-        }
-        .devices a.active,
-        .devices a:hover {
-            font-weight: bold;
-            background: #333;
-            color: #fff;
-        }
-        .preview-desktop {
-            width: 100%;
-        }
-        .preview-tablet {
-            width: 768px;
-        }
-        .preview-mobile {
-            width: 320px;
-        }
-    </style>
     <iframe
         width="100%"
         scrolling="no"
@@ -75,27 +33,4 @@ class="preview-desktop"
         onload="this.style.height = this.contentWindow.document.documentElement.scrollHeight + 'px';"
         src="<?= Url::to($url); ?>"
     ></iframe>
-    <script>
-        var previewId = '#<?= $formField->getId(); ?>';
-        var deviceSelectorId = '#<?= $formField->getId(); ?>DeviceSelector';
-        $(deviceSelectorId).on('click', 'a', function () {
-            var $this = $(this),
-                $previewContainer = $(previewId),
-                device = $this.data('preview-device');
-            $(deviceSelectorId).find('a').removeClass('active');
-            $this.addClass('active');
-            $previewContainer.removeClass('preview-desktop preview-tablet preview-mobile');
-            $previewContainer.addClass('preview-' + device.toLowerCase());
-        });
-        $('.control-tabs:has(' + previewId + ')').on('shown.bs.tab', function (e) {
-            const tabBody = $($(e.target).attr('data-target'));
-            if (!tabBody.length) {
-                return
-            }
-            const iframe = tabBody.find(previewId + ' iframe');
-            if (iframe.length) {
-                iframe[0].style.height = iframe[0].contentWindow.document.documentElement.scrollHeight + 'px';
-            }
-        })
-    </script>
-</div>
\ No newline at end of file
+</div>

From f9cbaf0462a3e19501216082df5aa8d22c4b9385 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 26 Sep 2022 00:43:48 -0600
Subject: [PATCH 11/52] Use the already loaded staticPage object when present
 instead of re-resolving it

---
 components/StaticPage.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/StaticPage.php b/components/StaticPage.php
index b7e4ecb..ddfeb41 100644
--- a/components/StaticPage.php
+++ b/components/StaticPage.php
@@ -79,8 +79,12 @@ public function onRun()
             return;
         }
 
-        $router = new Router(Theme::getActiveTheme());
-        $this->pageObject = $this->page['page'] = $router->findByUrl($url);
+        if (isset($this->controller->getPage()->apiBag['staticPage'])) {
+            $this->pageObject = $this->page['page'] = $this->controller->getPage()->apiBag['staticPage'];
+        } else {
+            $router = new Router(Theme::getActiveTheme());
+            $this->pageObject = $this->page['page'] = $router->findByUrl($url);
+        }
 
         if ($this->pageObject) {
             $this->title = $this->page['title'] = array_get($this->pageObject->viewBag, 'title');

From 1bec90eda96cf9d3e148d6d85d921040213bab1f Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 26 Sep 2022 00:47:06 -0600
Subject: [PATCH 12/52] Always store the latest seen version of the page for
 previewing

---
 classes/page/field.preview.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
index dba4b85..991ced0 100644
--- a/classes/page/field.preview.php
+++ b/classes/page/field.preview.php
@@ -14,9 +14,7 @@
             \Winter\Pages\Classes\ObjectHelper::resolveClassType(get_class($formModel))
         );
         $sessionKey = $prefix . $formAlias;
-        if (!Session::has($sessionKey)) {
-            Session::put($sessionKey, $formModel->toArray());
-        }
+        Session::put($sessionKey, $formModel->toArray());
         $url = "/winter.pages/preview/$formAlias";
         $this->addJs('/plugins/winter/pages/assets/js/page-preview.js', 'Winter.Pages');
         $this->addCss('/plugins/winter/pages/assets/css/page-preview.css', 'Winter.Pages');

From f3f77dbc174a6c5dbf4187dd2de3f6c282ac1fd2 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 26 Sep 2022 01:00:36 -0600
Subject: [PATCH 13/52] Dynamically add Preview tab as last secondary tab

---
 Plugin.php               | 31 ++++++++++++++++++++++++++++++-
 classes/page/fields.yaml | 14 --------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index 9f4b430..375c0b7 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -11,6 +11,7 @@
 use Winter\Pages\Classes\Router;
 use Winter\Pages\Classes\Snippet;
 use Winter\Pages\Classes\SnippetManager;
+use Winter\Pages\Controllers\Index;
 
 class Plugin extends PluginBase
 {
@@ -190,11 +191,39 @@ protected function extendThemeSync(): void
      */
     protected function extendBackendForms(): void
     {
-        Event::listen('backend.form.extendFieldsBefore', function($formWidget) {
+        Event::listen('backend.form.extendFieldsBefore', function ($formWidget) {
             if ($formWidget->model instanceof \Cms\Classes\Partial) {
                 Snippet::extendPartialForm($formWidget);
             }
         });
+
+        // Add the Preview tab as the last tab with a event priority that still
+        // allows other plugins to change it if desired.
+        Event::listen('backend.form.extendFieldsBefore', function ($formWidget) {
+            if (
+                $formWidget->isNested
+                || !($formWidget->getController() instanceof Index)
+                || !($formWidget->model instanceof StaticPage)
+            ) {
+                return;
+            }
+
+            $existingFields = array_merge(
+                array_keys($formWidget->fields ?? []),
+                array_keys($formWidget->tabs['fields'] ?? []),
+                array_keys($formWidget->secondaryTabs['fields'] ?? [])
+            );
+
+            $formWidget->secondaryTabs['fields'] = array_merge($formWidget->secondaryTabs['fields'], [
+                '_preview' => [
+                    'tab' => 'winter.pages::lang.editor.preview',
+                    'type' => 'partial',
+                    'span' => 'full',
+                    'path' => '$/winter/pages/classes/page/field.preview.php',
+                    'dependsOn' => $existingFields,
+                ],
+            ]);
+        }, PHP_INT_MIN + 1);
     }
 
     /**
diff --git a/classes/page/fields.yaml b/classes/page/fields.yaml
index fa1362f..e4379e5 100644
--- a/classes/page/fields.yaml
+++ b/classes/page/fields.yaml
@@ -68,17 +68,3 @@ secondaryTabs:
             type: richeditor
             stretch: true
             size: huge
-        _preview:
-            tab: winter.pages::lang.editor.preview
-            type: partial
-            span: full
-            path: $/winter/pages/classes/page/field.preview.php
-            dependsOn:
-                - viewBag[title]
-                - viewBag[url]
-                - viewBag[layout]
-                - viewBag[is_hidden]
-                - viewBag[navigation_hidden]
-                - viewBag[meta_title]
-                - viewBag[meta_description]
-                - markup

From 22c3d677b713ad6da6154374c9f6353b97f72edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?QuangTr=E1=BB=8DngOnline?= <quangtrongonline@gmail.com>
Date: Thu, 27 Oct 2022 02:35:44 +0700
Subject: [PATCH 14/52] Add Vietnamese translation (#20)

---
 lang/vn/lang.php | 145 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 lang/vn/lang.php

diff --git a/lang/vn/lang.php b/lang/vn/lang.php
new file mode 100644
index 0000000..1f7a645
--- /dev/null
+++ b/lang/vn/lang.php
@@ -0,0 +1,145 @@
+<?php
+
+return [
+    'plugin' => [
+        'name' => 'Trang',
+        'description' => 'Tính năng trang nội dung và memu',
+    ],
+    'page' => [
+        'menu_label' => 'Trang',
+        'template_title' => '%s Trang',
+        'delete_confirmation' => 'Bạn có thực sự muốn xóa các trang đã chọn không? Thao tác này cũng sẽ xóa các trang con, nếu có.',
+        'no_records' => 'Không tìm thấy trang nào',
+        'delete_confirm_single' => 'Bạn có thực sự muốn xóa trang này không? Thao tác này cũng sẽ xóa các trang con, nếu có.',
+        'new' => 'Thêm trang',
+        'add_subpage' => 'Thêm trang con',
+        'invalid_url' => 'Định dạng URL không hợp lệ. URL phải bắt đầu bằng ký hiệu gạch chéo và có thể chứa các chữ số, chữ cái Latinh và các ký hiệu sau: _-/.',
+        'url_not_unique' => 'URL này đã được sử dụng bởi một trang khác.',
+        'layout' => 'Bố cục',
+        'layouts_not_found' => 'Không tìm thấy bố cục nào',
+        'saved' => 'Trang đã được lưu thành công.',
+        'tab' => 'Trang',
+        'manage_pages' => 'Quản lý các trang nội dung',
+        'manage_menus' => 'Quản lý các menu',
+        'access_snippets' => 'Truy cập đoạn trích',
+        'manage_content' => 'Quản lý nội dung tĩnh',
+    ],
+    'menu' => [
+        'menu_label' => 'Menus',
+        'delete_confirmation' => 'Bạn có thực sự muốn xóa các menus đã chọn không?',
+        'no_records' => 'Không tìm thấy menu',
+        'new' => 'Thêm menu',
+        'new_name' => 'Tên menu mới',
+        'new_code' => 'new-menu',
+        'delete_confirm_single' => 'Bạn có thực sự muốn xóa menu này không?',
+        'saved' => 'Menu đã được lưu thành công.',
+        'name' => 'Tên menu',
+        'code' => 'Code',
+        'items' => 'Phần tử menu',
+        'add_subitem' => 'Thêm phần tử con',
+        'code_required' => 'Code là bắt buộc',
+        'invalid_code' => 'Định dạng code không hợp lệ. Mã có thể chứa các chữ số, chữ cái Latinh và các ký hiệu sau: _-',
+    ],
+    'menuitem' => [
+        'title' => 'Tiêu đề',
+        'editor_title' => 'Chỉnh sửa phần tử của menu',
+        'type' => 'Loại',
+        'allow_nested_items' => 'Cho phép các phần tử lồng nhau',
+        'allow_nested_items_comment' => 'Các phần tử lồng nhau có thể được tạo động bởi trang tĩnh và một số loại phần tử khác',
+        'url' => 'URL',
+        'reference' => 'Tham chiếu',
+        'search_placeholder' => 'Tìm kiếm tham chiếu...',
+        'title_required' => 'Tiêu đề là bắt buộc',
+        'unknown_type' => 'Loại menu không xác định',
+        'unnamed' => 'Không có tên',
+        'add_item' => 'Thêm <u>P</u>hần tử',
+        'new_item' => 'Mục mới',
+        'replace' => 'Thay thế mục này bằng các mục con đã tạo của nó',
+        'replace_comment' => 'Chọn mục này để đẩy các mục menu đã tạo lên cùng cấp với mục này. Bản thân mục này sẽ bị ẩn.',
+        'cms_page' => 'Trang CMS',
+        'cms_page_comment' => 'Chọn một trang để mở khi nhấp vào menu.',
+        'reference_required' => 'Tham chiếu của menu là bắt buộc.',
+        'url_required' => 'URL là bắt buộc',
+        'cms_page_required' => 'Vui lòng chọn 1 trang CMS',
+        'display_tab' => 'Hiển thị',
+        'hidden' => 'Ẩn',
+        'hidden_comment' => 'Ẩn menu này để không xuất hiện trên giao diện người dùng.',
+        'attributes_tab' => 'Thuộc tính',
+        'code' => 'Code',
+        'code_comment' => 'Nhập mã menu nếu bạn muốn truy cập mã đó bằng API.',
+        'css_class' => 'CSS Class',
+        'css_class_comment' => 'Nhập tên CSS class để cung cấp cho menu này một giao diện tùy chỉnh.',
+        'external_link' => 'Liên kết bên ngoài',
+        'external_link_comment' => 'Mở liên kết cho menu này trong một cửa sổ mới.',
+        'static_page' => 'Trang nội dung tĩnh',
+        'all_static_pages' => 'Tất cả các trang nội dung tĩnh'
+    ],
+    'content' => [
+        'menu_label' => 'Nội dung',
+        'saved' => 'Nội dung đã được lưu thành công.',
+        'cant_save_to_dir' => 'Không được phép lưu các tệp nội dung vào thư mục trang tĩnh.',
+    ],
+    'sidebar' => [
+        'add' => 'Thêm',
+        'search' => 'Tìm kiếm...',
+    ],
+    'object' => [
+        'invalid_type' => 'Loại đối tượng không xác định',
+        'unauthorized_type' => 'Bạn không được phép quản lý đối tượng :type',
+        'not_found' => 'Đối tượng được yêu cầu không được tìm thấy.',
+    ],
+    'editor' => [
+        'title' => 'Tiêu đề',
+        'new_title' => 'Tiêu đề trang',
+        'content' => 'Nội dung',
+        'url' => 'URL',
+        'filename' => 'Tên tệp',
+        'layout' => 'Bố cục',
+        'description' => 'Mô tả',
+        'preview' => 'Xem trước',
+        'enter_fullscreen' => 'Chế độ toàn màn hình',
+        'exit_fullscreen' => 'Thoát chế độ toàn màn hình',
+        'hidden' => 'Ẩn',
+        'hidden_comment' => 'Các trang ẩn chỉ có thể truy cập được bởi quản trị viên.',
+        'navigation_hidden' => 'Ẩn trong điều hướng',
+        'navigation_hidden_comment' => 'Chọn hộp này để ẩn trang này khỏi các menu và breadcrumbs được tạo tự động.',
+    ],
+    'snippet' => [
+        'partialtab' => 'Đoạn trích',
+        'code' => 'Mã đoạn trích',
+        'code_comment' => 'Nhập mã để cung cấp phần này dưới dạng đoạn mã trong plugin Trang tĩnh.',
+        'name' => 'Tên',
+        'name_comment' => 'Tên được hiển thị trong danh sách đoạn mã trong thanh bên Trang tĩnh và trên Trang khi đoạn mã được thêm vào.',
+        'no_records' => 'Không tìm thấy đoạn trích nào',
+        'menu_label' => 'Đoạn trích',
+        'column_property' => 'Tiêu đề',
+        'column_type' => 'Loại',
+        'column_code' => 'Mã',
+        'column_default' => 'Mặc định',
+        'column_options' => 'Tùy chọn',
+        'column_type_string' => 'Chuỗi ký tự',
+        'column_type_checkbox' => 'Hộp kiểm',
+        'column_type_dropdown' => 'Trình đơn thả xuống',
+        'not_found' => 'Đoạn mã được yêu cầu với mã :code không tìm thấy trong theme.',
+        'property_format_error' => 'Mã thuộc tính phải bắt đầu bằng chữ cái Latinh và chỉ có thể chứa các chữ cái và chữ số Latinh',
+        'invalid_option_key' => 'Tùy chọn: :key không hợp lệ. Các tùy chọn chỉ có thể chứa các chữ số, chữ cái Latinh và các ký tự _ và -',
+    ],
+    'component' => [
+        'static_page_name' => 'Trang tĩnh',
+        'static_page_description' => 'Hiển thị trang tĩnh trong bố cục CMS.',
+        'static_page_use_content_name' => 'Sử dụng trường nội dung trang',
+        'static_page_use_content_description' => 'Nếu bỏ chọn, phần nội dung sẽ không xuất hiện khi chỉnh sửa trang tĩnh. Nội dung trang sẽ chỉ được xác định thông qua trình giữ chỗ và các biến.',
+        'static_page_default_name' => 'Bố cục mặc định',
+        'static_page_default_description' => 'Xác định bố cục này làm mặc định cho các trang mới',
+        'static_page_child_layout_name' => 'Bố cục trang con',
+        'static_page_child_layout_description' => 'Bố cục để sử dụng làm mặc định cho bất kỳ trang con mới nào',
+        'static_menu_name' => 'Menu',
+        'static_menu_description' => 'Hiển thị menu trong bố cục CMS.',
+        'static_menu_code_name' => 'Menu',
+        'static_menu_code_description' => 'Chỉ định mã của menu mà thành phần sẽ xuất ra.',
+        'static_breadcrumbs_name' => 'Đường dẫn',
+        'static_breadcrumbs_description' => 'Hiển thị đường dẫn của trang.',
+        'child_pages_name' => 'Trang con',
+        'child_pages_description' => 'Hiển thị danh sách các trang con cho trang hiện tại',
+    ]
+];

From c4839527607097c07db80cde1cc1d90c36e09de6 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 14 Nov 2022 23:59:26 -0600
Subject: [PATCH 15/52] Improve support for rendering previews of unsaved
 content

---
 classes/Controller.php         |  2 +-
 classes/page/field.preview.php |  7 ++++++-
 controllers/Index.php          | 29 +++++++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/classes/Controller.php b/classes/Controller.php
index 8194d19..6d9c554 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -57,7 +57,7 @@ public function initCmsPage($url)
                     $page = ObjectHelper::fillObject(
                         $this->theme,
                         'page',
-                        $data['objectPath'] ?? $data['fileName'],
+                        $data['objectPath'] ?? $data['fileName'] ?? '',
                         $data
                     );
                 } catch (\Throwable $e) {
diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
index 991ced0..097224c 100644
--- a/classes/page/field.preview.php
+++ b/classes/page/field.preview.php
@@ -14,7 +14,12 @@
             \Winter\Pages\Classes\ObjectHelper::resolveClassType(get_class($formModel))
         );
         $sessionKey = $prefix . $formAlias;
-        Session::put($sessionKey, $formModel->toArray());
+
+        $object = (Request::ajax() && Request::has('objectType'))
+            ? $this->getObjectFromRequest()
+            : $formModel;
+
+        Session::put($sessionKey, $object->toArray());
         $url = "/winter.pages/preview/$formAlias";
         $this->addJs('/plugins/winter/pages/assets/js/page-preview.js', 'Winter.Pages');
         $this->addCss('/plugins/winter/pages/assets/css/page-preview.css', 'Winter.Pages');
diff --git a/controllers/Index.php b/controllers/Index.php
index 7de837b..84116c8 100644
--- a/controllers/Index.php
+++ b/controllers/Index.php
@@ -3,7 +3,6 @@
 use ApplicationException;
 use Backend\Classes\Controller;
 use BackendMenu;
-use Cms\Classes\CmsCompoundObject;
 use Cms\Classes\CmsObject;
 use Cms\Classes\Theme;
 use Cms\Widgets\TemplateList;
@@ -117,6 +116,21 @@ protected function getObjectType(): string
         return $type;
     }
 
+    /**
+     * Gets the object from the current request
+     * @throws ApplicationException if the current user does not have permissions to manage the identified type
+     */
+    public function getObjectFromRequest()
+    {
+        $type = $this->getObjectType();
+        return ObjectHelper::fillObject(
+            $this->theme,
+            $type,
+            Request::input('objectPath'),
+            post()
+        );
+    }
+
     //
     // Pages, menus and text blocks
     //
@@ -138,7 +152,18 @@ public function pageAction()
             $widget->bindEvent('form.refreshFields', function ($allFields) use ($widget) {
                 $prefix = ObjectHelper::getTypePreviewSessionKeyPrefix($this->getObjectType());
                 $sessionKey = "$prefix{$widget->alias}";
-                Session::put($sessionKey, post());
+
+                $this->validateRequestTheme();
+                $type = $this->getObjectType();
+                $object = $this->getObjectFromRequest();
+                $object = ObjectHelper::fillObject(
+                    $this->theme,
+                    $type,
+                    Request::input('objectPath'),
+                    post()
+                );
+
+                Session::put($sessionKey, $object->toArray());
             });
         }
 

From 01758a02d7bf1aba2febdfd78009f77e729c4537 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Tue, 15 Nov 2022 10:46:07 -0600
Subject: [PATCH 16/52] Add icon for settings tab

---
 classes/page/fields.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/page/fields.yaml b/classes/page/fields.yaml
index e4379e5..59b37b4 100644
--- a/classes/page/fields.yaml
+++ b/classes/page/fields.yaml
@@ -26,6 +26,10 @@ fields:
 
 tabs:
     cssClass: master-area
+
+    icons:
+        cms::lang.editor.settings: icon-cog
+
     fields:
         viewBag[layout]:
             tab: cms::lang.editor.settings

From 7ad3e5b0a0b0f377f3b10ebdd7b676f720f25828 Mon Sep 17 00:00:00 2001
From: Robert Alexa <mail@robertalexa.me>
Date: Mon, 21 Nov 2022 21:57:53 +0000
Subject: [PATCH 17/52] Fix issue with subpages of home would get 2 slashes
 (#21)

---
 controllers/index/_form_page.htm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/controllers/index/_form_page.htm b/controllers/index/_form_page.htm
index 1ee8c7c..4848262 100644
--- a/controllers/index/_form_page.htm
+++ b/controllers/index/_form_page.htm
@@ -17,9 +17,12 @@
     <?php endif ?>
 
     <?php if (isset($parentPage)): ?>
-        <input type="hidden" data-parent-url value="<?= e($parentPage->getViewBag()->property('url')) ?>" />
+        <input type="hidden" data-parent-url
+               value="<?= e($parentPage->getViewBag()->property('url')) === '/'
+                        ? ''
+                        : e($parentPage->getViewBag()->property('url')) ?>"/>
     <?php endif ?>
 
     <input type="hidden" value="0" name="objectForceSave" />
 
-<?= Form::close() ?>
\ No newline at end of file
+<?= Form::close() ?>

From 1637d1b56b2d526ec0fbc1d9571c47933497cf23 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Wed, 30 Nov 2022 10:21:18 +0000
Subject: [PATCH 18/52] Added fix to ensure iframe height fills container

---
 assets/css/page-preview.css    | 6 ++++++
 classes/page/field.preview.php | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/assets/css/page-preview.css b/assets/css/page-preview.css
index 087bff1..f96bf44 100644
--- a/assets/css/page-preview.css
+++ b/assets/css/page-preview.css
@@ -40,3 +40,9 @@
 [data-control="page-preview"].preview-mobile {
     width: 320px;
 }
+
+div.form-group[data-field-name="_preview"],
+div.form-group[data-field-name="_preview"] div[data-control="page-preview"],
+div.form-group[data-field-name="_preview"] div[data-control="page-preview"] iframe {
+    height: 100%;
+}
diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
index 097224c..80ab134 100644
--- a/classes/page/field.preview.php
+++ b/classes/page/field.preview.php
@@ -31,9 +31,12 @@
     </ul>
     <iframe
         width="100%"
-        scrolling="no"
         class="preview-desktop"
-        onload="this.style.height = this.contentWindow.document.documentElement.scrollHeight + 'px';"
+        onload="
+            this.contentWindow.document.documentElement.scrollHeight > 0
+                ? this.style.height = this.contentWindow.document.documentElement.scrollHeight + 'px'
+                : void(0);
+        "
         src="<?= Url::to($url); ?>"
     ></iframe>
 </div>

From 3bfec44c1ec3c68b7a354c509a2650ef8f8025fa Mon Sep 17 00:00:00 2001
From: Robert Alexa <mail@robertalexa.me>
Date: Wed, 30 Nov 2022 18:10:50 +0000
Subject: [PATCH 19/52] Fix issue where allowed ips can access the website but
 can't see the static pages content (#22)

---
 components/StaticPage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/StaticPage.php b/components/StaticPage.php
index 2e026b2..8844880 100644
--- a/components/StaticPage.php
+++ b/components/StaticPage.php
@@ -157,7 +157,8 @@ protected function isMaintenanceModeEnabled(): bool
     {
         return MaintenanceSetting::isConfigured() &&
             MaintenanceSetting::get('is_enabled', false) &&
-            !\BackendAuth::getUser();
+            !MaintenanceSetting::isAllowedIp(Request::ip()) &&
+            !BackendAuth::getUser();
     }
 
     /**

From 7c7188b957924db8d761273aa2e7df25d21a2047 Mon Sep 17 00:00:00 2001
From: Robert Alexa <mail@robertalexa.me>
Date: Wed, 30 Nov 2022 20:00:49 +0000
Subject: [PATCH 20/52] Add the right uses - i am sorry (#23)

---
 components/StaticPage.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/StaticPage.php b/components/StaticPage.php
index 8844880..5321943 100644
--- a/components/StaticPage.php
+++ b/components/StaticPage.php
@@ -1,5 +1,7 @@
 <?php namespace Winter\Pages\Components;
 
+use Request;
+use BackendAuth;
 use Cms\Classes\Theme;
 use Cms\Classes\ComponentBase;
 use Cms\Models\MaintenanceSetting;

From bf9e64bfdc43fa075a74c242fc46898d6c61ebb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Michael=20Thunstr=C3=B6m?= <micke@cemik.se>
Date: Thu, 8 Dec 2022 21:38:24 +0100
Subject: [PATCH 21/52] Improved Swedish translation (#24)

---
 lang/sv/lang.php | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lang/sv/lang.php b/lang/sv/lang.php
index 8e09e33..0ac52ef 100644
--- a/lang/sv/lang.php
+++ b/lang/sv/lang.php
@@ -8,9 +8,9 @@
     'page' => [
         'menu_label' => 'Sidor',
         'template_title' => '%s Sidor',
-        'delete_confirmation' => 'Vill du verkligen ta bort de valda sidorna? Detta kommer också ta bort undersidorna, ifall det finns några.',
+        'delete_confirmation' => 'Vill du verkligen ta bort de valda sidorna? Detta kommer även ta bort undersidorna, om det finns några.',
         'no_records' => 'Inga sidor hittades',
-        'delete_confirm_single' => 'Vill du verkligen ta bort den valda sidan? Detta kommer också ta bort sidans undersidor, ifall det finns några.',
+        'delete_confirm_single' => 'Vill du verkligen ta bort den valda sidan? Detta kommer även ta bort sidans undersidor, om det finns några.',
         'new' => 'Ny sida',
         'add_subpage' => 'Lägg till undersida',
         'invalid_url' => 'Ogiltigt format på URL. URL:en ska börja med slash och kan innehålla siffror, latinska bokstäver och följande symboler: _-/',
@@ -27,46 +27,46 @@
     'menu' => [
         'menu_label' => 'Menyer',
         'delete_confirmation' => 'Vill du verkligen ta bort valda de menyerna?',
-        'no_records' => 'Inga menyer kunde finnas',
+        'no_records' => 'Inga menyer hittades',
         'new' => 'Ny meny',
         'new_name' => 'Ny meny',
         'new_code' => 'ny-meny',
-        'delete_confirm_single' => 'Vill du verkligen ta bort denna menyn?',
+        'delete_confirm_single' => 'Vill du verkligen ta bort denna meny?',
         'saved' => 'Menyn har sparats.',
         'name' => 'Namn',
         'code' => 'Kod',
-        'items' => 'Menyföremål',
-        'add_subitem' => 'Lägg till underföremål',
-        'no_records' => 'Inga föremål kunde finnas',
+        'items' => 'Menyobjekt',
+        'add_subitem' => 'Lägg till undermeny',
+        'no_records' => 'Inga föremål kunde hittas',
         'code_required' => 'Koden är obligatorisk',
         'invalid_code' => 'Ogiltigt kodformat. Koden kan innehålla siffror, latinska bokstäver och följande symboler: _-'
     ],
     'menuitem' => [
-        'title' => 'Rubrik',
-        'editor_title' => 'Redigera menyföremål',
+        'title' => 'Titel',
+        'editor_title' => 'Redigera menyobjekt',
         'type' => 'Typ',
-        'allow_nested_items' => 'Tillåt underliggande föremål',
-        'allow_nested_items_comment' => 'Underliggande föremål kan skapas dynamiskt av en etatisk sida och några andra föremålstyper',
+        'allow_nested_items' => 'Tillåt underliggande menyer',
+        'allow_nested_items_comment' => 'Underliggande menyer kan skapas dynamiskt av en statisk sida och några andra föremålstyper',
         'url' => 'URL',
         'reference' => 'Referens',
-        'title_required' => 'Rubriken är obligatorisk',
-        'unknown_type' => 'Okänd menyföremålstyp',
-        'unnamed' => 'Namnlöst menyföremål',
-        'add_item' => 'Lägg till <u>f</u>öremål',
-        'new_item' => 'Nytt menyföremål',
-        'replace' => 'Ersätt detta föremål med dens skapade underföremål',
-        'replace_comment' => 'Använd denna kryssruta för att föra skapade menyföremål till samma nivå som detta föremålet. Detta föremålet kommer att gömmas.',
+        'title_required' => 'Titel är obligatorisk',
+        'unknown_type' => 'Okänd menytyp',
+        'unnamed' => 'Meny utan namn',
+        'add_item' => 'Lägg till <u>M</u>enyobjekt',
+        'new_item' => 'Ny meny',
+        'replace' => 'Ersätt menyobjekt med skapade underliggande menyer',
+        'replace_comment' => 'Använd denna kryssruta för att flytta skapade menyer till samma nivå som detta menyobjekt. Detta menyobjekt kommer att gömmas.',
         'cms_page' => 'CMS-sida',
-        'cms_page_comment' => 'Välj en sida som ska öppnas när menyföremålet klickas.',
-        'reference_required' => 'Menyföremålets referens är obligatorisk.',
+        'cms_page_comment' => 'Välj sida som ska öppnas när menyn klickas på.',
+        'reference_required' => 'Menyreferens är obligatorisk.',
         'url_required' => 'URL:en är obligatorisk',
         'cms_page_required' => 'Vänligen välj en CMS-sida',
         'code' => 'Kod',
-        'code_comment' => 'Fyll i menyföremålets kod om du vill få tillgång till det i API:t.'
+        'code_comment' => 'Ange kod om du vill få tillgång till menyobjektet i API:t.'
     ],
     'content' => [
         'menu_label' => 'Innehåll',
-        'cant_save_to_dir' => 'Att sparar innehållsfiler till mappen för statiska sidor är inte tillåtet.'
+        'cant_save_to_dir' => 'Att spara innehållsfiler till mappen för statiska sidor är inte tillåtet.'
     ],
     'sidebar' => [
         'add' => 'Lägg till',
@@ -77,8 +77,8 @@
         'not_found' => 'Det begärda objektet kunde inte finnas.'
     ],
     'editor' => [
-        'title' => 'Rubrik',
-        'new_title' => 'Ny sidrubrik',
+        'title' => 'Titel',
+        'new_title' => 'Ny sidtitel',
         'content' => 'Innehåll',
         'url' => 'URL',
         'filename' => 'Filnamn',

From 872d71f5aaeff3873c92f1031bc31b1a4c883363 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Wed, 4 Jan 2023 11:58:46 +0000
Subject: [PATCH 22/52] Moved data storage from session to cache and extended
 key to include session id

---
 classes/Controller.php         | 45 +++++++++++++++++-----------------
 classes/ObjectHelper.php       |  9 ++++---
 classes/page/field.preview.php | 10 +++++---
 controllers/Index.php          | 15 ++++++------
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/classes/Controller.php b/classes/Controller.php
index 6d9c554..0662318 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -5,7 +5,7 @@
 use Cms\Classes\Theme;
 use Exception;
 use Lang;
-use Session;
+use Cache;
 use Winter\Storm\Parse\Syntax\Parser as SyntaxParser;
 use Winter\Storm\Support\Str;
 
@@ -44,27 +44,28 @@ public function initCmsPage($url)
 
         if (!$page) {
             // Attempt to render a page preview if one exists
-            if (Str::startsWith($url, '/winter.pages/preview/')) {
-                $alias = Str::after($url, '/winter.pages/preview/');
-                $objectType = 'page';
-                $data = Session::get("winter.pages.$objectType.preview:$alias");
-
-                if (empty($data)) {
-                    return null;
-                }
-
-                try {
-                    $page = ObjectHelper::fillObject(
-                        $this->theme,
-                        'page',
-                        $data['objectPath'] ?? $data['fileName'] ?? '',
-                        $data
-                    );
-                } catch (\Throwable $e) {
-                    throw $e;// @TODO: Hide this exception
-                    return null;
-                }
-            } else {
+            if (!Str::startsWith($url, '/winter.pages/preview/')) {
+                return null;
+            }
+
+            $alias = Str::after($url, '/winter.pages/preview/');
+            $objectType = 'page';
+
+            $data = Cache::get(ObjectHelper::getTypePreviewSessionCacheKey($objectType, $alias));
+
+            if (empty($data)) {
+                return null;
+            }
+
+            try {
+                $page = ObjectHelper::fillObject(
+                    $this->theme,
+                    $objectType,
+                    $data['objectPath'] ?? $data['fileName'] ?? '',
+                    $data
+                );
+            } catch (\Throwable $e) {
+                throw $e;// @TODO: Hide this exception
                 return null;
             }
         }
diff --git a/classes/ObjectHelper.php b/classes/ObjectHelper.php
index d7af629..5ee7938 100644
--- a/classes/ObjectHelper.php
+++ b/classes/ObjectHelper.php
@@ -6,21 +6,22 @@
 use Cms\Classes\Theme;
 use Config;
 use Lang;
+use Session;
 
 class ObjectHelper
 {
     protected static array $types = [
         'page'    => \Winter\Pages\Classes\Page::class,
         'menu'    => \Winter\Pages\Classes\Menu::class,
-        'content' => \Winter\Pages\Classes\Conten::class,
+        'content' => \Winter\Pages\Classes\Content::class,
     ];
 
     /**
-     * Get the session key for the preview data.
+     * Get the cache key for the preview data tied to session.
      */
-    public static function getTypePreviewSessionKeyPrefix(string $type,): string
+    public static function getTypePreviewSessionCacheKey(string $type, string $alias): string
     {
-        return "winter.pages.$type.preview:";
+        return "winter.pages.$type.preview:$alias" . Session::getId();
     }
 
     /**
diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
index 80ab134..fbef41d 100644
--- a/classes/page/field.preview.php
+++ b/classes/page/field.preview.php
@@ -10,16 +10,18 @@
         if (empty($formAlias)) {
             return;
         }
-        $prefix = \Winter\Pages\Classes\ObjectHelper::getTypePreviewSessionKeyPrefix(
-            \Winter\Pages\Classes\ObjectHelper::resolveClassType(get_class($formModel))
+
+        $sessionKey = \Winter\Pages\Classes\ObjectHelper::getTypePreviewSessionCacheKey(
+            \Winter\Pages\Classes\ObjectHelper::resolveClassType(get_class($formModel)),
+            $formAlias
         );
-        $sessionKey = $prefix . $formAlias;
 
         $object = (Request::ajax() && Request::has('objectType'))
             ? $this->getObjectFromRequest()
             : $formModel;
 
-        Session::put($sessionKey, $object->toArray());
+        Cache::put($sessionKey, $object->toArray());
+
         $url = "/winter.pages/preview/$formAlias";
         $this->addJs('/plugins/winter/pages/assets/js/page-preview.js', 'Winter.Pages');
         $this->addCss('/plugins/winter/pages/assets/css/page-preview.css', 'Winter.Pages');
diff --git a/controllers/Index.php b/controllers/Index.php
index 84116c8..ba2f567 100644
--- a/controllers/Index.php
+++ b/controllers/Index.php
@@ -7,12 +7,12 @@
 use Cms\Classes\Theme;
 use Cms\Widgets\TemplateList;
 use Config;
+use Cache;
 use Event;
 use Exception;
 use Flash;
 use Lang;
 use Request;
-use Session;
 use System\Helpers\DateTime;
 use Url;
 use Winter\Pages\Classes\Content;
@@ -150,20 +150,19 @@ public function pageAction()
             $widget = $this->widget->{$formAlias};
 
             $widget->bindEvent('form.refreshFields', function ($allFields) use ($widget) {
-                $prefix = ObjectHelper::getTypePreviewSessionKeyPrefix($this->getObjectType());
-                $sessionKey = "$prefix{$widget->alias}";
-
                 $this->validateRequestTheme();
-                $type = $this->getObjectType();
-                $object = $this->getObjectFromRequest();
+
                 $object = ObjectHelper::fillObject(
                     $this->theme,
-                    $type,
+                    $this->getObjectType(),
                     Request::input('objectPath'),
                     post()
                 );
 
-                Session::put($sessionKey, $object->toArray());
+                Cache::put(
+                    ObjectHelper::getTypePreviewSessionCacheKey($this->getObjectType(), $widget->alias),
+                    $object->toArray()
+                );
             });
         }
 

From d98c61943842b6f055de681ddca4dd873fd302f4 Mon Sep 17 00:00:00 2001
From: Damien MATHIEU <contact@hounddd.fr>
Date: Mon, 20 Feb 2023 03:30:58 +0100
Subject: [PATCH 23/52] Add composer install instructions (#29)

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 65b6633..19d49cb 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,19 @@
 
 This plugin allows end users to create and edit static pages and menus with a simple WYSIWYG user interface.
 
+## Installation
+
+This plugin is available for installation via [Composer](http://getcomposer.org/).
+
+```bash
+composer require winter/wn-pages-plugin
+```
+
 ## Managing static pages
 
 Static pages are managed on the Pages tab of the Static Pages plugin. Static pages have three required parameters - **Title**, **URL** and **Layout**. The URL is generated automatically when the Title is entered, but it could be changed manually. URLs must start with the forward slash character. The Layout drop-down allows to select a layout created with the CMS. Only layouts that include the `staticPage` component are displayed in the drop-down.
 
-![image](https://raw.githubusercontent.com/wintercms/wn-pages-plugin/master/docs/images/static-page.png) {.img-responsive .frame}
+![image](https://raw.githubusercontent.com/wintercms/wn-pages-plugin/master/docs/images/static-page.png) 
 
 Pages are hierarchical. The page hierarchy is used when a new page URL is generated, but as URLs can be changed manually, the hierarchy doesn't really affect the routing process. The only place where the page hierarchy matters is the generated Menus. The generated menus reflect the page hierarchy. You can manage the page hierarchy by dragging pages in the page tree. The page drag handle appears when you move the mouse cursor over page item in the tree.
 

From b7e4a13becec7923e7ce5c57865eac503ffdf569 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Fri, 24 Feb 2023 16:54:26 +0000
Subject: [PATCH 24/52] Added config option to default preview to false

---
 Plugin.php        | 4 +++-
 config/config.php | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 config/config.php

diff --git a/Plugin.php b/Plugin.php
index 375c0b7..6d12307 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -4,6 +4,7 @@
 use Backend\Models\UserRole;
 use Cms\Classes\Controller as CmsController;
 use Cms\Classes\Theme;
+use Config;
 use Event;
 use System\Classes\PluginBase;
 use Winter\Pages\Classes\Controller;
@@ -201,7 +202,8 @@ protected function extendBackendForms(): void
         // allows other plugins to change it if desired.
         Event::listen('backend.form.extendFieldsBefore', function ($formWidget) {
             if (
-                $formWidget->isNested
+                !Config::get('winter.pages::preview_enabled', false)
+                || $formWidget->isNested
                 || !($formWidget->getController() instanceof Index)
                 || !($formWidget->model instanceof StaticPage)
             ) {
diff --git a/config/config.php b/config/config.php
new file mode 100644
index 0000000..a717b69
--- /dev/null
+++ b/config/config.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'preview_enabled' => false
+];

From 7bad14d6fabc6872e180ca138744bdc657ce4bd6 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Fri, 24 Feb 2023 16:56:25 +0000
Subject: [PATCH 25/52] Added fixes to styling bugs in css and removed js
 resizing

---
 assets/css/page-preview.css    | 22 +++++++++++++++-------
 assets/js/page-preview.js      | 15 ---------------
 classes/page/field.preview.php |  8 +-------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/assets/css/page-preview.css b/assets/css/page-preview.css
index f96bf44..392e6db 100644
--- a/assets/css/page-preview.css
+++ b/assets/css/page-preview.css
@@ -1,16 +1,20 @@
 [data-control="page-preview"] {
-    margin: 0 auto;
+    margin: 0;
     padding: 0 1em 1em 1em;
     background: #f2f2f2;
     border-radius: 5px;
+    display: flex;
+    flex-direction: column;
 }
 [data-control="page-preview"] iframe {
     background: #fff;
+    margin: 0 auto;
+    border: 0;
     box-shadow: 0px 0px 7px -3px rgb(0 0 0 / 50%);
     border-radius: 5px;
 }
 [data-control="page-preview"] .devices {
-    margin: 0;
+    margin: 0 auto;
     list-style: none;
     display: flex;
     justify-content: center;
@@ -31,14 +35,14 @@
     background: #333;
     color: #fff;
 }
-[data-control="page-preview"].preview-desktop {
+[data-control="page-preview"].preview-desktop iframe {
     width: 100%;
 }
-[data-control="page-preview"].preview-tablet {
-    width: 768px;
+[data-control="page-preview"].preview-tablet iframe {
+    width: min(768px, 100%);
 }
-[data-control="page-preview"].preview-mobile {
-    width: 320px;
+[data-control="page-preview"].preview-mobile iframe {
+    width: min(320px, 100%);
 }
 
 div.form-group[data-field-name="_preview"],
@@ -46,3 +50,7 @@ div.form-group[data-field-name="_preview"] div[data-control="page-preview"],
 div.form-group[data-field-name="_preview"] div[data-control="page-preview"] iframe {
     height: 100%;
 }
+
+div.form-group[data-field-name="_preview"] {
+    padding-bottom: 0;
+}
diff --git a/assets/js/page-preview.js b/assets/js/page-preview.js
index a2fa9b2..569dde6 100644
--- a/assets/js/page-preview.js
+++ b/assets/js/page-preview.js
@@ -60,21 +60,6 @@
         BaseProto.dispose.call(this)
     }
 
-    /**
-     * Resize the iframe to fit its content when displayed in a tab.
-     * @param {Event} e
-     */
-    PagePreview.prototype.onTabShown = function (e) {
-        const tabBody = $($(e.target).attr('data-target'));
-        if (!tabBody.length) {
-            return
-        }
-        const iframe = tabBody.find(this.$iframe);
-        if (iframe.length) {
-            iframe[0].style.height = iframe[0].contentWindow.document.documentElement.scrollHeight + 'px';
-        }
-    }
-
     /**
      * Resize the preview based on the selected device
      * @param {Event} event
diff --git a/classes/page/field.preview.php b/classes/page/field.preview.php
index fbef41d..5bf5198 100644
--- a/classes/page/field.preview.php
+++ b/classes/page/field.preview.php
@@ -1,4 +1,4 @@
-<div data-control="page-preview">
+<div data-control="page-preview" class="preview-desktop">
     <?php
         // Find the alias of the current Form widget
         foreach ($this->widget as $alias => $widget) {
@@ -33,12 +33,6 @@
     </ul>
     <iframe
         width="100%"
-        class="preview-desktop"
-        onload="
-            this.contentWindow.document.documentElement.scrollHeight > 0
-                ? this.style.height = this.contentWindow.document.documentElement.scrollHeight + 'px'
-                : void(0);
-        "
         src="<?= Url::to($url); ?>"
     ></iframe>
 </div>

From 101da46f8d8235735cc0a373a08f0ff903b19210 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 28 Feb 2023 14:48:29 +0000
Subject: [PATCH 26/52] Removed event handlers

---
 assets/js/page-preview.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/assets/js/page-preview.js b/assets/js/page-preview.js
index 569dde6..ceeb211 100644
--- a/assets/js/page-preview.js
+++ b/assets/js/page-preview.js
@@ -42,7 +42,6 @@
         this.$iframeTabContainer = this.$iframe.parent('.control-tabs')
 
         // Set up events on various elements
-        this.$iframeTabContainer.on('shown.bs.tab', this.proxy(this.onTabShown))
         this.$deviceSelector.on('click', 'a', this.proxy(this.onDeviceClick))
     }
 
@@ -50,7 +49,6 @@
      * Disposes the element.
      */
     PagePreview.prototype.dispose = function () {
-        this.$iframeTabContainer.off('shown.bs.tab', this.proxy(this.onTabShown))
         this.$deviceSelector.off('click', 'a', this.proxy(this.onDeviceClick))
 
         this.$deviceSelector = null

From 538042dc47c5214ac6f1017b8f6f9b3089b1d819 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 28 Feb 2023 14:50:24 +0000
Subject: [PATCH 27/52] Added comment and defaulted enabled to true

---
 config/config.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/config.php b/config/config.php
index a717b69..6073f97 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,5 +1,16 @@
 <?php
 
 return [
-    'preview_enabled' => false
+
+    /*
+   |--------------------------------------------------------------------------
+   | Preview Mode
+   |--------------------------------------------------------------------------
+   |
+   | This option is available to allow users to control if the preview tab
+   | should be shown or not.
+   |
+   */
+
+    'preview_enabled' => true
 ];

From 009fd4d677583b128dfbbd40a4e1e41213d30a5b Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 28 Feb 2023 15:15:23 +0000
Subject: [PATCH 28/52] Replaced exception with error log

---
 classes/Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/Controller.php b/classes/Controller.php
index 0662318..66e923f 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -1,11 +1,12 @@
 <?php namespace Winter\Pages\Classes;
 
+use Cache;
 use Cms\Classes\CmsException;
 use Cms\Classes\Page as CmsPage;
 use Cms\Classes\Theme;
 use Exception;
 use Lang;
-use Cache;
+use Log;
 use Winter\Storm\Parse\Syntax\Parser as SyntaxParser;
 use Winter\Storm\Support\Str;
 
@@ -65,7 +66,7 @@ public function initCmsPage($url)
                     $data
                 );
             } catch (\Throwable $e) {
-                throw $e;// @TODO: Hide this exception
+                Log::error($e->getMessage(), $e->getTrace());
                 return null;
             }
         }

From 9336d034e152e9ea6d5c7e7156bfff81559d0485 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Wed, 1 Mar 2023 10:16:06 +0000
Subject: [PATCH 29/52] Added tests

---
 .github/workflows/tests.yml        | 92 ++++++++++++++++++++++++++++
 phpunit.xml                        | 22 +++++++
 tests/classes/ObjectHelperTest.php | 97 ++++++++++++++++++++++++++++++
 3 files changed, 211 insertions(+)
 create mode 100644 .github/workflows/tests.yml
 create mode 100644 phpunit.xml
 create mode 100644 tests/classes/ObjectHelperTest.php

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..5fb890f
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,92 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  phpUnitTests:
+    runs-on: ubuntu-latest
+    name: Unit Tests / PHP ${{ matrix.phpVersion }} / Winter ${{ matrix.winterRelease }}
+    strategy:
+      max-parallel: 6
+      matrix:
+        phpVersion: ['8.0', '8.1']
+        winterRelease: ['develop']
+        winterReleaseDir: ['develop']
+        include:
+          - phpVersion: '7.2'
+            winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
+          - phpVersion: '7.3'
+            winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
+          - phpVersion: '7.4'
+            winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
+      fail-fast: false
+    env:
+      phpExtensions: mbstring, intl, gd, xml, sqlite
+      cacheKey: ext-cache-v1
+      winterCmsRelease: develop
+    steps:
+      - name: Checkout changes
+        uses: actions/checkout@v2
+        with:
+          path: pages-plugin
+
+      - name: Setup cache environment
+        id: extcache
+        uses: shivammathur/cache-extensions@v1
+        with:
+          php-version: ${{ matrix.phpVersion }}
+          extensions: ${{ env.phpExtensions }}
+          key: ${{ env.cacheKey }}
+
+      - name: Cache extensions
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.extcache.outputs.dir }}
+          key: ${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ steps.extcache.outputs.key }}
+
+      - name: Install PHP and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.phpVersion }}
+          extensions: ${{ env.phpExtensions }}
+
+      - name: Install Winter CMS
+        run: |
+          wget https://github.com/wintercms/winter/archive/${{ matrix.winterRelease }}.zip
+          unzip ${{ matrix.winterRelease }}.zip
+          rm ${{ matrix.winterRelease }}.zip
+          shopt -s dotglob
+          mv winter-${{ matrix.winterReleaseDir }}/* ./
+          rmdir winter-${{ matrix.winterReleaseDir }}
+          shopt -u dotglob
+          cp config/cms.php config/testing/cms.php
+          mkdir -p plugins/winter
+          mv pages-plugin plugins/winter/pages
+
+      - name: Get Composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --no-progress --no-suggest
+
+      - name: Run linting
+        run: ./vendor/bin/parallel-lint plugins/winter/pages
+
+      - name: Run unit tests
+        run: php artisan winter:test -p Winter.Pages
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..b60dfc3
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="../../../modules/system/tests/bootstrap/app.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+>
+    <testsuites>
+        <testsuite name="Plugin Unit Test Suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+    </php>
+</phpunit>
diff --git a/tests/classes/ObjectHelperTest.php b/tests/classes/ObjectHelperTest.php
new file mode 100644
index 0000000..3e49185
--- /dev/null
+++ b/tests/classes/ObjectHelperTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Winter\Pages\Tests\Classes;
+
+use Cms\Classes\Theme;
+use Config;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Pages\Classes\ObjectHelper;
+use Winter\Storm\Exception\ApplicationException;
+
+class ObjectHelperTest extends PluginTestCase
+{
+    /**
+     * Assert line ending conversion works and respects the cms config
+     */
+    public function testConvertLineEndings(): void
+    {
+        $sample = "Hello\r\nWorld\r\n";
+
+        // Check line ending conversion enabled
+        Config::set('cms.convertLineEndings', true);
+        $this->assertEquals("Hello\nWorld\n", ObjectHelper::convertLineEndings($sample));
+
+        // Check input returned without modification if converting is disabled
+        Config::set('cms.convertLineEndings', false);
+        $this->assertEquals($sample, ObjectHelper::convertLineEndings($sample));
+    }
+
+    /**
+     * Assert that the key generated includes unique identifiers
+     */
+    public function testGetTypePreviewSessionCacheKey(): void
+    {
+        $sessionId = \Session::getId();
+        $type = 'page-test';
+        $alias = 'page-alias';
+
+        $key = ObjectHelper::getTypePreviewSessionCacheKey($type, $alias);
+
+        $this->assertStringContainsString($sessionId, $key);
+        $this->assertStringContainsString($type, $key);
+        $this->assertStringContainsString($alias, $key);
+    }
+
+    /**
+     * Assert that resolving object type returns the correct class
+     */
+    public function testResolveTypeClassName(): void
+    {
+        // Test resolving valid types
+        $this->assertEquals(\Winter\Pages\Classes\Page::class, ObjectHelper::resolveTypeClassName('page'));
+        $this->assertEquals(\Winter\Pages\Classes\Menu::class, ObjectHelper::resolveTypeClassName('menu'));
+        $this->assertEquals(\Winter\Pages\Classes\Content::class, ObjectHelper::resolveTypeClassName('content'));
+
+        // Test exception handling for invalid type
+        $this->expectException(ApplicationException::class);
+        ObjectHelper::resolveTypeClassName('test');
+    }
+
+    /**
+     * Assert that resolving class returns the correct object type
+     */
+    public function testResolveClassType(): void
+    {
+        // Test resolving valid types
+        $this->assertEquals('page', ObjectHelper::resolveClassType(\Winter\Pages\Classes\Page::class));
+        $this->assertEquals('menu', ObjectHelper::resolveClassType(\Winter\Pages\Classes\Menu::class));
+        $this->assertEquals('content', ObjectHelper::resolveClassType(\Winter\Pages\Classes\Content::class));
+
+        // Test exception handling for invalid type
+        $this->expectException(ApplicationException::class);
+        ObjectHelper::resolveClassType(\Winter\Pages\Classes\Missing::class);
+    }
+
+    /**
+     * Assert that fill object returns the correct object with data
+     */
+    public function testFillObject(): void
+    {
+        $page = ObjectHelper::fillObject(Theme::getActiveTheme(), 'page', '', [
+            'markup' => '<h1>hello world</h1>',
+        ]);
+
+        $this->assertInstanceOf(\Winter\Pages\Classes\Page::class, $page);
+        $this->assertEquals($page->markup, '<h1>hello world</h1>');
+    }
+
+    /**
+     * Assert that create object returns the correct object
+     */
+    public function testCreateObject(): void
+    {
+        $page = ObjectHelper::createObject(Theme::getActiveTheme(), 'page');
+
+        $this->assertInstanceOf(\Winter\Pages\Classes\Page::class, $page);
+    }
+}

From e1c714c46eb91ac739354c5e979fc8fd5da720eb Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Thu, 2 Mar 2023 15:09:03 +0000
Subject: [PATCH 30/52] Added fixes for php 7.2

---
 classes/ObjectHelper.php | 5 ++++-
 controllers/Index.php    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/classes/ObjectHelper.php b/classes/ObjectHelper.php
index 5ee7938..1aa8807 100644
--- a/classes/ObjectHelper.php
+++ b/classes/ObjectHelper.php
@@ -10,7 +10,10 @@
 
 class ObjectHelper
 {
-    protected static array $types = [
+    /**
+     * @var array
+     */
+    protected static $types = [
         'page'    => \Winter\Pages\Classes\Page::class,
         'menu'    => \Winter\Pages\Classes\Menu::class,
         'content' => \Winter\Pages\Classes\Content::class,
diff --git a/controllers/Index.php b/controllers/Index.php
index ba2f567..305e746 100644
--- a/controllers/Index.php
+++ b/controllers/Index.php
@@ -425,7 +425,7 @@ public function onMenuItemReferenceSearch()
         $widget = $this->makeFormWidget(
             'Winter\Pages\FormWidgets\MenuItemSearch',
             [],
-            ['alias' => $alias],
+            ['alias' => $alias]
         );
 
         return $widget->onSearch();

From a89d871545ec27ea8144abc8e0902b582386ca31 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Thu, 2 Mar 2023 15:13:34 +0000
Subject: [PATCH 31/52] Bumped Winter test version

---
 .github/workflows/tests.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5fb890f..2313429 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,14 +18,14 @@ jobs:
         winterReleaseDir: ['develop']
         include:
           - phpVersion: '7.2'
-            winterRelease: 'v1.1.9'
-            winterReleaseDir: '1.1.9'
+            winterRelease: 'v1.2.1'
+            winterReleaseDir: '1.2.1'
           - phpVersion: '7.3'
-            winterRelease: 'v1.1.9'
-            winterReleaseDir: '1.1.9'
+            winterRelease: 'v1.2.1'
+            winterReleaseDir: '1.2.1'
           - phpVersion: '7.4'
-            winterRelease: 'v1.1.9'
-            winterReleaseDir: '1.1.9'
+            winterRelease: 'v1.2.1'
+            winterReleaseDir: '1.2.1'
       fail-fast: false
     env:
       phpExtensions: mbstring, intl, gd, xml, sqlite

From c178dc95d39516926dacea99fbb8f0d8ff564c29 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 7 Mar 2023 17:03:08 +0000
Subject: [PATCH 32/52] Added test fixes from translate

---
 .github/workflows/tests.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2313429..5bbdd8f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,15 +17,9 @@ jobs:
         winterRelease: ['develop']
         winterReleaseDir: ['develop']
         include:
-          - phpVersion: '7.2'
-            winterRelease: 'v1.2.1'
-            winterReleaseDir: '1.2.1'
-          - phpVersion: '7.3'
-            winterRelease: 'v1.2.1'
-            winterReleaseDir: '1.2.1'
           - phpVersion: '7.4'
-            winterRelease: 'v1.2.1'
-            winterReleaseDir: '1.2.1'
+            winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
       fail-fast: false
     env:
       phpExtensions: mbstring, intl, gd, xml, sqlite
@@ -88,5 +82,11 @@ jobs:
       - name: Run linting
         run: ./vendor/bin/parallel-lint plugins/winter/pages
 
-      - name: Run unit tests
+      - name: Run unit tests (1.2/develop)
+        if: matrix.winterRelease != 'v1.1.9'
         run: php artisan winter:test -p Winter.Pages
+
+      - name: Run unit tests (1.1)
+        if: matrix.winterRelease == 'v1.1.9'
+        working-directory: plugins/winter/pages
+        run: ../../../vendor/bin/phpunit --bootstrap ../../../tests/bootstrap.php

From 923c8013b510bcbc17bfe2b32ce2e293849fc1a6 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Wed, 8 Mar 2023 16:00:25 +0000
Subject: [PATCH 33/52] Updated test to use global test case for BC

---
 tests/classes/ObjectHelperTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/classes/ObjectHelperTest.php b/tests/classes/ObjectHelperTest.php
index 3e49185..b08bfb6 100644
--- a/tests/classes/ObjectHelperTest.php
+++ b/tests/classes/ObjectHelperTest.php
@@ -4,7 +4,7 @@
 
 use Cms\Classes\Theme;
 use Config;
-use System\Tests\Bootstrap\PluginTestCase;
+use PluginTestCase;
 use Winter\Pages\Classes\ObjectHelper;
 use Winter\Storm\Exception\ApplicationException;
 

From 3f6468491abf7bb18776d0087def9239776f39a8 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Wed, 8 Mar 2023 16:28:15 +0000
Subject: [PATCH 34/52] Switched config for permission

---
 Plugin.php        | 10 ++++++++--
 config/config.php | 16 ----------------
 lang/en/lang.php  |  1 +
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 config/config.php

diff --git a/Plugin.php b/Plugin.php
index 6d12307..d321b93 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -71,6 +71,12 @@ public function registerPermissions(): array
                 'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
                 'label' => 'winter.pages::lang.page.access_snippets',
             ],
+            'winter.pages.access_preview' => [
+                'tab'   => 'winter.pages::lang.page.tab',
+                'order' => 200,
+                'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
+                'label' => 'winter.pages::lang.page.access_preview',
+            ],
         ];
     }
 
@@ -202,8 +208,7 @@ protected function extendBackendForms(): void
         // allows other plugins to change it if desired.
         Event::listen('backend.form.extendFieldsBefore', function ($formWidget) {
             if (
-                !Config::get('winter.pages::preview_enabled', false)
-                || $formWidget->isNested
+                $formWidget->isNested
                 || !($formWidget->getController() instanceof Index)
                 || !($formWidget->model instanceof StaticPage)
             ) {
@@ -222,6 +227,7 @@ protected function extendBackendForms(): void
                     'type' => 'partial',
                     'span' => 'full',
                     'path' => '$/winter/pages/classes/page/field.preview.php',
+                    'permissions' => ['winter.pages.access_preview'],
                     'dependsOn' => $existingFields,
                 ],
             ]);
diff --git a/config/config.php b/config/config.php
deleted file mode 100644
index 6073f97..0000000
--- a/config/config.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-return [
-
-    /*
-   |--------------------------------------------------------------------------
-   | Preview Mode
-   |--------------------------------------------------------------------------
-   |
-   | This option is available to allow users to control if the preview tab
-   | should be shown or not.
-   |
-   */
-
-    'preview_enabled' => true
-];
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 3f43c34..fd50a24 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -22,6 +22,7 @@
         'manage_pages' => 'Manage static pages',
         'manage_menus' => 'Manage static menus',
         'access_snippets' => 'Access snippets',
+        'access_preview' => 'Access preview',
         'manage_content' => 'Manage static content',
     ],
     'menu' => [

From 49a1e9f86dc0d899223eeb0ebe377dd35818089a Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Thu, 9 Mar 2023 10:34:56 -0600
Subject: [PATCH 35/52] Improved typing of MenuItem class

---
 classes/MenuItem.php | 48 ++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/classes/MenuItem.php b/classes/MenuItem.php
index 98d95ea..d5cc949 100644
--- a/classes/MenuItem.php
+++ b/classes/MenuItem.php
@@ -16,7 +16,7 @@ class MenuItem
     /**
      * @var string Specifies the menu title
      */
-    public $title;
+    public $title = '';
 
     /**
      * @var array Specifies the item subitems
@@ -24,15 +24,14 @@ class MenuItem
     public $items = [];
 
     /**
-     * @var string Specifies the parent menu item.
-     * An object of the Winter\Pages\Classes\MenuItem class or null.
+     * @var self|null Specifies the parent menu item.
      */
-    public $parent;
+    public $parent = null;
 
     /**
      * @var boolean Determines whether the auto-generated menu items could have subitems.
      */
-    public $nesting;
+    public $nesting = false;
 
     /**
      * @var string Specifies the menu item type - URL, static page, etc.
@@ -40,30 +39,30 @@ class MenuItem
     public $type = 'url';
 
     /**
-     * @var string Specifies the URL for URL-type items.
+     * @var string|null Specifies the URL for URL-type items.
      */
-    public $url;
+    public $url = null;
 
     /**
-     * @var string Specifies the menu item code.
+     * @var string|null Specifies the menu item code.
      */
-    public $code;
+    public $code = null;
 
     /**
-     * @var string Specifies the object identifier the item refers to.
+     * @var string|null Specifies the object identifier the item refers to.
      * The identifier could be the database identifier or an object code.
      */
-    public $reference;
+    public $reference = null;
 
     /**
      * @var boolean Indicates that generated items should replace this item.
      */
-    public $replace;
+    public $replace = false;
 
     /**
-     * @var string Specifies the CMS page path to resolve dynamic menu items to.
+     * @var string|null Specifies the CMS page path to resolve dynamic menu items to.
      */
-    public $cmsPage;
+    public $cmsPage = null;
 
     /**
      * @var boolean Used by the system internally.
@@ -89,11 +88,10 @@ class MenuItem
     public $viewBag = [];
 
     /**
-     * Initializes a menu item from a data array.
-     * @param array $items Specifies the menu item data.
-     * @return Returns an array of the MenuItem objects.
+     * Initializes an array of MenuItem objects from an array of arrays
+     * containing menu item data.
      */
-    public static function initFromArray($items)
+    public static function initFromArray(array $items): array
     {
         $result = [];
 
@@ -119,9 +117,8 @@ public static function initFromArray($items)
 
     /**
      * Returns a list of registered menu item types
-     * @return array Returns an array of registered item types
      */
-    public function getTypeOptions($keyValue = null)
+    public function getTypeOptions(): array
     {
         /*
          * Baked in types
@@ -148,17 +145,17 @@ public function getTypeOptions($keyValue = null)
         return $result;
     }
 
-    public function getCmsPageOptions($keyValue = null)
+    public function getCmsPageOptions()
     {
         return []; // CMS Pages are loaded client-side
     }
 
-    public function getReferenceOptions($keyValue = null)
+    public function getReferenceOptions()
     {
         return []; // References are loaded client-side
     }
 
-    public static function getTypeInfo($type)
+    public static function getTypeInfo($type): array
     {
         $result = [];
         $apiResult = Event::fire('pages.menuitem.getTypeInfo', [$type]);
@@ -195,10 +192,9 @@ public static function getTypeInfo($type)
     }
 
     /**
-     * Converts the menu item data to an array
-     * @return array Returns the menu item data as array
+     * Returns the menu item data to an array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $result = [];
 

From 5ccb6918b3369c1169dcfcf75003bf449aa97376 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Thu, 9 Mar 2023 10:35:05 -0600
Subject: [PATCH 36/52] v2.0.3

---
 updates/version.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/updates/version.yaml b/updates/version.yaml
index fe79f5d..e482453 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -62,4 +62,10 @@
   - "Fixes rich editor usage inside repeaters."
   - "Fixes a lifecycle issue when switching the page layout."
   - "Fixes maintenance mode when using static pages."
-"2.0.2": "Add support for Winter 1.2"
\ No newline at end of file
+"2.0.2": "Add support for Winter 1.2"
+"2.0.3":
+  - "Fixed issue with Primary Tabs losing min-size class"
+  - "Added Vietnamese translation"
+  - "Fixed issue where subpages of home would get 2 slashes"
+  - "Fixed issue where allowed IPs couldn't access pages in maintenance mode"
+  - "Improved Swedish translation"

From 070abc62466266d06c48138a52670c7f6c9e0f0b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Thu, 9 Mar 2023 10:41:39 -0600
Subject: [PATCH 37/52] v2.1.0

---
 updates/version.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/updates/version.yaml b/updates/version.yaml
index e482453..63623b9 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -69,3 +69,4 @@
   - "Fixed issue where subpages of home would get 2 slashes"
   - "Fixed issue where allowed IPs couldn't access pages in maintenance mode"
   - "Improved Swedish translation"
+"2.1.0": "Added support for live previews of the frontend-rendered pages"

From 42658b115f4cfd392f032ce519f3236708197a00 Mon Sep 17 00:00:00 2001
From: Damien MATHIEU <contact@hounddd.fr>
Date: Thu, 9 Mar 2023 21:08:42 +0100
Subject: [PATCH 38/52] Improved French translation (#31)

---
 lang/fr/lang.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lang/fr/lang.php b/lang/fr/lang.php
index ff50f05..15456c3 100644
--- a/lang/fr/lang.php
+++ b/lang/fr/lang.php
@@ -22,6 +22,7 @@
         'manage_pages' => 'Gérer les pages statiques',
         'manage_menus' => 'Gérer les menus statiques',
         'access_snippets' => 'Accès aux fragments',
+        'access_preview' => 'Accès à l’aperçu',
         'manage_content' => 'Gérer le contenu statique'
     ],
     'menu' => [
@@ -76,6 +77,7 @@
     ],
     'content' => [
         'menu_label' => 'Contenu',
+        'saved' => 'Le contenu a été sauvegardé avec succès.',
         'cant_save_to_dir' => 'L’enregistrement des fichiers de contenu dans le répertoire des pages statiques n’est pas autorisé.'
     ],
     'sidebar' => [
@@ -84,6 +86,7 @@
     ],
     'object' => [
         'invalid_type' => 'Type d’objet inconnu',
+        'unauthorized_type' => 'Vous n’êtes pas autorisé à gérer les objets de type :type',
         'not_found' => 'L’objet demandé n’a pas été trouvé.'
     ],
     'editor' => [

From 963d4a5410a42f6207792f804bdc7b1ab314f17a Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Thu, 16 Mar 2023 19:58:36 +0800
Subject: [PATCH 39/52] Add icon for testing purposes

---
 .github/icon.png | Bin 0 -> 33572 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .github/icon.png

diff --git a/.github/icon.png b/.github/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..da1a21c64bc9070f21e0bdc074245c6e4c2a175d
GIT binary patch
literal 33572
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
Ah5!Hn

literal 0
HcmV?d00001


From 5f5ac5ef0952438eff68e9f4d80b8227f1727a57 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Thu, 16 Mar 2023 20:01:29 +0800
Subject: [PATCH 40/52] Testing Winter meta

---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4d3266c..af27917 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,10 @@
         "rainlab/pages-plugin": "~1.3"
     },
     "extra": {
-        "installer-name": "pages"
+        "installer-name": "pages",
+        "winter": {
+            "icon": "https://raw.githubusercontent.com/wintercms/wn-pages-plugin/main/.github/icon.png",
+            "categories": ["Content", "Navigation"]
+        },
     }
 }

From 5b4db7ec065d40908c31818a66abe59aecf987ab Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Thu, 16 Mar 2023 20:02:17 +0800
Subject: [PATCH 41/52] Remove trailing comma

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index af27917..c7972e1 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,6 @@
         "winter": {
             "icon": "https://raw.githubusercontent.com/wintercms/wn-pages-plugin/main/.github/icon.png",
             "categories": ["Content", "Navigation"]
-        },
+        }
     }
 }

From 80f4103cf314f239f1a77df1afb70e304c7cccc3 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 20 Mar 2023 19:51:35 +0800
Subject: [PATCH 42/52] Add plugin name to Composer

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index c7972e1..a4ffc84 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
     "extra": {
         "installer-name": "pages",
         "winter": {
+            "name": "Pages",
             "icon": "https://raw.githubusercontent.com/wintercms/wn-pages-plugin/main/.github/icon.png",
             "categories": ["Content", "Navigation"]
         }

From 80cc0ab5af8580bd7abd0c136778ebe4f37420b5 Mon Sep 17 00:00:00 2001
From: datune <hauser.j@gmail.com>
Date: Thu, 6 Apr 2023 03:50:04 +0200
Subject: [PATCH 43/52] Collapse all tree nodes by default (#32)

---
 widgets/pagelist/partials/_treebranch.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widgets/pagelist/partials/_treebranch.htm b/widgets/pagelist/partials/_treebranch.htm
index acf4752..8643dfb 100644
--- a/widgets/pagelist/partials/_treebranch.htm
+++ b/widgets/pagelist/partials/_treebranch.htm
@@ -1,7 +1,7 @@
 <?php foreach ($items as $pageObj): ?>
     <?php
         $fileName = $pageObj->page->getBaseFileName();
-        $groupStatus = $this->getCollapseStatus($fileName);
+        $groupStatus = $this->getCollapseStatus($fileName, false);
         $dataId = $this->dataIdPrefix.'-'.$fileName;
         $searchMode = strlen($this->getSearchTerm()) > 0;
         $cbId = 'cb'.md5($fileName);

From 2d73dd221cd2b3c0372c507d77583375ccd93b25 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 14 Apr 2023 14:07:22 -0400
Subject: [PATCH 44/52] Add multilang data to resolveMenuItem() method (#30)

Co-authored-by: Luke Towers <luke@luketowers.ca>
Co-authored-by: Luke Towers <git@luketowers.ca>

The plugin now handles its own multilang functionality.

See:
wintercms/wn-sitemap-plugin#11
wintercms/wn-translate-plugin#57
wintercms/wn-blog-plugin#34
---
 classes/Menu.php      |  71 +++++++++++++--------------
 classes/Page.php      | 108 ++++++++++++++++++++++++++++++++----------
 docs/documentation.md |   6 +--
 3 files changed, 118 insertions(+), 67 deletions(-)

diff --git a/classes/Menu.php b/classes/Menu.php
index 1ab8fc7..e015820 100644
--- a/classes/Menu.php
+++ b/classes/Menu.php
@@ -171,49 +171,42 @@ public function generateReferences($page)
                      * If the item type is not URL, use the API to request the item type's provider to
                      * return the item URL, subitems and determine whether the item is active.
                      */
-                    $apiResult = Event::fire('pages.menuitem.resolveItem', [$item->type, $item, $currentUrl, $this->theme]);
-                    if (is_array($apiResult)) {
-                        foreach ($apiResult as $itemInfo) {
-                            if (!is_array($itemInfo)) {
-                                continue;
-                            }
-
-                            if (!$item->replace && isset($itemInfo['url'])) {
-                                $parentReference->url = $itemInfo['url'];
-                                $parentReference->isActive = $itemInfo['isActive'] || $activeMenuItem === $item->code;
-                            }
-
-                            if (isset($itemInfo['items'])) {
-                                $itemIterator = function($items) use (&$itemIterator, $parentReference) {
-                                    $result = [];
-
-                                    foreach ($items as $item) {
-                                        $reference = new MenuItemReference;
-                                        $reference->type = isset($item['type']) ? $item['type'] : null;
-                                        $reference->title = isset($item['title']) ? $item['title'] : '--no title--';
-                                        $reference->url = isset($item['url']) ? $item['url'] : '#';
-                                        $reference->isActive = isset($item['isActive']) ? $item['isActive'] : false;
-                                        $reference->viewBag = isset($item['viewBag']) ? $item['viewBag'] : [];
-                                        $reference->code = isset($item['code']) ? $item['code'] : null;
+                    $itemInfo = Event::fire('pages.menuitem.resolveItem', [$item->type, $item, $currentUrl, $this->theme], true);
 
-                                        if (!strlen($parentReference->url)) {
-                                            $parentReference->url = $reference->url;
-                                            $parentReference->isActive = $reference->isActive;
-                                        }
-
-                                        if (isset($item['items'])) {
-                                            $reference->items = $itemIterator($item['items']);
-                                        }
+                    if (!$item->replace && isset($itemInfo['url'])) {
+                        $parentReference->url = $itemInfo['url'];
+                        $parentReference->isActive = $itemInfo['isActive'] || $activeMenuItem === $item->code;
+                    }
 
-                                        $result[] = $reference;
-                                    }
+                    if (isset($itemInfo['items'])) {
+                        $itemIterator = function($items) use (&$itemIterator, $parentReference) {
+                            $result = [];
+
+                            foreach ($items as $item) {
+                                $reference = new MenuItemReference;
+                                $reference->type = isset($item['type']) ? $item['type'] : null;
+                                $reference->title = isset($item['title']) ? $item['title'] : '--no title--';
+                                $reference->url = isset($item['url']) ? $item['url'] : '#';
+                                $reference->isActive = isset($item['isActive']) ? $item['isActive'] : false;
+                                $reference->viewBag = isset($item['viewBag']) ? $item['viewBag'] : [];
+                                $reference->code = isset($item['code']) ? $item['code'] : null;
+
+                                if (!strlen($parentReference->url)) {
+                                    $parentReference->url = $reference->url;
+                                    $parentReference->isActive = $reference->isActive;
+                                }
+
+                                if (isset($item['items'])) {
+                                    $reference->items = $itemIterator($item['items']);
+                                }
+
+                                $result[] = $reference;
+                            }
 
-                                    return $result;
-                                };
+                            return $result;
+                        };
 
-                                $parentReference->items = $itemIterator($itemInfo['items']);
-                            }
-                        }
+                        $parentReference->items = $itemIterator($itemInfo['items']);
                     }
                 }
 
diff --git a/classes/Page.php b/classes/Page.php
index 5b13f7f..893f084 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -12,13 +12,17 @@
 use Lang;
 use System\Helpers\View as ViewHelper;
 use Twig\Node\Node as TwigNode;
+use Url;
 use Validator;
 use Winter\Pages\Classes\PageList;
 use Winter\Pages\Classes\Snippet;
 use Winter\Storm\Parse\Bracket as TextParser;
 use Winter\Storm\Parse\Syntax\Parser as SyntaxParser;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Router\Router;
 use Winter\Storm\Support\Str;
+use Winter\Translate\Classes\Translator;
+use Winter\Translate\Models\Locale;
 
 /**
  * Represents a static page.
@@ -705,6 +709,7 @@ public static function clearMenuCache($theme)
 
     /**
      * Handler for the pages.menuitem.getTypeInfo event.
+     *
      * Returns a menu item type information. The type information is returned as array
      * with the following elements:
      * - references - a list of the item type reference options. The options are returned in the
@@ -717,28 +722,32 @@ public static function clearMenuCache($theme)
      *   Optional, false if omitted.
      * - cmsPages - a list of CMS pages (objects of the Cms\Classes\Page class), if the item type requires a CMS page reference to
      *   resolve the item URL.
-     * @param string $type Specifies the menu item type
-     * @return array Returns an array
      */
-    public static function getMenuTypeInfo($type)
+    public static function getMenuTypeInfo(string $type): ?array
     {
-        if ($type == 'all-static-pages') {
-            return [
-                'dynamicItems' => true
-            ];
-        }
+        $result = null;
 
-        if ($type == 'static-page') {
-            return [
-                'references'   => self::listStaticPageMenuOptions(),
-                'nesting'      => true,
-                'dynamicItems' => true
-            ];
+        switch ($type) {
+            case 'all-static-pages':
+                $result = [
+                    'dynamicItems' => true
+                ];
+                break;
+            case 'static-page':
+                $result = [
+                    'references'   => self::listStaticPageMenuOptions(),
+                    'nesting'      => true,
+                    'dynamicItems' => true
+                ];
+                break;
         }
+
+        return $result;
     }
 
     /**
      * Handler for the pages.menuitem.resolveItem event.
+     *
      * Returns information about a menu item. The result is an array
      * with the following keys:
      * - url - the menu item URL. Not required for menu item types that return all available records.
@@ -748,31 +757,61 @@ public static function getMenuTypeInfo($type)
      *   return all available records.
      * - items - an array of arrays with the same keys (url, isActive, items) + the title key.
      *   The items array should be added only if the $item's $nesting property value is TRUE.
-     * @param \Winter\Pages\Classes\MenuItem $item Specifies the menu item.
-     * @param \Cms\Classes\Theme $theme Specifies the current theme.
-     * @param string $url Specifies the current page URL, normalized, in lower case
-     * The URL is specified relative to the website root, it includes the subdirectory name, if any.
-     * @return mixed Returns an array. Returns null if the item cannot be resolved.
+     *
+     * @param \Winter\Sitemap\Classes\DefinitionItem|\Winter\Pages\Classes\MenuItem $item Specifies the menu item.
      */
-    public static function resolveMenuItem($item, $url, $theme)
+    public static function resolveMenuItem(object $item, string $url, Theme $theme): ?array
     {
+        $result = null;
+
         $tree = self::buildMenuTree($theme);
 
         if ($item->type == 'static-page' && !isset($tree[$item->reference])) {
-            return;
+            return null;
         }
 
-        $result = [];
+        // Helper to get the processed localized urls from the raw locale URL data array
+        // that takes into account the enabled locales
+        $getLocalizedUrls = function (array $pageInfo) {
+            $localeUrls = $pageInfo['localeUrls'];
+            $localizedUrls = [];
+            $enabledLocales = class_exists(Locale::class) ? Locale::listEnabled() : [];
+
+            if ($enabledLocales) {
+                $localizedUrls = [];
+                foreach ($enabledLocales as $locale => $name) {
+                    $localeUrl = array_get($localeUrls, $locale) ?: $pageInfo['url'];
+                    $pageUrl = static::getLocalizedUrl($localeUrl, $locale);
+                    if ($pageUrl) {
+                        $localizedUrls[$locale] = Url::to($pageUrl);
+                    }
+                }
+            }
+
+            return $localizedUrls;
+        };
+
 
         if ($item->type == 'static-page') {
             $pageInfo = $tree[$item->reference];
-            $result['url'] = Cms::url($pageInfo['url']);
-            $result['mtime'] = $pageInfo['mtime'];
+            $result = [
+                'url' => Cms::url($pageInfo['url']),
+                'mtime' => $pageInfo['mtime'],
+            ];
             $result['isActive'] = self::urlsAreEqual($result['url'], $url);
+
+            $localizedUrls = $getLocalizedUrls($pageInfo);
+            if (count($localizedUrls) > 1) {
+                $result['alternateLinks'] = $localizedUrls;
+            }
         }
 
         if ($item->nesting || $item->type == 'all-static-pages') {
-            $iterator = function($items) use (&$iterator, &$tree, $url) {
+            $result = [
+                'items' => [],
+            ];
+
+            $iterator = function($items) use (&$iterator, &$tree, $url, $getLocalizedUrls) {
                 $branch = [];
 
                 foreach ($items as $itemName) {
@@ -792,6 +831,11 @@ public static function resolveMenuItem($item, $url, $theme)
                     $branchItem['title'] = $itemInfo['title'];
                     $branchItem['mtime'] = $itemInfo['mtime'];
 
+                    $localizedUrls = $getLocalizedUrls($itemInfo);
+                    if (count($localizedUrls) > 1) {
+                        $result['alternateLinks'] = $localizedUrls;
+                    }
+
                     if ($itemInfo['items']) {
                         $branchItem['items'] = $iterator($itemInfo['items']);
                     }
@@ -808,6 +852,18 @@ public static function resolveMenuItem($item, $url, $theme)
         return $result;
     }
 
+    /**
+     * Gets the localized URL to this page
+     */
+    protected static function getLocalizedUrl(string $url, string $locale): ?string
+    {
+        $translator = Translator::instance();
+
+        $url = $translator->getPathInLocale($url, $locale);
+
+        return (new Router)->urlFromPattern($url);
+    }
+
     /**
      * Handler for the backend.richeditor.getTypeInfo event.
      * Returns a menu item type information. The type information is returned as array
@@ -879,12 +935,14 @@ public static function buildMenuTree($theme)
                 $pageCode = $item->page->getBaseFileName();
                 $pageUrl = Str::lower(RouterHelper::normalizeUrl(array_get($viewBag, 'url')));
 
+
                 $itemData = [
                     'url'    => $pageUrl,
                     'title'  => array_get($viewBag, 'title'),
                     'mtime'  => $item->page->mtime,
                     'items'  => $iterator($item->subpages, $pageCode, $level+1),
                     'parent' => $parent,
+                    'localeUrls' => array_get($viewBag, 'localeUrl', []),
                     'navigation_hidden' => array_get($viewBag, 'navigation_hidden')
                 ];
 
diff --git a/docs/documentation.md b/docs/documentation.md
index 1ca6ccd..ac6cc88 100644
--- a/docs/documentation.md
+++ b/docs/documentation.md
@@ -174,20 +174,20 @@ The next example shows an event handler registration code for the Blog plugin. T
 
     public function boot()
     {
-        Event::listen('pages.menuitem.listTypes', function() {
+        Event::listen('pages.menuitem.listTypes', function () {
             return [
                 'blog-category'=>'Blog category',
                 'all-blog-categories'=>'All blog categories',
             ];
         });
 
-        Event::listen('pages.menuitem.getTypeInfo', function($type) {
+        Event::listen('pages.menuitem.getTypeInfo', function ($type) {
             if ($type == 'blog-category' || $type == 'all-blog-categories') {
                 return Category::getMenuTypeInfo($type);
             }
         });
 
-        Event::listen('pages.menuitem.resolveItem', function($type, $item, $url, $theme) {
+        Event::listen('pages.menuitem.resolveItem', function ($type, $item, $url, $theme) {
             if ($type == 'blog-category' || $type == 'all-blog-categories') {
                 return Category::resolveMenuItem($item, $url, $theme);
             }

From 4bed40d4af0b5b81241dba375c9fdea852793945 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 15 Apr 2023 10:27:50 -0400
Subject: [PATCH 45/52] Set alternateLinks on the right variable

---
 classes/Page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Page.php b/classes/Page.php
index 893f084..e2e198b 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -833,7 +833,7 @@ public static function resolveMenuItem(object $item, string $url, Theme $theme):
 
                     $localizedUrls = $getLocalizedUrls($itemInfo);
                     if (count($localizedUrls) > 1) {
-                        $result['alternateLinks'] = $localizedUrls;
+                        $branchItem['alternateLinks'] = $localizedUrls;
                     }
 
                     if ($itemInfo['items']) {

From 7d82dea4073b4d2ef9d38e19b28294ffa0f6c7e5 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Tue, 18 Apr 2023 21:46:44 +0800
Subject: [PATCH 46/52] Defensive tweaks to getLocalizedUrls helper

---
 classes/Page.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/Page.php b/classes/Page.php
index e2e198b..c807364 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -773,12 +773,12 @@ public static function resolveMenuItem(object $item, string $url, Theme $theme):
         // Helper to get the processed localized urls from the raw locale URL data array
         // that takes into account the enabled locales
         $getLocalizedUrls = function (array $pageInfo) {
-            $localeUrls = $pageInfo['localeUrls'];
             $localizedUrls = [];
             $enabledLocales = class_exists(Locale::class) ? Locale::listEnabled() : [];
 
             if ($enabledLocales) {
-                $localizedUrls = [];
+                $localeUrls = $pageInfo['localeUrls'] ?? [];
+
                 foreach ($enabledLocales as $locale => $name) {
                     $localeUrl = array_get($localeUrls, $locale) ?: $pageInfo['url'];
                     $pageUrl = static::getLocalizedUrl($localeUrl, $locale);
@@ -791,7 +791,6 @@ public static function resolveMenuItem(object $item, string $url, Theme $theme):
             return $localizedUrls;
         };
 
-
         if ($item->type == 'static-page') {
             $pageInfo = $tree[$item->reference];
             $result = [

From 786cac1980fef39218a812d2f937107d63f023ba Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Thu, 20 Apr 2023 11:30:42 -0600
Subject: [PATCH 47/52] Fix compatibility with Winter.Translate (#34)

Co-authored-by: Marc Jauvin <marc.jauvin@gmail.com>

Replaces #33, fixes #26
---
 classes/ObjectHelper.php |  12 ++--
 controllers/Index.php    | 124 +++++++++++++++++----------------------
 2 files changed, 62 insertions(+), 74 deletions(-)

diff --git a/classes/ObjectHelper.php b/classes/ObjectHelper.php
index 1aa8807..6668487 100644
--- a/classes/ObjectHelper.php
+++ b/classes/ObjectHelper.php
@@ -107,15 +107,17 @@ public static function loadObject(Theme $theme, string $type, string $path, bool
     /**
      * Fills the provided Winter.Pages object with the provided data
      */
-    public static function fillObject(Theme $theme, string $type, string $path, array $data): CmsObject
+    public static function fillObject(Theme $theme, string $type, string $path, array $data, ?CmsObject $object = null): CmsObject
     {
         $objectData = [];
 
         // Get the object to fill
-        $path = trim($path);
-        $object = !empty($path)
-            ? static::loadObject($theme, $type, $path)
-            : static::createObject($theme, $type);
+        if (is_null($object)) {
+            $path = trim($path);
+            $object = !empty($path)
+                ? static::loadObject($theme, $type, $path)
+                : static::createObject($theme, $type);
+        }
 
         // Set page layout super early because it cascades to other elements
         if ($type === 'page' && ($layout = $data['viewBag']['layout'] ?? null)) {
diff --git a/controllers/Index.php b/controllers/Index.php
index 305e746..e512d8c 100644
--- a/controllers/Index.php
+++ b/controllers/Index.php
@@ -1,13 +1,17 @@
-<?php namespace Winter\Pages\Controllers;
+<?php
+
+namespace Winter\Pages\Controllers;
 
 use ApplicationException;
 use Backend\Classes\Controller;
+use Backend\Widgets\Form;
 use BackendMenu;
+use Cache;
 use Cms\Classes\CmsObject;
+use Cms\Classes\CmsObjectCollection;
 use Cms\Classes\Theme;
 use Cms\Widgets\TemplateList;
 use Config;
-use Cache;
 use Event;
 use Exception;
 use Flash;
@@ -17,14 +21,15 @@
 use Url;
 use Winter\Pages\Classes\Content;
 use Winter\Pages\Classes\MenuItem;
+use Winter\Pages\Classes\ObjectHelper;
 use Winter\Pages\Classes\Page as StaticPage;
 use Winter\Pages\Classes\SnippetManager;
+use Winter\Pages\FormWidgets\MenuItemSearch;
 use Winter\Pages\Plugin as PagesPlugin;
 use Winter\Pages\Widgets\MenuList;
 use Winter\Pages\Widgets\PageList;
 use Winter\Pages\Widgets\SnippetList;
-
-use Winter\Pages\Classes\ObjectHelper;
+use Winter\Storm\Halcyon\Datasource\DatasourceInterface;
 
 /**
  * Pages and Menus index
@@ -120,14 +125,28 @@ protected function getObjectType(): string
      * Gets the object from the current request
      * @throws ApplicationException if the current user does not have permissions to manage the identified type
      */
-    public function getObjectFromRequest()
+    public function getObjectFromRequest(): CmsObject
     {
         $type = $this->getObjectType();
+        $objectPath = trim(Request::input('objectPath'));
+
+        $object = $objectPath
+            ? ObjectHelper::loadObject($this->theme, $type, $objectPath)
+            : ObjectHelper::createObject($this->theme, $type);
+
+        // Set page layout super early because it cascades to other elements
+        if ($type === 'page' && ($layout = post('viewBag[layout]'))) {
+            $object->getViewBag()->setProperty('layout', $layout);
+        }
+
+        $formWidget = $this->makeObjectFormWidget($type, $object, Request::input('formWidgetAlias'));
+
         return ObjectHelper::fillObject(
             $this->theme,
             $type,
-            Request::input('objectPath'),
-            post()
+            $objectPath,
+            array_merge(post(), $formWidget->getSaveData()),
+            $object
         );
     }
 
@@ -152,12 +171,7 @@ public function pageAction()
             $widget->bindEvent('form.refreshFields', function ($allFields) use ($widget) {
                 $this->validateRequestTheme();
 
-                $object = ObjectHelper::fillObject(
-                    $this->theme,
-                    $this->getObjectType(),
-                    Request::input('objectPath'),
-                    post()
-                );
+                $object = $this->getObjectFromRequest();
 
                 Cache::put(
                     ObjectHelper::getTypePreviewSessionCacheKey($this->getObjectType(), $widget->alias),
@@ -189,7 +203,7 @@ public function index()
         }
     }
 
-    public function index_onOpen()
+    public function index_onOpen(): array
     {
         $this->validateRequestTheme();
 
@@ -199,17 +213,11 @@ public function index_onOpen()
         return $this->pushObjectForm($type, $object);
     }
 
-    public function onSave()
+    public function onSave(): array
     {
         $this->validateRequestTheme();
         $type = $this->getObjectType();
-
-        $object = ObjectHelper::fillObject(
-            $this->theme,
-            $type,
-            Request::input('objectPath'),
-            post()
-        );
+        $object = $this->getObjectFromRequest();
         $object->save();
 
         /*
@@ -235,7 +243,7 @@ public function onSave()
         return $result;
     }
 
-    public function onCreateObject()
+    public function onCreateObject(): array
     {
         $this->validateRequestTheme();
 
@@ -273,7 +281,7 @@ public function onCreateObject()
         return $result;
     }
 
-    public function onDelete()
+    public function onDelete(): array
     {
         $this->validateRequestTheme();
 
@@ -291,7 +299,7 @@ public function onDelete()
         return $result;
     }
 
-    public function onDeleteObjects()
+    public function onDeleteObjects(): array
     {
         $this->validateRequestTheme();
 
@@ -340,7 +348,7 @@ public function onOpenConcurrencyResolveForm()
         return $this->makePartial('concurrency_resolve_form');
     }
 
-    public function onGetMenuItemTypeInfo()
+    public function onGetMenuItemTypeInfo(): array
     {
         $type = Request::input('type');
 
@@ -349,22 +357,17 @@ public function onGetMenuItemTypeInfo()
         ];
     }
 
-    public function onUpdatePageLayout()
+    public function onUpdatePageLayout(): array
     {
         $this->validateRequestTheme();
 
         $type = $this->getObjectType();
-        $object = ObjectHelper::fillObject(
-            $this->theme,
-            $type,
-            Request::input('objectPath'),
-            post()
-        );
+        $object = $this->getObjectFromRequest();
 
         return $this->pushObjectForm($type, $object, Request::input('formWidgetAlias'));
     }
 
-    public function onGetInspectorConfiguration()
+    public function onGetInspectorConfiguration(): array
     {
         $configuration = [];
 
@@ -389,7 +392,7 @@ public function onGetInspectorConfiguration()
         ];
     }
 
-    public function onGetSnippetNames()
+    public function onGetSnippetNames(): array
     {
         $codes = array_unique(Request::input('codes'));
         $result = [];
@@ -418,12 +421,12 @@ public function onGetSnippetNames()
         ];
     }
 
-    public function onMenuItemReferenceSearch()
+    public function onMenuItemReferenceSearch(): array
     {
         $alias = Request::input('alias');
 
         $widget = $this->makeFormWidget(
-            'Winter\Pages\FormWidgets\MenuItemSearch',
+            MenuItemSearch::class,
             [],
             ['alias' => $alias]
         );
@@ -433,10 +436,8 @@ public function onMenuItemReferenceSearch()
 
     /**
      * Commits the DB changes of a object to the filesystem
-     *
-     * @return array $response
      */
-    public function onCommit()
+    public function onCommit(): array
     {
         $this->validateRequestTheme();
         $type = $this->getObjectType();
@@ -456,10 +457,8 @@ public function onCommit()
 
     /**
      * Resets a object to the version on the filesystem
-     *
-     * @return array $response
      */
-    public function onReset()
+    public function onReset(): array
     {
         $this->validateRequestTheme();
         $type = $this->getObjectType();
@@ -482,12 +481,8 @@ public function onReset()
 
     /**
      * Get the response to return in an AJAX request that updates an object
-     *
-     * @param CmsObject $object The object that has been affected
-     * @param string $type The type of object being affected
-     * @return array $result;
      */
-    protected function getUpdateResponse(CmsObject $object, string $type)
+    protected function getUpdateResponse(CmsObject $object, string $type): array
     {
         $result = [
             'objectPath'  => $type != 'content' ? $object->getBaseFileName() : $object->fileName,
@@ -508,10 +503,8 @@ protected function getUpdateResponse(CmsObject $object, string $type)
 
     /**
      * Get the active theme's datasource
-     *
-     * @return \Winter\Storm\Halcyon\Datasource\DatasourceInterface
      */
-    protected function getThemeDatasource()
+    protected function getThemeDatasource(): DatasourceInterface
     {
         return $this->theme->getDatasource();
     }
@@ -519,11 +512,8 @@ protected function getThemeDatasource()
     /**
      * Check to see if the provided object can be committed
      * Only available in debug mode, the DB layer must be enabled, and the object must exist in the database
-     *
-     * @param CmsObject $object
-     * @return boolean
      */
-    protected function canCommitObject(CmsObject $object)
+    protected function canCommitObject(CmsObject $object): bool
     {
         $result = false;
 
@@ -564,7 +554,7 @@ protected function validateRequestTheme(): void
         }
     }
 
-    protected function makeObjectFormWidget($type, $object, $alias = null)
+    protected function makeObjectFormWidget($type, $object, $alias = null): Form
     {
         $formConfigs = [
             'page'    => '~/plugins/winter/pages/classes/page/fields.yaml',
@@ -581,7 +571,7 @@ protected function makeObjectFormWidget($type, $object, $alias = null)
         $widgetConfig->alias = $alias ?: 'form' . studly_case($type) . md5($object->exists ? $object->getFileName() : uniqid());
         $widgetConfig->context = !$object->exists ? 'create' : 'update';
 
-        $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
+        $widget = $this->makeWidget(Form::class, $widgetConfig);
 
         if ($type == 'page') {
             $widget->bindEvent('form.extendFieldsBefore', function () use ($widget, $object) {
@@ -594,7 +584,7 @@ protected function makeObjectFormWidget($type, $object, $alias = null)
         return $widget;
     }
 
-    protected function checkContentField($formWidget, $page)
+    protected function checkContentField($formWidget, $page): void
     {
         if (!($layout = $page->getLayoutObject())) {
             return;
@@ -614,7 +604,7 @@ protected function checkContentField($formWidget, $page)
     /**
      * addPageSyntaxFields adds syntax defined fields to the form
      */
-    protected function addPageSyntaxFields($formWidget, $page)
+    protected function addPageSyntaxFields($formWidget, $page): void
     {
         $fields = $page->listLayoutSyntaxFields();
 
@@ -656,7 +646,7 @@ protected function addPageSyntaxFields($formWidget, $page)
         }
     }
 
-    protected function addPagePlaceholders($formWidget, $page)
+    protected function addPagePlaceholders($formWidget, $page): void
     {
         $placeholders = $page->listLayoutPlaceholders();
 
@@ -736,7 +726,7 @@ protected function getTabTitle(string $type, CmsObject $object): string
         return $result;
     }
 
-    protected function pushObjectForm($type, $object, $alias = null)
+    protected function pushObjectForm($type, $object, $alias = null): array
     {
         $widget = $this->makeObjectFormWidget($type, $object, $alias);
         $widget->bindToController();
@@ -762,7 +752,7 @@ protected function pushObjectForm($type, $object, $alias = null)
         ];
     }
 
-    protected function bindFormWidgetToController()
+    protected function bindFormWidgetToController(): void
     {
         $alias = Request::input('formWidgetAlias');
         $type = $this->getObjectType();
@@ -785,12 +775,9 @@ protected function bindFormWidgetToController()
     }
 
     /**
-     * Replaces Windows style (/r/n) line endings with unix style (/n)
-     * line endings.
-     * @param string $markup The markup to convert to unix style endings
-     * @return string
+     * Replaces Windows style (/r/n) line endings with unix style (/n) line endings.
      */
-    protected function convertLineEndings($markup)
+    protected function convertLineEndings(string $markup): string
     {
         $markup = str_replace("\r\n", "\n", $markup);
         $markup = str_replace("\r", "\n", $markup);
@@ -800,9 +787,8 @@ protected function convertLineEndings($markup)
 
     /**
      * Returns a list of content files
-     * @return \Winter\Storm\Database\Collection
      */
-    protected function getContentTemplateList()
+    protected function getContentTemplateList(): CmsObjectCollection
     {
         $templates = Content::listInTheme($this->theme, true);
 

From 13f0cd497a3de1000d125d14866d5b2e1256c825 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Thu, 20 Apr 2023 11:34:17 -0600
Subject: [PATCH 48/52] v2.1.2

---
 updates/version.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/updates/version.yaml b/updates/version.yaml
index 63623b9..beec8e8 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -70,3 +70,8 @@
   - "Fixed issue where allowed IPs couldn't access pages in maintenance mode"
   - "Improved Swedish translation"
 "2.1.0": "Added support for live previews of the frontend-rendered pages"
+"2.1.1": "Improved French translation"
+"2.1.2":
+  - "Added support for multilingual sitemap URLs"
+  - "Fixed support for Winter.Translate"
+  - "Collapse all pages in the backend list of pages by default"

From a272cc3d2e447506f60c8690813a25c73a13230a Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Sat, 12 Aug 2023 00:48:30 -0600
Subject: [PATCH 49/52] Fix crash caused by stale cache

---
 classes/Router.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/Router.php b/classes/Router.php
index 51a5ade..83c9f9a 100644
--- a/classes/Router.php
+++ b/classes/Router.php
@@ -115,7 +115,8 @@ protected function loadUrlMap()
                 'titles' => []
             ];
             foreach ($pages as $page) {
-                $url = $page->getViewBag()->property('url');
+                $viewBag = $page->getViewBag();
+                $url = $viewBag ? $viewBag->property('url') : null;
                 if (!$url) {
                     continue;
                 }

From add656adc5c4c2f6912c0d675c72917de0e5a418 Mon Sep 17 00:00:00 2001
From: gviabcua <gviabcua@gmail.com>
Date: Mon, 14 Aug 2023 10:24:14 +0300
Subject: [PATCH 50/52] Fix deprecation notice when attempting to resolve a
 non-static page (#37)

Co-authored-by: Luke Towers <github@luketowers.ca>
---
 Plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugin.php b/Plugin.php
index d321b93..15344b2 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -285,7 +285,7 @@ protected function extendCmsRenderer(): void
              * Get rendered content
              */
             $contents = Controller::instance()->getPageContents($page);
-            if (strlen($contents)) {
+            if (!empty($contents)) {
                 return $contents;
             }
         });

From e8dbc3ba2a5fe253f5d7a6918828e86846bb7f1e Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Sat, 4 Nov 2023 01:51:14 -0600
Subject: [PATCH 51/52] Fix snippets when using Winter.TailwindUI

---
 controllers/index/_sidepanel.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/index/_sidepanel.htm b/controllers/index/_sidepanel.htm
index fc58c6d..a4d735f 100644
--- a/controllers/index/_sidepanel.htm
+++ b/controllers/index/_sidepanel.htm
@@ -20,7 +20,7 @@
             <?php endif; ?>
 
             <?php if (in_array('snippetList', $activeWidgets)) : ?>
-                <form class="layout <?= !($activeWidgets[0] === 'snippetList') ? 'hide' : ''; ?>" data-content-id="snippet" data-object-type="snippet" data-type-icon="icon-newspaper-o" onsubmit="return false">
+                <form class="layout <?= !($activeWidgets[0] === 'snippetList') ? 'hide' : ''; ?>" data-content-id="snippets" data-object-type="snippet" data-type-icon="icon-newspaper-o" onsubmit="return false">
                     <?= $this->widget->snippetList->render() ?>
                 </form>
             <?php endif; ?>

From c793c12e958e1f63099156479d52406cf68d18ac Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 13 Nov 2023 13:45:36 -0600
Subject: [PATCH 52/52] Allow null input to convertLineEndings

Sometimes the value of placeholders could be set to null when creating a new page.
---
 classes/ObjectHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/ObjectHelper.php b/classes/ObjectHelper.php
index 6668487..4ff7d0d 100644
--- a/classes/ObjectHelper.php
+++ b/classes/ObjectHelper.php
@@ -60,14 +60,14 @@ public static function resolveClassType(string $class): string
     /**
      * Converts line endings based on the system's configuration
      */
-    public static function convertLineEndings(string $markup): string
+    public static function convertLineEndings(?string $markup): string
     {
         if (Config::get('cms.convertLineEndings', false) === true) {
             $markup = str_replace("\r\n", "\n", $markup);
             $markup = str_replace("\r", "\n", $markup);
         }
 
-        return $markup;
+        return $markup ?? '';
     }
 
     /**