odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improved css and show badge level using css. 

bzr revid: tpa@tinyerp.com-20140307123855-b5pb5xusq3as7n3t
This commit is contained in:
Turkesh Patel (Open ERP) 2014-03-07 18:08:55 +05:30
parent e059f2c019
commit 937e9c7acf
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/website_forum/controllers/main.py
View File

@ -83,8 +83,9 @@ class website_forum(http.Controller):
if type == 'followed':
domain += [ ('create_uid', '=', uid) ]
step = 10
question_count = Forum.search(cr, uid, domain, count=True, context=context)
pager = request.website.pager(url="/forum/%s/" % slug(forum), total=question_count, page=page, step=10, scope=10)
pager = request.website.pager(url="/forum/%s/" % slug(forum), total=question_count, page=page, step=step, scope=10)
obj_ids = Forum.search(cr, uid, domain, limit=step, offset=pager['offset'], context=context)
question_ids = Forum.browse(cr, uid, obj_ids, context=context)

1
addons/website_forum/data/forum_badges_data.xml
View File

@ -3,6 +3,7 @@
<data>
<!-- Badges -->
<!--TODO: Have to add condition when badge will be given-->
<record id="badge_1" model="gamification.badge">
<field name="name">Autobiographer</field>
<field name="description">Completed all user profile fields</field>

12
addons/website_forum/static/src/css/website_forum.css
View File

@ -30,4 +30,16 @@
color: white !important;
margin-top: 10px;
margin-bottom: 10px;
}
.badge-gold {
color: #FFCC00
}
.badge-silver {
color: #CCCCCC
}
.badge-bronze {
color: #EEA91E
}

16
addons/website_forum/views/website_forum.xml
View File

@ -234,11 +234,11 @@
<a t-attf-href="/forum/#{ slug(forum) }/user/#{ slug(user) }" t-field="user.name"/>
<t t-raw="separator or ', '"/>
<b><t t-esc="len(user.badges)"/> badges:</b>
<span class="fa fa-certificate badge-gold"/>
<span class="fa fa-circle badge-gold"/>
<t t-esc="user.gold_badge"/>
<span class="fa fa-certificate badge-silver"/>
<span class="fa fa-circle badge-silver"/>
<t t-esc="user.silver_badge"/>
<span class="fa fa-certificate badge-bronze"/>
<span class="fa fa-circle badge-bronze"/>
<t t-esc="user.bronze_badge"/>
<br/>
<t t-raw="0"/>
@ -471,6 +471,9 @@
</h1>
<div class="mt16" t-foreach="badges" t-as="badge">
<a t-attf-href="/forum/#{ slug(forum) }/badge/#{ slug(badge) }" class="badge pull-left">
<span t-if="badge.level == 'gold'" class="fa fa-circle badge-gold"/>
<span t-if="badge.level == 'silver'" class="fa fa-circle badge-silver"/>
<span t-if="badge.level == 'bronze'" class="fa fa-circle badge-bronze"/>
<span t-field="badge.name" />
</a>
<span style="margin-left:5px">
@ -487,7 +490,12 @@
<b>Badge "<span t-field="badge.name"/>"</b>
</h3>
<div>
<span class="pull-left badge" t-field="badge.name"/>
<div class="pull-left badge">
<span t-if="badge.level == 'gold'" class="fa fa-circle badge-gold"/>
<span t-if="badge.level == 'silver'" class="fa fa-circle badge-silver"/>
<span t-if="badge.level == 'bronze'" class="fa fa-circle badge-bronze"/>
<span t-field="badge.name"/>
</div>
<span t-field="badge.description" style="margin-left:20px"/>
</div>
<h4 class="mt32">