Merge pull request octobercms#3908 from octobercms/wip/halcyon-db-dat…

…asource

Database layer for the CMS objects

config/cms.php

@@ -56,7 +56,7 @@
     | Back-end login remember
     |--------------------------------------------------------------------------
     |
-    | Define live duration of backend sessions :
+    | Define live duration of backend sessions:
     |
     | true  - session never expire (cookie expiration in 5 years)
     |
@@ -211,6 +211,32 @@
 
     'enableAssetDeepHashing' => null,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Database-driven Themes
+    |--------------------------------------------------------------------------
+    |
+    | Stores theme templates in the database instead of the filesystem.
+    |
+    | false - All theme templates are sourced from the filesystem.
+    |
+    | true  - Source theme templates from the database with fallback to the filesytem.
+    |
+    | null  - Setting equal to the inverse of app.debug: debug enabled, this disabled.
+    |
+    | The database layer stores all modified CMS files in the database. Files that are
+    | not modified continue to be loaded from the filesystem. The `theme:sync $themeDir`
+    | console command is available to populate the database from the filesystem with
+    | the `--toFile` flag to sync in the other direction (database to filesystem) and
+    | the `--paths="/path/to/file.md,/path/to/file2.md" flag to sync only specific files.
+    |
+    | Files modified in the database are cached to indicate that they should be loaded
+    | from the database.
+    |
+    */
+
+    'databaseTemplates' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Public plugins path
@@ -346,20 +372,20 @@
     */
 
     'forceBytecodeInvalidation' => true,
-    
+
     /*
     |--------------------------------------------------------------------------
     | Twig Strict Variables
     |--------------------------------------------------------------------------
     |
-    | If strict_variables is disabled, Twig will silently ignore invalid 
+    | If strict_variables is disabled, Twig will silently ignore invalid
     | variables (variables and or attributes/methods that do not exist) and
     | replace them with a null value. When enabled, Twig throws an exception
     | instead. If set to null, it is enabled when debug mode (app.debug) is
     | enabled.
     |
     */
-    
+
     'enableTwigStrictVariables' => false,
 
     /*

modules/cms/ServiceProvider.php

@@ -29,6 +29,7 @@ public function register()
         $this->registerComponents();
         $this->registerThemeLogging();
         $this->registerCombinerEvents();
+        $this->registerHalcyonModels();
 
         /*
          * Backend specific
@@ -324,4 +325,20 @@ protected function bootRichEditorEvents()
             }
         });
     }
+
+    /**
+     * Registers the models to be made available to the theme database layer
+     */
+    protected function registerHalcyonModels()
+    {
+        Event::listen('system.console.theme.sync.getAvailableModelClasses', function () {
+            return [
+                Classes\Meta::class,
+                Classes\Page::class,
+                Classes\Layout::class,
+                Classes\Content::class,
+                Classes\Partial::class
+            ];
+        });
+    }
 }

modules/cms/assets/js/october.cmspage.js

@@ -173,7 +173,7 @@
         var dataId = $target.closest('li').attr('data-tab-id'),
             title = $target.attr('title'),
             $sidePanel = $('#cms-side-panel')
-        
+
         if (title)
             this.setPageTitle(title)
 
@@ -250,6 +250,8 @@
 
         $form.on('changed.oc.changeMonitor', function() {
             $panel.trigger('modified.oc.tab')
+            $panel.find('[data-control=commit-button]').addClass('hide');
+            $panel.find('[data-control=reset-button]').addClass('hide');
             self.updateModifiedCounter()
         })
 
@@ -279,6 +281,10 @@
     CmsPage.prototype.onAjaxSuccess = function(ev, context, data) {
         var element = ev.target
 
+        // Update the visibilities of the commit & reset buttons
+        $('[data-control=commit-button]', element).toggleClass('hide', !data.canCommit)
+        $('[data-control=reset-button]', element).toggleClass('hide', !data.canReset)
+
         if (data.templatePath !== undefined) {
             $('input[name=templatePath]', element).val(data.templatePath)
             $('input[name=templateMtime]', element).val(data.templateMtime)
@@ -313,6 +319,11 @@
         if (context.handler == 'onSave' && (!data['X_OCTOBER_ERROR_FIELDS'] && !data['X_OCTOBER_ERROR_MESSAGE'])) {
             $(element).trigger('unchange.oc.changeMonitor')
         }
+
+        // Reload the form if the server has requested it
+        if (data.forceReload) {
+            this.reloadForm(element)
+        }
     }
 
     CmsPage.prototype.onAjaxError = function(ev, context, message, data, jqXHR) {
@@ -359,7 +370,7 @@
         }).done(function(data) {
             var tabs = $('#cms-master-tabs').data('oc.tab');
             $.each(data.deleted, function(index, path){
-                var 
+                var
                     tabId = templateType + '-' + data.theme + '-' + path,
                     tab = tabs.findByIdentifier(tabId)
 
@@ -375,7 +386,12 @@
     }
 
     CmsPage.prototype.onInspectorShowing = function(ev, data) {
-        $(ev.currentTarget).closest('[data-control="toolbar"]').data('oc.dragScroll').goToElement(ev.currentTarget, data.callback)
+        var $dragScroll = $(ev.currentTarget).closest('[data-control="toolbar"]').data('oc.dragScroll')
+        if ($dragScroll) {
+            $dragScroll.goToElement(ev.currentTarget, data.callback)
+        } else {
+            data.callback();
+        }
 
         ev.stopPropagation()
     }
@@ -640,7 +656,7 @@
     }
 
     CmsPage.prototype.reloadForm = function(form) {
-        var 
+        var
             $form = $(form),
             data = {
                 type: $('[name=templateType]', $form).val(),
@@ -682,7 +698,7 @@
         $(form).request('onGetTemplateList', {
             success: function(data) {
                 $('#cms-master-tabs > .tab-content select[name="settings[layout]"]').each(function(){
-                    var 
+                    var
                         $select = $(this),
                         value = $select.val()