From 4dce6cc98b2b95a00249ac29245305e08f288e6c Mon Sep 17 00:00:00 2001 From: Cocographique Date: Wed, 25 Jul 2018 10:03:30 +0200 Subject: [PATCH] [IMP] website, *: review snippets and colors * web, web_editor, website_hr_recruitment, website_mail_channel, website_mass_mailing - Review all snippets and add new ones - Add lots of new options - Use odoo colors as default theme colors task-38878 --- .../static/src/scss/primary_variables.scss | 1 + .../static/src/js/editor/rte.summernote.js | 2 + .../static/src/js/editor/snippets.editor.js | 1 - .../static/src/js/editor/summernote.js | 2 +- addons/web_editor/static/src/js/tours/rte.js | 2 +- .../static/src/js/widgets/widgets.js | 9 +- .../static/src/scss/web_editor.variables.scss | 12 +- addons/web_editor/static/src/xml/editor.xml | 14 +- addons/web_editor/views/editor.xml | 4 +- addons/website/data/website_data.xml | 89 +- .../static/src/img/blocks/block_banner.png | Bin 504 -> 0 bytes .../src/img/blocks/block_big_picture.png | Bin 525 -> 0 bytes .../static/src/img/blocks/block_button.png | Bin 452 -> 0 bytes .../static/src/img/blocks/block_column.png | Bin 455 -> 0 bytes .../src/img/blocks/block_company_team.png | Bin 3542 -> 0 bytes .../src/img/blocks/block_comparison.png | Bin 648 -> 0 bytes .../static/src/img/blocks/block_faq.png | Bin 1003 -> 0 bytes .../src/img/blocks/block_feature_grid.png | Bin 748 -> 0 bytes .../static/src/img/blocks/block_features.png | Bin 729 -> 0 bytes .../src/img/blocks/block_image_gallery.png | Bin 1613 -> 0 bytes .../src/img/blocks/block_image_text.png | Bin 466 -> 0 bytes .../static/src/img/blocks/block_jumbotron.png | Bin 391 -> 0 bytes .../src/img/blocks/block_local_event.png | Bin 514 -> 0 bytes .../static/src/img/blocks/block_panel.png | Bin 437 -> 0 bytes .../static/src/img/blocks/block_parallax.png | Bin 668 -> 0 bytes .../static/src/img/blocks/block_portfolio.png | Bin 1231 -> 0 bytes .../static/src/img/blocks/block_quote.png | Bin 721 -> 0 bytes .../src/img/blocks/block_quotes_slider.png | Bin 969 -> 0 bytes .../src/img/blocks/block_references.png | Bin 1984 -> 0 bytes .../static/src/img/blocks/block_share.png | Bin 3199 -> 0 bytes .../static/src/img/blocks/block_slider.png | Bin 546 -> 0 bytes .../static/src/img/blocks/block_surprise.png | Bin 1409 -> 0 bytes .../static/src/img/blocks/block_table.png | Bin 701 -> 0 bytes .../src/img/blocks/block_text_block.png | Bin 755 -> 0 bytes .../src/img/blocks/block_text_image.png | Bin 457 -> 0 bytes .../src/img/blocks/block_three_columns.png | Bin 1187 -> 0 bytes .../static/src/img/blocks/block_title.png | Bin 594 -> 0 bytes .../static/src/img/blocks/block_well.png | Bin 294 -> 0 bytes .../static/src/img/blocks/blocks-icons.png | Bin 12275 -> 0 bytes .../img/blocks/button_channel_subscribe.png | Bin 2726 -> 0 bytes .../static/src/img/blocks/facebook_page.png | Bin 814 -> 0 bytes .../img/blocks/newsletter_subscribe_form.png | Bin 4178 -> 0 bytes .../static/src/img/blocks/twitter_scroll.png | Bin 2388 -> 0 bytes addons/website/static/src/img/odoo.jpg | Bin 196808 -> 0 bytes .../static/src/img/snippets_demo/s_banner.jpg | Bin 0 -> 219456 bytes .../static/src/img/snippets_demo/s_banner.png | Bin 35554 -> 0 bytes .../src/img/snippets_demo/s_big_picture.png | Bin 181459 -> 0 bytes .../src/img/snippets_demo/s_carousel_1.jpg | Bin 0 -> 135349 bytes .../src/img/snippets_demo/s_carousel_2.jpg | Bin 0 -> 155802 bytes .../src/img/snippets_demo/s_carousel_3.jpg | Bin 0 -> 116453 bytes .../static/src/img/snippets_demo/s_cover.jpg | Bin 0 -> 132843 bytes .../img/snippets_demo/s_image_floating.png | Bin 27202 -> 0 bytes .../src/img/snippets_demo/s_image_text.jpg | Bin 0 -> 65170 bytes .../src/img/snippets_demo/s_image_text.png | Bin 24707 -> 0 bytes .../src/img/snippets_demo/s_parallax.jpg | Bin 0 -> 233982 bytes .../img/snippets_demo/s_parallax_slider.png | Bin 11252 -> 0 bytes .../src/img/snippets_demo/s_picture.jpg | Bin 0 -> 89469 bytes .../img/snippets_demo/s_quotes_carousel_1.jpg | Bin 0 -> 115303 bytes .../img/snippets_demo/s_quotes_carousel_2.jpg | Bin 0 -> 206031 bytes .../src/img/snippets_demo/s_text_image.jpg | Bin 0 -> 48688 bytes .../src/img/snippets_demo/s_text_image.png | Bin 39938 -> 0 bytes .../src/img/snippets_thumbs/s_alert.png | Bin 0 -> 293 bytes .../src/img/snippets_thumbs/s_banner.png | Bin 0 -> 692 bytes .../src/img/snippets_thumbs/s_big_message.png | Bin 0 -> 614 bytes .../src/img/snippets_thumbs/s_button.png | Bin 0 -> 816 bytes .../s_button_channel_subscribe.png | Bin 0 -> 1344 bytes .../img/snippets_thumbs/s_call_to_action.png | Bin 0 -> 305 bytes .../static/src/img/snippets_thumbs/s_card.png | Bin 0 -> 323 bytes .../src/img/snippets_thumbs/s_carousel.png | Bin 0 -> 802 bytes .../img/snippets_thumbs/s_company_team.png | Bin 0 -> 698 bytes .../src/img/snippets_thumbs/s_comparison.png | Bin 0 -> 415 bytes .../src/img/snippets_thumbs/s_cover.png | Bin 0 -> 615 bytes .../img/snippets_thumbs/s_facebook_page.png | Bin 0 -> 470 bytes .../static/src/img/snippets_thumbs/s_faq.png | Bin 0 -> 418 bytes .../src/img/snippets_thumbs/s_features.png | Bin 0 -> 567 bytes .../img/snippets_thumbs/s_features_grid.png | Bin 0 -> 491 bytes .../img/snippets_thumbs/s_image_gallery.png | Bin 0 -> 842 bytes .../src/img/snippets_thumbs/s_image_text.png | Bin 0 -> 614 bytes .../img/snippets_thumbs/s_local_events.png | Bin 0 -> 852 bytes .../s_newsletter_subscribe_form.png | Bin 0 -> 621 bytes .../src/img/snippets_thumbs/s_parallax.png | Bin 0 -> 769 bytes .../src/img/snippets_thumbs/s_picture.png | Bin 0 -> 595 bytes .../img/snippets_thumbs/s_quotes_carousel.png | Bin 0 -> 692 bytes .../src/img/snippets_thumbs/s_rating.png | Bin 0 -> 635 bytes .../src/img/snippets_thumbs/s_references.png | Bin 0 -> 769 bytes .../src/img/snippets_thumbs/s_separator.png | Bin 0 -> 475 bytes .../src/img/snippets_thumbs/s_share.png | Bin 0 -> 1189 bytes .../static/src/img/snippets_thumbs/s_tabs.png | Bin 0 -> 369 bytes .../src/img/snippets_thumbs/s_text_block.png | Bin 0 -> 285 bytes .../src/img/snippets_thumbs/s_text_image.png | Bin 0 -> 609 bytes .../img/snippets_thumbs/s_three_columns.png | Bin 0 -> 562 bytes .../src/img/snippets_thumbs/s_title.png | Bin 0 -> 275 bytes .../img/snippets_thumbs/s_twitter_scroll.png | Bin 0 -> 968 bytes .../static/src/img/website_planner_clean.png | Bin 593968 -> 0 bytes .../static/src/img/website_planner_footer.png | Bin 16057 -> 0 bytes .../static/src/img/website_planner_menu.png | Bin 8951 -> 0 bytes .../src/js/content/snippets.animation.js | 2 +- .../static/src/js/editor/snippets.options.js | 16 +- addons/website/static/src/js/tours/banner.js | 6 +- .../static/src/scss/bootstrap_overridden.scss | 2 + addons/website/static/src/scss/website.scss | 733 ++++++-- addons/website/views/snippets.xml | 1492 ++++++++++------- addons/website_hr_recruitment/__manifest__.py | 1 - .../static/src/scss/s_hr_rating.scss | 61 - .../website_hr_recruitment_templates.xml | 20 +- .../views/website_hr_recuitment_snippets.xml | 61 - .../website_mail_channel/views/snippets.xml | 2 +- .../views/snippets_templates.xml | 2 +- 108 files changed, 1606 insertions(+), 928 deletions(-) delete mode 100644 addons/website/static/src/img/blocks/block_banner.png delete mode 100644 addons/website/static/src/img/blocks/block_big_picture.png delete mode 100644 addons/website/static/src/img/blocks/block_button.png delete mode 100644 addons/website/static/src/img/blocks/block_column.png delete mode 100644 addons/website/static/src/img/blocks/block_company_team.png delete mode 100644 addons/website/static/src/img/blocks/block_comparison.png delete mode 100644 addons/website/static/src/img/blocks/block_faq.png delete mode 100644 addons/website/static/src/img/blocks/block_feature_grid.png delete mode 100644 addons/website/static/src/img/blocks/block_features.png delete mode 100644 addons/website/static/src/img/blocks/block_image_gallery.png delete mode 100644 addons/website/static/src/img/blocks/block_image_text.png delete mode 100644 addons/website/static/src/img/blocks/block_jumbotron.png delete mode 100644 addons/website/static/src/img/blocks/block_local_event.png delete mode 100644 addons/website/static/src/img/blocks/block_panel.png delete mode 100644 addons/website/static/src/img/blocks/block_parallax.png delete mode 100644 addons/website/static/src/img/blocks/block_portfolio.png delete mode 100644 addons/website/static/src/img/blocks/block_quote.png delete mode 100644 addons/website/static/src/img/blocks/block_quotes_slider.png delete mode 100644 addons/website/static/src/img/blocks/block_references.png delete mode 100644 addons/website/static/src/img/blocks/block_share.png delete mode 100644 addons/website/static/src/img/blocks/block_slider.png delete mode 100644 addons/website/static/src/img/blocks/block_surprise.png delete mode 100644 addons/website/static/src/img/blocks/block_table.png delete mode 100644 addons/website/static/src/img/blocks/block_text_block.png delete mode 100644 addons/website/static/src/img/blocks/block_text_image.png delete mode 100644 addons/website/static/src/img/blocks/block_three_columns.png delete mode 100644 addons/website/static/src/img/blocks/block_title.png delete mode 100644 addons/website/static/src/img/blocks/block_well.png delete mode 100644 addons/website/static/src/img/blocks/blocks-icons.png delete mode 100644 addons/website/static/src/img/blocks/button_channel_subscribe.png delete mode 100644 addons/website/static/src/img/blocks/facebook_page.png delete mode 100644 addons/website/static/src/img/blocks/newsletter_subscribe_form.png delete mode 100644 addons/website/static/src/img/blocks/twitter_scroll.png delete mode 100644 addons/website/static/src/img/odoo.jpg create mode 100644 addons/website/static/src/img/snippets_demo/s_banner.jpg delete mode 100644 addons/website/static/src/img/snippets_demo/s_banner.png delete mode 100644 addons/website/static/src/img/snippets_demo/s_big_picture.png create mode 100755 addons/website/static/src/img/snippets_demo/s_carousel_1.jpg create mode 100755 addons/website/static/src/img/snippets_demo/s_carousel_2.jpg create mode 100755 addons/website/static/src/img/snippets_demo/s_carousel_3.jpg create mode 100755 addons/website/static/src/img/snippets_demo/s_cover.jpg delete mode 100644 addons/website/static/src/img/snippets_demo/s_image_floating.png create mode 100755 addons/website/static/src/img/snippets_demo/s_image_text.jpg delete mode 100644 addons/website/static/src/img/snippets_demo/s_image_text.png create mode 100755 addons/website/static/src/img/snippets_demo/s_parallax.jpg delete mode 100644 addons/website/static/src/img/snippets_demo/s_parallax_slider.png create mode 100755 addons/website/static/src/img/snippets_demo/s_picture.jpg create mode 100755 addons/website/static/src/img/snippets_demo/s_quotes_carousel_1.jpg create mode 100755 addons/website/static/src/img/snippets_demo/s_quotes_carousel_2.jpg create mode 100755 addons/website/static/src/img/snippets_demo/s_text_image.jpg delete mode 100644 addons/website/static/src/img/snippets_demo/s_text_image.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_alert.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_banner.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_big_message.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_button.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_button_channel_subscribe.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_call_to_action.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_card.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_carousel.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_company_team.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_comparison.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_cover.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_facebook_page.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_faq.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_features.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_features_grid.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_image_gallery.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_image_text.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_local_events.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_newsletter_subscribe_form.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_parallax.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_picture.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_quotes_carousel.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_rating.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_references.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_separator.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_share.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_tabs.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_text_block.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_text_image.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_three_columns.png create mode 100755 addons/website/static/src/img/snippets_thumbs/s_title.png create mode 100644 addons/website/static/src/img/snippets_thumbs/s_twitter_scroll.png delete mode 100644 addons/website/static/src/img/website_planner_clean.png delete mode 100644 addons/website/static/src/img/website_planner_footer.png delete mode 100644 addons/website/static/src/img/website_planner_menu.png delete mode 100644 addons/website_hr_recruitment/static/src/scss/s_hr_rating.scss delete mode 100644 addons/website_hr_recruitment/views/website_hr_recuitment_snippets.xml diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss index 47dfb4e22c6..6c0b2187a09 100644 --- a/addons/web/static/src/scss/primary_variables.scss +++ b/addons/web/static/src/scss/primary_variables.scss @@ -11,6 +11,7 @@ $o-line-height-base: 1.5; // This is BS default // Colors $o-community-color: #7C7BAD; $o-enterprise-color: #875A7B; +$o-enterprise-primary-color: #00A09D; $o-brand-odoo: $o-community-color; $o-brand-primary: $o-community-color; diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index 4cd15d4c3d7..e450874b95d 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -286,6 +286,7 @@ eventHandler.modules.popover.button.update = function ($container, oStyle) { $container.find('button[data-event="imageShape"][data-value="fa-spin"]').toggleClass("active", $(oStyle.image).hasClass("fa-spin")); $container.find('button[data-event="imageShape"][data-value="shadow"]').toggleClass("active", $(oStyle.image).hasClass("shadow")); + $container.find('.btn-group:has(button[data-event="imageShape"])').removeClass("d-none"); } else { $container.find('.d-none:not(.only_fa, .note-recent-color)').removeClass('d-none'); @@ -1034,6 +1035,7 @@ $.summernote.lang.odoo = { normal: _t('Normal'), blockquote: _t('Quote'), pre: _t('Code'), + small: _t('Small'), h1: _t('Header 1'), h2: _t('Header 2'), h3: _t('Header 3'), diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js index e3a8803619a..f5cbb34c802 100644 --- a/addons/web_editor/static/src/js/editor/snippets.editor.js +++ b/addons/web_editor/static/src/js/editor/snippets.editor.js @@ -288,7 +288,6 @@ var SnippetEditor = Widget.extend({ option.__order = i++; return option.attachTo($el); }); - $ul.append($('
', {class: 'dropdown-divider'})); var $parents = this.$target.parents(); _.each($parents, function (parent) { diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js index 0ef7881b920..f420f951633 100644 --- a/addons/web_editor/static/src/js/editor/summernote.js +++ b/addons/web_editor/static/src/js/editor/summernote.js @@ -1033,7 +1033,7 @@ options.keyMap.mac['ESCAPE'] = 'cancel'; options.keyMap.mac['UP'] = 'up'; options.keyMap.mac['DOWN'] = 'down'; -options.styleTags = ['p', 'pre', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote']; +options.styleTags = ['p', 'pre', 'small', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote']; $.summernote.pluginEvents.insertTable = function (event, editor, layoutInfo, sDim) { var $editable = layoutInfo.editable(); diff --git a/addons/web_editor/static/src/js/tours/rte.js b/addons/web_editor/static/src/js/tours/rte.js index 0bd1440e487..b997944a98b 100644 --- a/addons/web_editor/static/src/js/tours/rte.js +++ b/addons/web_editor/static/src/js/tours/rte.js @@ -314,7 +314,7 @@ tour.register('rte_inline', { trigger: '#wrapwrap img:first[width][height][style*="-radius"][style*="1px"][style*="padding"]', }, { content: "check the font image src", - trigger: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(0,123,255)/32"]', + trigger: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(0,160,157)/32"]', }, { content: "check the font class to css", trigger: '#wrapwrap img:eq(1)[height]:not([class*="fa"])', diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js index 74fbfe18f01..3103dc91505 100644 --- a/addons/web_editor/static/src/js/widgets/widgets.js +++ b/addons/web_editor/static/src/js/widgets/widgets.js @@ -1525,10 +1525,15 @@ var LinkDialog = Dialog.extend({ } var style = this.$('input[name="link_style_color"]:checked').val() || ''; + var shape = this.$('select[name="link_style_shape"]').val() || ''; var size = this.$('select[name="link_style_size"]').val() || ''; + var shapes = shape.split(','); + var outline = shapes[0] === 'outline'; + shape = shapes.slice(outline ? 1 : 0).join(' '); var classes = (this.data.className || '') - + ((style && style.length) ? (' btn btn-' + style) : '') - + ((size && size.length) ? (' btn-' + size) : ''); + + (style ? (' btn btn-' + (outline ? 'outline-' : '') + style) : '') + + (shape ? (' ' + shape) : '') + + (size ? (' btn-' + size) : ''); var isNewWindow = this.$('input[name="is_new_window"]').prop('checked'); if (url.indexOf('@') >= 0 && url.indexOf('mailto:') < 0 && !url.match(/^http[s]?/i)) { diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss index d0c0f312b93..eff996bea20 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -222,7 +222,7 @@ $o-we-switch-inactive-color: $o-we-color-paper !default; // Colors $o-color-palettes: ( ( - + ), ) !default; $o-color-palette-number: 1; @@ -230,11 +230,11 @@ $o-color-palette-number: 1; // Theme colors $o-theme-color-palettes: ( ( - primary: #007bff, // BS default here but needed for compatibility (see bootstrap_overridden) - secondary: #6c757d, // BS default here but needed for compatibility (see bootstrap_overridden) - gamma: #BA3C3D, - delta: #0D6759, - epsilon: #0B2E59, + primary: $o-enterprise-primary-color, + secondary: $o-enterprise-color, + gamma: #5C5B80, + delta: #5B899E, + epsilon: #E46F78, ), ) !default; $o-theme-color-palette-number: 1; diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index b265e375f3b..b3d1763ca71 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -257,6 +257,18 @@
+
+ +
+ +
+
@@ -266,7 +278,7 @@ - +