Skip to content

Commit

Permalink
Style updates (started adding channel domain list)
Browse files Browse the repository at this point in the history
  • Loading branch information
blaines committed Jul 13, 2010
1 parent b91ccec commit 73ed4eb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
5 changes: 4 additions & 1 deletion chatlet.css
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,7 @@
#chat_gadget_html { #chat_gadget_html {
background: transparent; background: transparent;
position: relative; position: relative;
z-index: 100000;
} }
#chat_gadget_html td { #chat_gadget_html td {
padding: 0 3px; padding: 0 3px;
Expand All @@ -14,6 +15,8 @@
-moz-border-radius: 1em; -moz-border-radius: 1em;
border-radius: 1em; border-radius: 1em;
background: #EDE9DC; background: #EDE9DC;
background: rgba(193, 192, 166, 0.9);
-webkit-box-shadow: rgba(0, 0, 0, 0.296875) 0px 0px 4px;
} }
#entry { #entry {
width: 80%; width: 80%;
Expand All @@ -33,7 +36,7 @@
max-height: 250px; max-height: 250px;
display: block; display: block;
/* enough padding to clear the toolbar.. is there a better way to do this? */ /* enough padding to clear the toolbar.. is there a better way to do this? */
background: inherit; /* background: inherit;*/
overflow: auto; overflow: auto;
} }
#toggle_sound { #toggle_sound {
Expand Down
2 changes: 1 addition & 1 deletion client.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ who = function() {
jQuery(document).ready(function() { jQuery(document).ready(function() {
TITLE = document.title; TITLE = document.title;
CONFIG.sound = true; CONFIG.sound = true;
jQuery("#chat_gadget_html").html('<div id="chat_gadget_body"><audio id="chatlet_new_message" src="http://dl.dropbox.com/u/1157635/Blow.mp3"></audio><div id="connect"><form action="#"><label for="nick">Name</label><input id="nickInput" class="text"type="text" name="nick" value=""/><input id="connectButton" class="button" type="submit" name="" value="Join"/></form></div><div id="loading"><p>loading</p></div><div id="log"></div><div id="toolbar"><input tabindex="1" type="text" id="entry"/><a id="toggle_sound">toggle sound</a></div>'); jQuery("#chat_gadget_html").html('<div id="chat_gadget_body"><audio id="chatlet_new_message" src="http://dl.dropbox.com/u/1157635/Blow.mp3"></audio><div id="connect"><form action="#"><label for="nick">Name</label><input id="nickInput" class="text"type="text" name="nick" placeholder="type here to chat" value=""/><input id="connectButton" class="button" type="submit" name="" value="Join"/></form></div><div id="loading"><p>loading</p></div><div id="log"></div><div id="toolbar"><input tabindex="1" type="text" id="entry"/><a id="toggle_sound">toggle sound</a></div>');
//submit new messages when the user hits enter if the message isnt blank //submit new messages when the user hits enter if the message isnt blank
jQuery("#entry").keypress(function(e) { jQuery("#entry").keypress(function(e) {
var msg; var msg;
Expand Down
12 changes: 9 additions & 3 deletions server.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Channel.prototype.appendMessage = function(nick, type, text) {
timestamp: new Date().getTime() timestamp: new Date().getTime()
}; };
if (type === "msg") { if (type === "msg") {
sys.puts("<" + nick + ">"); sys.puts("<" + nick + "> "+msg);
} else if (type === "join") { } else if (type === "join") {
sys.puts(nick + " join"); sys.puts(nick + " join");
} else if (type === "part") { } else if (type === "part") {
Expand Down Expand Up @@ -237,5 +237,11 @@ fu.get("/recv", function(req, res) {
rss: mem.rss rss: mem.rss
},callback); },callback);
}); });
sys.puts("GET done"); });
}); // fu.get("/chans", function(req, res) {
// channels
// return res.simpleJSONP(200, {
// messages: messages,
// rss: mem.rss
// },callback);
// });

0 comments on commit 73ed4eb

Please sign in to comment.