diff --git a/js/Message.js b/js/Message.js
index cf061db..1856bf7 100644
--- a/js/Message.js
+++ b/js/Message.js
@@ -7,38 +7,38 @@
*/
function Message() {
-
+
Message.ERROR = "error";
Message.WARNING = "warning";
Message.NOTICE = "notice";
Message.INFO = "info";
-
+
this.mode = "";
-
+
this.$element;
-
+
var self = this;
var autoHideDelay = 5000;
var autohideTimeout;
-
+
this.init = function($element) {
this.$element = $element;
}
- this.set = function(text,mode,autoHide,disableEffect) {
- console.log("Message:set: ",text,mode,autoHide,disableEffect);
+ this.set = function(contents,mode,autoHide,disableEffect) {
+ console.log("Message:set: ",contents,mode,autoHide,disableEffect);
if(disableEffect) {
- self.fill(text,mode,autoHide)
+ self.fill(contents,mode,autoHide)
} else{
self.hide(function() {
self.show();
- self.fill(text,mode,autoHide)
+ self.fill(contents,mode,autoHide)
});
}
}
- this.fill = function(text,mode,autoHide) {
+ this.fill = function(contents,mode,autoHide) {
//console.log("Message:fill: ",text,mode,autoHide);
self.clear();
- self.$element.text(text);
+ self.$element.html(contents);
self.$element.addClass(mode);
self.mode = mode;
clearTimeout(autohideTimeout);
@@ -47,10 +47,10 @@ function Message() {
}
}
this.clear = function($element) {
- this.$element.text("");
+ this.$element.html("");
this.$element.removeClass(this.mode);
}
-
+
this.show = function() {
this.$element.fadeIn(200);
}
diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js
index bbb0532..0b5541e 100644
--- a/js/buttonbehaviors.js
+++ b/js/buttonbehaviors.js
@@ -431,11 +431,11 @@ function setState(newState,newHasControl) {
} else if(newState == Printer.DISCONNECTED_STATE) {
message.set("Printer disconnected",Message.WARNING,true);
} else if(newState == Printer.CONNECTING_STATE) {
- message.set("Printer connecting",Message.INFO,false);
+ message.set("Printer connecting...",Message.INFO,false);
if (prevState != Printer.CONNECTING_STATE) { //enable 'watchdog' if we entered from a different state
clearTimeout(connectingHintDelay);
connectingHintDelay = setTimeout(function() {
- message.set("Printer still not connected, did you select the correct type?", Message.WARNING, false);
+ message.set("Printer still not connected, did you
select the correct printer type?", Message.WARNING, false);
connectingHintDelay = null;
}, connectingHintDelayTime);
}
diff --git a/less/message.less b/less/message.less
index e66f1fa..c374aad 100644
--- a/less/message.less
+++ b/less/message.less
@@ -1,5 +1,6 @@
#message {
position: absolute;
+ text-align: right;
top: 0;
right: 0;
@@ -14,7 +15,7 @@
white-space:nowrap;
//z-index: 5;
-
+
display:none;
&.error {
diff --git a/www/index.html b/www/index.html
index dd3be8f..cab8fab 100644
--- a/www/index.html
+++ b/www/index.html
@@ -7,11 +7,11 @@
-
+
-
+
@@ -39,7 +39,7 @@