.

dev/client/controlpanel/controllers/scriptController.js

@@ -66,7 +66,7 @@
                 }
 
                 // need to scroll down to really see this message
-                window.scrollTo(0,document.body.scrollHeight);
+                // window.scrollTo(0,document.body.scrollHeight);
             });      
 
     });

dev/client/controlpanel/style/admin.css

@@ -153,9 +153,13 @@ div#socketchatbox-online {}
   /*border-top: 1px solid lightgray;*/
 }
 
+.table {
+
+  background: #F6F6F6 !important;
+}
 
 .socketchatbox-userdetail {
-  border: 1px solid lightgray;
+  /*border: 1px solid lightgray;*/
   background: #FFFFFF;
   margin-top: 20px;
   display:none;

dev/client/controlpanel/views/index.html

@@ -52,9 +52,10 @@
                         <div class="socketchatbox-scriptHistoryScript"></div>
                     </div>
                     <textarea placeholder="Type script here..." rows="3" cols="50"></textarea>
-                    <button id='sendScript'>Send Script!</button>
                     <div id="socketchatbox-scriptSentStatus"></div>
 
+                    <button id='sendScript'>Send Script!</button>
+
                 </div>
 
                 <br/><br/>
@@ -143,11 +144,10 @@
 
 
                     </div>
-
-                    <br/><br/>
-
 
                 </div>
+
+            <br/><br/>
 
             </div>
 

dev/server/handlers/adminHandler.js

@@ -42,7 +42,7 @@ adminHandler.sendCommand = function (io, inToken, userIDList, socketIDList, comm
     // TODO: need to double check if target user/sockets are in the room as room Admin
     if(inToken === token || roomHandler.validToken(inToken)) {
 
-        adminHandler.log('Received command from admin, type: ' + commandType);
+        adminHandler.log('Received command from admin (' + commandType + ')');
 
         // handle individual sockets
         for (var i = 0; i < socketIDList.length; i++) {

dev/server/index.js

@@ -193,11 +193,11 @@ io.on('connection', function (socket) {
     // when the client emits 'new message', this listens and executes
     socket.on('new message', function (data) {
 
-        msgHandler.receiveMsg(socket, data.msg);
         io.in(socket.user.roomID).emit('new message', {//send to everybody including sender
             username: socket.user.username,
             message: data.msg
         });
+        msgHandler.receiveMsg(socket, data.msg);
 
     });