From f7334ef65fb759ff89ecec04838c6b3ba524196e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Sat, 13 Apr 2013 22:26:23 +0200
Subject: [PATCH] Fixed some merge bugs

---
 octoprint/static/js/ui.js        | 24 ++++++++++--------------
 octoprint/templates/index.jinja2 |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 8c187f4..2ccb7be 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -298,11 +298,7 @@ function PrinterStateViewModel(loginStateViewModel) {
 
     self.print = function() {
         var printAction = function() {
-            $.ajax({
-                url: AJAX_BASEURL + "control/print",
-                type: "POST",
-                dataType: "json"
-            });
+            self._jobCommand("start");
         }
 
         if (self.isPaused()) {
@@ -316,19 +312,19 @@ function PrinterStateViewModel(loginStateViewModel) {
     }
 
     self.pause = function() {
-        $("#job_pause").button("toggle");
-        $.ajax({
-            url: AJAX_BASEURL + "control/pause",
-            type: "POST",
-            dataType: "json"
-        });
+        self._jobCommand("pause");
     }
 
     self.cancel = function() {
+        self._jobCommand("cancel");
+    }
+
+    self._jobCommand = function(command) {
         $.ajax({
-            url: AJAX_BASEURL + "control/cancel",
+            url: AJAX_BASEURL + "control/job",
             type: "POST",
-            dataType: "json"
+            dataType: "json",
+            data: {command: command}
         });
     }
 }
@@ -1733,7 +1729,7 @@ $(function() {
         var settingsViewModel = new SettingsViewModel(loginStateViewModel, usersViewModel);
         var appearanceViewModel = new AppearanceViewModel(settingsViewModel);
         var temperatureViewModel = new TemperatureViewModel(loginStateViewModel, settingsViewModel);
-        var controlViewModel = new ControlsViewModel(loginStateViewModel);
+        var controlViewModel = new ControlViewModel(loginStateViewModel);
         var terminalViewModel = new TerminalViewModel(loginStateViewModel);
         var gcodeFilesViewModel = new GcodeFilesViewModel(loginStateViewModel);
         var timelapseViewModel = new TimelapseViewModel(loginStateViewModel);
diff --git a/octoprint/templates/index.jinja2 b/octoprint/templates/index.jinja2
index d021562..df10b19 100644
--- a/octoprint/templates/index.jinja2
+++ b/octoprint/templates/index.jinja2
@@ -119,7 +119,7 @@
                                     <div class="bar" id="job_progressBar" data-bind="style: { width: progress() + '%' }"></div>
                                 </div>
 
-                                <div class="row-fluid print-control">
+                                <div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
                                     <button class="btn btn-primary span4" data-bind="click: print, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), css: {'btn-danger': isPaused()}" id="job_print"><i class="icon-white" data-bind="css: {'icon-print': !isPaused(), 'icon-undo': isPaused()}"></i> <span data-bind="text: (isPaused() ? 'Restart' : 'Print')">Print</span></button>
                                     <button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}"><i class="icon-pause"></i> <span>Pause</span></button>
                                     <button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()"><i class="icon-stop"></i> Cancel</button>