Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
base_fontawesome/__manifest__.py
View File

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

24
base_fontawesome/static/src/css/fontawesome.css vendored
View File

@ -1,17 +1,21 @@
@font-face { @font-face {
font-family: 'FontAwesome'; 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");
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"); src: url("../../lib/fontawesome-5.7.1/webfonts/fa-solid-900.eot?#iefix")
ont-weight: normal; format("embedded-opentype"),
font-style: normal; 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.fa,
.btn.fas, .btn.fas,
.btn.far, .btn.far,
.btn.fal, .btn.fal,
.btn.fab { .btn.fab {
font-weight: 900; font-weight: 900;
} }

100
base_fontawesome/static/src/js/form_renderer.js
View File

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

57
base_fontawesome/static/src/js/list_renderer.js
View File

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

59
base_fontawesome/templates/assets.xml
View File

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