Elements: Weather PR clean up

resolves xibosignageltd/xibo-private#323
xibosignage · Jul 20, 2023 · 4edb0eb · 4edb0eb
1 parent ec8d489
commit 4edb0eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-date.png b/modules/assets/template-thumbnails/forecast/elements/weather-date.png
diff --git a/modules/templates/forecast-elements.xml b/modules/templates/forecast-elements.xml
@@ -358,9 +358,15 @@ if (meta && meta.hasOwnProperty('Attribution')) {
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-date-thumb</thumbnail>
+        <thumbnail>weather-date</thumbnail>
         <startWidth>420</startWidth>
         <startHeight>100</startHeight>
+        <properties>
+            <property id="dateFormat" type="text">
+                <title>Date Format</title>
+                <default>MMM D</default>
+            </property>
+        </properties>
         <onTemplateRender><![CDATA[
 // Match all affected elements and get date div value
 $(target).find('.date').each(function(_idx, dateEl){
@@ -374,7 +380,7 @@ $(target).find('.date').each(function(_idx, dateEl){
 });
         ]]></onTemplateRender>
         <assets>
-            <asset id="weather-date-thumb" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
+            <asset id="weather-date" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-date.png" />
         </assets>
     </template>
 </templates>
diff --git a/modules/templates/global-elements.xml b/modules/templates/global-elements.xml
@@ -198,9 +198,9 @@
                 <title>Date</title>
                 <default></default>
             </property>
-            <property id="dateFormat" type="text">
+            <property id="dateFormat" type="text" variant="dateFormat">
                 <title>Date Format</title>
-                <default>DD/MM/YYYY HH:mm:ss</default>
+                <default>#DATE_FORMAT#</default>
             </property>
             <property id="fontFamily" type="fontSelector">
                 <title>Font Family</title>