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

[IMP] pre-commit run after update 

Includes some manual fixes to silent ESLint warnings.
pull/1710/head
Jairo Llopis 2020-01-24 13:45:39 +00:00 committed by Pablo Fuentes
parent 05b64d119d
commit 61b5bb54f2
4 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_environment_ribbon/data/ribbon_data.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com> <!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo noupdate="1"> <odoo noupdate="1">

6
web_environment_ribbon/static/src/css/ribbon.css
View File

@ -2,7 +2,7 @@
Copyright 2017 Thomas Binsfeld <thomas.binsfeld@acsone.eu> Copyright 2017 Thomas Binsfeld <thomas.binsfeld@acsone.eu>
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
.test-ribbon{ .test-ribbon {
width: 300px; width: 300px;
top: 25px; top: 25px;
left: -100px; left: -100px;
@ -18,8 +18,8 @@
transform: rotate(-45deg); transform: rotate(-45deg);
z-index: 9999; z-index: 9999;
position: fixed; position: fixed;
box-shadow: 0 0 3px rgba(0,0,0,.3); box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
background: rgba(255,0,0,.6); background: rgba(255, 0, 0, 0.6);
pointer-events: none; pointer-events: none;
} }

34
web_environment_ribbon/static/src/js/ribbon.js
View File

@ -5,14 +5,14 @@
Copyright 2017 Xavier Jiménez <xavier.jimenez@qubiq.es> Copyright 2017 Xavier Jiménez <xavier.jimenez@qubiq.es>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
odoo.define('web_environment_ribbon.ribbon', function (require) { odoo.define("web_environment_ribbon.ribbon", function(require) {
"use strict"; "use strict";
var rpc = require('web.rpc'); var rpc = require("web.rpc");
var core = require('web.core'); var core = require("web.core");
// Code from: http://jsfiddle.net/WK_of_Angmar/xgA5C/ // Code from: http://jsfiddle.net/WK_of_Angmar/xgA5C/
function validStrColour (strToTest) { function validStrColour(strToTest) {
if (strToTest === "") { if (strToTest === "") {
return false; return false;
} }
@ -33,31 +33,31 @@ odoo.define('web_environment_ribbon.ribbon', function (require) {
return image.style.color !== "rgb(255, 255, 255)"; return image.style.color !== "rgb(255, 255, 255)";
} }
core.bus.on('web_client_ready', null, function () { core.bus.on("web_client_ready", null, function() {
var ribbon = $('<div class="test-ribbon hidden"/>'); var ribbon = $('<div class="test-ribbon hidden"/>');
$('body').append(ribbon); $("body").append(ribbon);
ribbon.hide(); ribbon.hide();
// Get ribbon data from backend // Get ribbon data from backend
rpc.query({ rpc.query({
model: 'web.environment.ribbon.backend', model: "web.environment.ribbon.backend",
method: 'get_environment_ribbon', method: "get_environment_ribbon",
}).then( }).then(function(ribbon_data) {
function (ribbon_data) {
// Ribbon name // Ribbon name
if (ribbon_data.name && ribbon_data.name !== 'False') { if (ribbon_data.name && ribbon_data.name !== "False") {
ribbon.html(ribbon_data.name); ribbon.html(ribbon_data.name);
ribbon.show(); ribbon.show();
} }
// Ribbon color // Ribbon color
if (ribbon_data.color && validStrColour(ribbon_data.color)) { if (ribbon_data.color && validStrColour(ribbon_data.color)) {
ribbon.css('color', ribbon_data.color); ribbon.css("color", ribbon_data.color);
} }
// Ribbon background color // Ribbon background color
if (ribbon_data.background_color && if (
validStrColour(ribbon_data.background_color)) { ribbon_data.background_color &&
ribbon.css('background-color', ribbon_data.background_color); validStrColour(ribbon_data.background_color)
) {
ribbon.css("background-color", ribbon_data.background_color);
} }
} });
);
}); });
}); });

17
web_environment_ribbon/view/base_view.xml
View File

@ -1,17 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com> <!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com>
Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com> Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<!-- Load css for ribbons --> <!-- Load css for ribbons -->
<template id="assets_backend" name="ribbon_test assets" <template id="assets_backend" name="ribbon_test assets" inherit_id="web.assets_backend">
inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" <link
href="/web_environment_ribbon/static/src/css/ribbon.css"/> rel="stylesheet"
<script type="text/javascript" href="/web_environment_ribbon/static/src/css/ribbon.css"
src="/web_environment_ribbon/static/src/js/ribbon.js"/> />
<script
type="text/javascript"
src="/web_environment_ribbon/static/src/js/ribbon.js"
/>
</xpath> </xpath>
</template> </template>