Skip to content
Snippets Groups Projects
Commit 3843bdf8 authored by Christian Dresen's avatar Christian Dresen
Browse files

Minor Changes in Base Template

parent 7d7d5f88
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
web/templates/base.html
+ 12
− 19
View file @ 3843bdf8
{% load i18n %}
<html>
<head>
<link rel="stylesheet" href="{{ MEDIA_URL }}/media/css/bootstrap.min.css" />
......@@ -27,7 +29,7 @@
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="/">
<img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/>&nbsp;&nbsp;WarpAuth
<img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/>&nbsp;&nbsp;Warpzone
</a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
<span class="icon-bar"></span>
......@@ -40,26 +42,17 @@
<ul class="nav navbar-nav">
{% for page in pages %}
{% if page.name != "Logout" and page.name != "Admin" and page.name != "Configuration" %}
<li><a href="/{{ page.link }}">{{ page.name}}</a></li>
{% endif %}
<li><a href="/{{ page.link }}">{{ page.name }}</a></li>
{% endif %}
{% endfor %}
</ul>
{% for page in pages %}
{% if page.name == "Logout" %}
<ul class="nav navbar-nav navbar-right"><li><a href="/{{ page.link }}">{{ page.name}}</a></li></ul>
{% elif page.name == "Admin" and user.is_superuser %}
<ul class="nav navbar-nav navbar-right">
<li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ page.name}}<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="/{{ page.link }}_daemon/">Daemon</a></li>
<li><a href="/{{ page.link }}_services/">Services</a></li>
<li><a href="/{{ page.link }}_regex/">Regex</a></li>
</ul>
</li>
</ul>
{% endif %}
{% endfor %}
<ul class="nav navbar-nav navbar-right"><li><a href="/logout">{% trans "Logout" %}</a></li></ul>
<ul class="nav navbar-nav navbar-right"><li><a href="/profile">{% trans "Profile Settings" %}</a></li></ul>
{% if user.is_superuser %}
<ul class="nav navbar-nav navbar-right"><li><a href="/admin">{% trans "Admin" %}</a></li></ul>
{% endif %}
{% endif %}
</div>
</div>
......
web/warpauth/templates/warpauth/about.html
+ 3
− 0
View file @ 3843bdf8
......@@ -3,5 +3,8 @@
{% load i18n %}
{% block content %}
<h2>{{ body_text }}</h2>
<p class="lead">{% trans "Welcome to Warpzone internal" %}</p><p />
{% endblock %}
\ No newline at end of file
web/warpauth/templatetags/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ 7d7d5f88
web/warpauth/urls.py
+ 1
− 11
View file @ 3843bdf8
......@@ -8,18 +8,8 @@ urlpatterns = [
url(r'^reset_password/$', reset_password.gen_token, name='index'),
url(r'^reset_password/(?P<reset_hash>\w+)/$', reset_password.change_password, name='index'),
# Main Page
# Main Page
url(r'^$', main.index, name='index'),
]
"""
url(r'^pizza/$', warp_food.index, name='warp_foot'),
url(r'^pizza/view/(?P<sheet_id>\w+)/$', warp_food.view, name='warp_foot_view'),
url(r'^pizza/toggle_sheet/(?P<sheet_id>\w+)/$', warp_food.toggle_closed, name='warp_foot_toggle_closed'),
url(r'^pizza/toggle_paid/(?P<order_id>\w+)/$', warp_food.toggle_paid, name='warp_foot_toggle_paid'),
url(r'^pizza/export_sheet/(?P<sheet_id>\w+)/$', warp_food.export_sheet, name='warp_foot_export_sheet'),
"""
\ No newline at end of file
web/warpauth/util.py
+ 0
− 2
View file @ 3843bdf8
pages = {'pages': [
{"link":"pizza", "name": "PizzaSheet"},
{"link":"about", "name": "About"},
{"link":"logout", "name": "Logout"},
{"link":"admin", "name": "Admin"}
]}
web/warpzone.db
+ 0
− 0
View file @ 3843bdf8
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment