[IMP] base_fontawesome: black, isort, prettier

pull/2462/head
Tony Galmiche 2020-05-24 08:55:48 +02:00 committed by Sylvain LE GAL
parent d6c4ac5076
commit 29b8601cd0
5 changed files with 139 additions and 121 deletions

View File

@ -3,16 +3,12 @@
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
{
'name': 'Base Fontawesome',
'summary': """Up to date Fontawesome resources.""",
'version': '12.0.5.7.1',
'license': 'LGPL-3',
'website': 'https://github.com/OCA/server-tools',
'author': 'Camptocamp,Creu Blanca,Odoo Community Association (OCA)',
'depends': [
'web',
],
'data': [
'templates/assets.xml',
],
"name": "Base Fontawesome",
"summary": """Up to date Fontawesome resources.""",
"version": "13.0.5.13.0",
"license": "LGPL-3",
"website": "https://github.com/OCA/server-tools",
"author": "Camptocamp,Creu Blanca,Odoo Community Association (OCA)",
"depends": ["web"],
"data": ["templates/assets.xml"],
}

View File

@ -1,17 +1,21 @@
@font-face {
font-family: 'FontAwesome';
src: url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.eot");
src: url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.woff2") format("woff2"), url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.woff") format("woff"), url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.ttf") format("truetype"), url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.svg#fontawesome") format("svg");
ont-weight: normal;
font-style: normal;
}
font-family: "FontAwesome";
src: url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.eot");
src: url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.eot?#iefix")
format("embedded-opentype"),
url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.woff2") format("woff2"),
url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.woff") format("woff"),
url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.ttf") format("truetype"),
url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.svg#fontawesome")
format("svg");
ont-weight: normal;
font-style: normal;
}
.btn.fa,
.btn.fas,
.btn.far,
.btn.fal,
.btn.fab {
font-weight: 900;
}
font-weight: 900;
}

View File

@ -1,55 +1,53 @@
odoo.define('base_fontawesome5.FormRenderer', function (require) {
"use strict";
odoo.define("base_fontawesome5.FormRenderer", function(require) {
"use strict";
var FormRenderer = require('web.FormRenderer');
var FormRenderer = require("web.FormRenderer");
FormRenderer.include({
_renderStatButton: function (node) {
var $button = this._super.apply(this, arguments);
if (node.attrs.brand_icon) {
$('<div>')
.addClass('fab fa-fw o_button_icon')
.addClass(node.attrs.brand_icon)
.prependTo($button);
}
if (node.attrs.solid_icon) {
$('<div>')
.addClass('fas fa-fw o_button_icon')
.addClass(node.attrs.solid_icon)
.prependTo($button);
}
if (node.attrs.regular_icon) {
$('<div>')
.addClass('far fa-fw o_button_icon')
.addClass(node.attrs.regular_icon)
.prependTo($button);
}
return $button;
},
_renderTagButton: function (node) {
var $button = this._super.apply(this, arguments);
if (node.attrs.brand_icon) {
$('<div>')
.addClass('fab fa-fw o_button_icon')
.addClass(node.attrs.brand_icon)
.prependTo($button);
}
if (node.attrs.solid_icon) {
$('<div>')
.addClass('fas fa-fw o_button_icon')
.addClass(node.attrs.solid_icon)
.prependTo($button);
}
if (node.attrs.regular_icon) {
$('<div>')
.addClass('far fa-fw o_button_icon')
.addClass(node.attrs.regular_icon)
.prependTo($button);
}
return $button;
}
});
FormRenderer.include({
_renderStatButton: function(node) {
var $button = this._super.apply(this, arguments);
if (node.attrs.brand_icon) {
$("<div>")
.addClass("fab fa-fw o_button_icon")
.addClass(node.attrs.brand_icon)
.prependTo($button);
}
if (node.attrs.solid_icon) {
$("<div>")
.addClass("fas fa-fw o_button_icon")
.addClass(node.attrs.solid_icon)
.prependTo($button);
}
if (node.attrs.regular_icon) {
$("<div>")
.addClass("far fa-fw o_button_icon")
.addClass(node.attrs.regular_icon)
.prependTo($button);
}
return $button;
},
_renderTagButton: function(node) {
var $button = this._super.apply(this, arguments);
if (node.attrs.brand_icon) {
$("<div>")
.addClass("fab fa-fw o_button_icon")
.addClass(node.attrs.brand_icon)
.prependTo($button);
}
if (node.attrs.solid_icon) {
$("<div>")
.addClass("fas fa-fw o_button_icon")
.addClass(node.attrs.solid_icon)
.prependTo($button);
}
if (node.attrs.regular_icon) {
$("<div>")
.addClass("far fa-fw o_button_icon")
.addClass(node.attrs.regular_icon)
.prependTo($button);
}
return $button;
},
});
});

View File

@ -1,34 +1,31 @@
odoo.define('base_fontawesome5.ListRenderer', function (require) {
"use strict";
odoo.define("base_fontawesome5.ListRenderer", function(require) {
"use strict";
var ListRenderer = require('web.ListRenderer');
var ListRenderer = require("web.ListRenderer");
ListRenderer.include({
_renderButton: function(record, node) {
var $button = this._super.apply(this, arguments);
ListRenderer.include({
_renderButton: function (record, node) {
var $button = this._super.apply(this, arguments);
if (node.attrs.brand_icon) {
$('<div>')
.addClass('fab fa-fw o_button_icon')
.addClass(node.attrs.brand_icon)
.prependTo($button);
}
if (node.attrs.solid_icon) {
$('<div>')
.addClass('fas fa-fw o_button_icon')
.addClass(node.attrs.solid_icon)
.prependTo($button);
}
if (node.attrs.regular_icon) {
$('<div>')
.addClass('far fa-fw o_button_icon')
.addClass(node.attrs.regular_icon)
.prependTo($button);
}
return $button;
}
});
if (node.attrs.brand_icon) {
$("<div>")
.addClass("fab fa-fw o_button_icon")
.addClass(node.attrs.brand_icon)
.prependTo($button);
}
if (node.attrs.solid_icon) {
$("<div>")
.addClass("fas fa-fw o_button_icon")
.addClass(node.attrs.solid_icon)
.prependTo($button);
}
if (node.attrs.regular_icon) {
$("<div>")
.addClass("far fa-fw o_button_icon")
.addClass(node.attrs.regular_icon)
.prependTo($button);
}
return $button;
},
});
});

View File

@ -5,29 +5,52 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-->
<odoo>
<template id="assets_common" inherit_id="web.assets_common">
<xpath expr="link[@href='/web/static/lib/fontawesome/css/font-awesome.css']"
position="replace">
<link rel="stylesheet" type="text/css"
href="/base_fontawesome/static/src/css/fontawesome.css"/>
<link rel="stylesheet" type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/all.css"/>
<link rel="stylesheet" type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/v4-shims.css"/>
<xpath
expr="link[@href='/web/static/lib/fontawesome/css/font-awesome.css']"
position="replace"
>
<link
rel="stylesheet"
type="text/css"
href="/base_fontawesome/static/src/css/fontawesome.css"
/>
<link
rel="stylesheet"
type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/all.css"
/>
<link
rel="stylesheet"
type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/v4-shims.css"
/>
</xpath>
<xpath expr="." position="inside">
<script type="text/javascript"
src="/base_fontawesome/static/src/js/form_renderer.js"/>
<script type="text/javascript"
src="/base_fontawesome/static/src/js/list_renderer.js"/>
<script
type="text/javascript"
src="/base_fontawesome/static/src/js/form_renderer.js"
/>
<script
type="text/javascript"
src="/base_fontawesome/static/src/js/list_renderer.js"
/>
</xpath>
</template>
<template id="report_assets_common" inherit_id="web.report_assets_common">
<xpath expr="link[@href='/web/static/lib/fontawesome/css/font-awesome.css']"
position="replace">
<link rel="stylesheet" type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/all.css"/>
<link rel="stylesheet" type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/v4-shims.css"/>
<xpath
expr="link[@href='/web/static/lib/fontawesome/css/font-awesome.css']"
position="replace"
>
<link
rel="stylesheet"
type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/all.css"
/>
<link
rel="stylesheet"
type="text/css"
href="/base_fontawesome/static/lib/fontawesome-5.7.1/css/v4-shims.css"
/>
</xpath>
</template>
</odoo>