diff options
author | Filipp Lepalaan <filipp@mac.com> | 2017-01-19 18:17:40 +0200 |
---|---|---|
committer | Filipp Lepalaan <filipp@mac.com> | 2017-01-19 18:17:40 +0200 |
commit | e9903924542441fd0839a8e4f649f32f26d10d13 (patch) | |
tree | a200a95c79661dbcba78202488d4a95a0aebf07f | |
parent | 4e7eea8ef9e017ef794dca8b9836de64bb826a02 (diff) | |
download | Servo-e9903924542441fd0839a8e4f649f32f26d10d13.tar.gz Servo-e9903924542441fd0839a8e4f649f32f26d10d13.tar.bz2 Servo-e9903924542441fd0839a8e4f649f32f26d10d13.zip |
Cleanup
-rw-r--r-- | servo/templates/checkin/error.html | 2 | ||||
-rw-r--r-- | servo/urls/checkin.py | 16 | ||||
-rw-r--r-- | static/images/sadmac.png | bin | 0 -> 3402 bytes |
3 files changed, 9 insertions, 9 deletions
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 %} <div class="container-narrow"> <div class="jumbotron"> - <h1>{% trans "Oops!" %}</h1> + <img src="{{ STATIC_URL }}/images/sadmac.png"/> <p class="lead">{% trans "It appears that an error has occurred." %}</p> <p>{{ message }}</p> <a class="btn btn-large btn-success" href="{% url 'checkin-index' %}"><i class="icon-refresh icon-white"></i> {% trans "Try again" %}</a> 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 Binary files differnew file mode 100644 index 0000000..69f1ea8 --- /dev/null +++ b/static/images/sadmac.png |