diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 index 052961df..006d0938 100644 --- a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 +++ b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 @@ -22,7 +22,7 @@

The Snapshot URL is the URL OctoPrint uses to fetch single images from the webcam for creating timelapse recordings. This needs to be - reachable from the OctoPrint server. + a fully qualified URL reachable from the OctoPrint server.

{% endtrans %}
diff --git a/src/octoprint/plugins/cura/templates/snippets/cura_engine.jinja2 b/src/octoprint/plugins/cura/templates/snippets/cura_engine.jinja2 index b05802a1..0c668b92 100644 --- a/src/octoprint/plugins/cura/templates/snippets/cura_engine.jinja2 +++ b/src/octoprint/plugins/cura/templates/snippets/cura_engine.jinja2 @@ -3,8 +3,8 @@
- - + +
diff --git a/src/octoprint/static/js/app/helpers.js b/src/octoprint/static/js/app/helpers.js index 5759670f..2652d601 100644 --- a/src/octoprint/static/js/app/helpers.js +++ b/src/octoprint/static/js/app/helpers.js @@ -446,6 +446,8 @@ function showMessageDialog(msg, options) { var message = options.message || ""; var close = options.close || gettext("Close"); var onclose = options.onclose || undefined; + var onshow = options.onshow || undefined; + var onshown = options.onshown || undefined; if (_.isString(message)) { message = $("

" + message + "

"); @@ -467,6 +469,14 @@ function showMessageDialog(msg, options) { } }); + if (onshow) { + modal.on("show", onshow); + } + + if (onshown) { + modal.on("shown", onshown); + } + modal.modal("show"); return modal; } diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js index 25be4dc1..1900e1b1 100644 --- a/src/octoprint/static/js/app/viewmodels/settings.js +++ b/src/octoprint/static/js/app/viewmodels/settings.js @@ -170,6 +170,11 @@ $(function() { self.webcam_ffmpegPathText = ko.observable(); self.webcam_ffmpegPathOk = ko.observable(false); self.webcam_ffmpegPathBroken = ko.observable(false); + self.webcam_ffmpegPathReset = function() { + self.webcam_ffmpegPathText(""); + self.webcam_ffmpegPathOk(false); + self.webcam_ffmpegPathBroken(false); + }; self.addTemperatureProfile = function() { self.temperature_profiles.push({name: "New", extruder:0, bed:0}); @@ -193,9 +198,13 @@ $(function() { } var text = gettext("If you see your webcam stream below, the entered stream URL is ok."); + var image = $(''); + var message = $("

") + .append(text) + .append(image); showMessageDialog({ title: gettext("Stream test"), - message: '

' + text + '

' + message: message }); }; @@ -296,6 +305,10 @@ $(function() { self.requestData(); }; + self.onSettingsHidden = function() { + self.webcam_ffmpegPathReset(); + }; + self.isDialogActive = function() { return self.settingsDialog.is(":visible"); }; diff --git a/src/octoprint/templates/dialogs/_snippets/configureffmpeg.jinja2 b/src/octoprint/templates/dialogs/_snippets/configureffmpeg.jinja2 index b2eb4136..14375942 100644 --- a/src/octoprint/templates/dialogs/_snippets/configureffmpeg.jinja2 +++ b/src/octoprint/templates/dialogs/_snippets/configureffmpeg.jinja2 @@ -1,10 +1,10 @@ -
+
- +
- +
diff --git a/src/octoprint/templates/dialogs/_snippets/configurewebcamurls.jinja2 b/src/octoprint/templates/dialogs/_snippets/configurewebcamurls.jinja2 index ab963a11..c2ca6c01 100644 --- a/src/octoprint/templates/dialogs/_snippets/configurewebcamurls.jinja2 +++ b/src/octoprint/templates/dialogs/_snippets/configurewebcamurls.jinja2 @@ -2,7 +2,7 @@
- +
@@ -11,7 +11,7 @@
- +