diff --git a/web_environment_ribbon/models/__init__.py b/web_environment_ribbon/models/__init__.py new file mode 100644 index 000000000000..07f672352f85 --- /dev/null +++ b/web_environment_ribbon/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2017 Xavier Brochard +# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). + +from . import ribbon diff --git a/web_environment_ribbon/models/ribbon.py b/web_environment_ribbon/models/ribbon.py new file mode 100644 index 000000000000..cc9d5778bc5f --- /dev/null +++ b/web_environment_ribbon/models/ribbon.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# © 2017 Xavier Brochard +# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). + +import os +from odoo import models, fields + +class DbName(models.Model): + + ribbon.name = fields.Char( + default=lambda self: self._default_name(), + help='Text printed on the Ribbon', + required=True + ) + @api.model + def _default_name(self): + """Default to database name.""" + return self.env.cr.dbname() diff --git a/web_environment_ribbon/static/src/css/ribbon.css b/web_environment_ribbon/static/src/css/ribbon.css index 999c64f7cf97..2e8d7757e2a1 100644 --- a/web_environment_ribbon/static/src/css/ribbon.css +++ b/web_environment_ribbon/static/src/css/ribbon.css @@ -2,11 +2,12 @@ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ .test-ribbon{ - width: 200px; + width: 300px; top: 25px; - left: -50px; + left: -100px; text-align: center; - line-height: 50px; + padding: 10px; + line-height: 20px; letter-spacing: 1px; color: #f0f0f0; -webkit-transform: rotate(-45deg); diff --git a/web_environment_ribbon/static/src/js/ribbon.js b/web_environment_ribbon/static/src/js/ribbon.js index 90015ad829ca..6b00fe6cacee 100644 --- a/web_environment_ribbon/static/src/js/ribbon.js +++ b/web_environment_ribbon/static/src/js/ribbon.js @@ -9,7 +9,8 @@ odoo.define('web_environment_ribbon.ribbon', function(require) { var $ = require('jquery'); var Model = require('web.Model'); var core = require('web.core'); - +var session = require('web.session'); + var model = new Model('ir.config_parameter'); // Code from: http://jsfiddle.net/WK_of_Angmar/xgA5C/ @@ -33,6 +34,7 @@ core.bus.on('web_client_ready', null, function () { model.call('get_param', ['ribbon.name']).then( function (name) { if (name && name != 'False') { + name = _.str.sprintf("%s
(%s)", name, session.db); ribbon.html(name); ribbon.show(); }