From 9669e154664cb476b5553a3c9c2ef9a5370cae0e Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Sun, 10 Jan 2016 01:52:49 +0100
Subject: [PATCH] Further Changes
---
web/templates/base.html | 2 +-
web/warpauth/templates/warpauth/about.html | 11 -----------
web/warpauth/templates/warpauth/login.html | 2 +-
web/warpauth/templates/warpauth/profile.html | 2 +-
web/warpauth/templates/warpauth/register.html | 4 +++-
.../warpauth/reset_password/change_password.html | 2 +-
.../warpauth/reset_password/token_gen.html | 2 +-
web/warpauth/views/register.py | 4 +++-
web/warpfood/templates/warpfood/main.html | 15 ++++++++++++---
web/warpfood/templates/warpfood/view.html | 1 +
web/warpfood/views.py | 2 +-
web/warpmain/templates/warpmain/about.html | 2 +-
web/warpmain/templates/warpmain/main.html | 2 +-
13 files changed, 27 insertions(+), 24 deletions(-)
delete mode 100644 web/warpauth/templates/warpauth/about.html
diff --git a/web/templates/base.html b/web/templates/base.html
index fe1eeb8..393205b 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -14,7 +14,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Warpzone - {{ page_title }}</title>
+ <title>{% block title %}{% endblock %} - Warpzone</title>
<style>
.table-scrollable{
diff --git a/web/warpauth/templates/warpauth/about.html b/web/warpauth/templates/warpauth/about.html
deleted file mode 100644
index 1bca999..0000000
--- a/web/warpauth/templates/warpauth/about.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "base.html" %}
-
-{% load i18n %}
-{% block content %}
-
- <h2>{{ body_text }}</h2>
- <p class="lead">{% trans "Welcome to Warpzone internal" %}</p>
- <p>
- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
- </p>
-{% endblock %}
\ No newline at end of file
diff --git a/web/warpauth/templates/warpauth/login.html b/web/warpauth/templates/warpauth/login.html
index 55ec5c1..0e5f383 100644
--- a/web/warpauth/templates/warpauth/login.html
+++ b/web/warpauth/templates/warpauth/login.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-
+{% block title %}{% trans "Login" %}{% endblock %}
{% block content %}
<form class="form-signin" style="max-width: 330px; margin: 0 auto; padding: 40px">
diff --git a/web/warpauth/templates/warpauth/profile.html b/web/warpauth/templates/warpauth/profile.html
index b6b3988..5445ae7 100644
--- a/web/warpauth/templates/warpauth/profile.html
+++ b/web/warpauth/templates/warpauth/profile.html
@@ -4,7 +4,7 @@
{% block content %}
-<p class="lead">{% trans "Profile Settings" %}</p><p></p>
+<p class="lead">{% block title %}{% trans "Profile Settings" %}{% endblock %}</p><p></p>
<div>
diff --git a/web/warpauth/templates/warpauth/register.html b/web/warpauth/templates/warpauth/register.html
index 7a75ec9..8d6e6d5 100644
--- a/web/warpauth/templates/warpauth/register.html
+++ b/web/warpauth/templates/warpauth/register.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-
+{% block title %}{% trans "Registration" %}{% endblock %}
{% block content %}
{% if success %}
<div class="alert alert-success">
@@ -26,6 +26,8 @@
{% trans "The Email adress is invalid." %}
{% elif error == "fill_all_fields" %}
{% trans "Please fill all fields." %}
+ {% elif error == "invalid_username" %}
+ {% trans "Username can only contain alphanumeric characters and the underscore." %}
{% endif %}
</strong>
</div>
diff --git a/web/warpauth/templates/warpauth/reset_password/change_password.html b/web/warpauth/templates/warpauth/reset_password/change_password.html
index 0ae3d12..bd1fdd8 100644
--- a/web/warpauth/templates/warpauth/reset_password/change_password.html
+++ b/web/warpauth/templates/warpauth/reset_password/change_password.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-
+{% block title %}{% trans "Reset Password" %}{% endblock %}
{% block content %}
{% if token_error %}
<h2 class="form-signin-heading">{% trans "The Token is invalid" %}</h2>
diff --git a/web/warpauth/templates/warpauth/reset_password/token_gen.html b/web/warpauth/templates/warpauth/reset_password/token_gen.html
index 98033d1..b38577f 100644
--- a/web/warpauth/templates/warpauth/reset_password/token_gen.html
+++ b/web/warpauth/templates/warpauth/reset_password/token_gen.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-
+{% block title %}{% trans "Reset Password" %}{% endblock %}
{% block content %}
{% if request.POST %}
<h2 class="form-signin-heading">{% trans "If your information were right, you've got an Email" %}</h2>
diff --git a/web/warpauth/views/register.py b/web/warpauth/views/register.py
index c5d8431..a935e6d 100644
--- a/web/warpauth/views/register.py
+++ b/web/warpauth/views/register.py
@@ -1,3 +1,4 @@
+import re
from django.core.exceptions import ValidationError
from django import forms
from django.shortcuts import render
@@ -11,7 +12,6 @@ def register(request):
pages['error'] = False
if request.method == "POST":
- print(request.POST)
username = request.POST['username']
password = request.POST['password']
password2 = request.POST['password2']
@@ -24,6 +24,8 @@ def register(request):
if username == "" or email == "" or password == "" or password2 == "":
pages['error'] = "fill_all_fields"
+ elif not re.search(r'^\w+$', username):
+ pages['error'] = "invalid_username"
elif password != password2:
pages['error'] = "passwords_did_not_match"
elif not pages["error"]:
diff --git a/web/warpfood/templates/warpfood/main.html b/web/warpfood/templates/warpfood/main.html
index 8df769b..295889e 100644
--- a/web/warpfood/templates/warpfood/main.html
+++ b/web/warpfood/templates/warpfood/main.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load humanize %}
{% load bootstrap %}
-
+{% block title %}{% trans "Pizza Sheet" %}{% endblock %}
{% block content %}
{% if user.is_authenticated %}
<div class="panel panel-default">
@@ -22,11 +22,20 @@
{% endif %}
<table class="table table-striped table-hover">
<thead>
- <tr><th>{% trans "Estimated Order Time" %}</th><th>{% trans "Pizza Service" %}</th></tr>
+ <tr><th>{% trans "Estimated Order Time" %}</th><th>{% trans "Pizza Service" %}</th><th>{% trans "Status" %}</th></tr>
</thead>
<tbody>
{% for sheet in food_sheets %}
- <tr data-link="/pizza/view/{{ sheet.id }}/"><td>{{ sheet.estimated_order_time | naturaltime }}</td><td>{{ sheet.food_service }}</td></tr>
+ <tr data-link="/pizza/view/{{ sheet.id }}/">
+ <td>{{ sheet.estimated_order_time | naturaltime }}</td>
+ <td>{{ sheet.food_service }}</td>
+ <td>
+ {% if sheet.closed %}
+ <span class="btn btn-xs btn-danger">Closed</span>
+ {% else %}
+ <span class="btn btn-xs btn-success">Open</span>
+ {% endif %}
+ </td>
{% endfor %}
</tbody>
</table>
diff --git a/web/warpfood/templates/warpfood/view.html b/web/warpfood/templates/warpfood/view.html
index e5d33a1..c87766f 100644
--- a/web/warpfood/templates/warpfood/view.html
+++ b/web/warpfood/templates/warpfood/view.html
@@ -3,6 +3,7 @@
{% load i18n %}
{% load bootstrap %}
{% load humanize %}
+{% block title %}{% trans "Pizza Sheet" %}{% endblock %}
{% block content %}
<div class="panel panel-default">
diff --git a/web/warpfood/views.py b/web/warpfood/views.py
index fc84234..c9e77d4 100644
--- a/web/warpfood/views.py
+++ b/web/warpfood/views.py
@@ -24,7 +24,7 @@ def index(request):
form.save()
else:
pages['error'] = form.errors
- pages['food_sheets'] = FoodSheet.objects.all()
+ pages['food_sheets'] = FoodSheet.objects.order_by("-id")
pages['pizza_services'] = FoodService.objects.all()
pages['create_food_sheet'] = FoodSheetForm()
return HttpResponse(render(request, 'warpfood/main.html', pages))
diff --git a/web/warpmain/templates/warpmain/about.html b/web/warpmain/templates/warpmain/about.html
index 5c5d274..7b106a3 100644
--- a/web/warpmain/templates/warpmain/about.html
+++ b/web/warpmain/templates/warpmain/about.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% block content %}
- <h2>{% trans "About" %}</h2>
+ <h2>{% block title %}{% trans "About" %}{% endblock %}</h2>
<p class="lead">Welcome to Warpzone Internal</p>
<p class="text-justify">
diff --git a/web/warpmain/templates/warpmain/main.html b/web/warpmain/templates/warpmain/main.html
index ac5d1cd..5a036cd 100644
--- a/web/warpmain/templates/warpmain/main.html
+++ b/web/warpmain/templates/warpmain/main.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% block content %}
- <h2>{% trans "News" %}</h2>
+ <h2>{% block title %}{% trans "News" %}{% endblock %}</h2>
{% for news in news_list %}
<div class="panel panel-primary">
--
GitLab