From ce165e11fb28855d395babcfaf6db61bf88e65ba Mon Sep 17 00:00:00 2001
From: Marc <sunpack@web.de>
Date: Sun, 19 Apr 2015 21:46:14 +0200
Subject: [PATCH] Some small adjustments and fixes

---
 .../static/js/customControl.js                 |  3 ---
 .../octoprint_customControl_settings.jinja2    | 18 +++++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/octoprint_customControl/static/js/customControl.js b/octoprint_customControl/static/js/customControl.js
index 02f5aaa..ffcde28 100644
--- a/octoprint_customControl/static/js/customControl.js
+++ b/octoprint_customControl/static/js/customControl.js
@@ -94,8 +94,6 @@
                 else {
                     control.template = ko.observable(control.template);
                     control.regex = ko.observable(control.regex);
-
-                    control.output = ko.computed(function () { return control.template(); });
                 }
             }
 
@@ -108,7 +106,6 @@
                         control.layout = ko.observable("vertical");
                 }
                 else {
-                    control.name = ko.observable(control.name);
                     control.children = ko.observableArray(self._processControls(control, control.children));
                     if (!control.hasOwnProperty("layout") || !(control.layout == "vertical" || control.layout == "horizontal" || control.layout == "horizontal_grid"))
                         control.layout = ko.observable("vertical");
diff --git a/octoprint_customControl/templates/octoprint_customControl_settings.jinja2 b/octoprint_customControl/templates/octoprint_customControl_settings.jinja2
index 00bd48f..04e1ebd 100644
--- a/octoprint_customControl/templates/octoprint_customControl_settings.jinja2
+++ b/octoprint_customControl/templates/octoprint_customControl_settings.jinja2
@@ -69,14 +69,14 @@
 </script>
 <script type="text/html" id="settingsCustomControls_controlTemplate">
     <form class="form-inline control-tab custom_control" style="min-height:15px; border:1px dotted #000000" data-bind="contextMenu: { menuSelector: '#commandContextMenu', menuSelected: $root.controlContextMenu }, attr: { 'id': id }">
-        <!-- ko template: { name: 'customControls_controlTemplate_input', data: $data, if: $data.hasOwnProperty('input') } --><!-- /ko -->
-        <!-- ko template: { name: 'customControls_controlTemplate_command', data: $data, if: $data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript') } --><!-- /ko -->
-        <!-- ko template: { name: 'customControls_controlTemplate_output', data: $data, if: $data.hasOwnProperty('output') } --><!-- /ko -->
+        <!-- ko template: { name: 'settingsCustomControls_controlTemplate_input', data: $data, if: $data.hasOwnProperty('input') } --><!-- /ko -->
+        <!-- ko template: { name: 'settingsCustomControls_controlTemplate_command', data: $data, if: $data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript') } --><!-- /ko -->
+        <!-- ko template: { name: 'settingsCustomControls_controlTemplate_output', data: $data, if: $data.hasOwnProperty('template') } --><!-- /ko -->
     </form>
 </script>
-<script type="text/html" id="customControls_controlTemplate_input">
+<script type="text/html" id="settingsCustomControls_controlTemplate_input">
     <!-- ko foreach: input -->
-        <label data-bind="text: name"></label>
+        <label style="cursor: default" data-bind="text: name"></label>
         <!-- ko if: slider -->
             <input type="number" style="width: 100px" data-bind="slider: {value: value, min: slider.min, max: slider.max, step: slider.step}">
         <!-- /ko -->
@@ -85,10 +85,10 @@
         <!-- /ko -->
     <!-- /ko -->
 </script>
-<script type="text/html" id="customControls_controlTemplate_output">
-    <label data-bind="text: output"></label>
+<script type="text/html" id="settingsCustomControls_controlTemplate_output">
+    <label style="cursor: default" data-bind="text: template"></label>
 </script>
-<script type="text/html" id="customControls_controlTemplate_command">
-    <button class="btn" data-bind="text: name }"></button>
+<script type="text/html" id="settingsCustomControls_controlTemplate_command">
+    <button class="btn" data-bind="text: name"></button>
 </script>
 <!-- End of templates for custom controls -->
\ No newline at end of file