diff --git a/app_odoo_customize/static/src/scss/app.scss b/app_odoo_customize/static/src/scss/app.scss index 858759bb..39835a20 100644 --- a/app_odoo_customize/static/src/scss/app.scss +++ b/app_odoo_customize/static/src/scss/app.scss @@ -21,7 +21,7 @@ .o_web_client.navbar_pos_bottom { @media (max-width: 768px) { - --o-navbar-height: 80px; + --o-navbar-height: 46px; } flex-direction: column-reverse!important; .o_navbar { @@ -29,7 +29,7 @@ .o_main_navbar { @media (max-width: 768px) { - --o-navbar-height: 80px; + --o-navbar-height: 46px; padding: 0 var(--o-navbar-height); } diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py index 94d46dc6..76e9ba66 100644 --- a/app_web_enterprise/__manifest__.py +++ b/app_web_enterprise/__manifest__.py @@ -26,19 +26,15 @@ 'license': 'LGPL-3', 'sequence': 2, 'summary': """ - Ui Enhance pack of odoo Enterprise version - 1. Add dropdown arrow to parent menu. - 2. Replace the odoo logo to your company logo in main menu. - 3. Alway show search in main menu. - 4. Table and report UI enhance(Grid View). + Ui Enhance pack of odoo Enterprise version. OEM Pack for odoo theme. Support mobile theme and dark mode theme. """, 'description': """ odoo enterprise version UI enhance. 欧度智能，odooai.cn 的odoo模块。企业版界面增强。 - 1. Ui Enhance pack of odoo Enterprise version - odoo企业版界面增强套件，更方便操作 + 1. Ui Enhance pack of odoo Enterprise version. Use comfortable green color + odoo企业版界面增强套件，更方便操作。使用更舒适护眼的绿色作为主色。 2. Add dropdown arrow to parent menu group. - 多级菜单中出现箭头。 + 多级菜单中出现箭头，导航操作更方便。 3. Replace the odoo logo or url to your company in menu and page. 替换主菜单界面的logo为你公司的logo。 4. Add underline for input field. @@ -50,12 +46,6 @@ 11. Multi-language Support. Multi-Company Support. 12. Support Odoo 18,17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition. 13. Full Open Source. - ========== - 1. - 2. - 11. 多语言支持，多公司支持 - 12. Odoo 18,17,16,15,14,13,12, 企业版，社区版，在线SaaS.sh版，等全版本支持 - 13. 代码完全开源 """, 'price': 68.00, 'currency': 'EUR', @@ -69,7 +59,7 @@ 'views/webclient_templates.xml', ], 'assets': { - # 企业版变色，注意这个是变量定义，要before + # 企业版变色，注意这个是变量定义，要before，应该是理解为 元素1 在元素2的前面 'web._assets_primary_variables': [ ('before', 'web_enterprise/static/src/scss/primary_variables.scss', 'app_web_enterprise/static/src/scss/primary_variables.scss'), ], @@ -83,14 +73,19 @@ 'app_web_enterprise/static/src/xml/res_config_edition.xml', # 'app_web_enterprise/static/src/xml/form.xml', ], - # 这里是改样式，要 after处理 - 'web.assets_common': [ - ('after', 'web/static/lib/jquery.ui/jquery-ui.css', 'app_web_enterprise/static/lib/jquery.ui/jquery-ui.css'), - ('after', 'web_enterprise/static/src/webclient/home_menu/home_menu_background.scss', 'app_web_enterprise/static/src/scss/home_menu_background.scss'), + # 黑夜模式 + "web.dark_mode_variables": [ + ('remove', 'app_web_enterprise/static/src/scss/primary_variables.scss'), + ('before', 'web_enterprise/static/src/scss/primary_variables.dark.scss', 'app_web_enterprise/static/src/scss/primary_variables.dark.scss'), ], + "web.assets_web_dark": [ + ('remove', 'app_web_enterprise/static/src/scss/home_menu.variables.scss'), + ('remove', 'app_web_enterprise/static/src/scss/navbar.variables.scss'), + ('remove', 'app_web_enterprise/static/src/scss/navbar.scss'), + ], + # 这里是改样式，要 after处理 'web.assets_frontend': [ - # ('after', 'web/static/src/core/**/*', 'app_web_enterprise/static/src/xml/base.xml'), - ('after', 'web_enterprise/static/src/webclient/home_menu/home_menu_background.scss', 'app_web_enterprise/static/src/scss/home_menu_background.scss'), + ('before', 'web_enterprise/static/src/webclient/home_menu/home_menu.variables.scss', 'app_web_enterprise/static/src/scss/home_menu.variables.scss'), 'app_web_enterprise/static/src/scss/app_style_website.scss', ], }, diff --git a/app_web_enterprise/static/description/app_web_enterprise_01.jpg b/app_web_enterprise/static/description/app_web_enterprise_01.jpg index 9bffc8e2..1e73ceed 100644 Binary files a/app_web_enterprise/static/description/app_web_enterprise_01.jpg and b/app_web_enterprise/static/description/app_web_enterprise_01.jpg differ diff --git a/app_web_enterprise/static/description/app_web_enterprise_02.jpg b/app_web_enterprise/static/description/app_web_enterprise_02.jpg index 4b0eb42b..1bd90c2b 100644 Binary files a/app_web_enterprise/static/description/app_web_enterprise_02.jpg and b/app_web_enterprise/static/description/app_web_enterprise_02.jpg differ diff --git a/app_web_enterprise/static/description/app_web_enterprise_03.jpg b/app_web_enterprise/static/description/app_web_enterprise_03.jpg index 7903e40f..a12224fd 100644 Binary files a/app_web_enterprise/static/description/app_web_enterprise_03.jpg and b/app_web_enterprise/static/description/app_web_enterprise_03.jpg differ diff --git a/app_web_enterprise/static/description/app_web_enterprise_04.jpg b/app_web_enterprise/static/description/app_web_enterprise_04.jpg new file mode 100644 index 00000000..be350322 Binary files /dev/null and b/app_web_enterprise/static/description/app_web_enterprise_04.jpg differ diff --git a/app_web_enterprise/static/description/app_web_enterprise_05.jpg b/app_web_enterprise/static/description/app_web_enterprise_05.jpg new file mode 100644 index 00000000..cf2b46c2 Binary files /dev/null and b/app_web_enterprise/static/description/app_web_enterprise_05.jpg differ diff --git a/app_web_enterprise/static/description/app_web_enterprise_06.jpg b/app_web_enterprise/static/description/app_web_enterprise_06.jpg new file mode 100644 index 00000000..48a909f8 Binary files /dev/null and b/app_web_enterprise/static/description/app_web_enterprise_06.jpg differ diff --git a/app_web_enterprise/static/description/b03.jpg b/app_web_enterprise/static/description/b03.jpg new file mode 100644 index 00000000..85a45904 Binary files /dev/null and b/app_web_enterprise/static/description/b03.jpg differ diff --git a/app_web_enterprise/static/description/b03.png b/app_web_enterprise/static/description/b03.png deleted file mode 100644 index 7428cb76..00000000 Binary files a/app_web_enterprise/static/description/b03.png and /dev/null differ diff --git a/app_web_enterprise/static/description/b04.jpg b/app_web_enterprise/static/description/b04.jpg new file mode 100644 index 00000000..1bef0024 Binary files /dev/null and b/app_web_enterprise/static/description/b04.jpg differ diff --git a/app_web_enterprise/static/description/b04.png b/app_web_enterprise/static/description/b04.png deleted file mode 100644 index 7a583536..00000000 Binary files a/app_web_enterprise/static/description/b04.png and /dev/null differ diff --git a/app_web_enterprise/static/description/b05.jpg b/app_web_enterprise/static/description/b05.jpg new file mode 100644 index 00000000..0f118ae0 Binary files /dev/null and b/app_web_enterprise/static/description/b05.jpg differ diff --git a/app_web_enterprise/static/description/b05.png b/app_web_enterprise/static/description/b05.png deleted file mode 100644 index d8d8f6a4..00000000 Binary files a/app_web_enterprise/static/description/b05.png and /dev/null differ diff --git a/app_web_enterprise/static/description/index.html b/app_web_enterprise/static/description/index.html index 25e6ba3b..1bc718e7 100644 --- a/app_web_enterprise/static/description/index.html +++ b/app_web_enterprise/static/description/index.html @@ -8,9 +8,9 @@
-

odoo Enterprise version enhance Pack

-

Replace odoo logo to your company logo

-

Make odoo Enterprise version better UI and flexible

+

odoo Enterprise version enhance Pack All in One

+

Replace odoo logo with yours And Better UI for user

+

将Odoo企业版OEM，同时使用更舒服的主色及界面，细节全面完善

@@ -24,58 +24,102 @@

More Powerful addons: odooai.cn Odoo Addons

-

Latest update: v17.24.08.17

-

This moduld allows user to .

+

Latest update: v18.24.12.14

+

This moduld allows user to

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

Customize Module Url(eg. Enterprise).

-
-
- -
-
-
-

5. Add grid line form list view. Easy to read list data.

-

+

1. Ui Enhance pack of odoo Enterprise version. Use comfortable green color

- + +
+

Better for mobile

+
+ +
+

Better for DarkMode. Good for your Eyes

+
+ +
+

Easy config all UI and OEM. Navbar at bottom quick operation

+
+ +
+

The dropdown arrow to show you action menu or group menu.

+
+ +
+

Easy setup you logo and menu OEM. And quick remove data

+
+
-

6. Add grid line to Account Reports. Easy to view Data.

+

4. Add underline for input field. 在可编辑字段下方增加下划线，易于分辨。

- + +
+
+
+
+
+

5. Add grid line form list view. Easy to read list data.为表格list增加行列分隔线，易于看数据。

+

+
+ +
+
+
+ +
+
+

6. Add grid line to Account Reports. Easy to view Data.为财务报表增加行列分隔线，易于看数据及对账。

+

+
+ +
+
+
+
+
+

Multi language support. 多语种支持

+

+
+
diff --git a/app_web_enterprise/static/lib/jquery.ui/jquery-ui.css b/app_web_enterprise/static/lib/jquery.ui/jquery-ui.css deleted file mode 100644 index cb09b8bb..00000000 --- a/app_web_enterprise/static/lib/jquery.ui/jquery-ui.css +++ /dev/null @@ -1,3 +0,0 @@ -.ui-widget { - font-size: 1.5em; -} \ No newline at end of file diff --git a/app_web_enterprise/static/src/scss/navbar.scss b/app_web_enterprise/static/src/scss/navbar.scss index da64f742..345ed4b9 100644 --- a/app_web_enterprise/static/src/scss/navbar.scss +++ b/app_web_enterprise/static/src/scss/navbar.scss @@ -7,30 +7,9 @@ --NavBar-entry-borderColor-active: #{$o-navbar-entry-bg--active}; - --NavBar-entry-backgroundColor: #{$o-navbar-background}; + --NavBar-entry-backgroundColor: transparent; --NavBar-entry-backgroundColor--hover: #{$o-navbar-entry-bg--hover}; --NavBar-entry-backgroundColor--active: #{$o-navbar-entry-bg--active}; --NavBar-entry-backgroundColor--focus: #{$o-navbar-entry-bg--hover}; - --NavBar-brand-color: #{$o-navbar-brand-color}; - - background: var(--NavBar-entry-backgroundColor, #{$o-navbar-background}); - - .o_menu_sections { - .o_nav_entry, .dropdown-toggle { - background: transparent; - - &:hover { - background: var(--NavBar-entry-backgroundColor--hover, #{$o-navbar-entry-bg--hover}); - } - - &:focus { - background: var(--NavBar-entry-backgroundColor--focus, #{$o-navbar-entry-bg--hover}); - } - - &:active { - background: var(--NavBar-entry-backgroundColor--active, #{$o-navbar-entry-bg--active}); - } - } - } } } \ No newline at end of file diff --git a/app_web_enterprise/static/src/scss/navbar.variables.scss b/app_web_enterprise/static/src/scss/navbar.variables.scss index 4d9706aa..7a8f80a9 100644 --- a/app_web_enterprise/static/src/scss/navbar.variables.scss +++ b/app_web_enterprise/static/src/scss/navbar.variables.scss @@ -1,15 +1,13 @@ //自定义的navbar -$o-navbar-background: rgba($o-brand-odoo, .8); -$o-navbar-entry-color: $o-gray-200 ; +$o-navbar-background: rgba($o-brand-odoo, .9); +$o-navbar-entry-color: $o-form-lightsecondary; -$o-navbar-entry-bg--hover: rgba($o-brand-odoo, 9); -$o-navbar-entry-color--hover: $o-gray-200 ; +$o-navbar-entry-bg--hover: transparent; +$o-navbar-entry-color--hover: $o-form-lightsecondary; -$o-navbar-entry-bg--active: rgba($o-brand-odoo, .9) ; -$o-navbar-entry-color--active: $o-gray-100 ; +$o-navbar-entry-bg--active: rgba($o-brand-odoo, .95) ; +$o-navbar-entry-color--active: $o-brand-lightsecondary ; -$o-navbar-brand-color: $o-gray-100 ; +$o-navbar-brand-color: $o-brand-lightsecondary; -$o-navbar-entry-color: rgba($o-white, .9); -$o-navbar-entry-color--hover: $o-white; diff --git a/app_web_enterprise/static/src/scss/primary_variables.dark.scss b/app_web_enterprise/static/src/scss/primary_variables.dark.scss new file mode 100644 index 00000000..fd51bf13 --- /dev/null +++ b/app_web_enterprise/static/src/scss/primary_variables.dark.scss @@ -0,0 +1,8 @@ +$o-enterprise-color: #00463e !default; + +$o-brand-odoo: $o-enterprise-color !default; + +// = Fine-tune contextual text colors. +$o-theme-text-colors: ( + "primary": #02c7b5, +) !default; \ No newline at end of file diff --git a/app_web_enterprise/static/src/scss/primary_variables.scss b/app_web_enterprise/static/src/scss/primary_variables.scss index 68813bfd..6b68e7e4 100644 --- a/app_web_enterprise/static/src/scss/primary_variables.scss +++ b/app_web_enterprise/static/src/scss/primary_variables.scss @@ -1,3 +1,2 @@ -$o-enterprise-color: #00796B !default; - -$o-brand-odoo: $o-enterprise-color !default; +$o-brand-odoo: #00796B !default; +$o-brand-primary: $o-brand-odoo !default;