warden/rlgwebd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RLG-Web client: improvements to UI messages.

Browse source 
Improve the appearance of the message area, make warnings a different
color from other messages, and make some message texts more helpful.
This commit is contained in:
John "Elwin" Edwards 2012-07-11 11:10:50 -07:00
parent 16df3d2a7a
commit 3dc15a18e7
2 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rlgterm.js
View file

@ -262,7 +262,7 @@ function postResponseHandler() {
function errHandler() { function errHandler() {
//debug(1, "Server unavailable?"); //debug(1, "Server unavailable?");
message("Unable to connect to the server."); message("Unable to connect to the server.", "warn");
} }
function sendback(str) { function sendback(str) {
@ -450,7 +450,14 @@ function formlogin(ev) {
} }
else if (reply.t == 'E') { else if (reply.t == 'E') {
debug(0, "Could not log in: " + reply.s); debug(0, "Could not log in: " + reply.s);
message("Logging in failed: " + reply.s); var failmsg = "Logging in failed. ";
if (reply.c == 2)
failmsg += reply.s.match(/Invalid data: (.*)/)[1];
else if (reply.c == 3)
failmsg += "The username or password was incorrect.";
else if (reply.c == 6)
failmsg += "The server is shutting down.";
message(failmsg, "warn");
document.getElementById("input_name").value = ""; document.getElementById("input_name").value = "";
document.getElementById("input_pw").value = ""; document.getElementById("input_pw").value = "";
} }
@ -630,18 +637,18 @@ function startgame(game) {
debug(1, "Could not start game: " + reply.s); debug(1, "Could not start game: " + reply.s);
if (reply.c == 1) { if (reply.c == 1) {
logout(); logout();
message("The server forgot about you, please log in again."); message("The server forgot about you, please log in again.", "warn");
} }
else if (reply.c == 4) { else if (reply.c == 4) {
message("You can't play that game because it is currently being " + message("You can't play that game because it is currently being " +
"played over SSH."); "played over SSH.", "warn");
} }
else if (reply.c == 7) { else if (reply.c == 7) {
message("The game is being saved, try again in a few seconds."); message("The game is being saved, try again in a few seconds.");
} }
else { else {
message("The server says it can't start your game because \"" + message("The server says it can't start your game because \"" +
reply.s + "\". This is probably a bug."); reply.s + "\". This is probably a bug.", "warn");
} }
} }
}; };
@ -676,7 +683,7 @@ function startwatching(gamenumber) {
} }
else if (reply.t == 'E') { else if (reply.t == 'E') {
debug(1, "Could not watch game " + gamenumber + ": " + reply.s); debug(1, "Could not watch game " + gamenumber + ": " + reply.s);
message("The game could not be watched: " + reply.s); message("The game could not be watched: " + reply.s, "warn");
getcurrent(); getcurrent();
} }
}; };
@ -736,7 +743,7 @@ function formreg(ev) {
} }
else else
failmsg += " This is probably a bug."; failmsg += " This is probably a bug.";
message(failmsg); message(failmsg, "warn");
document.getElementById("regin_name").value = ""; document.getElementById("regin_name").value = "";
document.getElementById("regin_pw").value = ""; document.getElementById("regin_pw").value = "";
document.getElementById("regin_email").value = ""; document.getElementById("regin_email").value = "";
@ -848,10 +855,13 @@ function toggleBlock(id) {
element.style.display = "none"; element.style.display = "none";
} }
function message(msg, type) { function message(msg, mtype) {
var msgdiv = document.createElement("div"); var msgdiv = document.createElement("div");
var msgtext = document.createTextNode(msg); var msgtext = document.createTextNode(msg);
msgdiv.appendChild(msgtext); msgdiv.appendChild(msgtext);
if (mtype) {
msgdiv.className = mtype;
}
var msgcontainer = document.getElementById("messages"); var msgcontainer = document.getElementById("messages");
msgcontainer.insertBefore(msgdiv, msgcontainer.firstChild); msgcontainer.insertBefore(msgdiv, msgcontainer.firstChild);
} }

6
style-rlg.css
View file

@ -83,7 +83,7 @@ div#keys {
div#messages { div#messages {
width: 100%; width: 100%;
max-height: 10em; max-height: 10em;
overflow: scroll; overflow-y: auto;
clear: both; clear: both;
} }
@ -97,6 +97,10 @@ div#messages > div:first-child {
font-weight: bold; font-weight: bold;
} }
div#messages > div.warn {
background-color: #F0F0C0;
}
div#debug { div#debug {
display: none; display: none;
} }