Commit 55fef6c8 authored by David Haynes's avatar David Haynes 🙆

Necessary updates to template refrences

- ie. need to look at new directories for the non-app templates
parent 60ef242c
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
...@@ -20,7 +20,7 @@ Go - Login ...@@ -20,7 +20,7 @@ Go - Login
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="well"> <div class="well">
<form class="form-horizontal" method="post" action="{% url 'django.contrib.auth.views.login' %}"> <form class="form-horizontal" method="post" action="{% url 'django.contrib.auth.views.login' %}">
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset>
......
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
......
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
......
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
......
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
......
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
...@@ -131,7 +131,7 @@ Go - Signup ...@@ -131,7 +131,7 @@ Go - Signup
</fieldset> </fieldset>
</form> </form>
</div> </div>
</div> </div>
{% else %} {% else %}
<div class="col-md-12"> <div class="col-md-12">
......
{% extends 'base.html' %} {% extends 'layouts/base.html' %}
{% block title %} {% block title %}
......
...@@ -56,7 +56,7 @@ def error_404(request): ...@@ -56,7 +56,7 @@ def error_404(request):
Error 404 view, in case a url is not found. Error 404 view, in case a url is not found.
""" """
return render(request, '404.html', { return render(request, 'core/404.html', {
}, },
) )
...@@ -66,7 +66,7 @@ def error_500(request): ...@@ -66,7 +66,7 @@ def error_500(request):
Error 500 view, in case a server error occurs. Error 500 view, in case a server error occurs.
""" """
return render(request, '500.html', { return render(request, 'core/500.html', {
}, },
) )
...@@ -117,7 +117,7 @@ def index(request): ...@@ -117,7 +117,7 @@ def index(request):
random_short = URL.generate_valid_short() random_short = URL.generate_valid_short()
if random_short is None: if random_short is None:
return HttpResponseServerError( return HttpResponseServerError(
render(request, '500.html', {}) render(request, 'core/500.html', {})
) )
else: else:
url.short = random_short url.short = random_short
...@@ -142,7 +142,7 @@ def index(request): ...@@ -142,7 +142,7 @@ def index(request):
url.save() url.save()
return redirect('view', url.short) return redirect('view', url.short)
return render(request, 'index.html', { return render(request, 'core/index.html', {
'form': url_form, 'form': url_form,
}, },
) )
...@@ -323,7 +323,7 @@ def useradmin(request): ...@@ -323,7 +323,7 @@ def useradmin(request):
todeny = RegisteredUser.objects.get(username=name) todeny = RegisteredUser.objects.get(username=name)
todeny.delete() todeny.delete()
need_approval = RegisteredUser.objects.filter(approved=False) need_approval = RegisteredUser.objects.filter(approved=False)
return render(request, 'useradmin.html', { return render(request, 'admin/useradmin.html', {
'need_approval': need_approval 'need_approval': need_approval
}, },
) )
...@@ -336,7 +336,7 @@ Define static user views here. ...@@ -336,7 +336,7 @@ Define static user views here.
def about(request): def about(request):
return render(request, 'about.html', { return render(request, 'core/about.html', {
}, },
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment