reduced run-time footprint, prep. for v1.0.3

thexmanxyz · Jun 29, 2019 · 8260ea1 · 8260ea1
1 parent d534780
commit 8260ea1
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -9,22 +9,22 @@ This project contains a Gantry Particle and is based on the default **Gantry Hel
 * Gantry Templating Framework and Theme
 
 ## Download
-Choose the correct download for your target platform. The Joomla Plugin System is supported for all Gantry themes globally or locally for the templates Helium and Hydrogen. The latest Particle version is **v1.0.2**.
+Choose the correct download for your target platform. The Joomla Plugin System is supported for all Gantry themes globally or locally for the templates Helium and Hydrogen. The latest Particle version is **v1.0.3**.
 ___
 **Default Particle:**
-[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.particle.only.EN.v1.0.2.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.particle.only.DE.v1.0.2.zip)
+[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.particle.only.EN.v1.0.3.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.particle.only.DE.v1.0.3.zip)
 
 **Legacy Particle - Gantry <5.3.2:**
-[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.particle.only.legacy.EN.v1.0.2.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.particle.only.legacy.DE.v1.0.2.zip)
+[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.particle.only.legacy.EN.v1.0.3.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.particle.only.legacy.DE.v1.0.3.zip)
 
 **Joomla Plugin - All Templates (Global):**
-[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.j3.global.EN.v1.0.2.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.j3.global.DE.v1.0.2.zip)
+[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.j3.global.EN.v1.0.3.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.j3.global.DE.v1.0.3.zip)
 
 **Joomla Plugin - Hydrogen:**
-[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.j3.hydrogen.EN.v1.0.2.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.j3.hydrogen.DE.v1.0.2.zip)
+[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.j3.hydrogen.EN.v1.0.3.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.j3.hydrogen.DE.v1.0.3.zip)
 
 **Joomla Plugin - Helium:**
-[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.j3.helium.EN.v1.0.2.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.2/ocn.j3.helium.DE.v1.0.2.zip)
+[English](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.j3.helium.EN.v1.0.3.zip) / [German](https://github.com/thexmanxyz/Owl-Carousel-Neo-Gantry/releases/download/v1.0.3/ocn.j3.helium.DE.v1.0.3.zip)
 ___
 
 ## Automatic Installation (Joomla only)

diff --git a/build/build.bat b/build/build.bat
@@ -29,7 +29,7 @@ set scr_log_files=0
 
 REM --- project variables ---
 set prj_id=ocn
-set prj_rev=v1.0.2
+set prj_rev=v1.0.3
 set prj_name=owlcarousel-neo
 set prj_fullname=Owl Carousel Neo
 set prj_title_hr=--------------------

diff --git a/platform/joomla/global/owlcarousel-neo.xml b/platform/joomla/global/owlcarousel-neo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Owl Carousel Neo - Gantry Particle (Global)</name>
-    <version>1.0.2</version>
-    <creationDate>26.06.2019</creationDate>
+    <version>1.0.3</version>
+    <creationDate>29.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://gantryprojects.com</authorUrl>

diff --git a/platform/joomla/global/translation/de/owlcarousel-neo.xml b/platform/joomla/global/translation/de/owlcarousel-neo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Owl Carousel Neo - Gantry Particle (Global)</name>
-    <version>1.0.2</version>
-    <creationDate>26.06.2019</creationDate>
+    <version>1.0.3</version>
+    <creationDate>29.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://gantryprojects.com</authorUrl>

diff --git a/platform/joomla/helium/owlcarousel-neo.xml b/platform/joomla/helium/owlcarousel-neo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Owl Carousel Neo - Gantry Particle (Helium)</name>
-    <version>1.0.2</version>
-    <creationDate>26.06.2019</creationDate>
+    <version>1.0.3</version>
+    <creationDate>29.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://gantryprojects.com</authorUrl>

diff --git a/platform/joomla/helium/translation/de/owlcarousel-neo.xml b/platform/joomla/helium/translation/de/owlcarousel-neo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Owl Carousel Neo - Gantry Particle (Helium)</name>
-    <version>1.0.2</version>
-    <creationDate>26.06.2019</creationDate>
+    <version>1.0.3</version>
+    <creationDate>29.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://gantryprojects.com</authorUrl>

diff --git a/platform/joomla/hydrogen/owlcarousel-neo.xml b/platform/joomla/hydrogen/owlcarousel-neo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Owl Carousel Neo - Gantry Particle (Hydrogen)</name>
-    <version>1.0.2</version>
-    <creationDate>26.06.2019</creationDate>
+    <version>1.0.3</version>
+    <creationDate>29.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://gantryprojects.com</authorUrl>

diff --git a/platform/joomla/hydrogen/translation/de/owlcarousel-neo.xml b/platform/joomla/hydrogen/translation/de/owlcarousel-neo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Owl Carousel Neo - Gantry Particle (Hydrogen)</name>
-    <version>1.0.2</version>
-    <creationDate>26.06.2019</creationDate>
+    <version>1.0.3</version>
+    <creationDate>29.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://gantryprojects.com</authorUrl>

diff --git a/src/default/owlcarousel-neo.html.twig b/src/default/owlcarousel-neo.html.twig
@@ -114,16 +114,18 @@
 
             {% for item in particle.items %}
                 {% set showItem = item.showItem|default('yes') %}
-                {% set format = (showItem == 'once') ? 'Y-m-d' : 'm-d' %}
-                {% set start, now, end = item.startDate|date(format), "now"|date(format), item.endDate|date(format) %}
-                {% if showItem == 'once' %}
-                    {% if start <= now and end >= now %}
-                        {% set showItem = 'yes' %}
-                    {% endif %}       
-                {% elseif showItem == 'annual' %}
-                    {% if (start <= end and start <= now and end >= now) or 
-                          (start > end and (start <= now or end >= now)) %}
-                        {% set showItem = 'yes' %}
+                {% if showItem != 'yes' and showItem != 'no' %}
+                    {% set format = (showItem == 'once') ? 'Y-m-d' : 'm-d' %}
+                    {% set start, now, end = item.startDate|date(format), "now"|date(format), item.endDate|date(format) %}
+                    {% if showItem == 'once' %}
+                        {% if start <= now and end >= now %}
+                            {% set showItem = 'yes' %}
+                        {% endif %}       
+                    {% elseif showItem == 'annual' %}
+                        {% if (start <= end and start <= now and end >= now) or 
+                              (start > end and (start <= now or end >= now)) %}
+                            {% set showItem = 'yes' %}
+                        {% endif %}
                     {% endif %}
                 {% endif %}
                 {% if showItem == 'yes' %}