Merge branch 'release/5.4.27'

gantry · Dec 14, 2018 · 10db207 · 10db207
2 parents 5dfb83e + ce2e589
commit 10db207
Show file tree

Hide file tree

Showing 36 changed files with 391 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,32 @@
+# 5.4.27
+## 12/14/2018
+
+1. [Common](#common)
+    1. [](#new)
+        - Added Section Variation field for Layout sections.
+    1. [](#bugfix)
+        - Fixed fatal error on PHP 5.4 (#2378)
+        - Fixed `Folder::doDelete($folder, false)` removing symlink when it should not (#2396)
+        - Fixed Assignment Knobs Escaping Containers - Google Chrome bug (#2412)
+1. [Joomla](#joomla)
+    1. [](#new)
+        - Added official Joomla 3.9 support
+1. [Grav](#grav)
+    1. [](#improved)
+        - Added styling for disabled input fields in admin
+1. [WordPress](#wordpress)
+    1. [](#new)
+        - Updated Timber to v1.8.3
+
 # 5.4.26
 ## 09/11/2018
 
 1. [Common](#common)
     1. [](#bugfix)
         - Fixed regression `Class 'Gantry\Component\Twig\TwigNodePageblock' not found`
+1. [WordPress](#wordpress)
+    1. [](#new)
+        - Updated Timber to v1.8.1
 
 # 5.4.25
 ## 09/10/2018

diff --git a/README.md b/README.md
@@ -126,7 +126,7 @@ We provide a few handy tasks as well:
 The Google Fonts JSON file can be generated by following guide at `https://developers.google.com/fonts/docs/developer_api` or simply using the `https://www.googleapis.com/webfonts/v1/webfonts?key=YOUR-API-KEY` url. You need to enable usage of Google Fonts API and provide your API key in the place of `YOUR-API-KEY`.
 
 ## License
-Gantry Framework v5.0 or later is licensed under a dual license system ([MIT](http://www.opensource.org/licenses/mit-license.php) or [GPL version 2 or later](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html). This means you are free to choose which license (MIT or GPL version 2 or later) is appropriate for your needs.
+Gantry Framework v5.4 or later is licensed under a dual license system ([MIT](http://www.opensource.org/licenses/mit-license.php) or [GPL version 2 or later](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html). This means you are free to choose which license (MIT or GPL version 2 or later) is appropriate for your needs.
 
 | [More Details](http://docs.gantry.org/gantry5/basics/license-and-usage) |
 |:-----------------------------------------------------------------------:|
diff --git a/assets/common/js/lightcase.js b/assets/common/js/lightcase.js
@@ -5,7 +5,7 @@
  * @author		Cornel Boppart <cornel@bopp-art.com>
  * @copyright	Author
  *
- * @version		2.4.4 (27/02/2018)
+ * @version		2.5.0 (11/03/2018)
  */
 
 ;(function ($) {
@@ -70,6 +70,7 @@
 				overlayOpacity: .9,
 				slideshow: false,
 				slideshowAutoStart: true,
+				breakBeforeShow: false,
 				timeout: 5000,
 				swipe: true,
 				useKeys: true,
@@ -167,7 +168,9 @@
 				},
 				onInit: {},
 				onStart: {},
-				onCalculateDimensions: {},
+				onBeforeCalculateDimensions: {},
+				onAfterCalculateDimensions: {},
+				onBeforeShow: {},
 				onFinish: {},
 				onResize: {},
 				onClose: {},
@@ -868,15 +871,11 @@
 
 			_self.cache.object = $object;
 
-			// Call onCalculateDimensions hook functions
-			_self._callHooks(_self.settings.onCalculateDimensions);
-
-			_self._calculateDimensions($object);
-
-			// Call onFinish hook functions
-			_self._callHooks(_self.settings.onFinish);
+			// Call onBeforeShow hook functions
+			_self._callHooks(_self.settings.onBeforeShow);
 
-			_self._startInTransition();
+			if (_self.settings.breakBeforeShow) return;
+			_self.show();
 		},
 
 		/**
@@ -923,6 +922,9 @@
 			setTimeout(function () {
 				 _self.transition.fade(_self.objects.info, 'in', _self.settings.speedIn);
 			}, _self.settings.speedIn);
+
+			// Call onFinish hook functions
+			_self._callHooks(_self.settings.onFinish);
 		},
 
 		/**
@@ -1542,10 +1544,9 @@
 		 * It stops an eventual timeout and recalculates dimensions.
 		 *
 		 * @param	{object}	dimensions
-		 * @param	{boolean}	startInTransition
 		 * @return	{void}
 		 */
-		resize: function (event, dimensions, startInTransition) {
+		resize: function (event, dimensions) {
 			if (!_self.isOpen) return;
 
 			if (_self.isSlideshowEnabled()) {
@@ -1584,10 +1585,6 @@
 
 			// Call onResize hook functions
 			_self._callHooks(_self.settings.onResize);
-
-			if (startInTransition) {
-				_self._startInTransition(_self.cache.object);
-			}
 		},
 
 		/**
@@ -1681,6 +1678,21 @@
 			_self.objects.case.attr('aria-hidden', 'false');
 		},
 
+		/**
+		 * Shows the lightcase by starting the transition
+		 */
+		show: function () {
+			// Call onCalculateDimensions hook functions
+			_self._callHooks(_self.settings.onBeforeCalculateDimensions);
+
+			_self._calculateDimensions(_self.cache.object);
+
+			// Call onAfterCalculateDimensions hook functions
+			_self._callHooks(_self.settings.onAfterCalculateDimensions);
+
+			_self._startInTransition();
+		},
+
 		/**
 		 * Escapes from the lightcase view
 		 *

diff --git a/engines/common/nucleus/admin/blueprints/layout/section.yaml b/engines/common/nucleus/admin/blueprints/layout/section.yaml
@@ -24,6 +24,12 @@ form:
       description: Enter CSS class names.
       default:
 
+    variations:
+      type: input.section-variations
+      label: Variations
+      description: Enter Section Variations.
+      default:        
+
     extra:
       type: collection.keyvalue
       label: Tag Attributes

diff --git a/engines/common/nucleus/templates/layout/section.html.twig b/engines/common/nucleus/templates/layout/section.html.twig
@@ -1,6 +1,7 @@
 {% set tag_type = segment.subtype|default('section') %}
 {% set attr_id = segment.attributes.id ?: 'g-' ~ segment.id %}
-{% set attr_class = segment.attributes.class %}
+{% set attr_class = segment.attributes.class
+    ~ (segment.attributes.variations ? ' ' ~ segment.attributes.variations|join(' ')) %}
 {% set attr_extra = segment.attributes.extra|attribute_array %}
 {% set boxed = segment.attributes.boxed %}
 {% if boxed is not null %}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gantry5",
-  "version": "1.0.0",
+  "version": "5.4",
   "description": "Gantry 5 / JS and CSS bundler",
   "main": "gulpfile.js",
   "dependencies": {

diff --git a/platforms/common/blueprints/gantry/theme/configuration.yaml b/platforms/common/blueprints/gantry/theme/configuration.yaml
@@ -69,6 +69,10 @@ form:
       type: input.hidden
       array: true
 
+    section-variations:
+      type: input.hidden
+      array: true  
+
     dependencies:
       type: input.hidden
       array: true
diff --git a/platforms/common/css-compiled/g-admin.css b/platforms/common/css-compiled/g-admin.css
diff --git a/platforms/common/scss/admin/_assignments.scss b/platforms/common/scss/admin/_assignments.scss
@@ -2,6 +2,14 @@
     #assignments, .settings-assignments {
         .enabler {
             float: right;
+
+            .toggle {
+                @include backface-visibility(hidden);
+
+                .knob {
+                    @include backface-visibility(hidden);
+                }
+            }
         }
 
         .settings-param-wrapper {

diff --git a/platforms/common/templates/forms/fields/input/section-variations.html.twig b/platforms/common/templates/forms/fields/input/section-variations.html.twig
@@ -0,0 +1,27 @@
+{% extends 'forms/fields/input/selectize.html.twig' %}
+
+{% block global_attributes %}
+    {% set variations = gantry.theme.details.configuration['section-variations'] %}
+    {% set Options = field.selectize.Options %}
+    {% set Optgroups = field.selectize.Optgroups %}
+    {% set options = [] %}
+    {% set optgroups = [] %}
+    {% if variations %}
+        {% for key,text in variations %}
+            {% if text is iterable %}
+                {% for item_key,item_text in text %}
+                    {% set options = options|merge([{optgroup: key, value: item_key, text: item_text}])  %}
+                    {% if key not in optgroups %}{% set optgroups = optgroups|merge([{value: key, label: key}]) %}{% endif %}
+                {%  endfor %}
+            {% else %}
+                {% set options = options|merge([{value: key, text: text}])  %}
+            {% endif %}
+        {% endfor %}
+
+
+        {% set field = field|merge(field.selectize.Options|default({}))|merge(field.selectize.Optgroups|default({}))|merge({selectize: { Options: options, Optgroups: optgroups, Subtitles: true }}) %}
+    {% endif %}
+
+    data-selectize="{{ (field.selectize is defined ? field.selectize|json_encode()|e('html_attr') : '') }}"
+    {{ parent() }}
+{% endblock %}
diff --git a/platforms/grav/gantry5/LICENSE b/platforms/grav/gantry5/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 RocketTheme
+Copyright (c) 2014-2018 RocketTheme
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/platforms/grav/gantry5/admin/css-compiled/grav-g-admin.css b/platforms/grav/gantry5/admin/css-compiled/grav-g-admin.css
diff --git a/platforms/grav/gantry5/admin/scss/grav-admin/_core.scss b/platforms/grav/gantry5/admin/scss/grav-admin/_core.scss
@@ -81,7 +81,6 @@ body #admin-main .admin-block {
         right: 1rem !important;
         left: inherit !important;
     }
-
 }
 
 .sidebar-closed #g5-container #main-header {

diff --git a/platforms/grav/gantry5/admin/scss/grav-admin/_settings.scss b/platforms/grav/gantry5/admin/scss/grav-admin/_settings.scss
@@ -5,6 +5,15 @@
             &:focus {
                 border-color: rgba($core-accent, .5);
             }
+            &[disabled], &[readonly] {
+                cursor: not-allowed;
+                background-color: #eee;    
+            }
+            &[type="radio"], &[type="checkbox"] {
+                &[disabled], &[readonly] {
+                    background-color: transparent;
+                }    
+            }
         }
 
         .fa {

diff --git a/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml b/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml
@@ -6,7 +6,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2</license>
     <description>GANTRY5_NUCLEUS_DESCRIPTION</description>
 

diff --git a/platforms/joomla/install.php b/platforms/joomla/install.php
@@ -21,11 +21,11 @@ class Pkg_Gantry5InstallerScript
     protected $versions = array(
         'PHP' => array (
             '5.4' => '5.4.0',
-            '0' => '7.0.23' // Preferred version
+            '0' => '7.0.32' // Preferred version
         ),
         'Joomla!' => array (
             '3.4' => '3.4.1',
-            '0' => '3.7.5' // Preferred version
+            '0' => '3.8.13' // Preferred version
         )
     );
     /**

diff --git a/platforms/joomla/lib_gantry5/gantry5.xml b/platforms/joomla/lib_gantry5/gantry5.xml
@@ -7,7 +7,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <description>LIB_GANTRY5_DESCRIPTION</description>
 

diff --git a/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml b/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml
@@ -6,7 +6,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2</license>
     <description>MOD_GANTRY5_PARTICLE_DESCRIPTION</description>
 

diff --git a/platforms/joomla/pkg_gantry5.xml b/platforms/joomla/pkg_gantry5.xml
@@ -7,7 +7,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2</license>
     <description>PKG_GANTRY5_DESCRIPTION</description>
 

diff --git a/platforms/joomla/plg_gantry5_preset/preset.xml b/platforms/joomla/plg_gantry5_preset/preset.xml
@@ -6,7 +6,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <description>PLG_GANTRY5_PRESET_DESCRIPTION</description>
 

diff --git a/platforms/joomla/plg_quickicon_gantry5/gantry5.xml b/platforms/joomla/plg_quickicon_gantry5/gantry5.xml
@@ -6,7 +6,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <description>PLG_QUICKICON_GANTRY5_DESCRIPTION</description>
 

diff --git a/platforms/joomla/plg_system_gantry5/gantry5.xml b/platforms/joomla/plg_system_gantry5/gantry5.xml
@@ -6,7 +6,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2</license>
     <description>PLG_SYSTEM_GANTRY5_DESCRIPTION</description>
 

diff --git a/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml b/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml
@@ -6,7 +6,7 @@
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
-    <copyright>(C) 2005 - 2017 RocketTheme, LLC. All rights reserved.</copyright>
+    <copyright>(C) 2005 - 2018 RocketTheme, LLC. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2</license>
     <description>PLG_SYSTEM_GANTRY5_DEBUGBAR_DESCRIPTION</description>
 

diff --git a/platforms/wordpress/gantry5/readme.txt b/platforms/wordpress/gantry5/readme.txt
@@ -2,8 +2,9 @@
 Contributors: gantry
 Author URI: http://gantry.org
 Tags: gantry, gantry5, framework, template, theme, yaml, twig, timber, scss, html5, css3, bourbon, layout, builder, widgets, flexible, extensible, configurable, flex, grid, columns, powerful, buddypress, woocommerce, bbpress
-Requires at least: 4.2+
-Tested up to: 4.9.8
+Requires at least: 4.2
+Tested up to: 5.0.1
+Requires PHP: 5.4
 Stable tag: @version@
 
 Gantry is a comprehensive set of building blocks to enable the rapid development and realization of a design into a flexible and powerful web platform