diff --git a/hue_backend_theme/__manifest__.py b/hue_backend_theme/__manifest__.py index 7f7ec0060..e785f5e56 100644 --- a/hue_backend_theme/__manifest__.py +++ b/hue_backend_theme/__manifest__.py @@ -42,17 +42,18 @@ "hue_backend_theme/static/src/layout/style/layout_style.scss", "hue_backend_theme/static/src/layout/style/sidebar.scss", "hue_backend_theme/static/src/components/app_menu/search_apps.js", - 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/' - 'jquery.min.js', + # 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/' + # 'jquery.min.js', ], "web.assets_frontend": [ "hue_backend_theme/static/src/layout/style/login.scss", ], }, "images": [ - "static/description/template01.jpg", - "static/description/template02.jpg", + "static/description/banner.jpg", + "static/description/theme_screenshot.jpg", ], + 'icon': 'static/description/icon.png', "license": "LGPL-3", "installable": True, "auto_install": False, diff --git a/hue_backend_theme/static/description/img/template01.jpg b/hue_backend_theme/static/description/banner.jpg similarity index 100% rename from hue_backend_theme/static/description/img/template01.jpg rename to hue_backend_theme/static/description/banner.jpg diff --git a/hue_backend_theme/static/description/img/icon.png b/hue_backend_theme/static/description/icon.png similarity index 100% rename from hue_backend_theme/static/description/img/icon.png rename to hue_backend_theme/static/description/icon.png diff --git a/hue_backend_theme/static/description/index.html b/hue_backend_theme/static/description/index.html index 5964ede56..5baae5621 100644 --- a/hue_backend_theme/static/description/index.html +++ b/hue_backend_theme/static/description/index.html @@ -59,7 +59,7 @@
- Odoo.sh + Odoo.sh
@@ -76,7 +76,7 @@
- +
diff --git a/hue_backend_theme/static/description/img/template02.jpg b/hue_backend_theme/static/description/theme_screenshot.jpg similarity index 100% rename from hue_backend_theme/static/description/img/template02.jpg rename to hue_backend_theme/static/description/theme_screenshot.jpg diff --git a/hue_backend_theme/static/src/components/app_menu/search_apps.js b/hue_backend_theme/static/src/components/app_menu/search_apps.js index 517a2ca4c..fd5b4d5b5 100644 --- a/hue_backend_theme/static/src/components/app_menu/search_apps.js +++ b/hue_backend_theme/static/src/components/app_menu/search_apps.js @@ -14,7 +14,7 @@ patch(NavBar.prototype, { setup() { super.setup() var self = this; - this._search_def = $.Deferred(); + this._search_def = this.createDeferred(); let { apps, menuItems } = computeAppsAndMenuItems (this.menuService.getMenuAsTree("root")); this._apps = apps; @@ -28,6 +28,16 @@ patch(NavBar.prototype, { this.setClass(); }) }, + createDeferred() { + let deferred = {}; + + deferred.promise = new Promise((resolve, reject) => { + deferred.resolve = resolve; + deferred.reject = reject; + }); + + return deferred; +}, async fetch_data() { // To fetch colors from database. this.orm = useService("orm") @@ -64,11 +74,11 @@ patch(NavBar.prototype, { }, setClass() { // Set variable for html elements. - this.$search_container = $(this.search_container.el) - this.$search_input = $(this.search_input.el); - this.$search_results = $(this.search_results.el); - this.$app_menu = $(this.app_menu.el); - this.$dropdown_menu = $(this.search_container.el.parentElement); + this.$search_container = this.search_container.el; + this.$search_input = this.search_input.el; + this.$search_results = this.search_results.el; + this.$app_menu = this.app_menu.el; + this.$dropdown_menu = this.search_container.el.parentElement; }, _searchMenusSchedule() { // Hide / Show based on search input.