Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use django-simple-menu for navigation #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use django-simple-menu for navigation #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0adddb4
Use django-simple-menu for navigation (fixes #26).
twaugh Nov 18, 2014
86b1384
Now requires python-django-simple-menu.
twaugh Nov 18, 2014
59fbf1d
Add in menus.py.
twaugh Nov 18, 2014
a8f59bf
Add back in menu items for parts without templates yet.
twaugh Nov 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dbs.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
8 changes: 8 additions & 0 deletions dbs/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -30,6 +34,10 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',

# django-simple-menu
'menu',

'dbs',
'dbs.api',
'dbs.web',
Expand Down
23 changes: 23 additions & 0 deletions dbs/web/menus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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))

Menu.add_item("main", MenuItem("Build a New Image",
"/new",
weight=40))

Menu.add_item("main", MenuItem("Move Image",
"/move",
weight=50))
15 changes: 15 additions & 0 deletions dbs/web/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% load staticfiles %}
{% load menu %}{% generate_menu %}
<!DOCTYPE html>
<!--[if IE 8]><html class="ie8"><![endif]-->
<!--[if IE 9]><html class="ie9"><![endif]-->
Expand Down Expand Up @@ -93,6 +94,20 @@
</li>
</ul><!-- /navbar-utility -->

<ul class="nav navbar-nav navbar-primary">
{% for item in menus.main %}
<li {% if item.selected %} class="active" {% endif %}>
<a href="{{ item.url }}">{{ item.title }}</a></li>
</li>
{% endfor %}
</ul><!-- /navbar-primary -->

</div><!-- /navbar-collapse -->
</nav><!-- /navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-md-12">

<!-- main content -->

{% block content %}{% endblock %}
Expand Down
29 changes: 5 additions & 24 deletions dbs/web/templates/dbs/image_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,11 @@

{% block content %}

<ul class="nav navbar-nav navbar-primary">
<li>
<a href="tasks">Tasks</a>
</li>
<li class="active">
<a href="images">Images</a>
</li>
<li>
<a href="new">Build a New Image</a>
</li>
<li>
<a href="move">Move Image</a>
</li>
</ul><!-- /navbar-primary -->
</div><!-- /navbar-collapse -->
</nav><!-- /navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li><a href="images">Images</a></li>
<li>Image {{ image.hash }}</li>
</ol><!-- /breadcrumb -->
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li><a href="/tasks">Images</a></li>
<li>Image {{ image.hash }}</li>
</ol><!-- /breadcrumb -->

<h1>Image Detail</h1>
<ul>
Expand Down
27 changes: 4 additions & 23 deletions dbs/web/templates/dbs/image_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,10 @@

{% block content %}

<ul class="nav navbar-nav navbar-primary">
<li>
<a href="tasks">Tasks</a>
</li>
<li class="active">
<a href="images">Images</a>
</li>
<li>
<a href="new">Build a New Image</a>
</li>
<li>
<a href="move">Move Image</a>
</li>
</ul><!-- /navbar-primary -->
</div><!-- /navbar-collapse -->
</nav><!-- /navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li>Images</li>
</ol><!-- /breadcrumb -->
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li>Images</li>
</ol><!-- /breadcrumb -->

<h1>Images</h1>
<table class="datatable table table-striped table-bordered">
Expand Down
29 changes: 5 additions & 24 deletions dbs/web/templates/dbs/task_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,11 @@

{% block content %}

<ul class="nav navbar-nav navbar-primary">
<li class="active">
<a href="tasks">Tasks</a>
</li>
<li>
<a href="images">Images</a>
</li>
<li>
<a href="new">Build a New Image</a>
</li>
<li>
<a href="move">Move Image</a>
</li>
</ul><!-- /navbar-primary -->
</div><!-- /navbar-collapse -->
</nav><!-- /navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li><a href="tasks">Tasks</a></li>
<li>Task {{ task.id }}</li>
</ol><!-- /breadcrumb -->
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li>{{ menus.selected_menu.title }}<a href="/tasks">Tasks</a></li>
<li>Task {{ task.id }}</li>
</ol><!-- /breadcrumb -->

<h1>Task Detail</h1>
<ul>
Expand Down
27 changes: 4 additions & 23 deletions dbs/web/templates/dbs/task_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,10 @@

{% block content %}

<ul class="nav navbar-nav navbar-primary">
<li class="active">
<a href="tasks">Tasks</a>
</li>
<li>
<a href="images">Images</a>
</li>
<li>
<a href="new">Build a New Image</a>
</li>
<li>
<a href="move">Move Image</a>
</li>
</ul><!-- /navbar-primary -->
</div><!-- /navbar-collapse -->
</nav><!-- /navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li>Tasks</li>
</ol><!-- /breadcrumb -->
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li>Tasks</li>
</ol><!-- /breadcrumb -->

<h1>Tasks</h1>
<table class="datatable table table-striped table-bordered">
Expand Down
25 changes: 3 additions & 22 deletions dbs/web/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,8 @@

{% block content %}

<ul class="nav navbar-nav navbar-primary">
<li>
<a href="tasks">Tasks</a>
</li>
<li>
<a href="images">Images</a>
</li>
<li>
<a href="new">Build a New Image</a>
</li>
<li>
<a href="move">Move Image</a>
</li>
</ul><!-- /navbar-primary -->
</div><!-- /navbar-collapse -->
</nav><!-- /navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<ol class="breadcrumb">
<li>Home</li>
</ol><!-- /breadcrumb -->
<ol class="breadcrumb">
<li>Home</li>
</ol><!-- /breadcrumb -->

{% endblock %}