Merge branch 'morejson' of git.someserver.de:k4ever into morejson

Conflicts:
	k4ever/main/templates/registration/loginForm.html
This commit is contained in:
Sebastian Lohff 2012-01-30 22:47:57 +01:00
commit 2018fc2396
5 changed files with 67 additions and 1 deletions

View File

@ -0,0 +1,15 @@
{% extends "base.html" %}
{% comment %}
# This file is part of k4ever, a point-of-sale system
# Contact............ <k4ever@lists.someserver.de>
# Website............ http://k4ever.someserver.de/
# Bug tracker........ http://k4ever.someserver.de/report
#
# Licensed under GNU Affero General Public License v3 or later
{% endcomment %}
{% block "content" %}
<h2>Whoops! Wir glauben du gehörst hier nicht hin...</h2>
<p>...zumindest sagt uns das dein Ausweis. Wie dem auch sei: Bis hierhin und nicht weiter</p>
{% endblock %}

View File

@ -0,0 +1,17 @@
{% extends "base.html" %}
{% comment %}
# This file is part of k4ever, a point-of-sale system
# Contact............ <k4ever@lists.someserver.de>
# Website............ http://k4ever.someserver.de/
# Bug tracker........ http://k4ever.someserver.de/report
#
# Licensed under GNU Affero General Public License v3 or later
{% endcomment %}
{% block "content" %}
<h2>Whoops! Da ist was schiefgegangen</h2>
<p>Die Seite, die du angefordert hast, konnte nicht gefunden werden.</p>
<p>Zahllose Ponies sind bereits auf der Suche nach ihr.</p>
{% endblock %}

View File

@ -0,0 +1,31 @@
{% extends "base.html" %}
{% comment %}
# This file is part of k4ever, a point-of-sale system
# Contact............ <k4ever@lists.someserver.de>
# Website............ http://k4ever.someserver.de/
# Bug tracker........ http://k4ever.someserver.de/report
#
# Licensed under GNU Affero General Public License v3 or later
{% endcomment %}
{% block head %}
<link rel="stylesheet" media="screen" type="text/css"
href="/media/css/style.css" />
{% block extrastyle %}{% endblock %}
<script type="text/javascript">
var MEDIA_URL = "/media/";
</script>
<script type='text/javascript' src="/media/js/jquery-1.5.1.js"></script>
<script type='text/javascript' src="/media/js/jquery-ui-1.8.10.custom.min.js"></script>
<script type='text/javascript' src="/media/js/jquery.ui.autocomplete.html.js"></script>
<script type='text/javascript' src="/media/js/jquery.gritter.min.js"></script>
<script type='text/javascript' src="/media/js/k4ever.js"></script>
{% endblock head %}
{% block "content" %}
<h2>Whoops! Da ist was schiefgegangen</h2>
<p>Bei der Bearbeitung deiner Anfrage ist ein Fehler aufgetreten für den du nichts kannst. Sorry!</p>
<p>Bitte nutze den Zurück-Button deines Browsers um zurückzufahren.</p>
{% endblock %}

View File

@ -11,6 +11,7 @@
<html {% if user.is_authenticated %}class="loggedIn"{% endif %}>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
{% block head %}
<link rel="stylesheet" media="screen" type="text/css"
href="{{ MEDIA_URL }}css/style.css" />
{% block extrastyle %}{% endblock %}
@ -23,6 +24,7 @@
<script type='text/javascript' src="{{ MEDIA_URL }}js/jquery.gritter.min.js"></script>
<script type='text/javascript' src="{{ MEDIA_URL }}js/k4ever.js"></script>
{% block extrahead %}{% endblock %}
{% endblock head %}
<title>Freitagsrundenkasse{% block "title" %}{% endblock %}</title>
</head>
<body{%block bodyargs %}{%endblock%}>

View File

@ -28,3 +28,4 @@
<input type="submit" class="button" value="Anmelden" />
<input type="hidden" name="next" value="{{ next }}" />
</form>