diff options
| author | Kevin Baptiste <kba@odoo.com> | 2019-08-12 07:18:23 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-11-28 10:05:12 +0000 |
| commit | ff1c35513aecef5fbc30f7c2f3834450e719714e (patch) | |
| tree | 8149f14df17095845e735d6cccaf9317a1f97af6 /addons/website_slides/static | |
| parent | 4c030311ada2ad19a2ee81b15544b7aed35b642b (diff) | |
[IMP] web: update to fontawesome 4.7.0 to 5.11.2
FontAwesome 5 introduced new names for some icons as described on
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes
This commit replaces the old names to the new ones.
closes odoo/odoo#35826
Taskid: 2050241
Related: odoo/enterprise#5180
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/website_slides/static')
5 files changed, 17 insertions, 17 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 05ce9b73a7a..e9dd0c8e2c3 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 @@ -198,8 +198,8 @@ odoo.define('website_slides.fullscreen', function (require) { * @param {Integer} slideId */ setSlideCompleted: function (slideId) { - var $elem = this.$('.fa-circle-thin[data-slide-id="'+slideId+'"]'); - $elem.removeClass('fa-circle-thin').addClass('fa-check text-success o_wslides_slide_completed'); + var $elem = this.$('.fa-circle[data-slide-id="'+slideId+'"]'); + $elem.removeClass('far fa-circle').addClass('fas fa-check text-success o_wslides_slide_completed'); }, /** * Updates the progressbar whenever a lesson is completed diff --git a/addons/website_slides/static/src/js/slides_course_quiz.js b/addons/website_slides/static/src/js/slides_course_quiz.js index 88da63bebe7..cf53fe1b236 100644 --- a/addons/website_slides/static/src/js/slides_course_quiz.js +++ b/addons/website_slides/static/src/js/slides_course_quiz.js @@ -144,19 +144,19 @@ odoo.define('website_slides.quiz', function (require) { var answerId = $answer.data('answerId'); if (_.contains(self.quiz.goodAnswers, answerId)) { $answer.removeClass('list-group-item-danger').addClass('list-group-item-success'); - $answer.find('i.fa').addClass('d-none'); + $answer.find('i.fas').addClass('d-none'); $answer.find('i.fa-check-circle').removeClass('d-none'); } else if (_.contains(self.quiz.badAnswers, answerId)) { $answer.removeClass('list-group-item-success').addClass('list-group-item-danger'); - $answer.find('i.fa').addClass('d-none'); + $answer.find('i.fas').addClass('d-none'); $answer.find('i.fa-times-circle').removeClass('d-none'); $answer.find('label input').prop('checked', false); } else { if (!self.slide.completed) { $answer.removeClass('list-group-item-danger list-group-item-success'); - $answer.find('i.fa').addClass('d-none'); + $answer.find('i.fas').addClass('d-none'); $answer.find('i.fa-circle').removeClass('d-none'); } } @@ -409,7 +409,7 @@ odoo.define('website_slides.quiz', function (require) { var self = this; var slide = ev.data.slide; var completion = ev.data.completion; - this.$('#o_wslides_lesson_aside_slide_check_' + slide.id).addClass('text-success fa-check').removeClass('text-600 fa-circle-o'); + this.$('#o_wslides_lesson_aside_slide_check_' + slide.id).addClass('text-success fa-check').removeClass('text-600 fa-circle'); // need to use global selector as progress bar is ouside this animation widget scope $('.o_wslides_lesson_header .progress-bar').css('width', completion + "%"); $('.o_wslides_lesson_header .progress span').text(_.str.sprintf("%s %%", completion)); diff --git a/addons/website_slides/static/src/js/slides_upload.js b/addons/website_slides/static/src/js/slides_upload.js index 83d24d8a447..29c18f6c515 100644 --- a/addons/website_slides/static/src/js/slides_upload.js +++ b/addons/website_slides/static/src/js/slides_upload.js @@ -329,17 +329,17 @@ var SlideUploadDialog = Dialog.extend({ _setup: function () { this.slide_type_data = { presentation: { - icon: 'fa-file-pdf-o', + icon: 'fa-file-pdf', label: _t('Presentation'), template: 'website.slide.upload.modal.presentation', }, webpage: { - icon: 'fa-file-text', + icon: 'fa-file-alt', label: _t('Web Page'), template: 'website.slide.upload.modal.webpage', }, video: { - icon: 'fa-video-camera', + icon: 'fa-video', label: _t('Video'), template: 'website.slide.upload.modal.video', }, diff --git a/addons/website_slides/static/src/xml/slide_quiz.xml b/addons/website_slides/static/src/xml/slide_quiz.xml index 81cb59e16bb..abf284ac61b 100644 --- a/addons/website_slides/static/src/xml/slide_quiz.xml +++ b/addons/website_slides/static/src/xml/slide_quiz.xml @@ -21,9 +21,9 @@ t-att-name="question.id" t-att-value="answer.id" class="d-none"/> - <i t-att-class="'fa fa-circle text-400' + (!(widget.slide.completed && answer.is_correct) ? '' : ' d-none')"></i> - <i class="fa fa-times-circle text-danger d-none"></i> - <i t-att-class="'fa fa-check-circle text-success' + (widget.slide.completed && answer.is_correct ? '' : ' d-none')"></i> + <i t-att-class="'fas fa-circle text-400' + (!(widget.slide.completed && answer.is_correct) ? '' : ' d-none')"></i> + <i class="fas fa-times-circle text-danger d-none"></i> + <i t-att-class="'fas fa-check-circle text-success' + (widget.slide.completed && answer.is_correct ? '' : ' d-none')"></i> </label> <span t-esc="answer.text_value"/> </a> diff --git a/addons/website_slides/static/src/xml/website_slides_share.xml b/addons/website_slides/static/src/xml/website_slides_share.xml index 7aa115918db..905fbbb53c9 100644 --- a/addons/website_slides/static/src/xml/website_slides_share.xml +++ b/addons/website_slides/static/src/xml/website_slides_share.xml @@ -12,9 +12,9 @@ <div class="col-12 col-lg-6 mb-4"> <h5 class="mt-0 mb-2">Share on Social Networks</h5> <div class="btn-group" role="group"> - <a t-attf-href="https://www.facebook.com/sharer/sharer.php?u=#{window.location.href}" class="btn border bg-white o_wslides_js_social_share" social-key="facebook" aria-label="Share on Facebook" title="Share on Facebook"><i class="fa fa-facebook-square fa-fw"/></a> - <a t-attf-href="https://twitter.com/intent/tweet?text=#{widget.slide.name}&url=#{window.location.href}" class="btn border bg-white o_wslides_js_social_share" social-key="twitter" aria-label="Share on Twitter" title="Share on Twitter"><i class="fa fa-twitter fa-fw"/></a> - <a t-attf-href="http://www.linkedin.com/shareArticle?mini=true&url=#{window.location.href}&title=#{widget.slide.name}&" social-key="linkedin" class="btn border bg-white o_wslides_js_social_share" aria-label="Share on LinkedIn" title="Share on LinkedIn"><i class="fa fa-linkedin fa-fw"/></a> + <a t-attf-href="https://www.facebook.com/sharer/sharer.php?u=#{window.location.href}" class="btn border bg-white o_wslides_js_social_share" social-key="facebook" aria-label="Share on Facebook" title="Share on Facebook"><i class="fab fa-facebook-square fa-fw"/></a> + <a t-attf-href="https://twitter.com/intent/tweet?text=#{widget.slide.name}&url=#{window.location.href}" class="btn border bg-white o_wslides_js_social_share" social-key="twitter" aria-label="Share on Twitter" title="Share on Twitter"><i class="fab fa-twitter fa-fw"/></a> + <a t-attf-href="http://www.linkedin.com/shareArticle?mini=true&url=#{window.location.href}&title=#{widget.slide.name}&" social-key="linkedin" class="btn border bg-white o_wslides_js_social_share" aria-label="Share on LinkedIn" title="Share on LinkedIn"><i class="fab fa-linkedin-in fa-fw"/></a> </div> </div> <div class="col-12 col-lg-6"> @@ -23,7 +23,7 @@ <input type="text" class="form-control o_wslides_js_share_link" t-att-value="window.location.href" readonly="readonly" onClick="this.select();" /> <div class="input-group-append"> <button class="btn btn-sm btn-primary o_clipboard_button" style="border-top-right-radius: 4px;border-bottom-right-radius: 4px;" > - <span class="fa fa-clipboard"> Copy Link</span> + <span class="far fa-clipboard"> Copy Link</span> </button> </div> </div> @@ -45,7 +45,7 @@ data-loading-text="Sending..." t-attf-data-slide-id="#{widget.slide.id}" style="border-top-right-radius: 4px;border-bottom-right-radius: 4px;"> - <i class="fa fa-envelope-o"/> Send Email + <i class="far fa-envelope"/> Send Email </button> </span> </div> |
