diff --git a/muk_web_glyphicons/README.md b/muk_web_glyphicons/README.md deleted file mode 100644 index ba14dcd..0000000 --- a/muk_web_glyphicons/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Bootstrap Glyphicons Support - -Odoo does not natively support the Glyphicons from Bootstrap although -it uses the framework. This module enables the Bootstrap Glyphicons. - -The Glyphicons from Font Awesome which are used by Odoo will still -be available. \ No newline at end of file diff --git a/muk_web_glyphicons/__init__.py b/muk_web_glyphicons/__init__.py index 48ccf85..21f21ae 100644 --- a/muk_web_glyphicons/__init__.py +++ b/muk_web_glyphicons/__init__.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - ################################################################################### # # Copyright (C) 2017 MuK IT GmbH diff --git a/muk_web_glyphicons/__manifest__.py b/muk_web_glyphicons/__manifest__.py index 0c822b1..042785a 100644 --- a/muk_web_glyphicons/__manifest__.py +++ b/muk_web_glyphicons/__manifest__.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - ################################################################################### # # Copyright (C) 2017 MuK IT GmbH @@ -19,34 +17,25 @@ # ################################################################################### - { "name": "MuK Bootstrap Glyphicons", 'summary': """Bootstrap Glyphicons Support""", - 'description':""" - Odoo does not natively support the Glyphicons from Bootstrap although - it uses the framework. This module enables the Bootstrap Glyphicons. - - The Glyphicons from Font Awesome which are used by Odoo will still - be available. - """, - "version": "11.0.1.0.0", + "version": "11.0.2.0.0", "category": "Extra Tools", "license": "AGPL-3", "website": "http://www.mukit.at", + "live_test_url": "https://demo.mukit.at/web/login", "author": "MuK IT", "contributors": [ "Mathias Markl ", "Kerrim Abdelhamed ", ], "depends": [ - "base", + "web_editor", ], "data": [ "template/assets.xml", ], - "demo": [ - ], "qweb": [ "static/src/xml/*.xml", ], diff --git a/muk_web_glyphicons/doc/changelog.rst b/muk_web_glyphicons/doc/changelog.rst index 9ee2b48..f2ae21c 100644 --- a/muk_web_glyphicons/doc/changelog.rst +++ b/muk_web_glyphicons/doc/changelog.rst @@ -1,3 +1,8 @@ +`2.0.0` +------- + +- Migrated to Python 3 + `1.0.0` ------- diff --git a/muk_web_glyphicons/doc/index.rst b/muk_web_glyphicons/doc/index.rst new file mode 100644 index 0000000..e71aa02 --- /dev/null +++ b/muk_web_glyphicons/doc/index.rst @@ -0,0 +1,49 @@ +============================ +Bootstrap Glyphicons Support +============================ + +Odoo does not natively support the Glyphicons from Bootstrap although +it uses the framework. This module enables the Bootstrap Glyphicons. + +The Glyphicons from Font Awesome which are used by Odoo will still +be available. + +Installation +============ + +To install this module, you need to: + +Download the module and add it to your Odoo addons folder. Afterward, log on to +your Odoo server and go to the Apps menu. Trigger the debug modus and update the +list by clicking on the "Update Apps List" link. Now install the module by +clicking on the install button. + +Configuration +============= + +No additional configuration is needed to use this module. + +Usage +============= + +Bootstrap Glyphicons are appended to the MediaDialog. + +Credits +======= + +Contributors +------------ + +* Mathias Markl + +Author & Maintainer +------------------- + +This module is maintained by the `MuK IT GmbH `_. + +MuK IT is an Austrian company specialized in customizing and extending Odoo. +We develop custom solutions for your individual needs to help you focus on +your strength and expertise to grow your business. + +If you want to get in touch please contact us via mail +(sale@mukit.at) or visit our website (https://mukit.at). diff --git a/muk_web_glyphicons/static/description/index.html b/muk_web_glyphicons/static/description/index.html index 2c39f30..14915f3 100644 --- a/muk_web_glyphicons/static/description/index.html +++ b/muk_web_glyphicons/static/description/index.html @@ -4,7 +4,7 @@

Bootstrap Glyphicons Support

MuK IT GmbH - www.mukit.at

-
+
@@ -12,7 +12,7 @@
-
+

Overview

Odoo does not natively support the Glyphicons from Bootstrap although it uses the framework. This module enables @@ -22,14 +22,46 @@

+
+

Demo

+
+
+
User:
+
+
+
apps
+
+
+
Password:
+
+
+
demo
+
+
+
+ + Live Preview +
+
+

Help and Support

+
Feel free to + contact us, if you need any help with your Odoo integration or + addiontal features.
- Email - - - Contact + Email + + Contact + + Support
. +* +**********************************************************************************/ + +odoo.define('muk_web_glyphicons.fonts', function (require) { +'use strict'; + +var editor_widgets = require('web_editor.widget'); + +editor_widgets.fontIcons.push({'base': 'glyphicon', 'parser': /(?=^|\s)(\.glyphicon-[0-9a-z_-]+::?before)/i}); + +}); \ No newline at end of file diff --git a/muk_web_glyphicons/static/src/less/glyphicons.less b/muk_web_glyphicons/static/src/less/glyphicons.less index 3cc5593..057979d 100644 --- a/muk_web_glyphicons/static/src/less/glyphicons.less +++ b/muk_web_glyphicons/static/src/less/glyphicons.less @@ -1,6 +1,24 @@ +/********************************************************************************** +* +* Copyright (C) 2017 MuK IT GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +* +**********************************************************************************/ + @font-face { font-family: 'Glyphicons Halflings'; - src: url('/muk_web_glyphicons/static/lib/bootstrap/fonts/glyphicons-halflings-regular.eot'); src: url('/muk_web_glyphicons/static/lib/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('/muk_web_glyphicons/static/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2') format('woff2'), diff --git a/muk_web_glyphicons/template/assets.xml b/muk_web_glyphicons/template/assets.xml index f7736b3..b57837b 100644 --- a/muk_web_glyphicons/template/assets.xml +++ b/muk_web_glyphicons/template/assets.xml @@ -1,8 +1,34 @@ + + + -