diff --git a/backend_theme_v12/images/screen.png b/backend_theme_v12/images/screen.png deleted file mode 100644 index 8e746db..0000000 Binary files a/backend_theme_v12/images/screen.png and /dev/null differ diff --git a/backend_theme_v12/static/description/crm.png b/backend_theme_v12/static/description/crm.png deleted file mode 100644 index d191baa..0000000 Binary files a/backend_theme_v12/static/description/crm.png and /dev/null differ diff --git a/backend_theme_v12/static/description/crm_mobile.png b/backend_theme_v12/static/description/crm_mobile.png deleted file mode 100644 index 93ab27a..0000000 Binary files a/backend_theme_v12/static/description/crm_mobile.png and /dev/null differ diff --git a/backend_theme_v12/static/description/desktop.png b/backend_theme_v12/static/description/desktop.png deleted file mode 100644 index 76fa555..0000000 Binary files a/backend_theme_v12/static/description/desktop.png and /dev/null differ diff --git a/backend_theme_v12/static/description/index.html b/backend_theme_v12/static/description/index.html deleted file mode 100644 index cc7c7d0..0000000 --- a/backend_theme_v12/static/description/index.html +++ /dev/null @@ -1,51 +0,0 @@ -
-
-
-

Openworx Material Backend Theme

-

The first Odoo 12.0 community backend theme

-
-

Enterprise look'n'feel and App Sidebar

-

-

App Dashboard

-

-

Quick search in App Dashboard

-

-

Side Chatter on widescreen

-

-

Fully responsive

-

-

-
-
-
-
- -
-
- -
-
-
-
-

Remark: It is possible that the Odoo service needs to be restarted after install.

-
-
-
-
- -
-
- -
-
-
-
-

Help & Support

-
- Website: Openworx
- Contact: Email Support
-
-
-
-
- diff --git a/backend_theme_v12/static/description/mobile.png b/backend_theme_v12/static/description/mobile.png deleted file mode 100644 index 4bcf6a7..0000000 Binary files a/backend_theme_v12/static/description/mobile.png and /dev/null differ diff --git a/backend_theme_v12/static/description/search.png b/backend_theme_v12/static/description/search.png deleted file mode 100644 index 0054611..0000000 Binary files a/backend_theme_v12/static/description/search.png and /dev/null differ diff --git a/backend_theme_v12/static/description/sidebar.png b/backend_theme_v12/static/description/sidebar.png deleted file mode 100644 index 022f8d6..0000000 Binary files a/backend_theme_v12/static/description/sidebar.png and /dev/null differ diff --git a/backend_theme_v12/static/src/img/material-background.jpg b/backend_theme_v12/static/src/img/material-background.jpg deleted file mode 100644 index d38241a..0000000 Binary files a/backend_theme_v12/static/src/img/material-background.jpg and /dev/null differ diff --git a/backend_theme_v12/views/web.xml b/backend_theme_v12/views/web.xml deleted file mode 100644 index 2b5fa87..0000000 --- a/backend_theme_v12/views/web.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/backend_theme_v12/LICENSE.txt b/backend_theme_v13/LICENSE.txt similarity index 100% rename from backend_theme_v12/LICENSE.txt rename to backend_theme_v13/LICENSE.txt diff --git a/backend_theme_v12/__init__.py b/backend_theme_v13/__init__.py similarity index 100% rename from backend_theme_v12/__init__.py rename to backend_theme_v13/__init__.py diff --git a/backend_theme_v12/__manifest__.py b/backend_theme_v13/__manifest__.py similarity index 59% rename from backend_theme_v12/__manifest__.py rename to backend_theme_v13/__manifest__.py index 474c817..be917d4 100644 --- a/backend_theme_v12/__manifest__.py +++ b/backend_theme_v13/__manifest__.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- -# Copyright 2016, 2019 Openworx +# Copyright 2016, 2020 Openworx - Mario Gielissen # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { - "name": "Openworx Material Backend Theme V12", - "summary": "Openworx Material Backend Theme V12 ", - "version": "12.0.0.1", + "name": "Openworx Material Backend Theme V13", + "summary": "Openworx Material Backend Theme V13", + "version": "13.0.0.3", "category": "Theme/Backend", "website": "http://www.openworx.nl", "description": """ - Openworx Material Backend theme for Odoo 12.0 community edition. + Openworx Material Backend theme for Odoo 13.0 community edition. """, 'images':[ 'images/screen.png' @@ -26,10 +26,9 @@ 'views/assets.xml', 'views/res_company_view.xml', 'views/users.xml', - 'views/sidebar.xml', - #'views/web.xml', + 'views/sidebar.xml', ], - 'live_test_url': 'https://youtu.be/JX-ntw2ORl8' + #'live_test_url': 'https://youtu.be/JX-ntw2ORl8' } diff --git a/backend_theme_v12/controllers/__init__.py b/backend_theme_v13/controllers/__init__.py similarity index 100% rename from backend_theme_v12/controllers/__init__.py rename to backend_theme_v13/controllers/__init__.py diff --git a/backend_theme_v12/controllers/main.py b/backend_theme_v13/controllers/main.py similarity index 90% rename from backend_theme_v12/controllers/main.py rename to backend_theme_v13/controllers/main.py index e899e58..25e7797 100644 --- a/backend_theme_v12/controllers/main.py +++ b/backend_theme_v13/controllers/main.py @@ -6,7 +6,7 @@ from odoo.http import Controller, request, route from werkzeug.utils import redirect -DEFAULT_IMAGE = '/backend_theme_v12/static/src/img/material-background.jpg' +DEFAULT_IMAGE = '/backend_theme_v13/static/src/img/material-background.png' class DasboardBackground(Controller): diff --git a/backend_theme_v13/images/screen.png b/backend_theme_v13/images/screen.png new file mode 100644 index 0000000..937fe6f Binary files /dev/null and b/backend_theme_v13/images/screen.png differ diff --git a/backend_theme_v12/models/__init__.py b/backend_theme_v13/models/__init__.py similarity index 66% rename from backend_theme_v12/models/__init__.py rename to backend_theme_v13/models/__init__.py index c5e3353..889e628 100644 --- a/backend_theme_v12/models/__init__.py +++ b/backend_theme_v13/models/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import res_company -from . import res_users \ No newline at end of file +from . import res_users + diff --git a/backend_theme_v12/models/res_company.py b/backend_theme_v13/models/res_company.py similarity index 100% rename from backend_theme_v12/models/res_company.py rename to backend_theme_v13/models/res_company.py diff --git a/backend_theme_v12/models/res_users.py b/backend_theme_v13/models/res_users.py similarity index 100% rename from backend_theme_v12/models/res_users.py rename to backend_theme_v13/models/res_users.py diff --git a/backend_theme_v12/static/description/icon.png b/backend_theme_v13/static/description/icon.png similarity index 100% rename from backend_theme_v12/static/description/icon.png rename to backend_theme_v13/static/description/icon.png diff --git a/openworx_backend_theme/static/description/index.html b/backend_theme_v13/static/description/index.html similarity index 64% rename from openworx_backend_theme/static/description/index.html rename to backend_theme_v13/static/description/index.html index 7ba5e9b..90cb865 100644 --- a/openworx_backend_theme/static/description/index.html +++ b/backend_theme_v13/static/description/index.html @@ -1,15 +1,13 @@
-

Openworx Backend Theme

-

The first Odoo 12.0 community backend theme

+

Openworx Material Backend Theme

+

The most popular backend theme for Odoo 13.0 Community

-

Enterprise look'n'feel and App Sidebar

-

-

Side Chatter on widescreen

-

-

CRM

-

+

Enterprise look'n'feel App dashboard

+

+

Formview

+

@@ -22,6 +20,7 @@

CRM

+

You can change the App dashboard background under Company Settings.

Remark: It is possible that the Odoo service needs to be restarted after install.

@@ -38,7 +37,7 @@

CRM

Help & Support


Website: Openworx
- Contact: Email Support
+ Contact: Email Support

diff --git a/backend_theme_v13/static/description/screenshot1.png b/backend_theme_v13/static/description/screenshot1.png new file mode 100644 index 0000000..cf9418b Binary files /dev/null and b/backend_theme_v13/static/description/screenshot1.png differ diff --git a/backend_theme_v13/static/description/screenshot2.png b/backend_theme_v13/static/description/screenshot2.png new file mode 100644 index 0000000..8eee3a4 Binary files /dev/null and b/backend_theme_v13/static/description/screenshot2.png differ diff --git a/backend_theme_v12/static/src/font/Roboto-Regular.ttf b/backend_theme_v13/static/src/font/Roboto-Regular.ttf similarity index 100% rename from backend_theme_v12/static/src/font/Roboto-Regular.ttf rename to backend_theme_v13/static/src/font/Roboto-Regular.ttf diff --git a/backend_theme_v12/static/src/img/checked.svg b/backend_theme_v13/static/src/img/checked.svg similarity index 100% rename from backend_theme_v12/static/src/img/checked.svg rename to backend_theme_v13/static/src/img/checked.svg diff --git a/backend_theme_v13/static/src/img/material-background.png b/backend_theme_v13/static/src/img/material-background.png new file mode 100644 index 0000000..de0bb76 Binary files /dev/null and b/backend_theme_v13/static/src/img/material-background.png differ diff --git a/backend_theme_v12/static/src/js/sidebar-toggle.js b/backend_theme_v13/static/src/js/sidebar-toggle.js similarity index 92% rename from backend_theme_v12/static/src/js/sidebar-toggle.js rename to backend_theme_v13/static/src/js/sidebar-toggle.js index 2330970..8abdce4 100644 --- a/backend_theme_v12/static/src/js/sidebar-toggle.js +++ b/backend_theme_v13/static/src/js/sidebar-toggle.js @@ -1,7 +1,7 @@ /* Copyright 2017 Openworx. * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ -odoo.define('backend_theme_v12.sidebar-toggle', function (require) { +odoo.define('backend_theme_v13.sidebar-toggle', function (require) { "use strict"; var session = require('web.session'); diff --git a/backend_theme_v12/static/src/js/sidebar.js b/backend_theme_v13/static/src/js/sidebar.js similarity index 91% rename from backend_theme_v12/static/src/js/sidebar.js rename to backend_theme_v13/static/src/js/sidebar.js index 176d151..7d4cbbd 100644 --- a/backend_theme_v12/static/src/js/sidebar.js +++ b/backend_theme_v13/static/src/js/sidebar.js @@ -2,7 +2,7 @@ * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ // Check if debug mode is active and then add debug into URL when clicking on the App sidebar -odoo.define('backend_theme_v12.Sidebar', function(require) { +odoo.define('backend_theme_v13.Sidebar', function(require) { "use strict"; var core = require('web.core'); var session = require('web.session'); diff --git a/backend_theme_v13/static/src/scss/colors.scss b/backend_theme_v13/static/src/scss/colors.scss new file mode 100644 index 0000000..3b7102c --- /dev/null +++ b/backend_theme_v13/static/src/scss/colors.scss @@ -0,0 +1,2 @@ +$brand-primary: #008DCA; +$brand-secondary: #5EC269; diff --git a/backend_theme_v12/static/src/scss/sidebar.scss b/backend_theme_v13/static/src/scss/sidebar.scss similarity index 93% rename from backend_theme_v12/static/src/scss/sidebar.scss rename to backend_theme_v13/static/src/scss/sidebar.scss index 1393964..158a148 100644 --- a/backend_theme_v12/static/src/scss/sidebar.scss +++ b/backend_theme_v13/static/src/scss/sidebar.scss @@ -8,7 +8,8 @@ $odoo-sidebar-width: 180px; .app-sidebar-panel { flex: 0 0 $odoo-sidebar-width; background-color: $gray-base; - height: 100% !important; + height: calc(100% - 46px) !important; + //height: 100% !important; overflow-y: auto; @media (max-width: 768px) { display: none; @@ -65,5 +66,5 @@ $odoo-sidebar-width: 180px; } .toggle-sidebar { - margin-left: 0px - $odoo-sidebar-width; -} \ No newline at end of file + display: none; +} diff --git a/backend_theme_v12/static/src/scss/style.scss b/backend_theme_v13/static/src/scss/style.scss similarity index 89% rename from backend_theme_v12/static/src/scss/style.scss rename to backend_theme_v13/static/src/scss/style.scss index 4faac80..225c463 100644 --- a/backend_theme_v12/static/src/scss/style.scss +++ b/backend_theme_v13/static/src/scss/style.scss @@ -4,7 +4,7 @@ @font-face { font-family: Roboto; - src: url(/backend_theme_v12/static/src/font/Roboto-Regular.ttf) + src: url(/backend_theme_v13/static/src/font/Roboto-Regular.ttf) } @@ -15,18 +15,6 @@ $gray: #777; $gray-light: #AEA79F; $gray-lighter: lighten($gray-base, 93.5%); - -// Change colors here - -// Odoo EE colors -//$brand-primary: #875a7b; -//$brand-secondary: #00A09D; -//------------------------ -$brand-primary: #008DCA; -$brand-secondary: #5EC269; -//------------------------ - - $brand-primary-dark: darken($brand-primary, 10%); $brand-secondary-dark: darken($brand-secondary, 10%); @@ -60,6 +48,31 @@ body { } +//.app-sidebar { +// display: none; +//} + +// Sidebar +html .o_web_client { + flex-flow: row wrap; + + >header { + flex: 0 0 100%; + } + + >.o_action_manager { + @media (max-width: 768px) { + flex: 0 0 100%; + } + flex: 0 0 calc(100% - 180px); + height: calc(100% - 46px) !important; + } + + .toggle-sidebar~.o_action_manager { + flex: 0 0 100%; + } +} + // Fix color Add file button .o_control_panel .o_cp_sidebar .o_hidden_input_file .o_form_binary_form span { color: $gray-dark !important; @@ -140,6 +153,11 @@ oe_highlight { color: $brand-primary !important; } +// Badges + +.badge { + border: 1px solid $brand-secondary; +} // Calendar @@ -360,10 +378,20 @@ textarea, select, .o_form_view.o_form_editable .o_form_field_many2manytags, // App Dashboard .o_menu_apps .dropdown-menu.show { - background: transparent url('/dashboard') no-repeat scroll center center / cover; - + background: url(/dashboard); + background-origin: border-box; + background-size: cover; + height: calc(100vh); + max-height: calc(100vh); + border-top: $o-navbar-height solid transparent; + top: 0 !important; } +.o_main_navbar > ul.o_menu_systray { + float: right; + position: relative; + z-index: 200; +} .fa-th-large::before { content: "\f00a"; @@ -373,6 +401,8 @@ textarea, select, .o_form_view.o_form_editable .o_form_field_many2manytags, width: 46px; font-size: 18px; text-align: center; + position: relative; + z-index: 200; } .o-app-name { @@ -405,4 +435,4 @@ textarea, select, .o_form_view.o_form_editable .o_form_field_many2manytags, .o_thread_window .o_thread_window_header { background-color: $brand-primary; -} \ No newline at end of file +} diff --git a/backend_theme_v12/views/assets.xml b/backend_theme_v13/views/assets.xml similarity index 65% rename from backend_theme_v12/views/assets.xml rename to backend_theme_v13/views/assets.xml index c2c9a0a..453c529 100644 --- a/backend_theme_v12/views/assets.xml +++ b/backend_theme_v13/views/assets.xml @@ -10,10 +10,11 @@