From bb35811320ccf38690fe3f3a7a61608a1e00759c Mon Sep 17 00:00:00 2001 From: David Beguin Date: Mon, 22 Jul 2019 11:40:33 +0000 Subject: [PATCH] [REF] website_slides : refactor share_modal to use same template(s) in all case This commit prepares the next one. It creates generic main and sub templates for slide share modal. In order to be usable for all cases, header and body sub template have been added. Also and in the same purpose, as the website url can be another url than the record to share (or if the record doesn't have website_url), this website_url can be specified separately from the record. Otherwise, the standard behaviour is to use the record.website_url. Task ID: 1950396 PR #31776 --- .../static/src/js/slides_share.js | 7 ++- .../views/website_slides_templates_course.xml | 42 +++---------- .../views/website_slides_templates_lesson.xml | 17 +++++- .../website_slides_templates_lesson_embed.xml | 5 +- .../views/website_slides_templates_utils.xml | 61 +++++++++++++------ 5 files changed, 74 insertions(+), 58 deletions(-) diff --git a/addons/website_slides/static/src/js/slides_share.js b/addons/website_slides/static/src/js/slides_share.js index d23b48c5c9a..2148abc034d 100644 --- a/addons/website_slides/static/src/js/slides_share.js +++ b/addons/website_slides/static/src/js/slides_share.js @@ -77,12 +77,13 @@ publicWidget.registry.websiteSlidesShare = publicWidget.Widget.extend({ _onShareLinkCopy: function (ev) { ev.preventDefault(); - var $clipboardBtn = this.$('.o_clipboard_button'); + var $clipboardBtn = $(ev.currentTarget); $clipboardBtn.tooltip({title: "Copied !", trigger: "manual", placement: "bottom"}); var self = this; - var clipboard = new ClipboardJS('.o_clipboard_button', { + var clipboard = new ClipboardJS('#' + $clipboardBtn[0].id, { target: function () { - return self.$('.o_wslides_js_share_link')[0]; + var share_link_el = self.$('#wslides_share_link_id_' + $clipboardBtn[0].id.split('id_')[1]); + return share_link_el[0]; }, container: this.el }); diff --git a/addons/website_slides/views/website_slides_templates_course.xml b/addons/website_slides/views/website_slides_templates_course.xml index f1d60471896..72fdae25d42 100644 --- a/addons/website_slides/views/website_slides_templates_course.xml +++ b/addons/website_slides/views/website_slides_templates_course.xml @@ -131,7 +131,7 @@
@@ -158,6 +158,11 @@ + + + + +
@@ -250,36 +255,9 @@
- + + + @@ -339,7 +317,7 @@
diff --git a/addons/website_slides/views/website_slides_templates_lesson.xml b/addons/website_slides/views/website_slides_templates_lesson.xml index 3770c1dca49..bfe35524f19 100644 --- a/addons/website_slides/views/website_slides_templates_lesson.xml +++ b/addons/website_slides/views/website_slides_templates_lesson.xml @@ -337,9 +337,20 @@ The social sharing module will be unlocked when a moderator will allow your publication. - - - +
+
+
Share on Social Networks
+ + + +
+
+ + + + +
+
diff --git a/addons/website_slides/views/website_slides_templates_lesson_embed.xml b/addons/website_slides/views/website_slides_templates_lesson_embed.xml index 6713bda120e..2103edd081c 100644 --- a/addons/website_slides/views/website_slides_templates_lesson_embed.xml +++ b/addons/website_slides/views/website_slides_templates_lesson_embed.xml @@ -43,7 +43,10 @@ t-att-data-defaultpage="page">
- + + + +
diff --git a/addons/website_slides/views/website_slides_templates_utils.xml b/addons/website_slides/views/website_slides_templates_utils.xml index 80368c76e09..a215367d788 100644 --- a/addons/website_slides/views/website_slides_templates_utils.xml +++ b/addons/website_slides/views/website_slides_templates_utils.xml @@ -2,7 +2,7 @@ -