]> git.scottworley.com Git - reliable-chat/commitdiff
projects / reliable-chat / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 79ced6f)
Merge skitch's changes.
authorScott Worley <sworley@chkno.net>
Fri, 3 Aug 2012 01:38:31 +0000 (18:38 -0700)
committerScott Worley <sworley@chkno.net>
Fri, 3 Aug 2012 01:38:31 +0000 (18:38 -0700)
Conflicts:
webclient/rc.html

webclient/rc.html patch | blob | blame | history

diff --git a/webclient/rc.html b/webclient/rc.html
index 8aeae37ce3d43d4de54b0cfcb65bca39488afc50..b3109a92ee387b858891d72a9f2fdf10f0641d0b 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -5,15 +5,59 @@
 <head>
  <title>Reliable Chat</title>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/
-       html, body, #outer-table, #history { width: 99.9%; height: 100%; margin: 0; padding: 0 }
-       #status { background-color: #eef }
+       html, body {
+               width: 99.9%;
+               height: 100%;
+               margin: 0;
+               padding: 0;
+               background-color: #293134;
+               color: silver;
+               font-family: monospace;
+       }
+       #container {
+               height: 100%;
+       }
+       #status {
+               width: 100%;
+               text-align: right;
+               background-color: #293134;
+               padding: 5px 5px 5px 0px;
+       }
+       #client {
+               width: 98.5%;
+               padding: 0px 0px 0px 5px;
+               height: 50px;
+               position: fixed;
+               bottom: 0;
+       }
+       #input {
+               width: 100%;
+               background-color: #293134;
+       }
        #say { width: 100% }
-       #history { vertical-align: bottom }
+       #history {
+               padding: 0px 5px 55px 5px;
+               vertical-align: bottom
+       }
        img { width: 1px; height: 1px; }
        iframe { display: none }
-       #status span { margin-right: 2em }
-       #status span.sad { background-color: #fee }
-       #status span.happy { background-color: #efe }
+       #status span { margin-right: 10px; }
+       #status span.sad {
+               background-color: #f00;
+               color: #fff;
+               border: 1px solid black;
+               border-radius: 5px;
+               padding-left: 5px;
+               padding-right: 5px;
+       }
+       #status span.happy {
+               background-color: #0f0;
+               color: #000;
+               border: 1px solid black;
+               border-radius: 5px;
+               padding-left: 5px;
+               padding-right: 5px;
+       }
   /*]]>*/--></style>
   <script type="text/javascript"><!--//--><![CDATA[//><!--
        var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
@@ -154,6 +198,17 @@
                                message = "<" + rcnick() + "> " + input;
                        }
 
+                       // /me support
+                       var message;
+                       var re = /^\/me (.*)/;
+                       var match = re.exec(input);
+                       var inputme = input.substring(4);
+                       if (match) {
+                               message = "* " + rcnick() + "  " + inputme;
+                       } else {
+                               message = "<" + rcnick() + "> " + input;
+                       }
+
                        // Say the message
                        var d = rcaddmessagetohistory(message);
                        rcsend(d, message);
@@ -169,12 +224,15 @@
 </head>
 
 <body onload="rcconnect()">
-       <table id="outer-table">
-               <tr><td id="history"></td></tr>
-               <tr><td id="status">&nbsp;</td></tr>
-               <tr><td><form name="input" onsubmit="return false" autocomplete="off">
-                       <input id="say" onkeydown="return rckeydown(event)" autocomplete="off"></input>
-                       </form></td></tr>
-       </table>
+       <div id="container">
+               <div id="history"></div>
+               <div id="client">
+                       <div id="input">
+                               <form name="input" onsubmit="return false" autocomplete="off">
+                                       <input id="say" onkeydown="return rckeydown(event)" autocomplete="off" autofocus="autofocus"></input>
+                               </form></div>
+                       <div id="status">&nbsp;</div>
+               </div>
+       </div>
 </body>
 </html>
Reliable Chat