summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src
diff options
context:
space:
mode:
authorCocographique <nmi@odoo.com>2018-07-25 10:03:30 +0200
committerqsm-odoo <qsm@odoo.com>2018-08-13 18:30:01 +0200
commit4dce6cc98b2b95a00249ac29245305e08f288e6c (patch)
tree43f76425632b4af977339a341e44e401e66e22de /addons/web_editor/static/src
parent2623644ba871de1954f2f33fc0caab7643eec93a (diff)
[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
Diffstat (limited to 'addons/web_editor/static/src')
-rw-r--r--addons/web_editor/static/src/js/editor/rte.summernote.js2
-rw-r--r--addons/web_editor/static/src/js/editor/snippets.editor.js1
-rw-r--r--addons/web_editor/static/src/js/editor/summernote.js2
-rw-r--r--addons/web_editor/static/src/js/tours/rte.js2
-rw-r--r--addons/web_editor/static/src/js/widgets/widgets.js9
-rw-r--r--addons/web_editor/static/src/scss/web_editor.variables.scss12
-rw-r--r--addons/web_editor/static/src/xml/editor.xml14
7 files changed, 30 insertions, 12 deletions
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($('<div/>', {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
@@ -258,6 +258,18 @@
</div>
</div>
<div class="form-group row">
+ <label class="col-form-label col-md-3">Style</label>
+ <div class="col-md-9">
+ <select name="link_style_shape" class="form-control col-md-3 link-shape">
+ <option value="" selected="selected">Default</option>
+ <option value="outline">Outline</option>
+ <option value="rounded-circle">Rounded</option>
+ <option value="outline,rounded-circle">Outline-Rounded</option>
+ <option value="flat">Flat</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group row">
<label class="col-form-label col-md-3">Color</label>
<div class="col-md-9">
<div class="o_link_dialog_color">
@@ -266,7 +278,7 @@
<input class="d-none link-style" name="link_style_color" type="radio" value=""/>
<i class="fa"/>
</label>
- <t t-foreach="['primary', 'secondary', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color">
+ <t t-foreach="['primary', 'secondary', 'gamma', 'delta', 'epsilon', 'success', 'info', 'warning', 'danger']" t-as="color">
<label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-#{color}" t-attf-aria-label="Color for #{color}" t-attf-title="Color for #{color}">
<input type="radio" name="link_style_color" class="d-none link-style" t-att-value="color"/>
<i class="fa"/>