From 650df247611fe83ab1b6c4e2035f42d410ce4e02 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Mon, 6 Nov 2017 14:27:02 -0800
Subject: [PATCH 1/4] Improved Haze UI in Create menu

---
 scripts/system/html/entityProperties.html | 46 +++++++++++++----------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index e7d4aed3fb..7fdeee67d3 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -555,20 +555,21 @@
                 </form>
                 <fieldset class="zone-group zone-section haze-section property gen fstuple">
                     <div class="tuple">
-                        <div><label>Range<span class="unit">m</span></label><input type="number" id="property-zone-haze-range" min="5" max="10000" step="5"></div>
+                        <div>
+                              <label>Range<span class="unit">m</span></label>
+                              <input type="number" id="property-zone-haze-range" min="5" max="10000" step="5"><
+                        /div>
                     </div>
                 </fieldset>
-                <fieldset class="zone-group zone-section haze-section property rgb fstuple">
                     <div class="zone-group zone-section haze-section property checkbox">
                         <input type="checkbox" id="property-zone-haze-altitude-effect">
                         <label for="property-zone-haze-altitude-effect">Use Altitude</label>
                     </div>
-                    <fieldset class="zone-group zone-section haze-section property gen fstuple">
-                      <div class="tuple">
-                          <div><label>Base<span class="unit">m</span></label><input type="number" id="property-zone-haze-base" min="-1000" max="1000" step="10"></div>
-                          <div><label>Ceiling<span class="unit">m</span></label><input type="number" id="property-zone-haze-ceiling" min="-1000" max="5000" step="10"></div>
-                      </div>
-                    </fieldset>
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                  <div class="tuple">
+                      <div><label>Base<span class="unit">m</span></label><input type="number" id="property-zone-haze-base" min="-1000" max="1000" step="10"></div>
+                      <div><label>Ceiling<span class="unit">m</span></label><input type="number" id="property-zone-haze-ceiling" min="-1000" max="5000" step="10"></div>
+                  </div>
                 </fieldset>
                 <fieldset class="zone-group zone-section haze-section property rgb fstuple">
                     <div class="color-picker" id="property-zone-haze-color"></div>
@@ -582,6 +583,15 @@
                           <label for="property-zone-haze-blend-in-color-blue">Blue:</label></div>
                     </div>
                 </fieldset>
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                    <div class="tuple">
+                        <div>
+                            <br>
+                            <label>Background Blend<span class="unit"></span></label>
+                            <input type="number" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01">
+                        </div>
+                    </div>
+                </fieldset>
                 <div class="zone-group zone-section haze-section property checkbox">
                     <input type="checkbox" id="property-zone-haze-enable-light-blend">
                     <label for="property-zone-haze-enable-light-blend">Enable Glare</label>
@@ -600,20 +610,18 @@
                 </fieldset>
                 <fieldset class="zone-group zone-section haze-section property gen fstuple">
                     <div class="tuple">
-                        <div><label>Glare Angle<span class="unit">deg</span></label><input type="number" id="property-zone-haze-blend-angle" min="0" max="180" step="1"></div>
-                    </div>
-                 </fieldset>
-                <fieldset class="zone-group zone-section haze-section property gen fstuple">
-                    <div>
-                        <label>Background Blend</label>
-                        <input type="number" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01">
+                        <div>
+                            <br>
+                            <label>Glare Angle<span class="unit">deg</span></label>
+                            <input type="number" id="property-zone-haze-blend-angle" min="0" max="180" step="1">
+                        </div>
                     </div>
                 </fieldset>
+                <div class="zone-group zone-section haze-section property checkbox">
+                    <input type="checkbox" id="property-zone-haze-attenuate-keylight">
+                    <label for="property-zone-haze-attenuate-keylight">Attenuate Keylight</label>
+                </div>
                 <fieldset class="zone-group zone-section haze-section property gen fstuple">
-                    <div class="zone-group zone-section haze-section property checkbox">
-                        <input type="checkbox" id="property-zone-haze-attenuate-keylight">
-                        <label for="property-zone-haze-attenuate-keylight">Attenuate Keylight</label>
-                    </div>
                     <div class="tuple">
                         <div><label>Range<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-range" 
                         min="5" max="1000000" step="5"></div>

From c1b5d009934ba5f8529807abd4bf2d5e96b58547 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 8 Nov 2017 15:41:24 -0800
Subject: [PATCH 2/4] Converted 'Background Blend' control to a slider.

---
 scripts/system/html/entityProperties.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 7fdeee67d3..0b96b59ddb 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -587,8 +587,8 @@
                     <div class="tuple">
                         <div>
                             <br>
-                            <label>Background Blend<span class="unit"></span></label>
-                            <input type="number" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01">
+                            <span style="padding-right: 1em"><label>Background Blend</label></span>
+                            <input type="range" class="slider" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01" value="0.0">
                         </div>
                     </div>
                 </fieldset>

From 5c7ebc0af3151e3fe93117f39565fc30751b0b89 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 8 Nov 2017 16:44:05 -0800
Subject: [PATCH 3/4] Converted 'Glare Angle' control to a slider.

---
 scripts/system/html/entityProperties.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 0b96b59ddb..dba6b7e792 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -587,8 +587,11 @@
                     <div class="tuple">
                         <div>
                             <br>
-                            <span style="padding-right: 1em"><label>Background Blend</label></span>
-                            <input type="range" class="slider" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01" value="0.0">
+                                <table>
+                                    <td><label>Background Blend&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0.0</label></td>
+                                    <td><input type="range" class="slider" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01" value="0.0"></td>
+                                    <td><label>1.0</label></td>
+                                </table>
                         </div>
                     </div>
                 </fieldset>
@@ -612,8 +615,11 @@
                     <div class="tuple">
                         <div>
                             <br>
-                            <label>Glare Angle<span class="unit">deg</span></label>
-                            <input type="number" id="property-zone-haze-blend-angle" min="0" max="180" step="1">
+                            <table>
+                                <td><label>Glare Angle&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0</label></td>
+                                <td><input type="range" class="slider" id="property-zone-haze-blend-angle" min="0" max="180" step="1"></td>
+                                <td><label>180</label>
+                            </table>
                         </div>
                     </div>
                 </fieldset>

From 7cb9514feb96eb5440f42001009f17a040cd58f3 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 8 Nov 2017 16:50:44 -0800
Subject: [PATCH 4/4] Converted 'Glare Angle' control to a slider.

---
 scripts/system/html/entityProperties.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index dba6b7e792..9453b476ee 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -557,8 +557,8 @@
                     <div class="tuple">
                         <div>
                               <label>Range<span class="unit">m</span></label>
-                              <input type="number" id="property-zone-haze-range" min="5" max="10000" step="5"><
-                        /div>
+                              <input type="number" id="property-zone-haze-range" min="5" max="10000" step="5">
+                        </div>
                     </div>
                 </fieldset>
                     <div class="zone-group zone-section haze-section property checkbox">