From 0027544779f156ec7183a13b24caf7de42ebe012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?=
Date: Tue, 25 Sep 2018 12:20:55 +0200
Subject: [PATCH] [FIX] website_slides: fix bs4 bugs
PR: #27131
---
.../lib/pdfslidesviewer/PDFSlidesViewer.js | 13 +-
.../static/src/scss/website_slides.scss | 24 ---
.../website_slides/views/website_slides.xml | 120 ++++++------
.../views/website_slides_embed.xml | 175 +++++++++---------
4 files changed, 145 insertions(+), 187 deletions(-)
diff --git a/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js b/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js
index f313a37dfa3..73fac349a1a 100644
--- a/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js
+++ b/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js
@@ -74,7 +74,7 @@ var PDFSlidesViewer = (function(){
self.pageRendering = false;
if (self.pageNumPending !== null) {
// New page rendering is pending
- renderPage(self.pageNumPending);
+ self.renderPage(self.pageNumPending);
self.pageNumPending = null;
}
self.pdf_page_current = page_number;
@@ -147,16 +147,9 @@ var PDFSlidesViewer = (function(){
PDFSlidesViewer.prototype.toggleFullScreenFooter = function(){
if(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
- var $navBarFooter = $('div#PDFViewer > div.navbar-fixed-bottom');
+ var $navBarFooter = $('div#PDFViewer div.oe_slides_panel_footer').parent();
$navBarFooter.toggleClass('oe_show_footer');
-
- if ($navBarFooter.css('display') === 'none') {
- $navBarFooter.css('display', 'block');
- $('div#PDFViewer').css('padding-bottom', '50px');
- } else {
- $navBarFooter.css('display', 'none');
- $('div#PDFViewer').css('padding-bottom', '0');
- }
+ $navBarFooter.toggle();
}
}
diff --git a/addons/website_slides/static/src/scss/website_slides.scss b/addons/website_slides/static/src/scss/website_slides.scss
index 22e4d30b446..f67344fdbb6 100644
--- a/addons/website_slides/static/src/scss/website_slides.scss
+++ b/addons/website_slides/static/src/scss/website_slides.scss
@@ -15,10 +15,6 @@ $MAX-Z-INDEX : 2147483647 !default;
object-position: top;
}
-.oe_slides_panel_footer {
- background-color: $light;
-}
-
.oe_slides_panel_footer .fa, .oe_slide_js_embed_option_link{
color : theme-color('primary');
cursor: pointer;
@@ -98,10 +94,6 @@ textarea.o_slides_comment {
}
// Thumbnails
-.oe_slides_thumbnail_container{
- height: 300px
-}
-
.oe_slides_grid_thumbnail {
@include top-covered-image;
height: 200px;
@@ -161,12 +153,6 @@ textarea.o_slides_comment {
padding: 10px;
}
-.oe_slides_panel{
- padding-bottom: 50px;
- height:100%;
- margin-bottom:0px;
-}
-
// PDF Viewer Share bar
.oe_slides_share_bar{
padding: 10px 0;
@@ -179,13 +165,3 @@ textarea.o_slides_comment {
.oe_show_footer {
z-index: $MAX-Z-INDEX; // Looks terrible but seems necessary due to fullscreen & canvas in PDFSlidesViewer
}
-// Display Slide Navigation Footer bit clear on mobile preview
-@media screen and (max-width: 300px) {
- .o_slide_navigation_buttons {
- margin-left: 15px;
- margin-right: -15px;
- .col-4 {
- display: none;
- }
- }
-}
diff --git a/addons/website_slides/views/website_slides.xml b/addons/website_slides/views/website_slides.xml
index e00e8e431ca..d353a696606 100644
--- a/addons/website_slides/views/website_slides.xml
+++ b/addons/website_slides/views/website_slides.xml
@@ -14,7 +14,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Share
+
+
+ Email
+
+
+ Embed
-
-
- Share
-
-
- Email
-
-
- Embed
-
-
-