- Merge with edhelas

app/widgets/Chat/Chat.php

@@ -147,7 +147,7 @@ class Chat extends WidgetCommon
         RPC::call('MovimTpl.scrollPanel');
         RPC::call('MovimTpl.showPanel');
 
-        $this->prepareMessages($room);
+        $this->prepareMessages($room, true);
     }
 
     /**

app/widgets/Chat/_chat.tpl

@@ -10,7 +10,7 @@
             <span class="icon gray emojis_open" onclick="Chat_ajaxSmiley()">
                 {$c->ajaxSmileyGet('😃')}
             </span>
-            <div class="action" onclick="{$send}">
+            <div class="action" onclick="Chat.sendMessage('{$jid}', {if="$muc"}true{else}false{/if})">
                 <i class="md md-send"></i>
             </div>
             <form>

app/widgets/Chat/_chat_header.tpl

@@ -1,6 +1,13 @@
 <div>
+    <ul class="active">
+        <li onclick="Rooms_ajaxAdd()">
+            <span class="icon">
+                <i class="md md-group-add"></i>
+            </span>
+        </li>
+    </ul>
     <span class="on_desktop icon"><i class="md md-forum"></i></span>
-    <h2>{$c->__('page.chats')}</h2>
+    <h2 class="r1">{$c->__('page.chats')}</h2>
 </div>
 <div>
     <ul class="active">

app/widgets/Chat/_chat_header_room.tpl

@@ -1,6 +1,13 @@
 <div>
+    <ul class="active">
+        <li onclick="Rooms_ajaxAdd()">
+            <span class="icon">
+                <i class="md md-group-add"></i>
+            </span>
+        </li>
+    </ul>
     <span class="on_desktop icon"><i class="md md-forum"></i></span>
-    <h2>{$c->__('page.chats')}</h2>
+    <h2 class="r1">{$c->__('page.chats')}</h2>
 </div>
 <div>
     <ul class="active">

app/widgets/Chat/chat.js

@@ -56,7 +56,6 @@ var Chat = {
             id = message.jidfrom + '_conversation';
             bubble.querySelector('div').innerHTML = message.body;
             bubble.querySelector('span.info').innerHTML = message.published;
-            console.log(message.color);
             bubble.querySelector('span.user').className = 'user ' + message.color;
             bubble.querySelector('span.user').innerHTML = message.resource;
         } else {
@@ -72,15 +71,6 @@ var Chat = {
             bubble.querySelector('div.bubble span.info').innerHTML = message.published;
         }
 
-        /*
-        bubble.querySelector('div.bubble div').innerHTML = message.body;
-        if(message.type == 'groupchat') {
-            bubble.querySelector('div.bubble div').innerHTML = '<b>' + message.resource + '</b>: ' + message.body;
-            bubble.querySelector('div.bubble').className = 'bubble room';
-        } else {
-            
-        }*/
-
         movim_append(id, bubble.outerHTML);
 
         MovimTpl.scrollPanel();

app/widgets/Post/_post_create.tpl

@@ -1,4 +1,4 @@
-<form name="post" class="padded_right">
+<form name="post" class="padded_top_bottom">
     <input type="hidden" name="to" value="{$to}">
     <input type="hidden" name="node" value="urn:xmpp:microblog:0">
     <div>

composer.json

@@ -20,6 +20,7 @@
         "cboden/ratchet": "0.3.*",
         "react/child-process": "0.5.*@dev",
         "ratchet/pawl": "dev-master",
+        "react/socket-client": "0.4.*@dev",
 
         "forxer/Gravatar": "~1.2",
         "respect/validation": "0.8.*"

linker.php

@@ -45,7 +45,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
     
     $conn->on('message', function($message) use ($conn, $loop) {
         if($message != '') {
-            fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
+            #fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
 
             if($message == '</stream:stream>') {
                 $conn->close();
@@ -76,7 +76,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
             }
 
             if(!empty($xml)) {
-                fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
+                #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
                 $conn->send(trim($xml));
             }
         }
@@ -118,7 +118,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
                 \Moxl\API::clear();
                 
                 if(!empty($xml)) {
-                    fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
+                    #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
                     $conn->send(trim($xml));
                 }
 

themes/material/css/style.css

@@ -771,6 +771,11 @@ dl dd {
         padding-right: 2rem;
         box-sizing: border-box;
     }
+
+    .padded_top_bottom {
+        padding: 0 2rem;
+        box-sizing: border-box;        
+    }
 }
 
 /* Divided */