From 6941f2d7fe6ff19be6e4b111b125fd248b28045f Mon Sep 17 00:00:00 2001 From: Tatoma Date: Wed, 25 Jan 2017 19:06:03 +0200 Subject: [PATCH] Add dummy frontpage Resolves #27 --- webapp/templates/index.html | 31 -------------- webapp/templates/main_index.html | 73 ++++++++++++++++++++++++++++++++ webapp/views.py | 2 +- 3 files changed, 74 insertions(+), 32 deletions(-) delete mode 100644 webapp/templates/index.html create mode 100644 webapp/templates/main_index.html diff --git a/webapp/templates/index.html b/webapp/templates/index.html deleted file mode 100644 index 7194da3..0000000 --- a/webapp/templates/index.html +++ /dev/null @@ -1,31 +0,0 @@ - \ No newline at end of file diff --git a/webapp/templates/main_index.html b/webapp/templates/main_index.html new file mode 100644 index 0000000..2a249ed --- /dev/null +++ b/webapp/templates/main_index.html @@ -0,0 +1,73 @@ + + + + + + + + + Aalto-yliopiston Sähköinsinöörikilta ry + + + + + + + + + + + + + + + + + + {%load staticfiles %} + + + + + + +

HURDURR DUMMY SITE

+
+Members +Infoscreen +Admin +
diff --git a/webapp/views.py b/webapp/views.py index 404d744..8efa54c 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -10,7 +10,7 @@ logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s', level=setti @require_http_methods(["GET"]) def main_index(request, *args, **kwargs): - return redirect("http://sahkoinsinoorikilta.fi/") + return render(request, "main_index.html", {}) @require_http_methods(["GET", "POST"]) def login_view(request, *args, **kwargs):