From 33dce6999a93cd8b81ccd294880b9798354dafa9 Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Sat, 18 Apr 2015 23:12:53 +0200
Subject: [PATCH] Redesign du forum

---
 app/services/MessServ.js               |   2 ++
 public/js/controllers/ForumConvCtrl.js |  12 +++++++-----
 public/js/controllers/ForumDirCtrl.js  |  10 ++++++----
 public/views/forumConv.html            |  71 +++++++++++++++++++++++++++++++++++++++++++++--------------------------
 public/views/forumDir.html             | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
 5 files changed, 158 insertions(+), 98 deletions(-)

diff --git a/app/services/MessServ.js b/app/services/MessServ.js
index d6e4b89..6e3db20 100644
--- a/app/services/MessServ.js
+++ b/app/services/MessServ.js
@@ -6,6 +6,8 @@ var async = require('async');
 var MesssServ = {};
 
 MesssServ.addData = function (mess, cb) {
+    mess.auteur = {};
+    mess.auteur.nom = mess.login;
     // PolyUserServ.get(Mess.login, function (err, nom) {
     //     if (nom) {
     //         Mess.nom = nom;
diff --git a/public/js/controllers/ForumConvCtrl.js b/public/js/controllers/ForumConvCtrl.js
index b6a21cd..760a89a 100644
--- a/public/js/controllers/ForumConvCtrl.js
+++ b/public/js/controllers/ForumConvCtrl.js
@@ -12,23 +12,25 @@ angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ', 'ngSanitize', 'btfor
             if (!err) {
                 $scope.conv = conv;
                 ApiServ("récupération des messages", 'get', 'messs', conv._id, function (err, messs) {
-                    if (!err)
+                    if (!err) {
                         $scope.messs = messs;
+                    }
                 });
             }
         });
 
-        $scope.createMess = function () {
+        $scope.addMess = function () {
             data = $scope.formData;
             data.conv = $scope.conv._id;
             ApiServ("envoi du message", 'post', 'messs', data, function (err, mess) {
-                if (!err)
+                if (!err) {
                     $scope.formData = {};
-                $scope.messs.push(mess);
+                    $scope.messs.push(mess);
+                }
             });
         };
 
-        $scope.deleteMess = function (index) {
+        $scope.delMess = function (index) {
             ApiServ("suppression du message", 'delete', 'messs', $scope.messs[index]._id, function (err) {
                 if (!err)
                     $scope.messs.splice(index, 1);
diff --git a/public/js/controllers/ForumDirCtrl.js b/public/js/controllers/ForumDirCtrl.js
index 2e949c5..e5d08c9 100644
--- a/public/js/controllers/ForumDirCtrl.js
+++ b/public/js/controllers/ForumDirCtrl.js
@@ -15,6 +15,7 @@ angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
                 console.error(err);
             } else {
                 if (doss) {
+                    $scope.doss = doss;
                     $scope.dosss = doss.dosss;
                     $scope.convs = doss.convs;
                 }
@@ -22,7 +23,8 @@ angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
         });
 
         // Dossiers
-        $scope.createDoss = function () {
+        $scope.addDoss = function () {
+            console.log('CALLA');
             $scope.formDoss.parent = $routeParams.doss_id;
             ApiServ("création du dossier", 'post', 'dosss', $scope.formDoss, function (err, doss) {
                 if (!err) {
@@ -32,7 +34,7 @@ angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
             });
         };
 
-        $scope.deleteDoss = function (index) {
+        $scope.delDoss = function (index) {
             ApiServ("suppression du dossier", 'delete', 'dosss', $scope.dosss[index]._id, function (err) {
                 if (!err)
                     $scope.dosss.splice(index, 1);
@@ -40,7 +42,7 @@ angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
         };
 
         // Conversations
-        $scope.createConv = function () {
+        $scope.addConv = function () {
             $scope.formConv.parent = $routeParams.doss_id;
             ApiServ("création de la conversation", 'post', 'convs', $scope.formConv, function (err, conv) {
                 if (!err) {
@@ -50,7 +52,7 @@ angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
             });
         };
 
-        $scope.deleteConv = function (index) {
+        $scope.delConv = function (index) {
             ApiServ("suppression de la conversation", 'delete', 'convs', $scope.convs[index]._id, function (err) {
                 if (!err)
                     $scope.convs.splice(index, 1);
diff --git a/public/views/forumConv.html b/public/views/forumConv.html
index fff0aa4..32d6d62 100644
--- a/public/views/forumConv.html
+++ b/public/views/forumConv.html
@@ -1,35 +1,54 @@
 <div class="container">
     <ol class="breadcrumb">
         <li><a href="/forum">Forum</a></li>
-        <li><a href="#">Conversations</a></li>
+        <li>Conversations</li>
         <li class="active">{{ conv.titre }}</li>
     </ol>
     <h1>{{ conv.titre }}</h1>
-    <div class="panel panel-default" ng-repeat="mess in messs">
-        <div class="panel-heading">
-            {{ mess.login }}
-            <button ng-show="session.canDelMess" type="button" class="btn btn-danger" ng-click="deleteMess($index)">
-                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer
-            </button>
-        </div>
-        <div class="panel-body" btf-markdown="mess.content">
-        </div>
-    </div>
-    <div class="form-group" ng-show="session.canAddMess">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    Nouveau message
-                </h4>
-            </div>
-            <div class="panel-body">
-                <textarea class="form-control" rows="3" ng-model="formData.content"></textarea>
-                <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createMess()">
-                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter
-                </button>
-            </div>
-        </div>
-    </div>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Détails</th>
+                <th>Message</th>
+                <th>Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr ng-repeat="mess in messs">
+                <td>
+                    {{ mess.auteur.image }}
+                    <br />
+                    <span class=".visible-xs">{{ mess.auteur.login }}</span>
+                    <span class=".hidden-xs">{{ mess.auteur.nom }}</span>
+                    <br/> {{ mess.auteur.section }}
+                    <br/> {{ mess.auteur.role }}
+                    <br/> {{ doss.date }}
+                </td>
+                <td btf-markdown="mess.content">
+                </td>
+                <td>
+                    <button type="button" class="btn btn-danger" ng-show="session.canDelMess" ng-click="delMess($index)">
+                        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                    </button>
+                </td>
+            </tr>
+            <tr ng-show="session.canAddMess">
+                <form>
+                    <td>
+                        <label for="nvMessTitre">Nouveau message</label>
+                    </td>
+                    <td class="form-group">
+                        <textarea class="form-control" id="nvMessTitre" rows="7" placeholder="Contenu du message" ng-model="formData.content"></textarea>
+                    </td>
+                    <td>
+                        <button type="submit" class="btn btn-primary" ng-class="{disabled: !formData.content}" ng-click="addMess()">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                        </button>
+                    </td>
+                </form>
+            </tr>
+        </tbody>
+    </table>
     <!-- <nav>
         <ul class="pagination">
             <li>
diff --git a/public/views/forumDir.html b/public/views/forumDir.html
index e5ed3b5..2a40f8b 100644
--- a/public/views/forumDir.html
+++ b/public/views/forumDir.html
@@ -1,71 +1,106 @@
 <div class="container">
     <ol class="breadcrumb">
         <li><a href="/forum">Forum</a></li>
-        <li><a href="#">Dossiers</a></li>
-        <li class="active">{{ dossier.titre }}</li>
+        <li>Dossiers</li>
+        <li class="active">{{ doss.titre }}</li>
     </ol>
     <h1>{{ doss.titre }}</h1>
-    <h2>Dossiers</h2>
-    <div class="panel panel-default" ng-repeat="doss in dosss">
-        <div class="panel-heading">
-            <h3 class="panel-title">
-                <a href="/forum/dir/{{ doss._id }}">
-                    <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> {{ doss.titre }}
-                </a>
-            </h3>
-        </div>
-        <div class="panel-body">
-            <!-- <strong>Date : </strong>{{ doss.date }}<br/> -->
-            <button ng-show="session.canDelDoss" type="button" class="btn btn-danger" ng-click="deleteDoss($index)">
-                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer
-            </button>
-        </div>
-    </div>
-    <div class="form-group" ng-show="session.canAddDoss">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title">
-                    <input type="text" class="form-control" placeholder="Titre du dossier" ng-model="formDoss.titre" />
-                </h3>
-            </div>
-            <div class="panel-body">
-                <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createDoss()">
-                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter
-                </button>
-            </div>
-        </div>
-    </div>
-    <h2>Conversations</h2>
-    <div class="panel panel-default" ng-repeat="conv in convs">
-        <div class="panel-heading">
-            <h3 class="panel-title">
-                <a href="/forum/conv/{{ conv._id }}">
-                    <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> {{ conv.titre }}
-                </a>
-            </h3>
-        </div>
-        <div class="panel-body">
-            <!-- <strong>Date : </strong>{{ conv.date }}<br/> -->
-            <button ng-show="session.canDelConv" type="button" class="btn btn-danger" ng-click="deleteConv($index)">
-                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer
-            </button>
-        </div>
-    </div>
-    <div class="form-group" ng-show="session.canAddConv">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title">
-                    <input type="text" class="form-control" placeholder="Titre de la conversation" ng-model="formConv.titre" />
-                </h3>
-            </div>
-            <div class="panel-body">
-                <!-- <textarea class="form-control" rows="3"></textarea> -->
-                <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createConv()">
-                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter
-                </button>
-            </div>
-        </div>
-    </div>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Nom</th>
+                <th>Auteur</th>
+                <th>Dernier message</th>
+                <th>Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr ng-repeat="doss in dosss">
+                <td>
+                    <a href="/forum/dir/{{ doss._id }}">
+                        <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span>
+                        {{ doss.titre }}
+                    </a>
+                    <span class="badge" ng-hide="doss.new">{{ doss.new }}</span>
+                </td>
+                <td>
+                    <span class=".visible-xs">{{ doss.auteur.login }}</span>
+                    <span class=".hidden-xs">{{ doss.auteur.nom }}</span>
+                </td>
+                <td>
+                    {{ doss.date }}
+                </td>
+                <td>
+                    <button type="button" class="btn btn-default" ng-show="session.canAbonner">
+                        <span class="glyphicon glyphicon-eye-open" aria-hidden="true" ng-show="doss.abonne"></span>
+                        <span class="glyphicon glyphicon-eye-close" aria-hidden="true" ng-hide="doss.abonne"></span>
+                    </button>
+                    <button type="button" class="btn btn-danger" ng-show="session.canDelDoss" ng-click="delDoss($index)">
+                        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                    </button>
+                </td>
+            </tr>
+            <tr ng-show="session.canAddDoss">
+                <form>
+                    <td class="form-group">
+                        <label for="nvDossTitre">Nouveau dossier</label>
+                        <input type="text" class="form-control" id="nvDossTitre" placeholder="Nom du dossier" ng-model="formDoss.titre" />
+                    </td>
+                    <td>
+                    </td>
+                    <td>
+                    </td>
+                    <td>
+                        <button type="submit" class="btn btn-primary" ng-class="{disabled: !formDoss.titre}" ng-click="addDoss()">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                        </button>
+                    </td>
+                </form>
+            </tr>
+            <tr ng-repeat="conv in convs">
+                <td>
+                    <a href="/forum/conv/{{ conv._id }}">
+                        <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
+                        {{ conv.titre }}
+                    </a>
+                    <span class="badge" ng-hide="conv.new">{{ conv.new }}</span>
+                </td>
+                <td>
+                    <span class=".visible-xs">{{ conv.auteur.login }}</span>
+                    <span class=".hidden-xs">{{ conv.auteur.nom }}</span>
+                </td>
+                <td>
+                    {{ conv.date }}
+                </td>
+                <td>
+                    <button type="button" class="btn btn-default" ng-show="session.canAbonner">
+                        <span class="glyphicon glyphicon-eye-open" aria-hidden="true" ng-show="conv.abonne"></span>
+                        <span class="glyphicon glyphicon-eye-close" aria-hidden="true" ng-hide="conv.abonne"></span>
+                    </button>
+                    <button type="button" class="btn btn-danger" ng-show="session.canDelConv" ng-click="delConv($index)">
+                        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                    </button>
+                </td>
+            </tr>
+            <tr ng-show="session.canAddConv">
+                <form>
+                    <td class="form-group">
+                        <label for="nvConvTitre">Nouvelle conversation</label>
+                        <input type="text" class="form-control" id="nvConvTitre" placeholder="Nom de la conversation" ng-model="formConv.titre" />
+                    </td>
+                    <td>
+                    </td>
+                    <td>
+                    </td>
+                    <td>
+                        <button type="submit" class="btn btn-primary" ng-class="{disabled: !formConv.titre}" ng-click="addConv()">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                        </button>
+                    </td>
+                </form>
+            </tr>
+        </tbody>
+    </table>
     <!-- <nav>
         <ul class="pagination">
             <li>
--
libgit2 0.21.2