pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: use summernote.less and fix color picker (+ add FA support)

Browse Source
This commit is contained in:
Jeremy Kersten
2015-07-10 16:10:03 +02:00
parent fb4c6bc865
commit 5ed23c87d4
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/lib/summernote/src/less/summernote.less
+1 -1
View File
@@ -1,4 +1,4 @@
@import "elements.less";
/* @_import "elements.less"; */
/* Theme Variables
------------------------------------------*/
addons/website/static/src/js/summernote.js
+7 -2
View File
@@ -1779,7 +1779,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
var startPoint = rng.getStartPoint();
var endPoint = rng.getEndPoint();
if (rng.isCollapsed()) {
if (rng.isCollapsed() && !dom.isFont(rng.sc)) {
return {
sc: startPoint.node,
so: startPoint.offset,
@@ -1827,6 +1827,11 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
});
nodes = list.unique(nodes);
// If ico fa
if (rng.isCollapsed()) {
node.push(startPoint.node);
}
// apply font: foreColor, backColor, size (the color can be use a class text-... or bg-...)
var node, font, $font, fonts = [], className;
if (color || bgcolor || size) {
@@ -1850,7 +1855,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
if (color) {
for (var k=0; k<className.length; k++) {
if (!className[k].length && className[k].slice(0,5) === "text-") {
if (className[k].length && className[k].slice(0,5) === "text-") {
className.splice(k,1);
k--;
}
addons/website/static/src/js/website.editor.js
-2
View File
@@ -111,8 +111,6 @@ define(['summernote/summernote'], function () {
})).appendTo($resizefa);
}
var $colorfa = $airPopover.find('.note-color').clone();
$colorfa.find(".btn-group:first").remove();
$colorfa.find("ul.dropdown-menu").css('min-width', '172px');
$colorfa.find('button[data-event="color"]').attr('data-value', '{"foreColor": "#f00"}')
.find("i").css({'background': '', 'color': '#f00'});
$resizefa.after($colorfa);
addons/website/views/website_templates.xml
+3 -3
View File
@@ -59,9 +59,9 @@
<script>openerp.define.next = 'summernote/openerp';</script>
<script type="text/javascript" src="/website/static/src/js/summernote.js"></script>
<script>openerp.define.desactive();</script>
<!--link rel="stylesheet" href="/website/static/lib/summernote/src/less/summernote.less"/-->
<link rel="stylesheet" href="/website/static/lib/summernote/summernote.css"/>
<link rel="stylesheet" href="/website/static/lib/summernote/src/less/elements.less"/>
<link rel="stylesheet" href="/website/static/lib/summernote/src/less/summernote.less"/>
<!--<link rel="stylesheet" href="/website/static/lib/summernote/summernote.css"/>-->
</template>
<template id="assets_common" inherit_id="web.assets_common" name="Website common assets">