-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + It appears your email has not been verified. + Click here to send a verification email allowing you to participate to the forum. +
+
+
+
+
+
+ Congratulations! Your email has just been validated. You may now participate to our forums.
+
+ Ask a Question
+
+
+
+
+
+ Keep Informed
+
+
+
+
+
+
+
+
+ About This Community
+
+
+ Read Guidelines
+ Back to
+
+
+
+ Moderation Tools
+ +
+
+ This forum has been archived.
+
-
-
-
-
-
-
-
-
-
-
- View Your Badges
-
-
-
-
-
-
- - It appears your email has not been verified. - Click here to send a verification email allowing you to participate to the forum. -
-
-
-
-
-
- Congratulations! Your email has just been validated. You may now participate to our forums.
-
- Ask a Question
-
-
-
-
-
- Keep Informed
-
-
-
-
-
-
-
-
- About This Community
-
-
- Read Guidelines
- Back to
-
-
-
- Moderation Tools
- -
-
- This forum has been archived.
-
-
+
[Deleted]
@@ -240,12 +241,12 @@
View Views
-
+
Answer
Answers
-
+
Favorite Favorites
@@ -282,7 +283,7 @@
-
+
( Comments
@@ -308,7 +309,7 @@
- ![Avatar]()
+ ![Avatar]()
- ![Avatar]()
+ ![Avatar]()
-
-
-
-
-
- Badges
-
-
- Besides gaining reputation with your questions and answers,
- you receive badges for being especially helpful. Badges
- appear on your profile page, and your posts.
-
-
-
-
-
-
-
-
-
-
-
- awarded users
-
-
-
-
-
-
-
-
![]()
+ ![]()
+
@@ -1233,330 +1205,6 @@
-
-
-
-
-
- This profile is private!
-
-
-
-
-
-
- Edit Profile
-
-
-
-
-
-
-
-
- Edit
-
- Profile
-
-
-
-
- ![]()
-
-
-
- Karma
-
-
- Badges
-
-
-
-
-
-
-
-
-
-
- Votes
-
-
-
-
-
-
-
-
-
-
-
- Contribution
-
-
-
-
- Member since
-
-
-
-
-
-
-
-
- Last connection
-
-
-
-
-
-
-
-
-
- Bio
-
-
-
-
- Location
-
-
-
-
- ,
-
-
-
-
-
-
- Website
-
-
-
-
-
-
-
-
-
-
-
- Introduction
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- awarded users
-
-
-
-
-
-
- No badge yet!
- Check available badges
-
-
-
-
-
-
- No vote given by you yet!
-
-
-
diff --git a/addons/website_forum/views/website_forum_profile.xml b/addons/website_forum/views/website_forum_profile.xml
new file mode 100644
index 00000000000..3cdac8b35c4
--- /dev/null
+++ b/addons/website_forum/views/website_forum_profile.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+ Return to the forum.
+
+
+
+
+
+
+
+
+ Votes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Activity
+
+
+ Votes
+
+
+
+
+
+
+
+ Questions
+
+
+
+
+ No question posted yet.
+
+
+
+
+ Favourite Questions
+
+
+
+
+ Followed Questions
+
+
+
+
+
+ Answers
+
+
+
+
+ No answer posted yet.
+
+
+
+
+
+ Votes
+ Activities
+
+
+
+
+
+
+
+
+
+ No activities yet!
+
+
+
+
+
+
+ No vote given by you yet!
+
+
+
diff --git a/addons/website_profile/__init__.py b/addons/website_profile/__init__.py
index dc5e6b693d1..8c67f893b37 100644
--- a/addons/website_profile/__init__.py
+++ b/addons/website_profile/__init__.py
@@ -2,3 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import models
+from . import controllers
diff --git a/addons/website_profile/__manifest__.py b/addons/website_profile/__manifest__.py
index 1575856c320..1214d3f03e8 100644
--- a/addons/website_profile/__manifest__.py
+++ b/addons/website_profile/__manifest__.py
@@ -8,11 +8,12 @@
'summary': 'Access the website profile of the users',
'description': """Allows to acces the website profile of the users and see their statistics (karma, badges, etc..)""",
'depends': [
- 'website',
+ 'website_partner',
'gamification'
],
'data': [
'views/gamification_badge_views.xml',
+ 'views/website_profile.xml',
'security/ir.model.access.csv',
],
'auto_install': False,
diff --git a/addons/website_profile/controllers/__init__.py b/addons/website_profile/controllers/__init__.py
new file mode 100644
index 00000000000..5d4b25db9c0
--- /dev/null
+++ b/addons/website_profile/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import main
diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py
new file mode 100644
index 00000000000..b1a29efe708
--- /dev/null
+++ b/addons/website_profile/controllers/main.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import base64
+import werkzeug.exceptions
+import werkzeug.urls
+import werkzeug.wrappers
+
+from odoo import http
+from odoo.http import request
+from odoo.osv import expression
+
+
+class WebsiteProfile(http.Controller):
+ # Profile
+ # ---------------------------------------------------
+ def _check_user_profile_access(self, user_id):
+ user_sudo = request.env['res.users'].sudo().browse(user_id)
+ if user_sudo.karma == 0 or not user_sudo.website_published or \
+ (user_sudo.id != request.session.uid and request.env.user.karma < request.website.karma_profile_min):
+ return False
+ return user_sudo
+
+ def _prepare_user_values(self, **kwargs):
+ values = {
+ 'user': request.env.user,
+ 'is_public_user': request.website.is_public_user(),
+ }
+ values.update(kwargs)
+ return values
+
+ def _prepare_user_profile_parameters(self, **post):
+ return post
+
+ def _prepare_user_profile_values(self, user, **post):
+ return {
+ 'uid': request.env.user.id,
+ 'user': user,
+ 'main_object': user,
+ 'is_profile_page': True,
+ 'edit_button_url_param': '',
+ }
+
+ @http.route(['/profile/user/'], type='http', auth="public", website=True)
+ def view_user_profile(self, user_id, **post):
+ user = self._check_user_profile_access(user_id)
+ if not user:
+ return request.render("website_profile.private_profile")
+ params = self._prepare_user_profile_parameters(**post)
+ values = self._prepare_user_profile_values(user, **params)
+ return request.render("website_profile.user_profile_main", values)
+
+ # Edit Profile
+ # ---------------------------------------------------
+ @http.route('/profile/edit', type='http', auth="user", website=True)
+ def view_user_profile_edition(self, **kwargs):
+ countries = request.env['res.country'].search([])
+ values = self._prepare_user_values(searches=kwargs)
+ values.update({
+ 'email_required': kwargs.get('email_required'),
+ 'countries': countries,
+ 'url_param': kwargs.get('url_param'),
+ })
+ return request.render("website_profile.user_profile_edit_main", values)
+
+ def _profile_edition_preprocess_values(self, user, **kwargs):
+ values = {
+ 'name': kwargs.get('name'),
+ 'website': kwargs.get('website'),
+ 'email': kwargs.get('email'),
+ 'city': kwargs.get('city'),
+ 'country_id': int(kwargs.get('country')) if kwargs.get('country') else False,
+ 'website_description': kwargs.get('description'),
+ }
+
+ if 'clear_image' in kwargs:
+ values['image'] = False
+ elif kwargs.get('ufile'):
+ image = kwargs.get('ufile').read()
+ values['image'] = base64.b64encode(image)
+
+ if request.uid == user.id: # the controller allows to edit only its own privacy settings; use partner management for other cases
+ values['website_published'] = kwargs.get('website_published') == 'True'
+ return values
+
+ @http.route('/profile/user/save', type='http', auth="user", methods=['POST'], website=True)
+ def save_edited_profile(self, **kwargs):
+ user = request.env.user
+ values = self._profile_edition_preprocess_values(user, **kwargs)
+ whitelisted_values = {key: values[key] for key in type(user).SELF_WRITEABLE_FIELDS if key in values}
+ user.write(whitelisted_values)
+ if kwargs.get('url_param'):
+ return werkzeug.utils.redirect("/profile/user/%d?%s" % (user.id, kwargs['url_param']))
+ else:
+ return werkzeug.utils.redirect("/profile/user/%d" % user.id)
+ # Ranks
+ # ---------------------------------------------------
+ @http.route('/profile/ranks', type='http', auth="public", website=True)
+ def ranks(self, **kwargs):
+ Rank = request.env['gamification.karma.rank']
+ ranks = Rank.sudo().search([])
+ ranks = ranks.sorted(key=lambda b: b.karma_min)
+ values = {
+ 'ranks': ranks,
+ }
+ return request.render("website_profile.rank_main", values)
+
+ # Badges
+ # ---------------------------------------------------
+ def _prepare_badges_domain(self, **kwargs):
+ """
+ Hook for other modules to restrict the badges showed on profile page, depending of the context
+ """
+ domain = [('website_published', '=', True)]
+ if 'category' in kwargs:
+ domain = expression.AND([[('challenge_ids.category', '=', kwargs.get('category'))], domain])
+ return domain
+
+ @http.route('/profile/badge', type='http', auth="public", website=True)
+ def badges(self, **kwargs):
+ Badge = request.env['gamification.badge']
+ badges = Badge.sudo().search(self._prepare_badges_domain(**kwargs))
+ badges = sorted(badges, key=lambda b: b.stat_count_distinct, reverse=True)
+ values = self._prepare_user_values(searches={'badges': True})
+ values.update({
+ 'badges': badges,
+ })
+ return request.render("website_profile.badge_main", values)
diff --git a/addons/website_profile/models/__init__.py b/addons/website_profile/models/__init__.py
index 980f26c8bd4..c26e78d1255 100644
--- a/addons/website_profile/models/__init__.py
+++ b/addons/website_profile/models/__init__.py
@@ -2,3 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import gamification_badge
+from . import website
diff --git a/addons/website_profile/models/website.py b/addons/website_profile/models/website.py
new file mode 100644
index 00000000000..76a37eba3d9
--- /dev/null
+++ b/addons/website_profile/models/website.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Website(models.Model):
+ _inherit = 'website'
+
+ karma_profile_min = fields.Integer(string="Minimal karma to see other user's profile", default=150)
diff --git a/addons/website_profile/static/src/scss/website_profile.scss b/addons/website_profile/static/src/scss/website_profile.scss
new file mode 100644
index 00000000000..c636bd40d92
--- /dev/null
+++ b/addons/website_profile/static/src/scss/website_profile.scss
@@ -0,0 +1,189 @@
+$gold: #ffcc00;
+$silver: #cccccc;
+$bronze: #eea91e;
+
+.o_wprofile_container {
+ margin: auto;
+ width: 100%;
+ max-width: 1140px;
+ padding: 32px 32px 0px 32px;
+}
+
+.o_wprofile_header {
+ margin: auto;
+ background-color: #875A7B !important;
+ border-bottom: 48px solid #66445e;
+ .o_wprofile_header_container {
+ top: 48px;
+ padding-top: 0px;
+ .o_wprofile_id {
+ font-size: 16px;
+ .o_wprofile_id_info {
+ margin-right: 36px;
+ }
+ }
+ .o_wprofile_pict {
+ .o_wprofile_photo {
+ width: 100%;
+ max-width: 256px;
+ }
+ }
+ }
+}
+
+.o_wprofile_content {
+ margin: auto;
+ background-color: #f2f2f2 !important;
+ .o_wprofile_content_container{
+ position: relative;
+ top: -80px;
+ .o_wprofile_navtabs_container {
+ .o_wprofile_nav_tabs {
+ border-bottom: 0px;
+ }
+ .o_wprofile_navlink {
+ color: white;
+ border-radius: 0px;
+ height: 48px;
+ font-weight: bold;
+ padding-top: 12px;
+ border-left: 2px solid #875A7B;
+ text-align: center;
+ width: 120px;
+ &:hover {
+ border: 0px;
+ border-radius: 0px;
+ background-color: #875A7B;
+ }
+ }
+ .o_wprofile_navlink.active {
+ color: #212529;
+ background-color: #f2f2f2;
+ border: 0px;
+ }
+ }
+ .o_wprofile_detail {
+ .o_wprofile_content_abstract {
+ top: 1px;
+ width: 256px;
+ max-width: 256px;
+ margin-left: 15px;
+ table {
+ width: 100%;
+ tr {
+ line-height: 32px;
+ }
+ th {
+ font-weight: normal;
+ }
+ }
+ .o_wprofile_rank {
+ background-color: white;
+ }
+ .o_wprofile_abstract_info {
+ background-color: white;
+ }
+ }
+ .o_wprofile_content_detail {
+ h4 {
+ border-bottom: 1px solid lightgrey;
+ color: grey;
+ margin-bottom: 16px;
+ }
+ .o_user_badges {
+ padding: 8px;
+ div {
+ padding: 8px;
+ }
+ img {
+ width: 48px;
+ height: 48px;
+ }
+ }
+ }
+ }
+ }
+}
+
+// Rank
+.o_wprofile_ranks_presentation {
+ background-color: lightgray;
+ .o_wprofile_rank_tile {
+ width: 20%;
+ div {
+ text-align:center;
+ img {
+ height: 128px;
+ }
+ }
+ }
+}
+
+.o_wprofile_next_rank_card {
+ div {
+ text-align: center;
+ img {
+ width: 128px;
+ height: 128px;
+ }
+ }
+ border-bottom: 1px solid lightgray;
+ .o_wprofile_next_rank_progress {
+ background-color: lightgray;
+ .o_wprofile_next_rank_progress_bar {
+ background-color: #00A09D !important;
+ }
+ }
+}
+
+// Edit Profile button
+.o_wprofile_edit {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ padding-left: 16px;
+ padding-right: 16px;
+}
+
+// Badges
+.badge-gold {
+ color: $gold;
+}
+.bg-gold {
+ background-color: $gold;
+}
+
+.badge-silver {
+ color: $silver;
+}
+.bg-silver {
+ background-color: $silver;
+}
+
+.badge-bronze {
+ color: $bronze;
+}
+.bg-bronze {
+ background-color: $bronze;
+}
+
+// Other stuffs
+.o_wprofile_bb_grey {
+ border-bottom: 2px solid lightgrey;
+}
+
+.country_flag {
+ display: inline-block;
+ margin-left: 2px;
+ max-height: 13px;
+ width: auto !important;
+}
+
+.o_wprofile_img_small {
+ width: 64px;
+ height: 64px;
+}
+.o_wprofile_img_medium {
+ width: 96px;
+ height: 96px;
+}
diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
new file mode 100644
index 00000000000..06562d0e697
--- /dev/null
+++ b/addons/website_profile/views/website_profile.xml
@@ -0,0 +1,379 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Edit Profile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Current Rank :
+
+
+
+
+
+
+
+ Joined
+
+
+ Badges
+
+
+
+
+
+ 0
+
+
+
+
+
+ Website
+
+
+
+
+ Location
+
+ ( )
+
+
+
+
+ Company
+
+
+
+
+
+
+
+
+
+
+ Badges
+ Biography
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ ""
+ / xp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ranks & Badges
+
+
+ Do not stop learning with Odoo. Collects points on the forum or the eLearning platform. Those points will make you reach new ranks.
+
+
+ How do I earn badges? When you finish a course, reach milestones, you're awarded badges.
+
+
+ How do I score more points? You can score more points by answering quizzes at the end of each course content. Points can also be earned on the forum. Follow this link to the guidelines of the forum.
+
+
+
+
+
+
+
+
+
+
+ Ranks
+
+
+ ![]()
+
+ points
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Badges
+
+
+ Besides gaining reputation with your questions and answers,
+ you receive badges for being especially helpful. Badges
+ appear on your profile page, and your posts.
+
+
+
+
+
+
+
+
+
+
+
+ awarded users
+
+
+
+
+
+
+
+
+
+
+
+ This profile is private!
+
+
+
+
+
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index fd307f967a5..aba81fcc88b 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -33,6 +33,7 @@ Share and Publish Videos, Presentations and Documents'
'views/slide_channel_tag_views.xml',
'views/slide_channel_invite_views.xml',
'views/website_slides_menu_views.xml',
+ 'views/website_slides_templates_profile.xml',
'data/website_slides_ir_data.xml',
'data/mail_data.xml',
'data/slide_data.xml',
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 2739d9d7d57..8d11d587608 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -11,13 +11,14 @@ from odoo.http import request
from odoo.osv import expression
from odoo.addons.http_routing.models.ir_http import slug
+from odoo.addons.website_profile.controllers.main import WebsiteProfile
from odoo.addons.website.models.ir_http import sitemap_qs2dom
from odoo.tools import html2plaintext
_logger = logging.getLogger(__name__)
-class WebsiteSlides(http.Controller):
+class WebsiteSlides(WebsiteProfile):
_slides_per_page = 12
_slides_per_list = 20
_order_by_criterion = {
@@ -44,9 +45,15 @@ class WebsiteSlides(http.Controller):
request.session['viewed_slides'] = viewed_slides
else:
slide.action_set_viewed()
-
return True
+ def _prepare_user_values(self, **kwargs):
+ values = super(WebsiteSlides, self)._prepare_user_values(**kwargs)
+ channel = self._get_channels(**kwargs)
+ if channel:
+ values['channel'] = channel
+ return values
+
def _get_slide_detail(self, slide):
most_viewed_slides = slide.get_most_viewed_slides(self._slides_per_list)
related_slides = slide.get_related_slides(self._slides_per_list)
@@ -95,7 +102,6 @@ class WebsiteSlides(http.Controller):
'''/slides//tag/''',
'''/slides//tag//page/''',
-
'''/slides//category/''',
'''/slides//category//page/''',
@@ -394,3 +400,37 @@ class WebsiteSlides(http.Controller):
except AccessError: # TODO : please, make it clean one day, or find another secure way to detect
# if the slide can be embedded, and properly display the error message.
return request.render('website_slides.embed_slide_forbidden', {})
+
+ # Profile
+ # ---------------------------------------------------
+ def _get_channels(self, **kwargs):
+ channels = []
+ if kwargs.get('channel'):
+ channels = kwargs['channel']
+ elif kwargs.get('channel_id'):
+ channels = request.env['slide.channel'].browse(int(kwargs['channel_id']))
+ return channels
+
+ def _prepare_user_slides_profile(self, user):
+ courses = request.env['slide.channel.partner'].sudo().search([('partner_id', '=', user.partner_id.id)]).mapped('channel_id')
+ values = {
+ 'uid': request.env.user.id,
+ 'user': user,
+ 'main_object': user,
+ 'courses': courses,
+ 'count_courses': len(courses),
+ 'is_profile_page': True,
+ 'badge_category': 'slides',
+ }
+ return values
+
+ def _prepare_user_profile_values(self, user, **post):
+ values = super(WebsiteSlides, self)._prepare_user_profile_values(user, **post)
+ if post.get('channel_id'):
+ values.update({'edit_button_url_param': 'channel_id=' + str(post['channel_id'])})
+ channels = self._get_channels(**post)
+ if not channels:
+ channels = request.env['slide.channel'].search([])
+ values.update(self._prepare_user_values(channel=channels[0] if len(channels) == 1 else True, **post))
+ values.update(self._prepare_user_slides_profile(user))
+ return values
diff --git a/addons/website_slides/models/__init__.py b/addons/website_slides/models/__init__.py
index 4872648aced..4b8210c6caa 100644
--- a/addons/website_slides/models/__init__.py
+++ b/addons/website_slides/models/__init__.py
@@ -7,3 +7,4 @@ from . import slide_channel_tag
from . import slide_channel_invite
from . import res_config_settings
from . import website
+from . import res_users
diff --git a/addons/website_slides/models/res_users.py b/addons/website_slides/models/res_users.py
new file mode 100644
index 00000000000..58be46c4eed
--- /dev/null
+++ b/addons/website_slides/models/res_users.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class Users(models.Model):
+ _inherit = 'res.users'
+
+ def get_gamification_redirection_data(self):
+ res = super(Users, self).get_gamification_redirection_data()
+ res.append({
+ 'url': '/slides',
+ 'label': 'See our eLearning'
+ })
+ return res
diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py
index 56d689c76db..29625c3e209 100644
--- a/addons/website_slides/models/slide_slide.py
+++ b/addons/website_slides/models/slide_slide.py
@@ -6,7 +6,6 @@ from PIL import Image
import base64
import datetime
import io
-import json
import re
from werkzeug import urls
@@ -121,6 +120,7 @@ class Slide(models.Model):
is_preview = fields.Boolean('Always visible', default=False)
completion_time = fields.Float('# Hours', default=1, digits=(10, 4))
image = fields.Binary('Image', attachment=True)
+ # TODO DBE : review image medium and small - using standard image calls (see web/image/.. route)
image_medium = fields.Binary('Medium', compute="_get_image", store=True, attachment=True)
image_thumb = fields.Binary('Thumbnail', compute="_get_image", store=True, attachment=True)
# subscribers
diff --git a/addons/website_slides/static/src/scss/website_slides_profile.scss b/addons/website_slides/static/src/scss/website_slides_profile.scss
new file mode 100644
index 00000000000..f5b703e9534
--- /dev/null
+++ b/addons/website_slides/static/src/scss/website_slides_profile.scss
@@ -0,0 +1,27 @@
+.o_wprofile_slides_card {
+ padding: 8px;
+ max-height: 68px;
+}
+.o_wprofile_slides_title {
+ top: -15px;
+ padding-left: 76px;
+}
+
+// Quest - Course Card
+.o_wprofile_slides_course_card_body {
+ cursor: pointer;
+ max-height: 64px;
+ .o_wprofile_slides_course_img {
+ position: absolute;
+ padding: 0px;
+ top: 8px;
+ left: 8px;
+ width: 66px;
+ height: 66px;
+ }
+ .o_wprofile_slide_course_rating {
+ position: absolute;
+ top: 13px;
+ right: 16px;
+ }
+}
diff --git a/addons/website_slides/views/assets.xml b/addons/website_slides/views/assets.xml
index a4e99c146ce..3602f06aab1 100644
--- a/addons/website_slides/views/assets.xml
+++ b/addons/website_slides/views/assets.xml
@@ -5,6 +5,7 @@
+
diff --git a/addons/website_slides/views/website_slides_templates.xml b/addons/website_slides/views/website_slides_templates.xml
index cb9b11f33f6..814b4a41d2d 100644
--- a/addons/website_slides/views/website_slides_templates.xml
+++ b/addons/website_slides/views/website_slides_templates.xml
@@ -107,34 +107,43 @@
-
-
-
-
-
- Joined
-
-
-
- /
-
-
-
- Upload
-
-
-
+
+
+
+
+
+
+ Joined
+
+
+
+ /
+
+
+
+ Upload
+
+
+
+
+
diff --git a/addons/website_slides/views/website_slides_templates_profile.xml b/addons/website_slides/views/website_slides_templates_profile.xml
new file mode 100644
index 00000000000..69ed013b8a5
--- /dev/null
+++ b/addons/website_slides/views/website_slides_templates_profile.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Courses
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ No followed course yet!
+
+
+
diff --git a/addons/website_slides_forum/__init__.py b/addons/website_slides_forum/__init__.py
new file mode 100644
index 00000000000..8c67f893b37
--- /dev/null
+++ b/addons/website_slides_forum/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
+from . import controllers
diff --git a/addons/website_slides_forum/__manifest__.py b/addons/website_slides_forum/__manifest__.py
new file mode 100644
index 00000000000..a272af7858c
--- /dev/null
+++ b/addons/website_slides_forum/__manifest__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+ 'name': 'Forum on course',
+ 'category': 'Hidden',
+ 'version': '1.0',
+ 'summary': 'Allows to link forum on a course',
+ 'description': """A Slide channel can be linked to forum. Also, profiles from slide and forum are regrouped together""",
+ 'depends': ['website_slides', 'website_forum'],
+ 'data': [
+ 'views/slide_channel_views.xml'
+ ],
+ 'auto_install': True,
+}
diff --git a/addons/website_slides_forum/controllers/__init__.py b/addons/website_slides_forum/controllers/__init__.py
new file mode 100644
index 00000000000..65a8c12013d
--- /dev/null
+++ b/addons/website_slides_forum/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import main
diff --git a/addons/website_slides_forum/controllers/main.py b/addons/website_slides_forum/controllers/main.py
new file mode 100644
index 00000000000..e86a4d70bf0
--- /dev/null
+++ b/addons/website_slides_forum/controllers/main.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.http import request
+from odoo.addons.website_slides.controllers.main import WebsiteSlides
+
+
+class WebsiteSlidesForum(WebsiteSlides):
+ # Profile
+ # ---------------------------------------------------
+ def _prepare_user_profile_parameters(self, **post):
+ post = super(WebsiteSlidesForum, self)._prepare_user_profile_parameters(**post)
+ if post.get('channel_id'):
+ channel = request.env['slide.channel'].browse(int(post.get('channel_id')))
+ if channel.forum_id:
+ post.update({
+ 'forum_id': channel.forum_id.id,
+ 'no_forum': False
+ })
+ else:
+ post.update({'no_forum': True})
+ return post
diff --git a/addons/website_slides_forum/models/__init__.py b/addons/website_slides_forum/models/__init__.py
new file mode 100644
index 00000000000..68c2a5669da
--- /dev/null
+++ b/addons/website_slides_forum/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import forum
+from . import slide_channel
diff --git a/addons/website_slides_forum/models/forum.py b/addons/website_slides_forum/models/forum.py
new file mode 100644
index 00000000000..907ae5c586e
--- /dev/null
+++ b/addons/website_slides_forum/models/forum.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Forum(models.Model):
+ _inherit = 'forum.forum'
+
+ slide_channel_id = fields.Many2one('slide.channel', 'Course')
diff --git a/addons/website_slides_forum/models/slide_channel.py b/addons/website_slides_forum/models/slide_channel.py
new file mode 100644
index 00000000000..9b8018a1af5
--- /dev/null
+++ b/addons/website_slides_forum/models/slide_channel.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Channel(models.Model):
+ _inherit = 'slide.channel'
+
+ forum_id = fields.Many2one('forum.forum', 'Course Forum')
+
+ _sql_constraints = [
+ ('forum_uniq', 'unique (forum_id)', "Only one forum per slide channel!"),
+ ]
diff --git a/addons/website_slides_forum/views/slide_channel_views.xml b/addons/website_slides_forum/views/slide_channel_views.xml
new file mode 100644
index 00000000000..ddff2b256b4
--- /dev/null
+++ b/addons/website_slides_forum/views/slide_channel_views.xml
@@ -0,0 +1,17 @@
+
+
+
+ website.slides_forum.view.form.inherit.slide.channel
+ slide.channel
+
+
+
+
+
+
+
+
+
+
- Badges -
-- Besides gaining reputation with your questions and answers, - you receive badges for being especially helpful. Badges - appear on your profile page, and your posts. -
-| - - - - - - | - - awarded users - | - - | -
- ![]()
+ ![]()
@@ -1233,330 +1205,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Edit
-
-
-
-
-
-
-
-
diff --git a/addons/website_forum/views/website_forum_profile.xml b/addons/website_forum/views/website_forum_profile.xml
new file mode 100644
index 00000000000..3cdac8b35c4
--- /dev/null
+++ b/addons/website_forum/views/website_forum_profile.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+ Return to the forum.
+
+
+
+
+
+
+
+
+ Votes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Activity
+
+
+ Votes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No activities yet!
+
+
+
+
+
+
diff --git a/addons/website_profile/__init__.py b/addons/website_profile/__init__.py
index dc5e6b693d1..8c67f893b37 100644
--- a/addons/website_profile/__init__.py
+++ b/addons/website_profile/__init__.py
@@ -2,3 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import models
+from . import controllers
diff --git a/addons/website_profile/__manifest__.py b/addons/website_profile/__manifest__.py
index 1575856c320..1214d3f03e8 100644
--- a/addons/website_profile/__manifest__.py
+++ b/addons/website_profile/__manifest__.py
@@ -8,11 +8,12 @@
'summary': 'Access the website profile of the users',
'description': """Allows to acces the website profile of the users and see their statistics (karma, badges, etc..)""",
'depends': [
- 'website',
+ 'website_partner',
'gamification'
],
'data': [
'views/gamification_badge_views.xml',
+ 'views/website_profile.xml',
'security/ir.model.access.csv',
],
'auto_install': False,
diff --git a/addons/website_profile/controllers/__init__.py b/addons/website_profile/controllers/__init__.py
new file mode 100644
index 00000000000..5d4b25db9c0
--- /dev/null
+++ b/addons/website_profile/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import main
diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py
new file mode 100644
index 00000000000..b1a29efe708
--- /dev/null
+++ b/addons/website_profile/controllers/main.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import base64
+import werkzeug.exceptions
+import werkzeug.urls
+import werkzeug.wrappers
+
+from odoo import http
+from odoo.http import request
+from odoo.osv import expression
+
+
+class WebsiteProfile(http.Controller):
+ # Profile
+ # ---------------------------------------------------
+ def _check_user_profile_access(self, user_id):
+ user_sudo = request.env['res.users'].sudo().browse(user_id)
+ if user_sudo.karma == 0 or not user_sudo.website_published or \
+ (user_sudo.id != request.session.uid and request.env.user.karma < request.website.karma_profile_min):
+ return False
+ return user_sudo
+
+ def _prepare_user_values(self, **kwargs):
+ values = {
+ 'user': request.env.user,
+ 'is_public_user': request.website.is_public_user(),
+ }
+ values.update(kwargs)
+ return values
+
+ def _prepare_user_profile_parameters(self, **post):
+ return post
+
+ def _prepare_user_profile_values(self, user, **post):
+ return {
+ 'uid': request.env.user.id,
+ 'user': user,
+ 'main_object': user,
+ 'is_profile_page': True,
+ 'edit_button_url_param': '',
+ }
+
+ @http.route(['/profile/user/'], type='http', auth="public", website=True)
+ def view_user_profile(self, user_id, **post):
+ user = self._check_user_profile_access(user_id)
+ if not user:
+ return request.render("website_profile.private_profile")
+ params = self._prepare_user_profile_parameters(**post)
+ values = self._prepare_user_profile_values(user, **params)
+ return request.render("website_profile.user_profile_main", values)
+
+ # Edit Profile
+ # ---------------------------------------------------
+ @http.route('/profile/edit', type='http', auth="user", website=True)
+ def view_user_profile_edition(self, **kwargs):
+ countries = request.env['res.country'].search([])
+ values = self._prepare_user_values(searches=kwargs)
+ values.update({
+ 'email_required': kwargs.get('email_required'),
+ 'countries': countries,
+ 'url_param': kwargs.get('url_param'),
+ })
+ return request.render("website_profile.user_profile_edit_main", values)
+
+ def _profile_edition_preprocess_values(self, user, **kwargs):
+ values = {
+ 'name': kwargs.get('name'),
+ 'website': kwargs.get('website'),
+ 'email': kwargs.get('email'),
+ 'city': kwargs.get('city'),
+ 'country_id': int(kwargs.get('country')) if kwargs.get('country') else False,
+ 'website_description': kwargs.get('description'),
+ }
+
+ if 'clear_image' in kwargs:
+ values['image'] = False
+ elif kwargs.get('ufile'):
+ image = kwargs.get('ufile').read()
+ values['image'] = base64.b64encode(image)
+
+ if request.uid == user.id: # the controller allows to edit only its own privacy settings; use partner management for other cases
+ values['website_published'] = kwargs.get('website_published') == 'True'
+ return values
+
+ @http.route('/profile/user/save', type='http', auth="user", methods=['POST'], website=True)
+ def save_edited_profile(self, **kwargs):
+ user = request.env.user
+ values = self._profile_edition_preprocess_values(user, **kwargs)
+ whitelisted_values = {key: values[key] for key in type(user).SELF_WRITEABLE_FIELDS if key in values}
+ user.write(whitelisted_values)
+ if kwargs.get('url_param'):
+ return werkzeug.utils.redirect("/profile/user/%d?%s" % (user.id, kwargs['url_param']))
+ else:
+ return werkzeug.utils.redirect("/profile/user/%d" % user.id)
+ # Ranks
+ # ---------------------------------------------------
+ @http.route('/profile/ranks', type='http', auth="public", website=True)
+ def ranks(self, **kwargs):
+ Rank = request.env['gamification.karma.rank']
+ ranks = Rank.sudo().search([])
+ ranks = ranks.sorted(key=lambda b: b.karma_min)
+ values = {
+ 'ranks': ranks,
+ }
+ return request.render("website_profile.rank_main", values)
+
+ # Badges
+ # ---------------------------------------------------
+ def _prepare_badges_domain(self, **kwargs):
+ """
+ Hook for other modules to restrict the badges showed on profile page, depending of the context
+ """
+ domain = [('website_published', '=', True)]
+ if 'category' in kwargs:
+ domain = expression.AND([[('challenge_ids.category', '=', kwargs.get('category'))], domain])
+ return domain
+
+ @http.route('/profile/badge', type='http', auth="public", website=True)
+ def badges(self, **kwargs):
+ Badge = request.env['gamification.badge']
+ badges = Badge.sudo().search(self._prepare_badges_domain(**kwargs))
+ badges = sorted(badges, key=lambda b: b.stat_count_distinct, reverse=True)
+ values = self._prepare_user_values(searches={'badges': True})
+ values.update({
+ 'badges': badges,
+ })
+ return request.render("website_profile.badge_main", values)
diff --git a/addons/website_profile/models/__init__.py b/addons/website_profile/models/__init__.py
index 980f26c8bd4..c26e78d1255 100644
--- a/addons/website_profile/models/__init__.py
+++ b/addons/website_profile/models/__init__.py
@@ -2,3 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import gamification_badge
+from . import website
diff --git a/addons/website_profile/models/website.py b/addons/website_profile/models/website.py
new file mode 100644
index 00000000000..76a37eba3d9
--- /dev/null
+++ b/addons/website_profile/models/website.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Website(models.Model):
+ _inherit = 'website'
+
+ karma_profile_min = fields.Integer(string="Minimal karma to see other user's profile", default=150)
diff --git a/addons/website_profile/static/src/scss/website_profile.scss b/addons/website_profile/static/src/scss/website_profile.scss
new file mode 100644
index 00000000000..c636bd40d92
--- /dev/null
+++ b/addons/website_profile/static/src/scss/website_profile.scss
@@ -0,0 +1,189 @@
+$gold: #ffcc00;
+$silver: #cccccc;
+$bronze: #eea91e;
+
+.o_wprofile_container {
+ margin: auto;
+ width: 100%;
+ max-width: 1140px;
+ padding: 32px 32px 0px 32px;
+}
+
+.o_wprofile_header {
+ margin: auto;
+ background-color: #875A7B !important;
+ border-bottom: 48px solid #66445e;
+ .o_wprofile_header_container {
+ top: 48px;
+ padding-top: 0px;
+ .o_wprofile_id {
+ font-size: 16px;
+ .o_wprofile_id_info {
+ margin-right: 36px;
+ }
+ }
+ .o_wprofile_pict {
+ .o_wprofile_photo {
+ width: 100%;
+ max-width: 256px;
+ }
+ }
+ }
+}
+
+.o_wprofile_content {
+ margin: auto;
+ background-color: #f2f2f2 !important;
+ .o_wprofile_content_container{
+ position: relative;
+ top: -80px;
+ .o_wprofile_navtabs_container {
+ .o_wprofile_nav_tabs {
+ border-bottom: 0px;
+ }
+ .o_wprofile_navlink {
+ color: white;
+ border-radius: 0px;
+ height: 48px;
+ font-weight: bold;
+ padding-top: 12px;
+ border-left: 2px solid #875A7B;
+ text-align: center;
+ width: 120px;
+ &:hover {
+ border: 0px;
+ border-radius: 0px;
+ background-color: #875A7B;
+ }
+ }
+ .o_wprofile_navlink.active {
+ color: #212529;
+ background-color: #f2f2f2;
+ border: 0px;
+ }
+ }
+ .o_wprofile_detail {
+ .o_wprofile_content_abstract {
+ top: 1px;
+ width: 256px;
+ max-width: 256px;
+ margin-left: 15px;
+ table {
+ width: 100%;
+ tr {
+ line-height: 32px;
+ }
+ th {
+ font-weight: normal;
+ }
+ }
+ .o_wprofile_rank {
+ background-color: white;
+ }
+ .o_wprofile_abstract_info {
+ background-color: white;
+ }
+ }
+ .o_wprofile_content_detail {
+ h4 {
+ border-bottom: 1px solid lightgrey;
+ color: grey;
+ margin-bottom: 16px;
+ }
+ .o_user_badges {
+ padding: 8px;
+ div {
+ padding: 8px;
+ }
+ img {
+ width: 48px;
+ height: 48px;
+ }
+ }
+ }
+ }
+ }
+}
+
+// Rank
+.o_wprofile_ranks_presentation {
+ background-color: lightgray;
+ .o_wprofile_rank_tile {
+ width: 20%;
+ div {
+ text-align:center;
+ img {
+ height: 128px;
+ }
+ }
+ }
+}
+
+.o_wprofile_next_rank_card {
+ div {
+ text-align: center;
+ img {
+ width: 128px;
+ height: 128px;
+ }
+ }
+ border-bottom: 1px solid lightgray;
+ .o_wprofile_next_rank_progress {
+ background-color: lightgray;
+ .o_wprofile_next_rank_progress_bar {
+ background-color: #00A09D !important;
+ }
+ }
+}
+
+// Edit Profile button
+.o_wprofile_edit {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ padding-left: 16px;
+ padding-right: 16px;
+}
+
+// Badges
+.badge-gold {
+ color: $gold;
+}
+.bg-gold {
+ background-color: $gold;
+}
+
+.badge-silver {
+ color: $silver;
+}
+.bg-silver {
+ background-color: $silver;
+}
+
+.badge-bronze {
+ color: $bronze;
+}
+.bg-bronze {
+ background-color: $bronze;
+}
+
+// Other stuffs
+.o_wprofile_bb_grey {
+ border-bottom: 2px solid lightgrey;
+}
+
+.country_flag {
+ display: inline-block;
+ margin-left: 2px;
+ max-height: 13px;
+ width: auto !important;
+}
+
+.o_wprofile_img_small {
+ width: 64px;
+ height: 64px;
+}
+.o_wprofile_img_medium {
+ width: 96px;
+ height: 96px;
+}
diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
new file mode 100644
index 00000000000..06562d0e697
--- /dev/null
+++ b/addons/website_profile/views/website_profile.xml
@@ -0,0 +1,379 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index fd307f967a5..aba81fcc88b 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -33,6 +33,7 @@ Share and Publish Videos, Presentations and Documents'
'views/slide_channel_tag_views.xml',
'views/slide_channel_invite_views.xml',
'views/website_slides_menu_views.xml',
+ 'views/website_slides_templates_profile.xml',
'data/website_slides_ir_data.xml',
'data/mail_data.xml',
'data/slide_data.xml',
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 2739d9d7d57..8d11d587608 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -11,13 +11,14 @@ from odoo.http import request
from odoo.osv import expression
from odoo.addons.http_routing.models.ir_http import slug
+from odoo.addons.website_profile.controllers.main import WebsiteProfile
from odoo.addons.website.models.ir_http import sitemap_qs2dom
from odoo.tools import html2plaintext
_logger = logging.getLogger(__name__)
-class WebsiteSlides(http.Controller):
+class WebsiteSlides(WebsiteProfile):
_slides_per_page = 12
_slides_per_list = 20
_order_by_criterion = {
@@ -44,9 +45,15 @@ class WebsiteSlides(http.Controller):
request.session['viewed_slides'] = viewed_slides
else:
slide.action_set_viewed()
-
return True
+ def _prepare_user_values(self, **kwargs):
+ values = super(WebsiteSlides, self)._prepare_user_values(**kwargs)
+ channel = self._get_channels(**kwargs)
+ if channel:
+ values['channel'] = channel
+ return values
+
def _get_slide_detail(self, slide):
most_viewed_slides = slide.get_most_viewed_slides(self._slides_per_list)
related_slides = slide.get_related_slides(self._slides_per_list)
@@ -95,7 +102,6 @@ class WebsiteSlides(http.Controller):
'''/slides//tag/''',
'''/slides//tag//page/''',
-
'''/slides//category/''',
'''/slides//category//page/''',
@@ -394,3 +400,37 @@ class WebsiteSlides(http.Controller):
except AccessError: # TODO : please, make it clean one day, or find another secure way to detect
# if the slide can be embedded, and properly display the error message.
return request.render('website_slides.embed_slide_forbidden', {})
+
+ # Profile
+ # ---------------------------------------------------
+ def _get_channels(self, **kwargs):
+ channels = []
+ if kwargs.get('channel'):
+ channels = kwargs['channel']
+ elif kwargs.get('channel_id'):
+ channels = request.env['slide.channel'].browse(int(kwargs['channel_id']))
+ return channels
+
+ def _prepare_user_slides_profile(self, user):
+ courses = request.env['slide.channel.partner'].sudo().search([('partner_id', '=', user.partner_id.id)]).mapped('channel_id')
+ values = {
+ 'uid': request.env.user.id,
+ 'user': user,
+ 'main_object': user,
+ 'courses': courses,
+ 'count_courses': len(courses),
+ 'is_profile_page': True,
+ 'badge_category': 'slides',
+ }
+ return values
+
+ def _prepare_user_profile_values(self, user, **post):
+ values = super(WebsiteSlides, self)._prepare_user_profile_values(user, **post)
+ if post.get('channel_id'):
+ values.update({'edit_button_url_param': 'channel_id=' + str(post['channel_id'])})
+ channels = self._get_channels(**post)
+ if not channels:
+ channels = request.env['slide.channel'].search([])
+ values.update(self._prepare_user_values(channel=channels[0] if len(channels) == 1 else True, **post))
+ values.update(self._prepare_user_slides_profile(user))
+ return values
diff --git a/addons/website_slides/models/__init__.py b/addons/website_slides/models/__init__.py
index 4872648aced..4b8210c6caa 100644
--- a/addons/website_slides/models/__init__.py
+++ b/addons/website_slides/models/__init__.py
@@ -7,3 +7,4 @@ from . import slide_channel_tag
from . import slide_channel_invite
from . import res_config_settings
from . import website
+from . import res_users
diff --git a/addons/website_slides/models/res_users.py b/addons/website_slides/models/res_users.py
new file mode 100644
index 00000000000..58be46c4eed
--- /dev/null
+++ b/addons/website_slides/models/res_users.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class Users(models.Model):
+ _inherit = 'res.users'
+
+ def get_gamification_redirection_data(self):
+ res = super(Users, self).get_gamification_redirection_data()
+ res.append({
+ 'url': '/slides',
+ 'label': 'See our eLearning'
+ })
+ return res
diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py
index 56d689c76db..29625c3e209 100644
--- a/addons/website_slides/models/slide_slide.py
+++ b/addons/website_slides/models/slide_slide.py
@@ -6,7 +6,6 @@ from PIL import Image
import base64
import datetime
import io
-import json
import re
from werkzeug import urls
@@ -121,6 +120,7 @@ class Slide(models.Model):
is_preview = fields.Boolean('Always visible', default=False)
completion_time = fields.Float('# Hours', default=1, digits=(10, 4))
image = fields.Binary('Image', attachment=True)
+ # TODO DBE : review image medium and small - using standard image calls (see web/image/.. route)
image_medium = fields.Binary('Medium', compute="_get_image", store=True, attachment=True)
image_thumb = fields.Binary('Thumbnail', compute="_get_image", store=True, attachment=True)
# subscribers
diff --git a/addons/website_slides/static/src/scss/website_slides_profile.scss b/addons/website_slides/static/src/scss/website_slides_profile.scss
new file mode 100644
index 00000000000..f5b703e9534
--- /dev/null
+++ b/addons/website_slides/static/src/scss/website_slides_profile.scss
@@ -0,0 +1,27 @@
+.o_wprofile_slides_card {
+ padding: 8px;
+ max-height: 68px;
+}
+.o_wprofile_slides_title {
+ top: -15px;
+ padding-left: 76px;
+}
+
+// Quest - Course Card
+.o_wprofile_slides_course_card_body {
+ cursor: pointer;
+ max-height: 64px;
+ .o_wprofile_slides_course_img {
+ position: absolute;
+ padding: 0px;
+ top: 8px;
+ left: 8px;
+ width: 66px;
+ height: 66px;
+ }
+ .o_wprofile_slide_course_rating {
+ position: absolute;
+ top: 13px;
+ right: 16px;
+ }
+}
diff --git a/addons/website_slides/views/assets.xml b/addons/website_slides/views/assets.xml
index a4e99c146ce..3602f06aab1 100644
--- a/addons/website_slides/views/assets.xml
+++ b/addons/website_slides/views/assets.xml
@@ -5,6 +5,7 @@
+
diff --git a/addons/website_slides/views/website_slides_templates.xml b/addons/website_slides/views/website_slides_templates.xml
index cb9b11f33f6..814b4a41d2d 100644
--- a/addons/website_slides/views/website_slides_templates.xml
+++ b/addons/website_slides/views/website_slides_templates.xml
@@ -107,34 +107,43 @@
+
This profile is private!
- -Edit Profile
-
-
-
- Profile
-
-
-
-
-
-
-
-
-
-
- ![]()
-
- -
- Karma
-
-
-
- Badges
-
-
-
-
-
-
-
-
-
-
- Votes
-
-
-
-
-
-
-
-
- Contribution
-
-
-
-
- Bio
-
-
-
-
-
- Member since
-
-
-
-
-
-
-
-
-
- Last connection
-
-
-
-
-
-
-
- Introduction
-
-
-
-
-
- Location
-
-
-
-
- ,
-
-
-
-
-
-
-
- Website
-
-
-
-
-
-
-
-
-
-
-
- | - - - - - - | - - awarded users - | - - | -
- No badge yet!
- Check available badges -
-
-
-
-
- - Check available badges -
- No vote given by you yet!
-
-
-
+
+
+
+
+
+
+
+
+
+ No question posted yet.
+
+
+ Questions
+
+
+
+
+ Favourite Questions
+
+
+
+
+ Followed Questions
+
+
+
+
+
+
+
+
+ No answer posted yet.
+
+
+ Answers
+
+
+
+
+
+
+ Votes
+
+
+
+
+ Activities
+
+ No vote given by you yet!
+
+
+
+
+
+
+ Edit Profile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Current Rank : | ++ |
|---|
+
+
+
+
+
+
+ | Joined | ++ |
|---|---|
| Badges | +
+ |
+
| Website | ++ |
| Location | +
+ |
+
| Company | ++ |
+
+
+
+
+
+
+
+ Badges
+
+
+ Biography
+ +
+ ![]()
+
+
+
+
+ ""
+ / xp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+ + + | +
|---|
+
+ + Ranks & Badges +
++ Do not stop learning with Odoo. Collects points on the forum or the eLearning platform. Those points will make you reach new ranks. +
++ How do I earn badges? When you finish a course, reach milestones, you're awarded badges. +
++ How do I score more points? You can score more points by answering quizzes at the end of each course content. Points can also be earned on the forum. Follow this link to the guidelines of the forum. +
+
+
+
+
+
+
+
+
+ Ranks
+
+
+
+ ![]()
+
+
+
points
+
+
+
+
+ + Badges +
++ Besides gaining reputation with your questions and answers, + you receive badges for being especially helpful. Badges + appear on your profile page, and your posts. +
+| + + + + + + | + + awarded users + | + + | +
+
+ This profile is private!
+ +
-
-
-
-
-
- Joined
-
-
-
+
-
-
-
-
- Joined
-
-
-
- /
-
-
-
- Upload
-
-
-
+
+
+
+
+
+
+ Joined
+
+
+
+
+
+
+
+
+
+ Joined
+
+
+
+ /
+
+
+
+ Upload
+
+
+
+
+
diff --git a/addons/website_slides/views/website_slides_templates_profile.xml b/addons/website_slides/views/website_slides_templates_profile.xml
new file mode 100644
index 00000000000..69ed013b8a5
--- /dev/null
+++ b/addons/website_slides/views/website_slides_templates_profile.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No followed course yet!
+
+
+
diff --git a/addons/website_slides_forum/__init__.py b/addons/website_slides_forum/__init__.py
new file mode 100644
index 00000000000..8c67f893b37
--- /dev/null
+++ b/addons/website_slides_forum/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
+from . import controllers
diff --git a/addons/website_slides_forum/__manifest__.py b/addons/website_slides_forum/__manifest__.py
new file mode 100644
index 00000000000..a272af7858c
--- /dev/null
+++ b/addons/website_slides_forum/__manifest__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+ 'name': 'Forum on course',
+ 'category': 'Hidden',
+ 'version': '1.0',
+ 'summary': 'Allows to link forum on a course',
+ 'description': """A Slide channel can be linked to forum. Also, profiles from slide and forum are regrouped together""",
+ 'depends': ['website_slides', 'website_forum'],
+ 'data': [
+ 'views/slide_channel_views.xml'
+ ],
+ 'auto_install': True,
+}
diff --git a/addons/website_slides_forum/controllers/__init__.py b/addons/website_slides_forum/controllers/__init__.py
new file mode 100644
index 00000000000..65a8c12013d
--- /dev/null
+++ b/addons/website_slides_forum/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import main
diff --git a/addons/website_slides_forum/controllers/main.py b/addons/website_slides_forum/controllers/main.py
new file mode 100644
index 00000000000..e86a4d70bf0
--- /dev/null
+++ b/addons/website_slides_forum/controllers/main.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.http import request
+from odoo.addons.website_slides.controllers.main import WebsiteSlides
+
+
+class WebsiteSlidesForum(WebsiteSlides):
+ # Profile
+ # ---------------------------------------------------
+ def _prepare_user_profile_parameters(self, **post):
+ post = super(WebsiteSlidesForum, self)._prepare_user_profile_parameters(**post)
+ if post.get('channel_id'):
+ channel = request.env['slide.channel'].browse(int(post.get('channel_id')))
+ if channel.forum_id:
+ post.update({
+ 'forum_id': channel.forum_id.id,
+ 'no_forum': False
+ })
+ else:
+ post.update({'no_forum': True})
+ return post
diff --git a/addons/website_slides_forum/models/__init__.py b/addons/website_slides_forum/models/__init__.py
new file mode 100644
index 00000000000..68c2a5669da
--- /dev/null
+++ b/addons/website_slides_forum/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import forum
+from . import slide_channel
diff --git a/addons/website_slides_forum/models/forum.py b/addons/website_slides_forum/models/forum.py
new file mode 100644
index 00000000000..907ae5c586e
--- /dev/null
+++ b/addons/website_slides_forum/models/forum.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Forum(models.Model):
+ _inherit = 'forum.forum'
+
+ slide_channel_id = fields.Many2one('slide.channel', 'Course')
diff --git a/addons/website_slides_forum/models/slide_channel.py b/addons/website_slides_forum/models/slide_channel.py
new file mode 100644
index 00000000000..9b8018a1af5
--- /dev/null
+++ b/addons/website_slides_forum/models/slide_channel.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Channel(models.Model):
+ _inherit = 'slide.channel'
+
+ forum_id = fields.Many2one('forum.forum', 'Course Forum')
+
+ _sql_constraints = [
+ ('forum_uniq', 'unique (forum_id)', "Only one forum per slide channel!"),
+ ]
diff --git a/addons/website_slides_forum/views/slide_channel_views.xml b/addons/website_slides_forum/views/slide_channel_views.xml
new file mode 100644
index 00000000000..ddff2b256b4
--- /dev/null
+++ b/addons/website_slides_forum/views/slide_channel_views.xml
@@ -0,0 +1,17 @@
+
+
+
+ website.slides_forum.view.form.inherit.slide.channel
+ slide.channel
+
+
+
+
+
+
+
+
+
+
+
+ Courses
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+