Skip to content

Commit

Permalink
Removed login.html page. Unused.
Browse files Browse the repository at this point in the history
Added a status for the login screen where we redirect the notices that arrive before the motd and the motd itself.
Adeed css styling for login status message
  • Loading branch information
microp11 committed Mar 29, 2012
1 parent b8235d8 commit fc63f9e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 20 deletions.
6 changes: 6 additions & 0 deletions public/css/irc.css
Expand Up @@ -139,6 +139,12 @@ a {
text-align: center;
color: green;
}
#login-status {
font-size: 0.7em;
margin: 13px -10px -30px -10px;
text-align: left;
color: #500000;
}
#top_section {
padding: 0 151px 0 0;
}
Expand Down
5 changes: 5 additions & 0 deletions public/index.html
Expand Up @@ -23,6 +23,11 @@ <h2>IRC #nodester channel</h2>
<button href="#" class="btn btn-info" id="join"> Join</button>
</form>
</div>
<table id="login-status">
<tr>
<td id="login-status-text"></td>
</tr>
</table>
</div>

<div id="chat_wrapper" class="off">
Expand Down
8 changes: 7 additions & 1 deletion public/js/app.js
Expand Up @@ -13,6 +13,7 @@ $(document).ready(function(){
var chatForm = $('#chat-form');
var joinForm = $('#join-form');
var audio = $('.notification audio').get(0);
var loginStatus = $('#login-status-text');
var doNotReconnect = false; //prohibit reconnect to nodester server after a socket disconnect, no retries
window.counter = 0;
$('#nick').focus();
Expand Down Expand Up @@ -205,6 +206,9 @@ $(document).ready(function(){
case "notice-msg":
if (c.getIrcNoticesEnabled() == true) {
appendMessage(obj.from, obj.message, false);
} else {
//redirect to login screen
loginStatus.text(obj.message);
}
break;
case "message":
Expand All @@ -231,6 +235,8 @@ $(document).ready(function(){
*/
case "motd":
//motd += obj.message + "<br />";
//for the time being as it is not used, redirect to login screen
loginStatus.text(obj.message);
break;
case "endmotd":
//appendEvent(obj.from, obj.messagetype, false);
Expand Down Expand Up @@ -324,7 +330,7 @@ $(document).ready(function(){
return false;
});

/* var colors = {
/* var ocolors = {
'bold' : ['\033[1m', '\033[22m'],
'italic' : ['\033[3m', '\033[23m'],
'underline' : ['\033[4m', '\033[24m'],
Expand Down
19 changes: 0 additions & 19 deletions public/login.html

This file was deleted.

0 comments on commit fc63f9e

Please sign in to comment.