From 0adddb4e81e9d43ce9412d7b1cde17035e903839 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 18 Nov 2014 17:22:34 +0000 Subject: [PATCH 1/4] Use django-simple-menu for navigation (fixes #26). --- dbs/settings.py | 8 +++++++ dbs/web/templates/base.html | 15 +++++++++++++ dbs/web/templates/dbs/image_detail.html | 29 +++++-------------------- dbs/web/templates/dbs/image_list.html | 27 ++++------------------- dbs/web/templates/dbs/task_detail.html | 29 +++++-------------------- dbs/web/templates/dbs/task_list.html | 27 ++++------------------- dbs/web/templates/home.html | 25 +++------------------ 7 files changed, 44 insertions(+), 116 deletions(-) diff --git a/dbs/settings.py b/dbs/settings.py index bbd4178..bea5fce 100644 --- a/dbs/settings.py +++ b/dbs/settings.py @@ -22,6 +22,10 @@ # Application definition +from django.conf import global_settings +TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'django.core.context_processors.request', +) INSTALLED_APPS = ( 'django.contrib.admin', @@ -30,6 +34,10 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + + # django-simple-menu + 'menu', + 'dbs', 'dbs.api', 'dbs.web', diff --git a/dbs/web/templates/base.html b/dbs/web/templates/base.html index 6511990..bdd65db 100644 --- a/dbs/web/templates/base.html +++ b/dbs/web/templates/base.html @@ -1,4 +1,5 @@ {% load staticfiles %} +{% load menu %}{% generate_menu %} @@ -93,6 +94,20 @@ + + + + +
+
+
+ {% block content %}{% endblock %} diff --git a/dbs/web/templates/dbs/image_detail.html b/dbs/web/templates/dbs/image_detail.html index 0bbc3fa..fd05d09 100644 --- a/dbs/web/templates/dbs/image_detail.html +++ b/dbs/web/templates/dbs/image_detail.html @@ -6,30 +6,11 @@ {% block content %} - -
- -
-
-
-
    -
  1. Home
    2. -
  2. Images
    3. -
  3. Image {{ image.hash }}
    4. -
+
    +
  1. Home
    2. +
  2. Images
    3. +
  3. Image {{ image.hash }}
    4. +

Image Detail

    diff --git a/dbs/web/templates/dbs/image_list.html b/dbs/web/templates/dbs/image_list.html index fb9c66f..f6c48f3 100644 --- a/dbs/web/templates/dbs/image_list.html +++ b/dbs/web/templates/dbs/image_list.html @@ -6,29 +6,10 @@ {% block content %} - -
- -
-
-
-
    -
  1. Home
    2. -
  2. Images
    3. -
+
    +
  1. Home
    2. +
  2. Images
    3. +

Images

diff --git a/dbs/web/templates/dbs/task_detail.html b/dbs/web/templates/dbs/task_detail.html index 6b5f2af..b19cd97 100644 --- a/dbs/web/templates/dbs/task_detail.html +++ b/dbs/web/templates/dbs/task_detail.html @@ -6,30 +6,11 @@ {% block content %} - - - -
-
-
-
    -
  1. Home
    2. -
  2. Tasks
    3. -
  3. Task {{ task.id }}
    4. -
+
    +
  1. Home
    2. +
  2. {{ menus.selected_menu.title }}Tasks
    3. +
  3. Task {{ task.id }}
    4. +

Task Detail

    diff --git a/dbs/web/templates/dbs/task_list.html b/dbs/web/templates/dbs/task_list.html index dd2c25e..2369dd7 100644 --- a/dbs/web/templates/dbs/task_list.html +++ b/dbs/web/templates/dbs/task_list.html @@ -6,29 +6,10 @@ {% block content %} - -
- -
-
-
-
    -
  1. Home
    2. -
  2. Tasks
    3. -
+
    +
  1. Home
    2. +
  2. Tasks
    3. +

Tasks

diff --git a/dbs/web/templates/home.html b/dbs/web/templates/home.html index f60fdb4..e31425f 100644 --- a/dbs/web/templates/home.html +++ b/dbs/web/templates/home.html @@ -2,27 +2,8 @@ {% block content %} - - - -
-
-
-
    -
  1. Home
    2. -
+
    +
  1. Home
    2. +
{% endblock %} From 86b138470062a0b37d27b9c0314a028c46a39dc2 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 18 Nov 2014 17:24:33 +0000 Subject: [PATCH 2/4] Now requires python-django-simple-menu. --- dbs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dbs.spec b/dbs.spec index 73c7719..1427b5a 100644 --- a/dbs.spec +++ b/dbs.spec @@ -25,6 +25,7 @@ Requires: mod_wsgi Requires: python-celery Requires: python-django >= 1.7 Requires: python-django-celery +Requires: python-django-simple-menu Requires(pre): /usr/sbin/useradd From 59fbf1dfaa925aea32dc7f0df1304aa00d0094b7 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 18 Nov 2014 17:26:38 +0000 Subject: [PATCH 3/4] Add in menus.py. --- dbs/web/menus.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 dbs/web/menus.py diff --git a/dbs/web/menus.py b/dbs/web/menus.py new file mode 100644 index 0000000..7300a97 --- /dev/null +++ b/dbs/web/menus.py @@ -0,0 +1,16 @@ +from __future__ import absolute_import, division, generators, nested_scopes, print_function, unicode_literals, with_statement +from django.core.urlresolvers import reverse +from menu import Menu, MenuItem + +Menu.add_item("main", MenuItem("Home", + reverse("dbs.web.views.home"), + weight=10)) + +Menu.add_item("main", MenuItem("Tasks", + "/tasks", + weight=20)) + +Menu.add_item("main", MenuItem("Images", + "/images", + weight=30)) + From a8f59bf5f1b50771fb3f74bc12330ba68aef1235 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 18 Nov 2014 17:30:23 +0000 Subject: [PATCH 4/4] Add back in menu items for parts without templates yet. --- dbs/web/menus.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dbs/web/menus.py b/dbs/web/menus.py index 7300a97..5e7ad1d 100644 --- a/dbs/web/menus.py +++ b/dbs/web/menus.py @@ -14,3 +14,10 @@ "/images", weight=30)) +Menu.add_item("main", MenuItem("Build a New Image", + "/new", + weight=40)) + +Menu.add_item("main", MenuItem("Move Image", + "/move", + weight=50))