From e2bac40b171ae82eeb44f134a19ba4aa6ddf324e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sat, 29 Mar 2014 23:05:46 +0000
Subject: [PATCH] Update range node ui

---
 nodes/core/logic/15-change.html | 11 ++++++++--
 nodes/core/logic/16-range.html  | 39 ++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/nodes/core/logic/15-change.html b/nodes/core/logic/15-change.html
index 9ebefe417..76f0d2736 100644
--- a/nodes/core/logic/15-change.html
+++ b/nodes/core/logic/15-change.html
@@ -59,7 +59,7 @@
         category: 'function',
         defaults: {
             action: {value:"replace",required:true},
-            property: {value:"payload"},
+            property: {value:"payload",required:true},
             from: {value:"",validate: function(v) {
                 if (this.action == "change" && this.reg) {
                     try {
@@ -79,7 +79,14 @@
         outputs: 1,
         icon: "swap.png",
         label: function() {
-            return this.name || this.action || "change";
+            if (this.name) {
+                return this.name;
+            }
+            if (this.action == "replace") {
+                return "set msg."+this.property;
+            } else {
+                return this.action+" msg."+this.property
+            }
         },
         labelStyle: function() {
             return this.name ? "node_label_italic" : "";
diff --git a/nodes/core/logic/16-range.html b/nodes/core/logic/16-range.html
index f6c9c84a8..d7f323776 100644
--- a/nodes/core/logic/16-range.html
+++ b/nodes/core/logic/16-range.html
@@ -16,27 +16,30 @@
 
 <script type="text/x-red" data-template-name="range">
     <div class="form-row">
-        Re-map input values between<br/>
-        <input type="text" id="node-input-minin" placeholder="0" style="width:35%;"/>
-        and
-        <input type="text" id="node-input-maxin" placeholder="99" style="width:35%;"/>
-    </div>
-    <div class="form-row">
-        to be between<br/>
-        <input type="text" id="node-input-minout" placeholder="0" style="width:35%;"/>
-        and
-        <input type="text" id="node-input-maxout" placeholder="255" style="width:35%;"/>
-    </div>
-    <div class="form-row">
-        and <select id="node-input-action" style="width:90%; margin-right:5px;">
-            <option value="scale">try to scale if outside this range</option>
-            <option value="clamp">clamp to max and min values of this range</option>
-            <option value="roll">perform modulus to keep within this range</option>
+        <select id="node-input-action" style="width:90%; margin-right:5px;">
+            <option value="scale">Scale msg.payload</option>
+            <option value="clamp">Scale and limit to the target range</option>
+            <option value="roll">Scale and wrap within the target range</option>
         </select>
     </div>
+    <br/>
     <div class="form-row">
-        <label for="node-input-round" style="width:200px;">Round to nearest integer ?</label>
-        <input type="checkbox" id="node-input-round" style="display: inline-block; width: auto; vertical-align: top;">
+        From the range:
+    </div>
+    <div class="form-row">
+        &nbsp;&nbsp;&nbsp;&nbsp;min: <input type="text" id="node-input-minin" placeholder="0" style="width:100px;"/>
+        &nbsp;&nbsp;max: <input type="text" id="node-input-maxin" placeholder="99" style="width:100px;"/>
+    </div>
+    <div class="form-row">
+        to the range:
+    </div>
+    <div class="form-row">
+        &nbsp;&nbsp;&nbsp;&nbsp;min: <input type="text" id="node-input-minout" placeholder="0" style="width:100px;"/>
+        &nbsp;&nbsp;max: <input type="text" id="node-input-maxout" placeholder="255" style="width:100px;"/>
+    </div>
+    <br/>
+    <div class="form-row">
+        <input type="checkbox" id="node-input-round" style="display: inline-block; width: auto; vertical-align: top;"> <label style="width: auto;" for="node-input-round">Round to nearest integer?</label></input>
     </div>
     <br/>
     <div class="form-row">