diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index c4c1be80ff7..f31b59e430f 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -540,31 +540,6 @@ class WebsiteForum(WebsiteProfile): # User # -------------------------------------------------- - @http.route(['''/forum//users''', - '''/forum//users/page/'''], - type='http', auth="public", website=True) - def users(self, forum, page=1, **searches): - User = request.env['res.users'] - step = 30 - dom = [('karma', '>', 1), ('website_published', '=', True)] - tag_count = User.sudo().search_count(dom) - pager = request.website.pager(url="/forum/%s/users" % slug(forum), total=tag_count, page=page, step=step, scope=30) - - if searches.get('user'): - dom += [('name', 'ilike', searches.get('user'))] - - users = User.sudo().search(dom, limit=step, offset=pager['offset'], order='karma DESC') - - searches['users'] = 'True' - values = self._prepare_user_values(forum=forum, searches=searches) - values .update({ - 'users': users, - 'main_object': forum, - 'pager': pager, - }) - - return request.render("website_forum.users", values) - @http.route(['/forum//partner/'], type='http', auth="public", website=True) def open_partner(self, forum, partner_id=0, **post): if partner_id: diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 8de274e0be8..abcf91f786b 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -163,7 +163,7 @@ t-attf-class="nav-link #{sorting == 'create_date desc' and 'active' or ''}">Newest
  • - People
  • @@ -1160,51 +1160,6 @@ - - @@ -139,7 +139,7 @@
    - No vote given by you yet! + No vote given by you yet!
    diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py index c0d6a278a0b..ec587f59eca 100644 --- a/addons/website_profile/controllers/main.py +++ b/addons/website_profile/controllers/main.py @@ -189,3 +189,45 @@ class WebsiteProfile(http.Controller): 'badges': badges, }) return request.render("website_profile.badge_main", values) + + # All Users Page + # --------------------------------------------------- + def _prepare_all_users_values(self, user, position): + return { + 'position': position, + 'id': user.id, + 'name': user.name, + 'rank': user.rank_id.name, + 'karma': user.karma, + 'badge_count': len(user.badge_ids), + } + + @http.route(['/profile/users', + '/profile/users/page/'], type='http', auth="public", website=True) + def view_all_users_page(self, page=1, **searches): + User = request.env['res.users'] + dom = [('karma', '>', 1), ('website_published', '=', True)] + + # Get the Top 3 users + top3_users = User.sudo().search(dom, limit=3, order='karma DESC') + top3_user_values = [self._prepare_all_users_values(user, position+1) for position, user in enumerate(top3_users)] + + # Get the other users + if top3_users: + dom += [('id', 'not in', top3_users.ids)] + step = 30 + user_count = User.sudo().search_count(dom) + pager = request.website.pager(url="/profile/users", total=user_count, page=page, step=step, scope=step) + + if searches.get('user'): + dom += [('name', 'ilike', searches.get('user'))] + + users = User.sudo().search(dom, limit=step, offset=pager['offset'], order='karma DESC') + + user_values = [self._prepare_all_users_values(user, position + 4 + ((page-1) * step)) for position, user in enumerate(users)] + values = { + 'top3_users': top3_user_values, + 'users': user_values, + 'pager': pager + } + return request.render("website_profile.users_page_main", values) diff --git a/addons/website_profile/static/src/scss/website_profile.scss b/addons/website_profile/static/src/scss/website_profile.scss index cd590c9bb19..1a00803b1b9 100644 --- a/addons/website_profile/static/src/scss/website_profile.scss +++ b/addons/website_profile/static/src/scss/website_profile.scss @@ -145,6 +145,88 @@ $bronze: #eea91e; padding-right: 16px; } +// All Users Page +.o_wprofile_all_users_header { + margin: auto; + background-color: #875A7B !important; + > div:first-child { + margin: auto; + width: 100%; + max-width: 1140px; + padding: 32px 32px 0px 32px; + color: white; + top: 48px; + padding-top: 0px; + height: 250px; + } +} + +.o_wprofile_all_user_content { + position: relative; + top: -140px; + .o_wprofile_all_user_card_top3 { + cursor: pointer; + height: 325px; + text-align: center; + border-radius: 0px; + border: 0px; + .card-body { + padding-left: 0px; + padding-right: 0px; + > div:first-child { + margin-bottom: -40px; + div { + position: relative; + margin: auto; + right: -35px; + bottom: 55px; + width: 45px; + padding: 12px 0px 12px 0px; + border-radius: 50%; + } + .o_wprofile_top3_first { + background-color: $gold; + } + .o_wprofile_top3_second { + background-color: $silver; + } + .o_wprofile_top3_third { + background-color: $bronze; + } + } + :nth-child(4) { + position: absolute; + bottom: 0px; + width: 100%; + margin: auto; + border-top: 1px solid lightgrey; + div { + padding: 4% 0% 4% 0%; + border-radius: 0px; + } + } + } + } + .o_wprofile_all_users_card { + cursor: pointer; + border-radius: 0px; + border: 0px; + padding: 8px 15px 8px 15px; + > div > div:first-child > div > div:nth-child(3) { + padding-top: 12px; + padding-bottom: 12px; + } + > div > div:first-child > div > div:nth-child(2) { + padding: 0px; + width: 80px; + } + > div > div:first-child > div > div:first-child { + padding: 5% 0px 5% 16px; + width: 60px; + } + } +} + // Badges .badge-gold { color: $gold; @@ -169,7 +251,7 @@ $bronze: #eea91e; // Other stuffs .o_wprofile_bb_grey { - border-bottom: 2px solid lightgrey; + border-bottom: 2px solid lightgrey !important; } .country_flag { diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml index 2a4752c2830..8831b93e351 100644 --- a/addons/website_profile/views/website_profile.xml +++ b/addons/website_profile/views/website_profile.xml @@ -6,6 +6,11 @@ + + + + + + + +