From 4ec2587fb206dbfc2543ee88c730ca825d878cb8 Mon Sep 17 00:00:00 2001
From: Khaled Boka <bokae97@gmail.com>
Date: Sat, 5 Dec 2020 13:32:23 +0200
Subject: [PATCH 1/3] fix: use os.path instead of hard coded

---
 pavement.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pavement.py b/pavement.py
index e82a2362..639542f6 100644
--- a/pavement.py
+++ b/pavement.py
@@ -597,8 +597,8 @@ def install_docker_data_dir():
 
 @task
 def prepare_docker_oauth_fixture():
-    project_name = os.environ.get('PROJECT_NAME', 'cartoview')
-    fixturefile = path('{}/fixtures/default_oauth_apps_docker.json'.format(project_name))
+    project_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "cartoview")
+    fixturefile = os.path.join(project_dir, 'fixtures', 'default_oauth_apps_docker.json')
     os.remove(fixturefile)
     siteurl = os.environ.get('SITEURL', 'http://localhost/')
     default_fixture = [

From 7532af0c6385002fd205333e4af0071f235b90d4 Mon Sep 17 00:00:00 2001
From: khaled <bokae97@gmail.com>
Date: Sat, 5 Dec 2020 13:57:07 +0200
Subject: [PATCH 2/3] using wagtail menus if cartoview_cms is installed

---
 cartoview/templates/geonode_base.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cartoview/templates/geonode_base.html b/cartoview/templates/geonode_base.html
index c3217728..987bbc93 100644
--- a/cartoview/templates/geonode_base.html
+++ b/cartoview/templates/geonode_base.html
@@ -4,10 +4,17 @@
 {% block extra_head %}
     {{ block.super }}
 {% endblock %}
+
 {% block tabs %}
-<li><a href="{% url 'app_manager_base_url' %}">{% trans "Apps" %}</a></li> 
-{{block.super}}
+{% if 'cartoview_cms' in INSTALLED_APPS %}
+    {% load menu_tags %}
+    {% main_menu template="menus/main_menu.html" %}
+{% else %}
+    <li><a href="{% url 'app_manager_base_url' %}">{% trans "Apps" %}</a></li> 
+    {{block.super}}
+{% endif %}
 {% endblock %}
+
 {% block footer %}
 <footer>
         <div class="container">

From 5ebc3ca24b872ce39efe192d6e6e9325ab363bb3 Mon Sep 17 00:00:00 2001
From: khaled <bokae97@gmail.com>
Date: Mon, 21 Dec 2020 07:56:47 +0200
Subject: [PATCH 3/3] fixed: unable to load wagtail menu if not in installed
 apps

---
 cartoview/templates/geonode_base.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cartoview/templates/geonode_base.html b/cartoview/templates/geonode_base.html
index 987bbc93..d3d47c7b 100644
--- a/cartoview/templates/geonode_base.html
+++ b/cartoview/templates/geonode_base.html
@@ -7,8 +7,7 @@
 
 {% block tabs %}
 {% if 'cartoview_cms' in INSTALLED_APPS %}
-    {% load menu_tags %}
-    {% main_menu template="menus/main_menu.html" %}
+    {% include "cartoview_cms/menus.html" %}
 {% else %}
     <li><a href="{% url 'app_manager_base_url' %}">{% trans "Apps" %}</a></li> 
     {{block.super}}