"):a.text);typeof a.width=="string"&&b.css("width",a.width);typeof a.min_height=="string"&&b.container.css("min-height",a.min_height);b.pnotify_history=a.history;b.pnotify_hide=a.hide;var h=i.data("pnotify");if(h==null||typeof h!="object")h=[];h=a.stack.push=="top"?d.merge([b],h):d.merge(h,[b]);i.data("pnotify",h);a.stack.push=="top"&&b.pnotify_queue_position(1);a.after_init&&a.after_init(b);if(a.history){var m=i.data("pnotify_history");typeof m=="undefined"&&(m= +d("",{"class":"ui-pnotify-history-container "+f.hi_menu,mouseleave:function(){m.animate({top:"-"+q+"px"},{duration:100,queue:false})}}).append(d("",{"class":"ui-pnotify-history-header",text:"Redisplay"})).append(d("",{"class":"ui-pnotify-history-all "+f.hi_btn,text:"All",mouseenter:function(){d(this).addClass(f.hi_btnhov)},mouseleave:function(){d(this).removeClass(f.hi_btnhov)},click:function(){d.each(h,function(){this.pnotify_history&&(this.is(":visible")?this.pnotify_hide&& +this.pnotify_queue_remove():this.pnotify_display&&this.pnotify_display())});return false}})).append(d("",{"class":"ui-pnotify-history-last "+f.hi_btn,text:"Last",mouseenter:function(){d(this).addClass(f.hi_btnhov)},mouseleave:function(){d(this).removeClass(f.hi_btnhov)},click:function(){var a=-1,b;do{b=a==-1?h.slice(a):h.slice(a,a+1);if(!b[0])break;a--}while(!b[0].pnotify_history||b[0].is(":visible"));if(!b[0])return false;b[0].pnotify_display&&b[0].pnotify_display();return false}})).appendTo(r), +q=d("",{"class":"ui-pnotify-history-pulldown "+f.hi_hnd,mouseenter:function(){m.animate({top:"0"},{duration:100,queue:false})}}).appendTo(m).offset().top+2,m.css({top:"-"+q+"px"}),i.data("pnotify_history",m))}a.stack.animation=false;b.pnotify_display();return b}});var t=/^on/,v=/^(dbl)?click$|^mouse(move|down|up|over|out|enter|leave)$|^contextmenu$/,w=/^(focus|blur|select|change|reset)$|^key(press|down|up)$/,x=/^(scroll|resize|(un)?load|abort|error)$/,n=function(e,g){var a,e=e.toLowerCase(); +document.createEvent&&this.dispatchEvent?(e=e.replace(t,""),e.match(v)?(d(this).offset(),a=document.createEvent("MouseEvents"),a.initMouseEvent(e,g.bubbles,g.cancelable,g.view,g.detail,g.screenX,g.screenY,g.clientX,g.clientY,g.ctrlKey,g.altKey,g.shiftKey,g.metaKey,g.button,g.relatedTarget)):e.match(w)?(a=document.createEvent("UIEvents"),a.initUIEvent(e,g.bubbles,g.cancelable,g.view,g.detail)):e.match(x)&&(a=document.createEvent("HTMLEvents"),a.initEvent(e,g.bubbles,g.cancelable)),a&&this.dispatchEvent(a)): +(e.match(t)||(e="on"+e),a=document.createEventObject(g),this.fireEvent(e,a))};d.pnotify.defaults={title:false,title_escape:false,text:false,text_escape:false,styling:"bootstrap",addclass:"",cornerclass:"",nonblock:false,nonblock_opacity:0.2,history:true,width:"300px",min_height:"16px",type:"notice",icon:true,animation:"fade",animate_speed:"slow",opacity:1,shadow:true,closer:true,closer_hover:true,sticker:true,sticker_hover:true,hide:true,delay:8E3,mouse_reset:true,remove:true,insert_brs:true,stack:{dir1:"down", +dir2:"left",push:"bottom",spacing1:25,spacing2:25}}})(jQuery); diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js index 70a49f9..4b777e8 100644 --- a/octoprint/static/js/ui.js +++ b/octoprint/static/js/ui.js @@ -202,28 +202,6 @@ function PrinterStateViewModel() { } } -function AppearanceViewModel(settingsViewModel) { - var self = this; - - self.name = settingsViewModel.appearance_name; - self.color = settingsViewModel.appearance_color; - - self.brand = ko.computed(function() { - if (self.name()) - return "OctoPrint: " + self.name(); - else - return "OctoPrint"; - }) - - self.title = ko.computed(function() { - if (self.name()) - return self.name() + " [OctoPrint]"; - else - return "OctoPrint"; - }) -} - - function TemperatureViewModel(settingsViewModel) { var self = this; @@ -989,6 +967,8 @@ function SettingsViewModel() { self.temperature_profiles = ko.observableArray(undefined); + self.system_actions = ko.observableArray([]); + self.addTemperatureProfile = function() { self.temperature_profiles.push({name: "New", extruder:0, bed:0}); }; @@ -1030,6 +1010,8 @@ function SettingsViewModel() { self.folder_logs(response.folder.logs); self.temperature_profiles(response.temperature.profiles); + + self.system_actions(response.system.actions); } self.saveData = function() { @@ -1063,6 +1045,9 @@ function SettingsViewModel() { }, "temperature": { "profiles": self.temperature_profiles() + }, + "system": { + "actions": self.system_actions() } } @@ -1081,6 +1066,37 @@ function SettingsViewModel() { } +function NavigationViewModel(appearanceViewModel, settingsViewModel) { + var self = this; + + self.appearance = appearanceViewModel; + self.systemActions = settingsViewModel.system_actions; + + self.triggerAction = function(action) { + var callback = function() { + $.ajax({ + url: AJAX_BASEURL + "system", + type: "POST", + dataType: "json", + data: "action=" + action.action, + success: function() { + $.pnotify({title: "Success", text: "The command \""+ action.name +"\" executed successfully", type: "success"}); + }, + error: function(jqXHR, textStatus, errorThrown) { + $.pnotify({title: "Error", text: "
The command \"" + action.name + "\" could not be executed.
Reason:
" + jqXHR.responseText + "", type: "error"}); + } + }) + } + if (action.confirm) { + $("#confirmation_dialog .confirmation_dialog_message").text(action.confirm); + $("#confirmation_dialog .confirmation_dialog_acknowledge").click(function(e) {e.preventDefault(); $("#confirmation_dialog").modal("hide"); callback(); }); + $("#confirmation_dialog").modal("show"); + } else { + callback(); + } + } +} + function DataUpdater(connectionViewModel, printerStateViewModel, temperatureViewModel, controlsViewModel, speedViewModel, terminalViewModel, gcodeFilesViewModel, webcamViewModel, gcodeViewModel) { var self = this; @@ -1370,6 +1386,27 @@ function ItemListHelper(listType, supportedSorting, supportedFilters, defaultSor self._loadCurrentSortingFromLocalStorage(); } +function AppearanceViewModel(settingsViewModel) { + var self = this; + + self.name = settingsViewModel.appearance_name; + self.color = settingsViewModel.appearance_color; + + self.brand = ko.computed(function() { + if (self.name()) + return "OctoPrint: " + self.name(); + else + return "OctoPrint"; + }) + + self.title = ko.computed(function() { + if (self.name()) + return self.name() + " [OctoPrint]"; + else + return "OctoPrint"; + }) +} + $(function() { //~~ View models @@ -1384,6 +1421,7 @@ $(function() { var gcodeFilesViewModel = new GcodeFilesViewModel(); var webcamViewModel = new WebcamViewModel(); var gcodeViewModel = new GcodeViewModel(); + var navigationViewModel = new NavigationViewModel(appearanceViewModel, settingsViewModel); var dataUpdater = new DataUpdater( connectionViewModel, @@ -1566,7 +1604,7 @@ $(function() { ko.applyBindings(speedViewModel, document.getElementById("speed")); ko.applyBindings(gcodeViewModel, document.getElementById("gcode")); ko.applyBindings(settingsViewModel, document.getElementById("settings_dialog")); - ko.applyBindings(appearanceViewModel, document.getElementById("navbar")); + ko.applyBindings(navigationViewModel, document.getElementById("navbar")); ko.applyBindings(appearanceViewModel, document.getElementsByTagName("head")[0]); var webcamElement = document.getElementById("webcam"); @@ -1597,6 +1635,8 @@ $(function() { } }) + $.pnotify.defaults.history = false; + } ); diff --git a/octoprint/templates/dialogs.html b/octoprint/templates/dialogs.html new file mode 100644 index 0000000..6c95967 --- /dev/null +++ b/octoprint/templates/dialogs.html @@ -0,0 +1,33 @@ +
+
+
+
+
\ No newline at end of file
diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index 3bb10d1..96bdd17 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -9,6 +9,7 @@
+
@@ -26,12 +27,23 @@
+
+
+
+
+
+ Server is offline
++ The server appears to be offline, at least I'm not getting any response from it. I'll try to reconnect + automatically over the next couple of minutes, however you are welcome to try a manual reconnect + anytime using the button below. +
+ +
-
-
 }})
-
-
-
{% include 'settings.html' %}
+ {% include 'dialogs.html' %}
@@ -539,6 +533,7 @@
+
diff --git a/octoprint/templates/settings.html b/octoprint/templates/settings.html
index 9005fce..9e93f1e 100644
--- a/octoprint/templates/settings.html
+++ b/octoprint/templates/settings.html
@@ -1,6 +1,6 @@
-
-
-
-
-
- Server is offline
-- The server appears to be offline, at least I'm not getting any response from it. I'll try to reconnect - automatically over the next couple of minutes, however you are welcome to try a manual reconnect - anytime using the button below. -
- -