From 06885309362d2cf228d08fb856452b3c6e647522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Mon, 8 Jan 2018 23:14:25 +0100
Subject: [PATCH] Improve Contact page, reorganistion of the UI and add tabs
 Fix #582

---
 app/views/contact.tpl                         |  3 ++
 app/widgets/ContactDisco/ContactDisco.php     |  7 +--
 app/widgets/ContactDisco/_contactdisco.tpl    | 51 +------------------
 .../ContactDiscoPosts/ContactDiscoPosts.php   | 27 ++++++++++
 .../ContactDiscoPosts/_contactdiscoposts.tpl  | 46 +++++++++++++++++
 .../ContactDiscoPosts/contactdiscoposts.js    |  3 ++
 .../ContactDiscoPosts/contactdiscoposts.tpl   |  1 +
 app/widgets/Roster/_roster_list.tpl           |  3 ++
 app/widgets/Roster/roster.tpl                 |  2 +-
 themes/material/css/block.css                 |  7 ++-
 10 files changed, 92 insertions(+), 58 deletions(-)
 create mode 100644 app/widgets/ContactDiscoPosts/ContactDiscoPosts.php
 create mode 100644 app/widgets/ContactDiscoPosts/_contactdiscoposts.tpl
 create mode 100644 app/widgets/ContactDiscoPosts/contactdiscoposts.js
 create mode 100644 app/widgets/ContactDiscoPosts/contactdiscoposts.tpl

diff --git a/app/views/contact.tpl b/app/views/contact.tpl
index fe3ad43b1..074a8b772 100644
--- a/app/views/contact.tpl
+++ b/app/views/contact.tpl
@@ -18,8 +18,11 @@
                 <?php $this->widget('ContactDisco');?>
             </aside>
             <div>
+                <?php $this->widget('Tabs');?>
+
                 <?php $this->widget('Invitations');?>
                 <?php $this->widget('Roster');?>
+                <?php $this->widget('ContactDiscoPosts');?>
             </div>
         <?php } else { ?>
             <aside>
diff --git a/app/widgets/ContactDisco/ContactDisco.php b/app/widgets/ContactDisco/ContactDisco.php
index d3db43bdd..298bd37ed 100644
--- a/app/widgets/ContactDisco/ContactDisco.php
+++ b/app/widgets/ContactDisco/ContactDisco.php
@@ -16,15 +16,10 @@ class ContactDisco extends \Movim\Widget\Base
     {
         $view = $this->tpl();
 
-        $nd = new \Modl\PostnDAO;
-        $blogs = $nd->getLastBlogPublic(0, 6);
-        $blogs = is_array($blogs) ? $blogs : [];
-
         $cd = new \Modl\ContactDAO;
-        $users = $cd->getAllPublic(0, 16);
+        $users = $cd->getAllPublic(0, 40);
 
         $view->assign('presencestxt', getPresencesTxt());
-        $view->assign('blogs', $blogs);
         $view->assign('users', $users);
 
         return $view->draw('_contactdisco', true);
diff --git a/app/widgets/ContactDisco/_contactdisco.tpl b/app/widgets/ContactDisco/_contactdisco.tpl
index e7c23e630..b45446f06 100644
--- a/app/widgets/ContactDisco/_contactdisco.tpl
+++ b/app/widgets/ContactDisco/_contactdisco.tpl
@@ -1,5 +1,5 @@
 <ul class="list flex active">
-    <li class="subheader">
+    <li class="subheader block large">
         <p>{$c->__('explore.explore')}</p>
     </li>
     {loop="$users"}
@@ -34,52 +34,3 @@
     {/loop}
 </ul>
 
-<ul class="list active middle card shadow">
-    <li class="subheader">
-        <p>{$c->__('post.blog_last')}</p>
-    </li>
-    {loop="$blogs"}
-        {$attachments = $value->getAttachments()}
-        <li class="block" onclick="MovimUtils.redirect('{$c->route('post', [$value->origin, $value->node, $value->nodeid])}')">
-            <span class="primary icon thumb color {$value->getContact()->jid|stringToColor}"
-            {$picture = $value->getPicture()}
-            {if="$picture != null"}
-                style="background-image: url({$picture});"
-            {else}
-                {$url = $value->getContact()->getPhoto('l')}
-                {if="$url"}
-                    style="background-image: url({$url});"
-                {/if}
-            {/if}
-            >
-                {$value->getContact()->getTrueName()|firstLetterCapitalize}
-            </span>
-            <p class="line" {if="isset($value->title)"}title="{$value->title}"{/if}>
-            {if="isset($value->title)"}
-                {$value->title}
-            {else}
-                {$value->node}
-            {/if}
-            </p>
-            <p dir="auto">{$value->getSummary()}</p>
-            <p>
-                <a href="{$c->route('contact', $value->getContact()->jid)}">
-                    {$value->getContact()->getTrueName()}
-                </a>
-
-                {$count = $value->countLikes()}
-                {if="$count > 0"}
-                    {$count} <i class="zmdi zmdi-favorite-outline"></i>
-                {/if}
-
-                {$count = $value->countComments()}
-                {if="$count > 0"}
-                    {$count} <i class="zmdi zmdi-comment-outline"></i>
-                {/if}
-                <span class="info">
-                    {$value->published|strtotime|prepareDate:true,true}
-                </span>
-            </p>
-        </li>
-    {/loop}
-</ul>
diff --git a/app/widgets/ContactDiscoPosts/ContactDiscoPosts.php b/app/widgets/ContactDiscoPosts/ContactDiscoPosts.php
new file mode 100644
index 000000000..7c3bab109
--- /dev/null
+++ b/app/widgets/ContactDiscoPosts/ContactDiscoPosts.php
@@ -0,0 +1,27 @@
+<?php
+
+class ContactDiscoPosts extends \Movim\Widget\Base
+{
+    public function load()
+    {
+        $this->addjs('contactdiscoposts.js');
+    }
+
+    public function ajaxGet()
+    {
+        $this->rpc('MovimTpl.fill', '#contactdiscoposts', $this->preparePosts());
+    }
+
+    public function preparePosts()
+    {
+        $view = $this->tpl();
+
+        $nd = new \Modl\PostnDAO;
+        $blogs = $nd->getLastBlogPublic(0, 36);
+        $blogs = is_array($blogs) ? $blogs : [];
+
+        $view->assign('blogs', $blogs);
+
+        return $view->draw('_contactdiscoposts', true);
+    }
+}
diff --git a/app/widgets/ContactDiscoPosts/_contactdiscoposts.tpl b/app/widgets/ContactDiscoPosts/_contactdiscoposts.tpl
new file mode 100644
index 000000000..7c6470142
--- /dev/null
+++ b/app/widgets/ContactDiscoPosts/_contactdiscoposts.tpl
@@ -0,0 +1,46 @@
+<ul class="list middle column half active card">
+    {loop="$blogs"}
+        {$attachments = $value->getAttachments()}
+        <li class="block" onclick="MovimUtils.redirect('{$c->route('post', [$value->origin, $value->node, $value->nodeid])}')">
+            <span class="primary icon thumb color {$value->getContact()->jid|stringToColor}"
+            {$picture = $value->getPicture()}
+            {if="$picture != null"}
+                style="background-image: url({$picture});"
+            {else}
+                {$url = $value->getContact()->getPhoto('l')}
+                {if="$url"}
+                    style="background-image: url({$url});"
+                {/if}
+            {/if}
+            >
+                {$value->getContact()->getTrueName()|firstLetterCapitalize}
+            </span>
+            <p class="line" {if="isset($value->title)"}title="{$value->title}"{/if}>
+            {if="isset($value->title)"}
+                {$value->title}
+            {else}
+                {$value->node}
+            {/if}
+            </p>
+            <p dir="auto">{$value->getSummary()}</p>
+            <p>
+                <a href="{$c->route('contact', $value->getContact()->jid)}">
+                    {$value->getContact()->getTrueName()}
+                </a>
+
+                {$count = $value->countLikes()}
+                {if="$count > 0"}
+                    {$count} <i class="zmdi zmdi-favorite-outline"></i>
+                {/if}
+
+                {$count = $value->countComments()}
+                {if="$count > 0"}
+                    {$count} <i class="zmdi zmdi-comment-outline"></i>
+                {/if}
+                <span class="info">
+                    {$value->published|strtotime|prepareDate:true,true}
+                </span>
+            </p>
+        </li>
+    {/loop}
+</ul>
diff --git a/app/widgets/ContactDiscoPosts/contactdiscoposts.js b/app/widgets/ContactDiscoPosts/contactdiscoposts.js
new file mode 100644
index 000000000..eddd0ba1b
--- /dev/null
+++ b/app/widgets/ContactDiscoPosts/contactdiscoposts.js
@@ -0,0 +1,3 @@
+MovimWebsocket.attach(function() {
+    ContactDiscoPosts_ajaxGet();
+});
diff --git a/app/widgets/ContactDiscoPosts/contactdiscoposts.tpl b/app/widgets/ContactDiscoPosts/contactdiscoposts.tpl
new file mode 100644
index 000000000..c544b0b47
--- /dev/null
+++ b/app/widgets/ContactDiscoPosts/contactdiscoposts.tpl
@@ -0,0 +1 @@
+<div id="contactdiscoposts" class="tabelem spin" title="{$c->__('button.discover')}"></div>
diff --git a/app/widgets/Roster/_roster_list.tpl b/app/widgets/Roster/_roster_list.tpl
index 186c0e68b..6d2f0163f 100644
--- a/app/widgets/Roster/_roster_list.tpl
+++ b/app/widgets/Roster/_roster_list.tpl
@@ -1,6 +1,9 @@
 <header>
     <ul class="list">
         <li>
+            <span class="primary icon bubble gray">
+                <i class="zmdi zmdi-search"></i>
+            </span>
             {if="count($contacts) > 5"}
             <form onsubmit="return false;">
                 <div onclick="Roster.init();">
diff --git a/app/widgets/Roster/roster.tpl b/app/widgets/Roster/roster.tpl
index d327477cc..03ed2fb28 100644
--- a/app/widgets/Roster/roster.tpl
+++ b/app/widgets/Roster/roster.tpl
@@ -1,3 +1,3 @@
-<div id="roster">
+<div id="roster" class="tabelem spin" title="{$c->__('page.contacts')}">
     {$c->prepareItems()}
 </div>
diff --git a/themes/material/css/block.css b/themes/material/css/block.css
index ec8c0d278..a18cd7d76 100644
--- a/themes/material/css/block.css
+++ b/themes/material/css/block.css
@@ -40,6 +40,10 @@
     margin: 1rem 0;
 }
 
+.column.half {
+    column-count: 2;
+}
+
 .column > * {
     display: inline-block;
     width: 100%;
@@ -54,7 +58,8 @@
         max-width: 100%;
     }
 
-    .column {
+    .column,
+    .column.half {
         column-count: 1;
     }
 }