From da177406345fb12589b0d20ea4f9b60bbd0c47a3 Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Mon, 4 Mar 2019 13:04:14 +0000 Subject: [PATCH 01/14] [FIX] website_rating: fix rating popupcomposer display Improve overall widget layout, fix stars design and perform some small tweaks. Commit linked to task ID 1941250 and PR #31977 --- addons/website_rating/static/src/xml/portal_chatter.xml | 8 ++++---- addons/website_rating/static/src/xml/website_mail.xml | 4 ++-- addons/website_rating/views/website_rating_templates.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/website_rating/static/src/xml/portal_chatter.xml b/addons/website_rating/static/src/xml/portal_chatter.xml index e331c0393cc..5d0395c099b 100644 --- a/addons/website_rating/static/src/xml/portal_chatter.xml +++ b/addons/website_rating/static/src/xml/portal_chatter.xml @@ -44,17 +44,17 @@ It can alse be used to modify a message --> -
-
+
+
- ( ratings) + ( ratings)
-
@@ -73,7 +73,7 @@ - +
diff --git a/addons/website_rating/views/website_rating_templates.xml b/addons/website_rating/views/website_rating_templates.xml index c5893a7944e..36bd88a1186 100644 --- a/addons/website_rating/views/website_rating_templates.xml +++ b/addons/website_rating/views/website_rating_templates.xml @@ -30,7 +30,7 @@ - + () From 7d0d49b4e331c4cb719ef26d91b2635cbf66ae41 Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Fri, 8 Mar 2019 10:30:02 +0000 Subject: [PATCH 02/14] [FIX] website_profile: improve top banner and navigation and apply various tweaks Improve the email validation banner and allow adding custom classes when calling its templates. Also improve top banner design as well as navigation and tabs. Finally perform some minor tweaks on design. Commit linked to task ID 1941250 and PR #31977 --- .../static/src/scss/website_profile.scss | 60 ++------ .../website_profile/views/website_profile.xml | 141 +++++++++++------- 2 files changed, 104 insertions(+), 97 deletions(-) diff --git a/addons/website_profile/static/src/scss/website_profile.scss b/addons/website_profile/static/src/scss/website_profile.scss index a20b1ea2eef..ad1771c5d62 100644 --- a/addons/website_profile/static/src/scss/website_profile.scss +++ b/addons/website_profile/static/src/scss/website_profile.scss @@ -1,5 +1,5 @@ $owprofile-color-bg: desaturate(map-get($grays, "200"), 80%); -$owprofile-tabs-height: 37px; +$owprofile-tabs-height: 36px; .o_wprofile_wrap { background-color: $owprofile-color-bg; @@ -119,52 +119,24 @@ $owprofile-tabs-height: 37px; // All Users Page .o_wprofile_all_users_nav { - margin: auto; - background: linear-gradient(90deg, #875A7B 20%, #62495B 80%) !important; - a { - color: #FFFFFF; - } - nav { - .breadcrumb-item::before { - font-weight: bold; - color: #FFFFFF; - opacity: 0.8; - } - .breadcrumb-item { - a { - font-weight: bold; - color: #FFFFFF; - opacity: 0.8; - transition: opacity linear .3s; - } - &.active { - a { - opacity: 1.0; - } - } - } - ol { - background-color: transparent; - } - } -} + border-width: 1px 0; -.o_wprofile_all_users_header { - @include media-breakpoint-up(sm) { - min-height: 200px; - margin-bottom: -60px; + &, .o_wprofile_course_nav_search { + background-color: rgba(white, 0.05); + border-color: rgba(white, 0.1); + border-style: solid; } - margin: auto; - background: linear-gradient(90deg, #875A7B 20%, #62495B 80%) !important; - > div:first-child { - margin: auto; - width: 100%; - max-width: 1140px; - padding: 32px 32px 0px 32px; + + .o_wprofile_course_nav_search { + border-width: 0 1px; + } + + .breadcrumb-item.active a, .breadcrumb-item a:hover { color: white; - top: 48px; - padding-top: 0px; - height: 250px; + } + + .breadcrumb-item a, .breadcrumb-item + .breadcrumb-item::before, .o_wprofile_course_nav_search input::placeholder { + color: rgba(white, 0.8); } } diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml index 540c7c608b5..d35e3bde919 100644 --- a/addons/website_profile/views/website_profile.xml +++ b/addons/website_profile/views/website_profile.xml @@ -9,6 +9,74 @@ + +
@@ -383,43 +455,10 @@ @@ -500,24 +539,20 @@ From b2e555eb0b9327a059ffb7e15ff2585ce8e66f1c Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Thu, 7 Mar 2019 12:44:19 +0000 Subject: [PATCH 03/14] [FIX] website_slides: fix various fullscreen layout issues Improve overall widget layout, perform some small tweaks. Also remove top title as it is not wanted. Commit linked to task ID 1941250 and PR #31977 --- .../src/js/slides_course_fullscreen_player.js | 5 ++- .../static/src/js/slides_embed.js | 18 +++++++--- .../src/scss/slides_slide_fullscreen.scss | 22 ++++--------- .../static/src/scss/website_slides.scss | 16 --------- .../src/xml/website_slides_fullscreen.xml | 22 +++---------- .../website_slides_templates_lesson_embed.xml | 2 +- ...ite_slides_templates_lesson_fullscreen.xml | 33 +++++-------------- 7 files changed, 35 insertions(+), 83 deletions(-) diff --git a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js index 30d23f20f2f..71e8041daee 100644 --- a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js +++ b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js @@ -181,7 +181,7 @@ odoo.define('website_slides.fullscreen', function (require) { */ setSlideCompleted: function (slideId) { var $elem = this.$('.fa-circle-thin[data-slide-id="'+slideId+'"]'); - $elem.removeClass('fa-circle-thin').addClass('fa-check-circle text-success bg-white o_wslides_slide_completed rounded-circle'); + $elem.removeClass('fa-circle-thin').addClass('fa-check text-success o_wslides_slide_completed'); }, /** * Updates the progressbar whenever a lesson is completed @@ -484,8 +484,7 @@ odoo.define('website_slides.fullscreen', function (require) { _onChangeSlide: function () { var self = this; var slide = this.get('slide'); - return this._fetchSlideContent().then(function() { // update title and render content - self.$('.o_wslides_fs_slide_title').html(QWeb.render('website.slides.fullscreen.title', {widget: self})); + return this._fetchSlideContent().then(function() { // render content return self._renderSlide(); }).then(function() { if (slide._autoSetDone && !session.is_website_user) { // no useless RPC call diff --git a/addons/website_slides/static/src/js/slides_embed.js b/addons/website_slides/static/src/js/slides_embed.js index b5ea4325375..5d86a257c7d 100644 --- a/addons/website_slides/static/src/js/slides_embed.js +++ b/addons/website_slides/static/src/js/slides_embed.js @@ -32,7 +32,6 @@ $(document).ready(function () { this.$('canvas').show(); this.$('#page_count').text(this.pdf_viewer.pdf_page_total); this.$('#PDFViewerLoader').hide(); - this.$('#PDFViewerLoader').toggleClass('d-flex'); if (this.pdf_viewer.pdf_page_total > 1) { this.$('.o_slide_navigation_buttons').removeClass('hide'); } @@ -44,16 +43,19 @@ $(document).ready(function () { on_rendered_page: function (pageNumber) { if (pageNumber) { this.$('#page_number').val(pageNumber); + this.navUpdate(pageNumber); } }, // page switching render_page: function (pageNumber) { this.pdf_viewer.renderPage(pageNumber).then(this.on_rendered_page.bind(this)); + this.navUpdate(pageNumber); }, change_page: function () { var pageAsked = parseInt(this.$('#page_number').val(), 10); if (1 <= pageAsked && pageAsked <= this.pdf_viewer.pdf_page_total) { this.pdf_viewer.changePage(pageAsked).then(this.on_rendered_page.bind(this)); + this.navUpdate(pageAsked); } else { // if page number out of range, reset the page_counter to the actual page this.$('#page_number').val(this.pdf_viewer.pdf_page_current); @@ -77,23 +79,28 @@ $(document).ready(function () { if (pageNum) { self.on_rendered_page(pageNum); } - self.$("#slide_suggest").hide(); + self.$("#slide_suggest").addClass('d-none'); }); }, first: function () { var self = this; this.pdf_viewer.firstPage().then(function (pageNum) { self.on_rendered_page(pageNum); - self.$("#slide_suggest").hide(); + self.$("#slide_suggest").addClass('d-none'); }); }, last: function () { var self = this; this.pdf_viewer.lastPage().then(function (pageNum) { self.on_rendered_page(pageNum); - self.$("#slide_suggest").hide(); + self.$("#slide_suggest").addClass('d-none'); }); }, + navUpdate: function (pageNum) { + this.$('#first').toggleClass('disabled', pageNum < 3 ); + this.$('#previous').toggleClass('disabled', pageNum < 2 ); + this.$('#next, #last').removeClass('disabled'); + }, // full screen mode fullscreen: function () { this.pdf_viewer.toggleFullScreen(); @@ -105,7 +112,8 @@ $(document).ready(function () { }, // display suggestion displayed after last slide display_suggested_slides: function () { - this.$("#slide_suggest").show(); + this.$("#slide_suggest").removeClass('d-none'); + this.$('#next, #last').addClass('disabled'); }, }; diff --git a/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss b/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss index d4a5cbd7105..a4ce29f60d3 100644 --- a/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss +++ b/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss @@ -4,10 +4,10 @@ $o-wslides-tabs-height: 36px; .o_wslides_fs_main { @include o-position-absolute(0,0,0,0); z-index: 2000; + background-image: linear-gradient(120deg, $o-wslides-color-dark2, $o-wslides-color-dark3); .o_wslides_slide_fs_header { - background-image: linear-gradient(120deg, $o-wslides-color-dark1, $o-wslides-color-dark2); - padding-bottom: 3px; + background-image: linear-gradient(-6deg, $o-wslides-color-dark1, $o-wslides-color-dark2); height: 50px; > div > a { @@ -24,29 +24,22 @@ $o-wslides-tabs-height: 36px; } &.active{ - background-color: transparent; + background-color: $o-wslides-color-dark1; color: #fff; } } } - .o_wslides_fs_container { - background-color: $o-wslides-color-dark2; - } - - .o_wslides_fs_content { + .o_wslides_fs_player, .o_wslides_fs_sidebar, .o_wslides_fs_sidebar_content { transition: all .2s ease-in; } .o_wslides_fs_sidebar { - transition: all .2s ease-in; background-image: linear-gradient(160deg, $o-wslides-color-dark1, $o-wslides-color-dark2); - box-shadow: 5px 0 15px rgba(black, 0.2); position: relative; .o_wslides_fs_sidebar_content { min-width: $o-wslides-fs-side-width; - transition: all .2s ease-in; } .o_wslides_fs_toggle_sidebar { @@ -57,6 +50,7 @@ $o-wslides-tabs-height: 36px; @include media-breakpoint-down (md) { @include o-position-absolute(0, auto, 0, 0); + box-shadow: 5px 0 15px rgba(black, 0.2); &.o_wslides_fs_sidebar_hidden { display: none; @@ -82,6 +76,7 @@ $o-wslides-tabs-height: 36px; .o_wslides_fs_sidebar_section { background-color: rgba($o-wslides-color-dark3, 0.3); + margin-bottom: 1px; } .o_wslides_fs_sidebar_section_slides li { @@ -97,11 +92,6 @@ $o-wslides-tabs-height: 36px; } } - i.o_wslides_slide_completed{ - @include size(13px); - box-shadow: inset 0 0 0 1px theme-color('success'); - } - .o_wslides_fs_slide_name { line-height: 1; } diff --git a/addons/website_slides/static/src/scss/website_slides.scss b/addons/website_slides/static/src/scss/website_slides.scss index 9cbdef9fc87..c6bbc1998fa 100644 --- a/addons/website_slides/static/src/scss/website_slides.scss +++ b/addons/website_slides/static/src/scss/website_slides.scss @@ -130,10 +130,6 @@ $o-wslides-fs-side-width: 300px; // ************************************************** .o_wslides_home_main { - .o_wprofile_next_rank_card { - background-color: transparent !important; - } - .o_wslides_home_aside_loggedin { @include media-breakpoint-up(lg) { background: none; @@ -361,22 +357,10 @@ $o-wslides-fs-side-width: 300px; } } -// Slide display -div.embed-responsive { - iframe.o_wslides_iframe_viewer { - position: relative; - } -} - -// PDF Viewer Share bar .oe_slides_share_bar{ padding: 10px 0; } -.oe_slides_panel_footer #page_number { - width: 45px; -} - .oe_show_footer { z-index: $MAX-Z-INDEX; // Looks terrible but seems necessary due to fullscreen & canvas in PDFSlidesViewer } diff --git a/addons/website_slides/static/src/xml/website_slides_fullscreen.xml b/addons/website_slides/static/src/xml/website_slides_fullscreen.xml index 683dc45752d..6793dd5c736 100644 --- a/addons/website_slides/static/src/xml/website_slides_fullscreen.xml +++ b/addons/website_slides/static/src/xml/website_slides_fullscreen.xml @@ -1,28 +1,14 @@ - - - - - - - - - - - Quiz: - - - -
- +
+