seba
/
k4ever
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Sebastian Lohff 2012-01-27 17:39:11 +01:00
parent d8d40415bd 3be9d20a58
commit cadeffec3a
6 changed files with 75 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
k4ever/main/templates/403.html Normal file
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 %}

17
k4ever/main/templates/404.html Normal file
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 %}

31
k4ever/main/templates/500.html Normal file
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 %}

4
k4ever/main/templates/base.html
View File

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

5
k4ever/main/templates/registration/loginForm.html
View File

@ -29,8 +29,3 @@
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
</form> </form>
<div class="notice">
<h2>Das Kassensystem ist 'Aktiv' - nutzt euren Frunden-Account</h2>
</div>

10
k4ever/media/js/k4ever.js
View File

@ -25,6 +25,13 @@ jQuery(document).ready(function($) {
}, options), callback); }, options), callback);
}; };
var updateBalance = function(newBalance) {
var balanceString = $("span.balance").text().split(": ");
balanceString[1] = parseFloat(newBalance).toFixed(2).replace(".", ",") + " €";
$("span.balance").text(balanceString.join(": "));
}
$.extend($.gritter.options, { $.extend($.gritter.options, {
position: "bottom-right", position: "bottom-right",
fade_in_speed: 250, fade_in_speed: 250,
@ -61,6 +68,7 @@ jQuery(document).ready(function($) {
}); });
dataContainer.children().removeClass("locked"); dataContainer.children().removeClass("locked");
updateBalance(data.balance);
}, options); }, options);
}); });
@ -121,7 +129,7 @@ jQuery(document).ready(function($) {
if(status === "success") { if(status === "success") {
selected_item.addClass("success"); selected_item.addClass("success");
//TODO neuer kontostand wär schnaffte updateBalance(data.balance);
} else { } else {
selected_item.addClass("failure"); selected_item.addClass("failure");
} }