From e9903924542441fd0839a8e4f649f32f26d10d13 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Thu, 19 Jan 2017 18:17:40 +0200 Subject: Cleanup --- servo/templates/checkin/error.html | 2 +- servo/urls/checkin.py | 16 ++++++++-------- static/images/sadmac.png | Bin 0 -> 3402 bytes 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 static/images/sadmac.png diff --git a/servo/templates/checkin/error.html b/servo/templates/checkin/error.html index eaa45d5..d21e91f 100644 --- a/servo/templates/checkin/error.html +++ b/servo/templates/checkin/error.html @@ -6,7 +6,7 @@ {% block main %}
-

{% trans "Oops!" %}

+

{% trans "It appears that an error has occurred." %}

{{ message }}

{% trans "Try again" %} diff --git a/servo/urls/checkin.py b/servo/urls/checkin.py index c35d927..685bef3 100644 --- a/servo/urls/checkin.py +++ b/servo/urls/checkin.py @@ -3,16 +3,16 @@ from django.views.generic.base import RedirectView from django.conf.urls import url -from servo.views.checkin import * +from servo.views import checkin urlpatterns = [ - url(r'^$', index, name='checkin-index'), + url(r'^$', checkin.index, name='checkin-index'), url(r'^sn/$', RedirectView.as_view(url='/checkin/', permanent=True)), - url(r'^customer/$', get_customer, name='checkin-get_customer'), - url(r'^reset/$', reset, name='checkin-reset'), - url(r'^status/$', status, name='checkin-status'), - url(r'^checkin/print/(\w+)/$', print_confirmation, name='checkin-print'), - url(r'^thanks/(\w+)/$', thanks, name='checkin-thanks'), - url(r'^terms/$', terms, name='checkin-terms'), + url(r'^customer/$', checkin.get_customer, name='checkin-get_customer'), + url(r'^reset/$', checkin.reset, name='checkin-reset'), + url(r'^status/$', checkin.status, name='checkin-status'), + url(r'^checkin/print/(\w+)/$', checkin.print_confirmation, name='checkin-print'), + url(r'^thanks/(\w+)/$', checkin.thanks, name='checkin-thanks'), + url(r'^terms/$', checkin.terms, name='checkin-terms'), ] diff --git a/static/images/sadmac.png b/static/images/sadmac.png new file mode 100644 index 0000000..69f1ea8 Binary files /dev/null and b/static/images/sadmac.png differ -- cgit v1.2.3