diff --git a/base_fontawesome/__manifest__.py b/base_fontawesome/__manifest__.py index 20ddaf07f..3dde78010 100644 --- a/base_fontawesome/__manifest__.py +++ b/base_fontawesome/__manifest__.py @@ -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"], } diff --git a/base_fontawesome/static/src/css/fontawesome.css b/base_fontawesome/static/src/css/fontawesome.css index c08028e4f..f5de37c2e 100644 --- a/base_fontawesome/static/src/css/fontawesome.css +++ b/base_fontawesome/static/src/css/fontawesome.css @@ -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; - } \ No newline at end of file + font-weight: 900; +} diff --git a/base_fontawesome/static/src/js/form_renderer.js b/base_fontawesome/static/src/js/form_renderer.js index 7181372e6..7494356e3 100644 --- a/base_fontawesome/static/src/js/form_renderer.js +++ b/base_fontawesome/static/src/js/form_renderer.js @@ -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) { - $('
') - .addClass('fab fa-fw o_button_icon') - .addClass(node.attrs.brand_icon) - .prependTo($button); - } - if (node.attrs.solid_icon) { - $('
') - .addClass('fas fa-fw o_button_icon') - .addClass(node.attrs.solid_icon) - .prependTo($button); - } - if (node.attrs.regular_icon) { - $('
') - .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) { - $('
') - .addClass('fab fa-fw o_button_icon') - .addClass(node.attrs.brand_icon) - .prependTo($button); - } - if (node.attrs.solid_icon) { - $('
') - .addClass('fas fa-fw o_button_icon') - .addClass(node.attrs.solid_icon) - .prependTo($button); - } - if (node.attrs.regular_icon) { - $('
') - .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) { + $("
") + .addClass("fab fa-fw o_button_icon") + .addClass(node.attrs.brand_icon) + .prependTo($button); + } + if (node.attrs.solid_icon) { + $("
") + .addClass("fas fa-fw o_button_icon") + .addClass(node.attrs.solid_icon) + .prependTo($button); + } + if (node.attrs.regular_icon) { + $("
") + .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) { + $("
") + .addClass("fab fa-fw o_button_icon") + .addClass(node.attrs.brand_icon) + .prependTo($button); + } + if (node.attrs.solid_icon) { + $("
") + .addClass("fas fa-fw o_button_icon") + .addClass(node.attrs.solid_icon) + .prependTo($button); + } + if (node.attrs.regular_icon) { + $("
") + .addClass("far fa-fw o_button_icon") + .addClass(node.attrs.regular_icon) + .prependTo($button); + } + return $button; + }, + }); }); diff --git a/base_fontawesome/static/src/js/list_renderer.js b/base_fontawesome/static/src/js/list_renderer.js index 9a04ea680..cde8f8ec3 100644 --- a/base_fontawesome/static/src/js/list_renderer.js +++ b/base_fontawesome/static/src/js/list_renderer.js @@ -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) { - $('
') - .addClass('fab fa-fw o_button_icon') - .addClass(node.attrs.brand_icon) - .prependTo($button); - } - if (node.attrs.solid_icon) { - $('
') - .addClass('fas fa-fw o_button_icon') - .addClass(node.attrs.solid_icon) - .prependTo($button); - } - if (node.attrs.regular_icon) { - $('
') - .addClass('far fa-fw o_button_icon') - .addClass(node.attrs.regular_icon) - .prependTo($button); - } - return $button; - } -}); - + if (node.attrs.brand_icon) { + $("
") + .addClass("fab fa-fw o_button_icon") + .addClass(node.attrs.brand_icon) + .prependTo($button); + } + if (node.attrs.solid_icon) { + $("
") + .addClass("fas fa-fw o_button_icon") + .addClass(node.attrs.solid_icon) + .prependTo($button); + } + if (node.attrs.regular_icon) { + $("
") + .addClass("far fa-fw o_button_icon") + .addClass(node.attrs.regular_icon) + .prependTo($button); + } + return $button; + }, + }); }); diff --git a/base_fontawesome/templates/assets.xml b/base_fontawesome/templates/assets.xml index b25eae30c..cbc3f598c 100644 --- a/base_fontawesome/templates/assets.xml +++ b/base_fontawesome/templates/assets.xml @@ -5,29 +5,52 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -->