diff --git a/web/templates/base.html b/web/templates/base.html
index 1de9eacab2b0f0d440586232d6094edcb7c4de4d..de3320c2ac72ec23c5f9e90bff6a8e49ff2cb517 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -1,3 +1,5 @@
+{% 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'/> WarpAuth
+ <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> 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>
diff --git a/web/warpauth/templates/warpauth/about.html b/web/warpauth/templates/warpauth/about.html
index 18b058400e9faf43c28d455a0d665ddf18620fa5..23230b583cc6cb9c1f249386e74141fbfebd4eb3 100644
--- a/web/warpauth/templates/warpauth/about.html
+++ b/web/warpauth/templates/warpauth/about.html
@@ -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
diff --git a/web/warpauth/templatetags/__init__.py b/web/warpauth/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/web/warpauth/urls.py b/web/warpauth/urls.py
index 425ac2048b4a97f232e88c79a82ba68f30d6a6be..8566b63bef4b34381f88e6c4a2c28b87335c02b9 100644
--- a/web/warpauth/urls.py
+++ b/web/warpauth/urls.py
@@ -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
diff --git a/web/warpauth/util.py b/web/warpauth/util.py
index e2e0407399e53c6f9dcf51085f5ebed0a0032324..3f881d691061727d154e11e6175c167952e7dad7 100644
--- a/web/warpauth/util.py
+++ b/web/warpauth/util.py
@@ -1,6 +1,4 @@
pages = {'pages': [
{"link":"pizza", "name": "PizzaSheet"},
{"link":"about", "name": "About"},
- {"link":"logout", "name": "Logout"},
- {"link":"admin", "name": "Admin"}
]}
diff --git a/web/warpzone.db b/web/warpzone.db
index b209dcbfbccb71f5b07682a2fc1f5b0a6e2b64cc..63ba1400f02eb26d7f41a3af1e3848f1bb4495de 100644
Binary files a/web/warpzone.db and b/web/warpzone.db differ