Merge branch 'master' of https://github.com/krebscode/painload

5 files changed, 11 insertions, 9 deletions

diff --git a/cholerab/bling/krebs-v2_320x240.png b/cholerab/bling/krebs-v2_320x240.png
deleted file mode 100644
index cae1e835..00000000
--- a/cholerab/bling/krebs-v2_320x240.png
+++ /dev/null
diff --git a/webchat/hello_web.js b/webchat/hello_web.js
index e1f8f312..aa580652 100644
--- a/webchat/hello_web.js
+++ b/webchat/hello_web.js
@@ -3,7 +3,6 @@ var http = require('https');
 var sockjs = require('sockjs');
 var connect = require('connect');
 var irc = require('irc');
-var krebsimage = require('./krebs-img.js');
 var Clients = [];
 Clients.broadcast = function(object) {
   Clients.forEach(function(client) {
@@ -59,7 +58,7 @@ conn.write(JSON.stringify({from: 'system', message: 'hello'}))
       var object = JSON.parse(message);
       object.from = name
     console.log(object.message);
-  irc_client.say("#krebs", name + '→' + object.message);
+  irc_client.say("#krebs", name + ' → ' + object.message);
   Clients.broadcast(object);
 
     } catch (error) {
@@ -88,10 +87,11 @@ var app = connect()
     res.write('<script src="sockjs-0.3.min.js"></script>');
     res.write('<script src="jquery-2.0.3.min.js"></script>');
     res.write('<script src="client.js"></script>');
-    res.write(krebsimage+'<br>');
+    res.write('<div id=bg>');
     res.write('hello, this is #krebs:<br>');
     res.write('<table id="chatbox"></table>');
     res.end('<input type="text" id="input"><br>');
+    res.write('</div>');
 
   })
 var server = http.createServer(options, app);
diff --git a/webchat/krebs-img.js b/webchat/krebs-img.js
deleted file mode 100644
index b7be37da..00000000
--- a/webchat/krebs-img.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports='<img src="data:image/png; charset=unknown;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAADwCAYAAABxLb1rAAAAAXNSR0IArs4c6QAAAAZiS0dEAAAAAAB/OfnX0gAAAAlwSFlzAAA9hAAAPYQB1ayvdAAAAAd0SU1FB9sIFBYiEPmIRMMAAAQ6SURBVHja7dwxaxRBGIDhb+Jx2ptGkSNEOLFQgvXV1oLYGbA48D+kyfwNIb3/wTqktNAiGDDIFSGF9iYqY2OlR9Ts3t1k93n6DDvf7r3OWmyK2C0B0ENrXdjEZnpR3TWN03NPFx007NRuBnVcRm7018elvms6cq6mSrmSNdpe63LrrHkggFWZxIFXYAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBATQCAABXJGH6Zm7AEswiceG8JsGX4TOrVzAO19OXrLc4Wuxt4vse/i9AgMIICCARgAIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACAggggAACCNADg8v/aW7xMrI7sTS5w/fM3i4yStOYlTtV7epL3LyqAezqw0/fbaZPcVw2OrevWdlr6XfS3m/t0CswgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCAggMAvg/hhCAII0PV/7OiZ7Fr+4qh4SpwAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBgUSr5IGpuYY1hROw0XmUSB7EfbxqvM0rTmPmwJtVp/lu7Hg/iLJ42Xud++hCH5bUTYDvOW1mljfhFRMzKXoUzGvr9L8mjeNLZvZ3F+1bWWXX8KjoBspxTMsvyNrYiYsu9r5z/AwQEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABlsYXof+QjQDPpBMggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAKdM4mDKq4jRewWt6N2w4jYMYbeykbgBNhn50YAAggggAACCCCAAAIIIIAAAggggAACCCCAgAACCCCAAAIIIIAAAggggAACXGU+iT/H7fQyTsotg4C5shNgl52UV4YAXoEBBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEGABBkawSNne7Mv+nAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAALzZK08ZrrMepQULlfBF6jlnZa7zGZ2P8B7ny9cxcAHt3c7O9UVlssufRKzBNjNNHQwAB7Kfvcc0QQAABBBAQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEBAAAEEEKA/BkawOOO0HUflrkHQUK5kDSdA/sON+GoIIID99M0BGwQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBHB1Dsu9aq7luGy0ut56nDZeY5y2PSRLMkpTQ5gjRewWYwCcAAF65Cczj2SzJnZVUQAAAABJRU5ErkJggg==">'
-
-function secretfunc(){
-  return("you will never use me");
-}
-console.log("haha, im a require text message");
diff --git a/webchat/public/krebs.png b/webchat/public/krebs.png
new file mode 100644
index 00000000..263d5b1c
--- /dev/null
+++ b/webchat/public/krebs.png
diff --git a/webchat/public/reset.css b/webchat/public/reset.css
index 746b81c4..46b52478 100644
--- a/webchat/public/reset.css
+++ b/webchat/public/reset.css
@@ -58,3 +58,11 @@ q:before, q:after {
 .chat_from:after {
   content: ":";
 }
+#bg {
+  background-image: url(krebs.png);
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}