From 3d9b3823cc999138f0318369d2e59aa427d5e6e5 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 3 Apr 2020 22:25:35 +0100
Subject: [PATCH] suncalc rearrange sorti of times into time order

to close #633
---
 time/suncalc/79-suncalc.html | 14 +++++++-------
 time/suncalc/package.json    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/time/suncalc/79-suncalc.html b/time/suncalc/79-suncalc.html
index 69feede9..2776a656 100644
--- a/time/suncalc/79-suncalc.html
+++ b/time/suncalc/79-suncalc.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="sunrise">
+<script type="text/html" data-template-name="sunrise">
   <div class="form-row">
     <label for="node-input-lat"><i class="fa fa-globe"></i> Latitude</label>
     <input type="text" id="node-input-lat" placeholder="51.025">
@@ -11,20 +11,20 @@
   <div class="form-row">
     <label for="node-input-start"><i class="fa fa-clock-o"></i> Start</label>
     <select id="node-input-start" style='width:70%'>
+      <option value="nightEnd">Morning astronomical twilight starts</option>
+      <option value="nauticalDawn">Morning nautical twilight starts</option>
+      <option value="dawn">Dawn, morning civil twilight starts</option>
       <option value="sunrise">Sunrise</option>
       <option value="sunriseEnd">Sunrise end</option>
-      <option value="dawn">Dawn, morning civil twilight starts</option>
       <option value="goldenHourEnd">End of morning golden hour</option>
-      <option value="nauticalDawn">Morning nautical twilight starts</option>
-      <option value="nightEnd">Morning astronomical twilight starts</option>
     </select>
   </div>
   <div class="form-row">
     <label for="node-input-end"><i class="fa fa-clock-o"></i> End</label>
     <select id="node-input-end" style='width:70%'>
-      <option value="sunset">Sunset, civil twilight starts</option>
-      <option value="sunsetStart">Sunset start</option>
       <option value="goldenHour">Start of evening golden hour</option>
+      <option value="sunsetStart">Sunset start</option>
+      <option value="sunset">Sunset, civil twilight starts</option>
       <option value="dusk">Dusk, Evening astronomical twilight starts</option>
       <option value="nauticalDusk">Evening nautical twilight starts</option>
       <option value="night">Dark enough for astronomy</option>
@@ -36,7 +36,7 @@
   </div>
 </script>
 
-<script type="text/x-red" data-help-name="sunrise">
+<script type="text/html" data-help-name="sunrise">
     <p>Uses the suncalc module to generate an output at sunrise and sunset based on a specified location.</p>
     <p>Several choices of definition of sunrise and sunset are available, see the <i><a href = "https://github.com/mourner/suncalc" target="_new">suncalc</a></i> module for details.</p>
     <p>The first output emits a <code>msg.payload</code> of <i>1</i> or <i>0</i> every minute depending if in between selected times or not.
diff --git a/time/suncalc/package.json b/time/suncalc/package.json
index d4a3de87..ecb27bcf 100644
--- a/time/suncalc/package.json
+++ b/time/suncalc/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-suncalc",
-    "version"       : "0.0.12",
+    "version"       : "0.1.0",
     "description"   : "A Node-RED node to provide a signal at sunrise and sunset",
     "dependencies"  : {
         "suncalc"   : "^1.8.0"