From 64536bb621414d6e61929008162d82eaae635255 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 4 Jul 2018 22:20:50 +0300 Subject: [PATCH 1/2] Release 5.4.24 - Automatic Version Number Updates --- VERSION | 2 +- .../blueprints/gantry/theme/details.yaml | 4 ++-- platforms/grav/gantry5/blueprints.yaml | 2 +- platforms/joomla/com_gantry5/admin/gantry5.xml | 4 ++-- .../joomla/gantry5_nucleus/gantry5_nucleus.xml | 4 ++-- platforms/joomla/lib_gantry5/gantry5.xml | 4 ++-- .../mod_gantry5_particle.xml | 4 ++-- platforms/joomla/pkg_gantry5.xml | 18 +++++++++--------- platforms/joomla/plg_gantry5_preset/preset.xml | 4 ++-- .../joomla/plg_quickicon_gantry5/gantry5.xml | 4 ++-- .../joomla/plg_system_gantry5/gantry5.xml | 4 ++-- .../gantry5_debugbar.xml | 4 ++-- platforms/joomla/updates/gantry5_jed.xml | 2 +- platforms/joomla/updates/list.xml | 6 +++--- platforms/joomla/updates/pkg_gantry5.xml | 6 +++--- platforms/joomla/updates/tpl_g5_helium.xml | 6 +++--- platforms/joomla/updates/tpl_g5_hydrogen.xml | 6 +++--- src/RealLoader.php | 4 ++-- themes/base/joomla/templateDetails.xml | 4 ++-- .../helium-child/wordpress/gantry/theme.yaml | 4 ++-- themes/helium/grav/blueprints.yaml | 2 +- themes/helium/grav/gantry/theme.yaml | 4 ++-- themes/helium/joomla/gantry/theme.yaml | 4 ++-- themes/helium/joomla/templateDetails.xml | 4 ++-- themes/helium/prime/gantry/theme.yaml | 4 ++-- themes/helium/wordpress/gantry/theme.yaml | 4 ++-- .../hydrogen-child/wordpress/gantry/theme.yaml | 4 ++-- themes/hydrogen/grav/blueprints.yaml | 2 +- themes/hydrogen/grav/gantry/theme.yaml | 4 ++-- themes/hydrogen/joomla/gantry/theme.yaml | 4 ++-- themes/hydrogen/joomla/templateDetails.xml | 4 ++-- themes/hydrogen/prime/gantry/theme.yaml | 4 ++-- themes/hydrogen/wordpress/gantry/theme.yaml | 4 ++-- 33 files changed, 72 insertions(+), 72 deletions(-) diff --git a/VERSION b/VERSION index 14d2ff637..c5e33e5af 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -@version@ +5.4.24 diff --git a/platforms/common/blueprints/gantry/theme/details.yaml b/platforms/common/blueprints/gantry/theme/details.yaml index 169d770c1..6d37a2432 100644 --- a/platforms/common/blueprints/gantry/theme/details.yaml +++ b/platforms/common/blueprints/gantry/theme/details.yaml @@ -12,7 +12,7 @@ form: version: type: input.text label: Version - default: "@version@" + default: "5.4.24" icon: type: input.text @@ -22,7 +22,7 @@ form: date: type: input.text label: Release Date - default: "@versiondate@" + default: "July 4, 2018" author.name: type: input.text diff --git a/platforms/grav/gantry5/blueprints.yaml b/platforms/grav/gantry5/blueprints.yaml index 6ab7474b7..64a9d37df 100644 --- a/platforms/grav/gantry5/blueprints.yaml +++ b/platforms/grav/gantry5/blueprints.yaml @@ -1,5 +1,5 @@ name: Gantry 5 Framework -version: '@version@' +version: '5.4.24' description: Theme framework. icon: gantry author: diff --git a/platforms/joomla/com_gantry5/admin/gantry5.xml b/platforms/joomla/com_gantry5/admin/gantry5.xml index d39832f19..5e8bda9aa 100644 --- a/platforms/joomla/com_gantry5/admin/gantry5.xml +++ b/platforms/joomla/com_gantry5/admin/gantry5.xml @@ -1,8 +1,8 @@ com_gantry5 - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml b/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml index 1852ad52f..8ad01040c 100644 --- a/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml +++ b/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml @@ -1,8 +1,8 @@ gantry5_nucleus - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/lib_gantry5/gantry5.xml b/platforms/joomla/lib_gantry5/gantry5.xml index dc78a095d..513d7d153 100644 --- a/platforms/joomla/lib_gantry5/gantry5.xml +++ b/platforms/joomla/lib_gantry5/gantry5.xml @@ -2,8 +2,8 @@ Gantry 5 Framework gantry5 - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml b/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml index 0a4d7650b..eb61ea175 100644 --- a/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml +++ b/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml @@ -1,8 +1,8 @@ mod_gantry5_particle - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/pkg_gantry5.xml b/platforms/joomla/pkg_gantry5.xml index 7d8d44f39..0b43e68e6 100644 --- a/platforms/joomla/pkg_gantry5.xml +++ b/platforms/joomla/pkg_gantry5.xml @@ -2,8 +2,8 @@ pkg_gantry5 gantry5 - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com @@ -16,19 +16,19 @@ true - plg_system_gantry5_v@version@.zip + plg_system_gantry5_v5.4.24.zip - plg_quickicon_gantry5_v@version@.zip + plg_quickicon_gantry5_v5.4.24.zip - plg_gantry5_preset_v@version@.zip + plg_gantry5_preset_v5.4.24.zip - mod_gantry5_particle_v@version@.zip + mod_gantry5_particle_v5.4.24.zip - lib_gantry5_v@version@.zip + lib_gantry5_v5.4.24.zip - gantry5_nucleus_v@version@.zip + gantry5_nucleus_v5.4.24.zip - com_gantry5_v@version@.zip + com_gantry5_v5.4.24.zip diff --git a/platforms/joomla/plg_gantry5_preset/preset.xml b/platforms/joomla/plg_gantry5_preset/preset.xml index 211391c08..8ab4ddb4d 100644 --- a/platforms/joomla/plg_gantry5_preset/preset.xml +++ b/platforms/joomla/plg_gantry5_preset/preset.xml @@ -1,8 +1,8 @@ plg_gantry5_preset - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/plg_quickicon_gantry5/gantry5.xml b/platforms/joomla/plg_quickicon_gantry5/gantry5.xml index c22082e50..5c161bd5f 100644 --- a/platforms/joomla/plg_quickicon_gantry5/gantry5.xml +++ b/platforms/joomla/plg_quickicon_gantry5/gantry5.xml @@ -1,8 +1,8 @@ plg_quickicon_gantry5 - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/plg_system_gantry5/gantry5.xml b/platforms/joomla/plg_system_gantry5/gantry5.xml index 167f75385..c267b6e2e 100644 --- a/platforms/joomla/plg_system_gantry5/gantry5.xml +++ b/platforms/joomla/plg_system_gantry5/gantry5.xml @@ -1,8 +1,8 @@ plg_system_gantry5 - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml b/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml index bcee95519..2c555e684 100644 --- a/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml +++ b/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml @@ -1,8 +1,8 @@ plg_system_gantry5_debugbar - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/platforms/joomla/updates/gantry5_jed.xml b/platforms/joomla/updates/gantry5_jed.xml index b0c9d9d89..da250ac4a 100644 --- a/platforms/joomla/updates/gantry5_jed.xml +++ b/platforms/joomla/updates/gantry5_jed.xml @@ -1,6 +1,6 @@ - @version@ + 5.4.24 30 diff --git a/platforms/joomla/updates/list.xml b/platforms/joomla/updates/list.xml index 4694b97d1..f71048b42 100644 --- a/platforms/joomla/updates/list.xml +++ b/platforms/joomla/updates/list.xml @@ -5,20 +5,20 @@ element="pkg_gantry5" type="package" client="site" - version="@version@" + version="5.4.24" detailsurl="http://updates.gantry.org/5.0/joomla/pkg_gantry5.xml"/> diff --git a/platforms/joomla/updates/pkg_gantry5.xml b/platforms/joomla/updates/pkg_gantry5.xml index 8c2b0c6b5..556438061 100644 --- a/platforms/joomla/updates/pkg_gantry5.xml +++ b/platforms/joomla/updates/pkg_gantry5.xml @@ -5,10 +5,10 @@ Gantry Framework pkg_gantry5 package - @version@ - http://docs.gantry.org/gantry5 + 5.4.24 + http://docs.gantry.org/gantry5 - http://updates.gantry.org/download/@version@/joomla-pkg_gantry5_v@version@.zip + http://updates.gantry.org/download/5.4.24/joomla-pkg_gantry5_v5.4.24.zip stable diff --git a/platforms/joomla/updates/tpl_g5_helium.xml b/platforms/joomla/updates/tpl_g5_helium.xml index a81157895..66374eb2a 100644 --- a/platforms/joomla/updates/tpl_g5_helium.xml +++ b/platforms/joomla/updates/tpl_g5_helium.xml @@ -5,10 +5,10 @@ Helium Template g5_helium template - @version@ - http://docs.gantry.org/gantry5 + 5.4.24 + http://docs.gantry.org/gantry5 - http://updates.gantry.org/download/@version@/joomla-tpl_g5_helium_v@version@.zip + http://updates.gantry.org/download/5.4.24/joomla-tpl_g5_helium_v5.4.24.zip stable diff --git a/platforms/joomla/updates/tpl_g5_hydrogen.xml b/platforms/joomla/updates/tpl_g5_hydrogen.xml index f22fd9cdb..eb69b9e91 100644 --- a/platforms/joomla/updates/tpl_g5_hydrogen.xml +++ b/platforms/joomla/updates/tpl_g5_hydrogen.xml @@ -5,10 +5,10 @@ Hydrogen Template g5_hydrogen template - @version@ - http://docs.gantry.org/gantry5 + 5.4.24 + http://docs.gantry.org/gantry5 - http://updates.gantry.org/download/@version@/joomla-tpl_g5_hydrogen_v@version@.zip + http://updates.gantry.org/download/5.4.24/joomla-tpl_g5_hydrogen_v5.4.24.zip stable diff --git a/src/RealLoader.php b/src/RealLoader.php index 8bc05f46f..cc5452b2a 100644 --- a/src/RealLoader.php +++ b/src/RealLoader.php @@ -45,8 +45,8 @@ public static function getClassLoader() throw new \LogicException(self::$errorMessageGantryLoaded); } - define('GANTRY5_VERSION', '@version@'); - define('GANTRY5_VERSION_DATE', '@versiondate@'); + define('GANTRY5_VERSION', '5.4.24'); + define('GANTRY5_VERSION_DATE', 'July 4, 2018'); if (!defined('DS')) { define('DS', DIRECTORY_SEPARATOR); diff --git a/themes/base/joomla/templateDetails.xml b/themes/base/joomla/templateDetails.xml index 0a6f4f90d..ea29d2ba2 100644 --- a/themes/base/joomla/templateDetails.xml +++ b/themes/base/joomla/templateDetails.xml @@ -1,8 +1,8 @@ g5_base - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/themes/helium-child/wordpress/gantry/theme.yaml b/themes/helium-child/wordpress/gantry/theme.yaml index 83a5d0c1e..70bc1ad2e 100644 --- a/themes/helium-child/wordpress/gantry/theme.yaml +++ b/themes/helium-child/wordpress/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Helium Child - version: @version@ + version: 5.4.24 icon: paper-plane - date: @versiondate@ + date: July 4, 2018 author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/helium/grav/blueprints.yaml b/themes/helium/grav/blueprints.yaml index de4fea8a4..cca3b6113 100644 --- a/themes/helium/grav/blueprints.yaml +++ b/themes/helium/grav/blueprints.yaml @@ -1,5 +1,5 @@ name: Helium -version: "@version@" +version: "5.4.24" description: "Default Gantry 5 theme." icon: gantry author: diff --git a/themes/helium/grav/gantry/theme.yaml b/themes/helium/grav/gantry/theme.yaml index 87034692d..3db8ef4f5 100644 --- a/themes/helium/grav/gantry/theme.yaml +++ b/themes/helium/grav/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Helium - version: '@version@' + version: '5.4.24' icon: paper-plane - date: '@versiondate@' + date: 'July 4, 2018' author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/helium/joomla/gantry/theme.yaml b/themes/helium/joomla/gantry/theme.yaml index 2fedbd873..ad60f0d6f 100644 --- a/themes/helium/joomla/gantry/theme.yaml +++ b/themes/helium/joomla/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Helium - version: '@version@' + version: '5.4.24' icon: paper-plane - date: '@versiondate@' + date: 'July 4, 2018' author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/helium/joomla/templateDetails.xml b/themes/helium/joomla/templateDetails.xml index 2328ce4ba..a2ee8d6c7 100644 --- a/themes/helium/joomla/templateDetails.xml +++ b/themes/helium/joomla/templateDetails.xml @@ -1,8 +1,8 @@ g5_helium - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/themes/helium/prime/gantry/theme.yaml b/themes/helium/prime/gantry/theme.yaml index ab2626775..33b24b01a 100644 --- a/themes/helium/prime/gantry/theme.yaml +++ b/themes/helium/prime/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Helium - version: '@version@' + version: '5.4.24' icon: paper-plane - date: '@versiondate@' + date: 'July 4, 2018' author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/helium/wordpress/gantry/theme.yaml b/themes/helium/wordpress/gantry/theme.yaml index ba70cfbc1..76abd3635 100644 --- a/themes/helium/wordpress/gantry/theme.yaml +++ b/themes/helium/wordpress/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Helium - version: '@version@' + version: '5.4.24' icon: paper-plane - date: '@versiondate@' + date: 'July 4, 2018' author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/hydrogen-child/wordpress/gantry/theme.yaml b/themes/hydrogen-child/wordpress/gantry/theme.yaml index da2e0615f..d468840ee 100644 --- a/themes/hydrogen-child/wordpress/gantry/theme.yaml +++ b/themes/hydrogen-child/wordpress/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Hydrogen Child - version: "@version@" + version: "5.4.24" icon: paper-plane - date: @versiondate@ + date: July 4, 2018 author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/hydrogen/grav/blueprints.yaml b/themes/hydrogen/grav/blueprints.yaml index 564af2588..d1b7b3af1 100644 --- a/themes/hydrogen/grav/blueprints.yaml +++ b/themes/hydrogen/grav/blueprints.yaml @@ -1,5 +1,5 @@ name: Hydrogen -version: "@version@" +version: "5.4.24" description: "Default Gantry 5 theme." icon: gantry author: diff --git a/themes/hydrogen/grav/gantry/theme.yaml b/themes/hydrogen/grav/gantry/theme.yaml index 49eedcee5..7a975526f 100644 --- a/themes/hydrogen/grav/gantry/theme.yaml +++ b/themes/hydrogen/grav/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Hydrogen - version: "@version@" + version: "5.4.24" icon: paper-plane - date: @versiondate@ + date: July 4, 2018 author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/hydrogen/joomla/gantry/theme.yaml b/themes/hydrogen/joomla/gantry/theme.yaml index bf4f9d57f..c07556c3b 100644 --- a/themes/hydrogen/joomla/gantry/theme.yaml +++ b/themes/hydrogen/joomla/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Hydrogen - version: "@version@" + version: "5.4.24" icon: paper-plane - date: @versiondate@ + date: July 4, 2018 author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/hydrogen/joomla/templateDetails.xml b/themes/hydrogen/joomla/templateDetails.xml index 025b262e6..4a3c0074b 100644 --- a/themes/hydrogen/joomla/templateDetails.xml +++ b/themes/hydrogen/joomla/templateDetails.xml @@ -1,8 +1,8 @@ g5_hydrogen - @version@ - @versiondate@ + 5.4.24 + July 4, 2018 RocketTheme, LLC support@rockettheme.com http://www.rockettheme.com diff --git a/themes/hydrogen/prime/gantry/theme.yaml b/themes/hydrogen/prime/gantry/theme.yaml index 3db2897b9..dd60fb177 100644 --- a/themes/hydrogen/prime/gantry/theme.yaml +++ b/themes/hydrogen/prime/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Hydrogen - version: "@version@" + version: "5.4.24" icon: paper-plane - date: @versiondate@ + date: July 4, 2018 author: name: RocketTheme, LLC email: support@rockettheme.com diff --git a/themes/hydrogen/wordpress/gantry/theme.yaml b/themes/hydrogen/wordpress/gantry/theme.yaml index c74a52337..ce47e35d2 100644 --- a/themes/hydrogen/wordpress/gantry/theme.yaml +++ b/themes/hydrogen/wordpress/gantry/theme.yaml @@ -1,8 +1,8 @@ details: name: Hydrogen - version: "@version@" + version: "5.4.24" icon: paper-plane - date: @versiondate@ + date: July 4, 2018 author: name: RocketTheme, LLC email: support@rockettheme.com From 959f955bc9c55b60edf0f883be824c283a3a2682 Mon Sep 17 00:00:00 2001 From: Ioannis Tsimpidis <6756053+joomlabeat@users.noreply.github.com> Date: Wed, 5 Sep 2018 14:03:34 +0300 Subject: [PATCH 2/2] Admin Outlines Styles appearing according to the available sections of the outline layout --- .../Controller/Html/Configurations/Styles.php | 2 +- src/classes/Gantry/Admin/Styles.php | 36 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/classes/Gantry/Admin/Controller/Html/Configurations/Styles.php b/src/classes/Gantry/Admin/Controller/Html/Configurations/Styles.php index c5b92e5e2..64a80c461 100644 --- a/src/classes/Gantry/Admin/Controller/Html/Configurations/Styles.php +++ b/src/classes/Gantry/Admin/Controller/Html/Configurations/Styles.php @@ -68,7 +68,7 @@ public function index() $this->params['data'] = ConfigServiceProvider::load($this->container, $outline, false, false); } - $this->params['blocks'] = $this->container['styles']->group(); + $this->params['blocks'] = $this->container['styles']->group($outline); $this->params['route'] = "configurations.{$outline}.styles"; return $this->render('@gantry-admin/pages/configurations/styles/styles.html.twig', $this->params); diff --git a/src/classes/Gantry/Admin/Styles.php b/src/classes/Gantry/Admin/Styles.php index f2b31b8a1..2866c998f 100644 --- a/src/classes/Gantry/Admin/Styles.php +++ b/src/classes/Gantry/Admin/Styles.php @@ -48,16 +48,42 @@ public function all() return $this->blocks; } - public function group() + public function group($outline = null) { - $blocks = $this->all(); + if (!is_null($outline)) + { + $locator = $this->container['locator']; + $outline = $locator->findResource("gantry-layouts://{$outline}.yaml"); + $outline = CompiledYamlFile::instance($outline); + $available_sections = $outline->content()['layout']; + $outline_styles = []; + foreach ($available_sections as $k=>$section) + { + $outline_styles[] = str_replace('/','',$k); + } + } + $blocks = $this->all(); $list = []; - foreach ($blocks as $name => $style) { - $type = isset($style['type']) ? $style['type'] : 'block'; - $list[$type][$name] = $style; + if (!isset($outline_styles)) + { + foreach ($blocks as $name => $style) { + + $type = isset($style['type']) ? $style['type'] : 'block'; + $list[$type][$name] = $style; + } } + else + { + foreach ($blocks as $name => $style) { + $type = isset($style['type']) ? $style['type'] : 'block'; + if ($type !== 'section' || ($type === 'section' && in_array($name, $outline_styles))) + { + $list[$type][$name] = $style; + } + } + } return $this->sort($list); }