diff --git a/www/web/templates/base.html b/www/web/templates/base.html index 6a81913f4593bb9e4125702161756460270760c4..40756cb0526338920a75de55da2a4f86b4b8e56f 100644 --- a/www/web/templates/base.html +++ b/www/web/templates/base.html @@ -37,7 +37,11 @@ </head> <body> <header> - <nav class="navbar navbar-inverse"> + {% if debug %} + <nav class="navbar navbar-default"> + {% else %} + <nav class="navbar navbar-inverse"> + {% endif %} <div class="container"> <div class="navbar-header"> <a class="navbar-brand" href="/"> diff --git a/www/web/warpfood/urls.py b/www/web/warpfood/urls.py index 436265b321dce7fb108d7e1e739e5f9486953e34..20b05d97614625557a2fe60842fbc4bb21e37c46 100644 --- a/www/web/warpfood/urls.py +++ b/www/web/warpfood/urls.py @@ -3,13 +3,16 @@ from warpfood.views import * urlpatterns = [ - url(r'^pizza/$', index, name='warp_foot'), - url(r'^pizza/view/(?P<sheet_id>\w+)/$', view, name='warp_foot_view'), - url(r'^pizza/toggle_sheet/(?P<sheet_id>\w+)/$', toggle_closed, name='warp_foot_toggle_closed'), - url(r'^pizza/edit_sheet/(?P<sheet_id>\w+)/$', edit_sheet, name='warp_foot_toggle_closed'), - url(r'^pizza/toggle_paid/(?P<order_id>\w+)/$', toggle_paid, name='warp_foot_toggle_paid'), - url(r'^pizza/sheet_ordered/(?P<sheet_id>\w+)/$', sheet_ordered, name='warp_foot_toggle_paid'), -# url(r'^pizza/export_sheet/(?P<sheet_id>\w+)/$', export_sheet, name='warp_foot_export_sheet'), + url(r'^pizza/$', index, name='warp_food'), + url(r'^pizza/view/(?P<sheet_id>\w+)/$', view, name='warp_food_view'), + url(r'^pizza/toggle_sheet/(?P<sheet_id>\w+)/$', toggle_closed, name='warp_food_toggle_closed'), + url(r'^pizza/edit_sheet/(?P<sheet_id>\w+)/$', edit_sheet, name='warp_food_toggle_closed'), + url(r'^pizza/toggle_paid/(?P<order_id>\w+)/$', toggle_paid, name='warp_food_toggle_paid'), + url(r'^pizza/sheet_ordered/(?P<sheet_id>\w+)/$', sheet_ordered, name='warp_food_toggle_paid'), + url(r'^pizza/delete_order/(?P<order_id>\w+)/$', delete_order, name='warp_food_delete_order'), + url(r'^pizza/new/service/$', create_food_service, name='warp_food_create_food_service'), + +# url(r'^pizza/export_sheet/(?P<sheet_id>\w+)/$', export_sheet, name='warp_food_export_sheet'), ] diff --git a/www/web/warpfood/util.py b/www/web/warpfood/util.py index f4183eecdc2c92e25af5a5bdaaa0a9a8994ce16d..d3687f52b3acd73235c457e2b3d81aeac1732f3c 100644 --- a/www/web/warpfood/util.py +++ b/www/web/warpfood/util.py @@ -1,11 +1,12 @@ from django.contrib.humanize.templatetags.humanize import intcomma +from django.conf import settings page_context = {'pages': [ {"link":"pizza", "name": "PizzaSheet"}, {"link":"about", "name": "About"}, {"link":"logout", "name": "Logout"}, {"link":"admin", "name": "Admin"} -]} +], 'debug': settings.DEBUG} def format_euro(amount): euro = round(float(amount), 2) diff --git a/www/web/warpzone/util.py b/www/web/warpzone/util.py index 2efb422f41307004428ea90e650c2910b4f81ad7..f56b7974c73ba917c3f9b15da6b6860e0a86caec 100644 --- a/www/web/warpzone/util.py +++ b/www/web/warpzone/util.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _ page_context = {'pages': [ {"link": "pizza", "name": _("pizza_sheet")}, {"link": "about", "name": _("about")}, -]} +], 'debug': settings.DEBUG} def send_email(to_address, subject, content): try: