[MERGE] forward port of branch saas-6 up to bf1e999

3 files changed, 73 insertions, 36 deletions

diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index 395167cf615..2e1a4ebaa38 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -1,113 +1,145 @@
 .vote {
   min-width: 38px;
-  margin-right: 12px; }
-  .vote .vote_count {
-    font-size: 160%;
-    font-weight: bold;
-    line-height: 12px; }
-  .vote .vote_up, .vote .vote_down {
-    font-size: 130%; }
+  margin-right: 12px;
+}
+.vote .vote_count {
+  font-size: 160%;
+  font-weight: bold;
+  line-height: 12px;
+}
+.vote .vote_up, .vote .vote_down {
+  font-size: 130%;
+}
 
 .author-box {
   min-width: 200px;
   padding: 4px;
-  background-color: whitesmoke; }
+  background-color: #f5f5f5;
+}
 
 .question-block {
-  margin-left: 50px; }
+  margin-left: 50px;
+}
+
+.question {
+  clear: left;
+}
 
 .question .question-name {
-  font-size: 150%; }
+  font-size: 150%;
+}
 .question .badge {
-  background-color: #cccccc;
-  margin-left: 4px; }
+  background-color: #ccc;
+  margin-left: 4px;
+}
 .question .badge-active {
-  background-color: #428bca; }
+  background-color: #428bca;
+}
 .question img {
   max-width: 600px;
-  height: auto !important; }
+  height: auto !important;
+}
 
 .forum_answer img {
   max-width: 600px;
-  height: auto !important; }
+  height: auto !important;
+}
 
 img.img-avatar {
   max-height: 40px;
-  margin-right: 10px; }
+  margin-right: 10px;
+}
 
 .oe_grey {
-  background-color: #eeeeee; }
+  background-color: #eeeeee;
+}
 
 .badge-gold {
-  color: #ffcc00; }
+  color: #ffcc00;
+}
 
 .badge-silver {
-  color: #cccccc; }
+  color: #cccccc;
+}
 
 .badge-bronze {
-  color: #eea91e; }
+  color: #eea91e;
+}
 
 .oe_answer_true {
-  color: #3c763d; }
+  color: #3c763d;
+}
 
 .forum_answer .oe_answer_true:hover {
   color: #4D964E;
 }
 
 .oe_answer_false {
-  color: #bbbbbb; }
+  color: #bbbbbb;
+}
 
 .oe_answer_false:hover {
   color: #9E9C9C;
 }
 
 .favourite_question {
-  color: #bbbbbb !important; }
+  color: #bbbbbb !important;
+}
 
 .forum_favourite_question {
-  color: #ffcc00 !important; }
+  color: #ffcc00 !important;
+}
 
 a.no-decoration {
   cursor: pointer;
-  text-decoration: none !important; }
+  text-decoration: none !important;
+}
 
 .faq-question:hover {
   text-decoration: none !important;
-  color: #428bca; }
+  color: #428bca;
+}
 
 .oe_comment_grey {
-  background-color: whitesmoke;
-  padding: 4px; }
+  background-color: #f5f5f5;
+  padding: 4px;
+}
 
 .close.comment_delete {
-  font-size: 16px; }
+  font-size: 16px;
+}
 
 .country_flag {
   max-height: 16px;
   display: inline-block;
-  margin-left: 2px; }
+  margin-left: 2px;
+}
 
 .tag_text .text-core .text-wrap textarea, .tag_text .text-core .text-wrap input, .tag_text .text-core .text-wrap .text-dropdown, .tag_text .text-core .text-wrap .text-prompt {
-  font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important; }
+  font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important;
+}
 .tag_text .text-core .text-wrap .text-tags .text-tag .text-button {
   font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important;
-  height: 1.2em !important; }
+  height: 1.2em !important;
+}
 
 .oe_forum_alert {
   position: absolute;
   margin-top: -30px;
   margin-left: 90px;
   width: 300px;
-  z-index: 9999; }
+  z-index: 9999;
+}
 
 .oe_forum_email_required {
   position: absolute;
   margin-top: 155px;
   margin-left: 500px;
   margin-right: 100px;
-  z-index: 5; }
+  z-index: 5;
+}
 
 button.btn-link.text-muted {
-  color: #999999;
+  color: #999;
 }
 
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index 1313516a084..4cfa6e97c74 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -17,6 +17,9 @@
   margin-left: 50px
 
 .question
+  clear: left
+
+.question
   .question-name
     font-size: 150%
   .badge
diff --git a/addons/website_forum/static/src/js/website_forum.share.js b/addons/website_forum/static/src/js/website_forum.share.js
index 3ad1f3d0e7d..766008b297f 100644
--- a/addons/website_forum/static/src/js/website_forum.share.js
+++ b/addons/website_forum/static/src/js/website_forum.share.js
@@ -5,6 +5,7 @@ var ajax = require('web.ajax');
 var core = require('web.core');
 var SocialShare = require('website.share');
 var website = require('website.website');
+website.if_dom_contains('.website_forum', function () {
 
 var qweb = core.qweb;
 website.add_template_file('/website_forum/static/src/xml/website_forum_share_templates.xml');
@@ -61,6 +62,7 @@ website.ready().done(function() {
     }
 });
 
-return ForumShare;
+});
+return {};
 
 });