diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mass_mailing/views/snippets_themes.xml | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/tests/test_utils.js | 8 | ||||
| -rw-r--r-- | addons/website/views/snippets.xml | 102 | ||||
| -rw-r--r-- | addons/website_blog/views/snippets.xml | 4 | ||||
| -rw-r--r-- | addons/website_sale/views/snippets.xml | 4 |
5 files changed, 49 insertions, 71 deletions
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml index b268850e6f7..75f3d04487d 100644 --- a/addons/mass_mailing/views/snippets_themes.xml +++ b/addons/mass_mailing/views/snippets_themes.xml @@ -811,7 +811,7 @@ data-selector=".note-editable > div:not(.o_layout), .note-editable .oe_structure > div, td, th" data-exclude=".o_mail_no_colorpicker, .o_mail_no_options"> <we-collapse-area> - <we-toggler><i class="fa fa-eyedropper"/> Background Color</we-toggler> + <we-toggler>Background Color</we-toggler> <we-collapse/> </we-collapse-area> </div> diff --git a/addons/web_editor/static/tests/test_utils.js b/addons/web_editor/static/tests/test_utils.js index 7898ed63f95..fcc2b895a3a 100644 --- a/addons/web_editor/static/tests/test_utils.js +++ b/addons/web_editor/static/tests/test_utils.js @@ -80,7 +80,7 @@ MockServer.include({ ' <div data-js="sizing_y" data-selector=".s_hr, .test_option_all"></div>' + ' <div data-js="colorpicker" data-selector=".test_option_all">' + ' <we-collapse-area>' + - ' <we-toggler><i class="fa fa-eyedropper"/> Background Color</we-toggler>' + + ' <we-toggler>Background Color</we-toggler>' + ' <we-collapse/>' + ' </we-collapse-area>' + ' </div>' + @@ -89,7 +89,7 @@ MockServer.include({ ' </div>' + ' <div data-js="option_test" data-selector=".s_hr">' + ' <we-collapse-area>' + - ' <we-toggler><i class="fa fa-arrows-v"/> Alignment</we-toggler>' + + ' <we-toggler>Alignment</we-toggler>' + ' <we-collapse>' + ' <we-button data-select-class="align-items-start">Top</we-button>' + ' <we-button data-select-class="align-items-center">Middle</we-button>' + @@ -255,7 +255,7 @@ function wysiwygData(data) { ' <div data-js="sizing_y" data-selector=".s_hr, .test_option_all"></div>' + ' <div data-js="colorpicker" data-selector=".test_option_all">' + ' <we-collapse-area>' + - ' <we-toggler><i class="fa fa-eyedropper"/>Background Color</we-toggler>' + + ' <we-toggler>Background Color</we-toggler>' + ' <we-collapse/>' + ' </we-collapse-area>' + ' </div>' + @@ -264,7 +264,7 @@ function wysiwygData(data) { ' </div>' + ' <div data-js="option_test" data-selector=".s_hr">' + ' <we-collapse-area>' + - ' <we-toggler><i class="fa fa-arrows-v"/> Alignment</we-toggler>' + + ' <we-toggler>Alignment</we-toggler>' + ' <we-collapse>' + ' <we-button data-select-class="align-items-start">Top</we-button>' + ' <we-button data-select-class="align-items-center">Middle</we-button>' + diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index ac46f7b5371..214a60cf28d 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -987,7 +987,7 @@ data-target=".card" data-palette-title="Box Color"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Color</we-toggler> + <we-toggler>Color</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1000,7 +1000,7 @@ data-palette-exclude="transparent_grayscale, common" data-palette-title="Separator Color"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Color</we-toggler> + <we-toggler>Color</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1010,7 +1010,7 @@ data-selector=".s_card, .accordion .card" data-palette-title="Card Color"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Color</we-toggler> + <we-toggler>Color</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1021,7 +1021,7 @@ data-color-prefix="alert-" data-palette-title="Box Color"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Color</we-toggler> + <we-toggler>Color</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1030,7 +1030,7 @@ <!-- STYLES | .s_title --> <div data-selector=".s_title" data-target="[class*='s_title_']"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-font"/> Typography</we-toggler> + <we-toggler>Typography</we-toggler> <we-collapse> <we-button data-select-class="s_title_boxed">Boxed</we-button> <we-button data-select-class="s_title_lines">Line-On-Sides</we-button> @@ -1047,7 +1047,7 @@ <!-- H-ALIGN | .s_btn --> <div data-selector=".s_btn, .s_share"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-align-left"/> Alignment</we-toggler> + <we-toggler>Alignment</we-toggler> <we-collapse> <we-button data-select-class="text-left">Left</we-button> <we-button data-select-class="text-center">Center</we-button> @@ -1058,7 +1058,7 @@ <div data-selector=".s_alert"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-arrows"/> Size</we-toggler> + <we-toggler>Size</we-toggler> <we-collapse> <we-button data-select-class="s_alert_sm">Small</we-button> <we-button data-select-class="s_alert_md">Medium</we-button> @@ -1069,7 +1069,7 @@ <div data-selector=".s_alert, .s_card"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-arrows-h"/> Width</we-toggler> + <we-toggler>Width</we-toggler> <we-collapse> <we-button data-select-class="w-25">25%</we-button> <we-button data-select-class="w-50">50%</we-button> @@ -1114,7 +1114,7 @@ <!-- STYLES | .s_hr --> <div data-selector=".s_hr" data-target="hr"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-minus"/> Thickness</we-toggler> + <we-toggler>Thickness</we-toggler> <we-collapse> <t t-foreach="range(1,6)" t-as="s_hr_thickness"> <we-button t-attf-data-select-class="s_hr_{{s_hr_thickness}}px"><t t-esc="s_hr_thickness"/>px</we-button> @@ -1122,7 +1122,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-pencil"/> Style</we-toggler> + <we-toggler>Style</we-toggler> <we-collapse> <we-button data-select-class="s_hr_solid">Solid</we-button> <we-button data-select-class="s_hr_dashed">Dashed</we-button> @@ -1131,7 +1131,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-arrows-h"/> Width</we-toggler> + <we-toggler>Width</we-toggler> <we-collapse> <we-button data-select-class="w-25">25%</we-button> <we-button data-select-class="w-50">50%</we-button> @@ -1140,7 +1140,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-align-left"/> Alignment</we-toggler> + <we-toggler>Alignment</we-toggler> <we-collapse> <we-button data-select-class="mr-auto">Left</we-button> <we-button data-select-class="mx-auto">Center</we-button> @@ -1153,14 +1153,10 @@ <div data-js="carousel" data-selector="section" data-target="> .carousel"> - <we-button data-add-slide="true" data-no-preview="true"> - <i class="fa fa-fw fa-plus-circle"/> Add Slide - </we-button> - <we-button data-remove-slide="true" data-no-preview="true"> - <i class="fa fa-fw fa-trash-o"/> Remove Slide - </we-button> + <we-button data-add-slide="true" data-no-preview="true">Add Slide</we-button> + <we-button data-remove-slide="true" data-no-preview="true">Remove Slide</we-button> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-clone"/> Transition</we-toggler> + <we-toggler>Transition</we-toggler> <we-collapse> <we-button data-select-class="slide">Slide</we-button> <we-button data-select-class="carousel-fade slide">Fade</we-button> @@ -1169,7 +1165,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-magic"/> Style</we-toggler> + <we-toggler>Style</we-toggler> <we-collapse> <we-button data-select-class="s_carousel_bordered">Bordered</we-button> <we-button data-select-class="s_carousel_boxed">Boxed</we-button> @@ -1179,7 +1175,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-clock-o"/> Speed</we-toggler> + <we-toggler>Speed</we-toggler> <we-collapse> <we-button data-interval="1000">1s</we-button> <we-button data-interval="2000">2s</we-button> @@ -1192,24 +1188,16 @@ </div> <div data-js="navTabs" data-selector="section .row > div" data-target=".nav-tabs"> - <we-button data-add-tab="1" data-no-preview="true"> - <i class="fa fa-fw fa-plus"/> Add Tab - </we-button> - <we-button data-remove-tab="1" data-no-preview="true"> - <i class="fa fa-fw fa-minus"/> Remove Tab - </we-button> + <we-button data-add-tab="1" data-no-preview="true">Add Tab</we-button> + <we-button data-remove-tab="1" data-no-preview="true">Remove Tab</we-button> </div> <div data-js="gallery" data-selector=".o_gallery"> - <we-button data-add-images="true" data-no-preview="true"> - <i class="fa fa-fw fa-plus-circle"/> Add images - </we-button> - <we-button data-remove-all-images="true" data-no-preview="true"> - <i class="fa fa-fw fa-trash"/> Remove all images - </we-button> + <we-button data-add-images="true" data-no-preview="true">Add images</we-button> + <we-button data-remove-all-images="true" data-no-preview="true">Remove all images</we-button> <we-divider/> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-magic"/> Mode</we-toggler> + <we-toggler>Mode</we-toggler> <we-collapse> <we-button data-mode="nomode">Float</we-button> <we-button data-mode="masonry">Masonry</we-button> @@ -1218,7 +1206,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-clock-o"/> Slideshow speed</we-toggler> + <we-toggler>Slideshow speed</we-toggler> <we-collapse> <we-button data-interval="1000">1s</we-button> <we-button data-interval="2000">2s</we-button> @@ -1229,7 +1217,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-th"/> Columns</we-toggler> + <we-toggler>Columns</we-toggler> <we-collapse> <we-button data-columns="1">1</we-button> <we-button data-columns="2">2</we-button> @@ -1240,7 +1228,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area class="o_w_image_spacing_option"> - <we-toggler><i class="fa fa-fw fa-arrows-h"/> Images spacing</we-toggler> + <we-toggler>Images spacing</we-toggler> <we-collapse> <we-button data-select-class="o_spc-none">None</we-button> <we-button data-select-class="o_spc-small">Small</we-button> @@ -1249,7 +1237,7 @@ </we-collapse> </we-collapse-area> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-paint-brush"/> Styling</we-toggler> + <we-toggler>Styling</we-toggler> <we-collapse> <we-button data-styling="">Square</we-button> <we-button data-styling="rounded">Rounded corners</we-button> @@ -1262,7 +1250,7 @@ <div data-js="gallery_img" data-selector=".o_gallery img"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-refresh"/> Re-order</we-toggler> + <we-toggler>Re-order</we-toggler> <we-collapse data-no-preview="true"> <we-button data-position="first">Move to first</we-button> <we-button data-position="prev">Move to previous</we-button> @@ -1274,9 +1262,7 @@ <!-- Facebook Page --> <div data-js="facebookPage" data-selector=".o_facebook_page"> - <we-button data-fb-page-options="true" data-no-preview="true"> - <i class="fa fa-fw fa-facebook"/> Options - </we-button> + <we-button data-fb-page-options="true" data-no-preview="true">Facebook Options</we-button> </div> <!-- Accordion --> @@ -1288,7 +1274,7 @@ data-selector="section" data-target="> * > .row:not(.s_nb_column_fixed)"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-columns"/> Number of columns</we-toggler> + <we-toggler>Number of columns</we-toggler> <we-collapse data-no-preview="true"> <we-button data-select-count="1">1</we-button> <we-button data-select-count="2">2</we-button> @@ -1303,7 +1289,7 @@ <!-- V-ALIGN --> <div id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns" data-target=".row"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-arrows-v"/> Alignment</we-toggler> + <we-toggler>Alignment</we-toggler> <we-collapse> <we-button data-select-class="align-items-start">Top</we-button> <we-button data-select-class="align-items-center">Middle</we-button> @@ -1318,24 +1304,20 @@ <div data-js="background" string="Background" data-selector="section, .parallax, .carousel-item" data-exclude=".s_hr, .s_image_gallery, .o_gallery .carousel-item"> - <we-button data-choose-image="true" data-no-preview="true"> - <i class="fa fa-fw fa-picture-o"/> Background - </we-button> + <we-button data-choose-image="true" data-no-preview="true">Background</we-button> </div> <!-- Background Image --> <div data-js="background_position" data-selector="section, .parallax, .carousel-item" data-exclude=".o_gallery .carousel-item"> - <we-button data-background-position="true" data-no-preview="true"> - <i class="fa fa-fw fa-arrows"/> Background Image Sizing - </we-button> + <we-button data-background-position="true" data-no-preview="true">Background Image Sizing</we-button> </div> <!-- Parallax --> <div data-js="parallax" data-selector=".parallax"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-clock-o"/> Scroll Speed</we-toggler> + <we-toggler>Scroll Speed</we-toggler> <we-collapse> <we-button data-scroll="0">No-scroll</we-button> <we-divider/> @@ -1355,7 +1337,7 @@ data-selector="section, .carousel-item" data-exclude=".parallax, .o_gallery .carousel-item"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Background Color</we-toggler> + <we-toggler>Background Color</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1367,7 +1349,7 @@ data-palette-default="transparent_grayscale" data-palette-title="Overlay Color"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Filter</we-toggler> + <we-toggler>Filter</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1377,7 +1359,7 @@ data-selector="section .row > div" data-exclude=".s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .o_gallery .row > div"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Background Color</we-toggler> + <we-toggler>Background Color</we-toggler> <we-collapse/> </we-collapse-area> </div> @@ -1385,7 +1367,7 @@ <div data-selector="section .row > div" data-exclude=".s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .o_gallery .row > div"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-magic"/> Styles</we-toggler> + <we-toggler>Styles</we-toggler> <we-collapse> <we-button data-toggle-class="border">Border</we-button> <we-button data-toggle-class="rounded">Rounded</we-button> @@ -1430,9 +1412,7 @@ <div data-js="topMenuTransparency" data-selector="[data-main-object^='website.page('] #wrapwrap > header" data-no-check="true"> - <we-button data-transparent="true" data-no-preview="true"> - <i class="fa fa-fw fa-eye-slash"/> Transparent - </we-button> + <we-button data-transparent="true" data-no-preview="true">Transparent</we-button> </div> <div data-js="topMenuColor" @@ -1442,7 +1422,7 @@ data-palette-title="Top Menu Color" data-no-check="true"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-eyedropper"/> Background Color</we-toggler> + <we-toggler>Background Color</we-toggler> <div class="dropdown-menu"/> </we-collapse-area> </div> @@ -1459,7 +1439,7 @@ <!-- Mega Menu settings --> <div data-selector=".o_mega_menu"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-arrows-h"/> Size</we-toggler> + <we-toggler>Size</we-toggler> <we-collapse> <we-button data-select-class="">Full-Width</we-button> <we-button data-select-class="o_mega_menu_container_size">Narrow</we-button> @@ -1537,7 +1517,7 @@ data-selector="section" data-target="> .container, > .container-fluid"> <we-collapse-area> - <we-toggler><i class="fa fa-fw fa-arrows-h"/> Stretch</we-toggler> + <we-toggler>Stretch</we-toggler> <we-collapse> <we-button data-select-class="container-fluid">Yes</we-button> <we-button data-select-class="container">No</we-button> diff --git a/addons/website_blog/views/snippets.xml b/addons/website_blog/views/snippets.xml index 21d8f66727a..63c224f3c35 100644 --- a/addons/website_blog/views/snippets.xml +++ b/addons/website_blog/views/snippets.xml @@ -12,7 +12,7 @@ <xpath expr="//div[@data-js='background']" position="before"> <div data-js="js_get_posts_selectBlog" data-selector=".s_latest_posts, .s_latest_posts_big_picture" data-target=".js_get_posts" data-no-check="true"> <we-collapse-area> - <we-toggler><i class="fa fa-folder-open"/> Choose a blog</we-toggler> + <we-toggler>Choose a blog</we-toggler> <we-collapse data-no-preview="true"> <we-button data-filter-by-blog-id="0">All blogs</we-button> <!-- the blog list will be generated in js --> @@ -22,7 +22,7 @@ <div data-js="js_get_posts_limit" data-selector=".s_latest_posts, .s_latest_posts_big_picture" data-target=".js_get_posts" data-no-check="true"> <we-collapse-area> - <we-toggler><i class="fa fa-sort-numeric-asc"/> Posts limit</we-toggler> + <we-toggler>Posts limit</we-toggler> <we-collapse data-no-preview="true"> <we-button data-posts-limit="1">1 post max</we-button> <we-button data-posts-limit="2">2 posts max</we-button> diff --git a/addons/website_sale/views/snippets.xml b/addons/website_sale/views/snippets.xml index 31d40dd882e..faf4ed6bdad 100644 --- a/addons/website_sale/views/snippets.xml +++ b/addons/website_sale/views/snippets.xml @@ -114,9 +114,7 @@ <div data-js="ProductsSearchBar" data-selector=".s_wsale_products_searchbar_input"> - <we-button data-no-preview="true" data-open-searchbar-settings=""> - <i class="fa fa-search"/> Products Search Bar - </we-button> + <we-button data-no-preview="true" data-open-searchbar-settings="">Products Search Bar</we-button> </div> </xpath> <xpath expr="//div[@id='so_content_addition']" position="attributes"> |
