diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index 0667dea..cf47f37 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -171,10 +171,8 @@
Real
- {% show_menu %}
-
- Books
-
+ {% show_flatpage_menu %}
+ {% show_bookshelf_menu %}
{% include 'includes/search.html' %}
diff --git a/ram/portal/templates/bookshelf_menu.html b/ram/portal/templates/bookshelf_menu.html
new file mode 100644
index 0000000..6d209a8
--- /dev/null
+++ b/ram/portal/templates/bookshelf_menu.html
@@ -0,0 +1,10 @@
+ {% if bookshelf_menu %}
+
+
+
+
+ {% endif %}
diff --git a/ram/portal/templates/flatpage_menu.html b/ram/portal/templates/flatpage_menu.html
index 193fa08..af5fc49 100644
--- a/ram/portal/templates/flatpage_menu.html
+++ b/ram/portal/templates/flatpage_menu.html
@@ -1,10 +1,10 @@
- {% if menu %}
+ {% if flatpage_menu %}
diff --git a/ram/portal/templatetags/show_menu.py b/ram/portal/templatetags/show_menu.py
index 609c8b4..07f5270 100644
--- a/ram/portal/templatetags/show_menu.py
+++ b/ram/portal/templatetags/show_menu.py
@@ -1,10 +1,16 @@
from django import template
-from portal.views import Flatpage
+from portal.models import Flatpage
+from bookshelf.models import Book
register = template.Library()
+@register.inclusion_tag('bookshelf_menu.html')
+def show_bookshelf_menu():
+ return {"bookshelf_menu": Book.objects.exists()}
+
+
@register.inclusion_tag('flatpage_menu.html')
-def show_menu():
+def show_flatpage_menu():
menu = Flatpage.objects.filter(published=True).order_by("name")
- return {"menu": menu}
+ return {"flatpage_menu": menu}