From f3616cb63a2e228985cf99d6dd4d2e0fb4f07f67 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 8 Mar 2014 17:25:24 +0100
Subject: [PATCH] [IMP] design forum

bzr revid: fp@tinyerp.com-20140308162524-1jc03priitz3p1mm
---
 addons/website_forum/models/website_forum.py | 12 +++++-----
 addons/website_forum/views/website_forum.xml | 23 +++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/addons/website_forum/models/website_forum.py b/addons/website_forum/models/website_forum.py
index 89b583e04f4..80725e80aa3 100644
--- a/addons/website_forum/models/website_forum.py
+++ b/addons/website_forum/models/website_forum.py
@@ -188,9 +188,6 @@ class Users(osv.Model):
             }
         return result
     _columns = {
-        # Field to remove
-        'tags': fields.many2many('website.forum.tag', 'forum_tag_rel', 'forum_id', 'forum_tag_id', 'Tag'),
-
         'create_date': fields.datetime('Create Date', select=True, readonly=True),
         'karma': fields.integer('Karma'), # Use Gamification for this
         'forum': fields.boolean('Is Forum Member'),
@@ -201,7 +198,8 @@ class Users(osv.Model):
         'bronze_badge':fields.function(_get_user_badge_level, string="Number of bronze badges", type='integer', multi='badge_level'),
     }
     _defaults = {
-        'forum': False
+        'forum': False,
+        'karma': 0
     }
 
 class PostHistory(osv.Model):
@@ -243,11 +241,14 @@ class Badge(osv.Model):
         'level': 'bronze'
     }
 
+
+# TODO:
+# remove this object and replace by mail.message of type notes on related post
+# type = message types
 class ForumActivity(osv.Model):
     _name = "website.forum.activity"
     _description = "Activity"
     _order = "id desc"
-
     _columns = {
         'name': fields.char('Name', size=64),
         'post_id': fields.many2one('website.forum.post', 'Post'),
@@ -263,6 +264,7 @@ class ForumActivity(osv.Model):
                                   ('voted_question', 'voted question'), ('voted_answer', 'voted answer'),
                                   ('received_badge', 'received badge'),
                                   ], 'Activity Type'),
+        # merge these 2 fields into one: karma: fields.integer (that can be positive or negative)
         'karma_add': fields.integer('Added Karma'),
         'karma_sub': fields.integer('Karma Removed')
    }
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 23ea664fba3..96e5fff6190 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -690,7 +690,7 @@
                     <div t-foreach="users" t-as="user" class="col-sm-4">
                         <t t-set="separator"><br/></t>
                         <t t-call="website_forum.user_detail"/>
-                        <span class="text-muted">Joined on <span t-field="user.create_date"/></span>
+                        <span class="text-muted">Joined on <span t-field="user.create_date" t-field-options='{"format":"short"}'/></span>
                     </div>
                 </div>
                 <div class="pull-left">
@@ -715,10 +715,10 @@
                         <tr>
                             <td rowspan="2" valign="top"><span class="text-muted">contributions</span></td>
                             <td>member since</td>
-                            <td><span t-field="user.create_date" t-field-options='{"format": "MMMM d, YYYY"}'/></td>
+                            <td><span t-field="user.create_date" t-field-options='{"format": "short"}'/></td>
                         </tr><tr>
                             <td>last connection</td>
-                            <td><span t-field="user.login_date" t-field-options='{"format": "long"}'/></td>
+                            <td><span t-field="user.login_date" t-field-options='{"format": "short"}'/></td>
                         </tr>
                         </table>
                     </div><div class="col-sm-5">
@@ -812,14 +812,17 @@
         </template>
 
         <template id="user_badges">
-            <div class="col-sm-3 mt16" t-foreach="user.badges" t-as="badge">
-                <a t-attf-href="/forum/#{ slug(forum) }/badge/#{ slug(badge.badge_id) }" class="badge">
-                    <span t-field="badge.badge_id.name" />
-                </a>
-                <span> 
-                    X <t t-esc="len(badge.badge_id.owner_ids)"/>
-                </span>
+            <div class="row mb32">
+                <div class="col-sm-3 mt16" t-foreach="user.badges" t-as="badge">
+                    <a t-attf-href="/forum/#{ slug(forum) }/badge/#{ slug(badge.badge_id) }" class="badge">
+                        <span t-field="badge.badge_id.name" />
+                    </a>
+                    <span> 
+                        X <t t-esc="len(badge.badge_id.owner_ids)"/>
+                    </span>
+                </div>
             </div>
+            <b t-if="not user.badges" class="mb32">No badge yet!</b>
         </template>
 
     </data>