From 7f5d45efdcee60b3d66deb4a174ddbf3df857aac Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Sat, 11 Jul 2015 16:54:52 +0200
Subject: [PATCH] fixed confirmation dialog.

---
 src/octoprint/static/js/app/viewmodels/control.js      | 10 +++-------
 src/octoprint/static/js/app/viewmodels/printerstate.js |  3 +--
 src/octoprint/static/js/app/viewmodels/terminal.js     | 10 ++++++++--
 src/octoprint/templates/dialogs/confirmation.jinja2    |  1 +
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index e4bc53a7..2bc3b5ed 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -631,19 +631,15 @@ $(function() {
 		self.jogDistanceInMM = ko.observable(undefined);
 
 		self.focus_on = function () {
-
-			$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now be enabled. Protect yourself and everybody in the room appropriately before proceeding!"));
-			$("#confirmation_dialog .confirmation_dialog_acknowledge").unbind("click");
-			$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
-					function (e) {
+			var callback = function (e) {
 						e.preventDefault();
 						$("#confirmation_dialog").modal("hide");
 						self.sendCustomCommand({type: 'commands', commands: ['M8', 'M3S10']});
 						setTimeout(function () { // switch focus off after 30 seconds for safety reasons.
 							self.focus_off();
 						}, 30000);
-					});
-			$("#confirmation_dialog").modal("show");
+					};
+			self.printerState.show_safety_glasses_warning(callback);
 		};
 
 		self.focus_off = function () {
diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js
index 7a6da552..2cac8c1e 100644
--- a/src/octoprint/static/js/app/viewmodels/printerstate.js
+++ b/src/octoprint/static/js/app/viewmodels/printerstate.js
@@ -190,7 +190,7 @@ $(function() {
 
 
 		self.show_safety_glasses_warning = function (callback) {
-			$('#confirmation_dialog .confirmation_dialog_message').html();
+			$('#confirmation_dialog .confirmation_dialog_message div').remove();
 			jQuery('<div/>', {
 				class: "safety_glasses_heads_up"
 			}).appendTo("#confirmation_dialog .confirmation_dialog_message");
@@ -198,7 +198,6 @@ $(function() {
 				class: "safety_glasses_warning",
 				text: gettext("The laser will now start. Protect yourself and everybody in the room appropriately before proceeding!")
 			}).appendTo("#confirmation_dialog .confirmation_dialog_message");
-			//$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now start. Protect yourself and everybody in the room appropriately before proceeding!"));
 			$("#confirmation_dialog .confirmation_dialog_acknowledge").unbind("click");
 			$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
 					function (e) {
diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js
index 3ccca333..45a3a254 100644
--- a/src/octoprint/static/js/app/viewmodels/terminal.js
+++ b/src/octoprint/static/js/app/viewmodels/terminal.js
@@ -245,8 +245,14 @@ $(function() {
 
 			var parts = command.match(/^(M3|M03)(S[0-9.]+)?/i);
 			if (parts !== null) {
-
-				$("#confirmation_dialog .confirmation_dialog_message").text(gettext("The laser will now be enabled. Protect yourself and everybody in the room appropriately before proceeding!"));
+				$('#confirmation_dialog .confirmation_dialog_message div').remove();
+				jQuery('<div/>', {
+					class: "safety_glasses_heads_up"
+				}).appendTo("#confirmation_dialog .confirmation_dialog_message");
+				jQuery('<div/>', {
+					class: "safety_glasses_warning",
+					text: gettext("The laser will now start. Protect yourself and everybody in the room appropriately before proceeding!")
+				}).appendTo("#confirmation_dialog .confirmation_dialog_message");
 				$("#confirmation_dialog .confirmation_dialog_acknowledge").unbind("click");
 				$("#confirmation_dialog .confirmation_dialog_acknowledge").click(
 						function (e) {
diff --git a/src/octoprint/templates/dialogs/confirmation.jinja2 b/src/octoprint/templates/dialogs/confirmation.jinja2
index 63395d34..67ed76fe 100644
--- a/src/octoprint/templates/dialogs/confirmation.jinja2
+++ b/src/octoprint/templates/dialogs/confirmation.jinja2
@@ -6,6 +6,7 @@
     <div class="modal-body">
         <p class="confirmation_dialog_message"></p>
         <p>{{ _('Are you sure you want to proceed?') }}</p>
+		<div style="clear:both"></div>
     </div>
     <div class="modal-footer">
         <a href="#" class="btn" data-dismiss="modal" aria-hidden="true">{{ _('Cancel') }}</a>