TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add dummy SIKAdmin at /sikadmin

Browse Source
This commit is contained in:
Jan Tuomi
2017-02-12 00:49:22 +02:00
parent 8d53885820
commit 255b3bfe83
12 changed files with 196 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -2
View File
@@ -11,6 +11,5 @@ infoscreen/migrations/*
webapp/migrations/*
.idea/
logs/
logs/*
static/
static/*
node_modules/
locale/en/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/en/LC_MESSAGES/django.po
+38 -1
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-10 21:16+0200\n"
"POT-Creation-Date: 2017-02-12 00:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,6 +47,7 @@ msgid "Add to rotation"
msgstr ""
#: infoscreen/templates/infoscreen_admin.html:39
#: infoscreen/templates/infoscreen_admin.html:45
#: infoscreen/templates/infoscreen_admin.html:72
#: infoscreen/templates/infoscreen_admin.html:79
#: infoscreen/templates/infoscreen_admin.html:96
@@ -55,6 +56,10 @@ msgstr ""
msgid "Delete"
msgstr ""
#: infoscreen/templates/infoscreen_admin.html:44
msgid "Add"
msgstr ""
#: infoscreen/templates/infoscreen_admin.html:48
msgid "Create new item"
msgstr ""
@@ -225,3 +230,35 @@ msgstr ""
#: templates/footer.html:11
msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr ""
#: webapp/templates/admin_index.html:6
msgid "SIK Admin"
msgstr ""
#: webapp/templates/main_index.html:7
msgid "Members"
msgstr ""
#: webapp/templates/main_index.html:8
msgid "Infoscreen"
msgstr ""
#: webapp/templates/main_index.html:9
msgid "Admin tools"
msgstr ""
#: webapp/templates/navigation.html:29
msgid "Event calendar"
msgstr ""
#: webapp/templates/navigation.html:30
msgid "International"
msgstr ""
#: webapp/templates/navigation.html:31
msgid "Sössö"
msgstr ""
#: webapp/templates/navigation.html:32
msgid "Contact"
msgstr ""
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+38 -3
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-10 21:16+0200\n"
"POT-Creation-Date: 2017-02-12 00:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,6 +48,7 @@ msgid "Add to rotation"
msgstr "Lisää rotaatioon"
#: infoscreen/templates/infoscreen_admin.html:39
#: infoscreen/templates/infoscreen_admin.html:45
#: infoscreen/templates/infoscreen_admin.html:72
#: infoscreen/templates/infoscreen_admin.html:79
#: infoscreen/templates/infoscreen_admin.html:96
@@ -56,6 +57,10 @@ msgstr "Lisää rotaatioon"
msgid "Delete"
msgstr "Poista"
#: infoscreen/templates/infoscreen_admin.html:44
msgid "Add"
msgstr "Lisää"
#: infoscreen/templates/infoscreen_admin.html:48
msgid "Create new item"
msgstr "Luo uusi dia"
@@ -227,5 +232,35 @@ msgstr "suomi"
msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
#~ msgid "Change language"
#~ msgstr "Vaihda kieli"
#: webapp/templates/admin_index.html:6
msgid "SIK Admin"
msgstr "SIK Hallintapaneeli"
#: webapp/templates/main_index.html:7
#, fuzzy
msgid "Members"
msgstr "Jäsenlistaus"
#: webapp/templates/main_index.html:8
msgid "Infoscreen"
msgstr "Infonäyttö"
#: webapp/templates/main_index.html:9
msgid "Admin tools"
msgstr "Hallintatyökalut"
#: webapp/templates/navigation.html:29
msgid "Event calendar"
msgstr "Tapahtumakalenteri"
#: webapp/templates/navigation.html:30
msgid "International"
msgstr "International"
#: webapp/templates/navigation.html:31
msgid "Sössö"
msgstr "Sössö"
#: webapp/templates/navigation.html:32
msgid "Contact"
msgstr "Yhteystiedot"
sikweb/urls.py
+2
View File
@@ -24,6 +24,7 @@ from django.contrib.staticfiles import views as static_views
# main
from webapp.views import main_index
from webapp.views import admin_index
# login
from webapp.views import login_view
from webapp.views import logout_view
@@ -72,6 +73,7 @@ favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True
urlpatterns = [
# main
url(r'^$', main_index),
url(r'^sikadmin$', admin_index),
# admin
url(r'^admin/', admin.site.urls),
# login stuff
webapp/templates/admin_index.html
+8
View File
@@ -0,0 +1,8 @@
{% extends "base.html" %}
{% load i18n %}
{% block content %}
<h1>{% trans "SIK Admin" %}</h1>
{% endblock %}
webapp/templates/admin_navigation.html
+12
View File
@@ -0,0 +1,12 @@
{% load i18n %}
<nav class="navbar navbar-default sidebar" role="navigation">
<div class="container-fluid">
<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/sikadmin">SIK Admin</a></li>
</ul>
</div>
</div>
</nav>
webapp/templates/base.html
+45
View File
@@ -0,0 +1,45 @@
{% load i18n %}
{% load static %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en" ng-app="webApp">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="uli uli">
<meta name="author" content="veedeeämkoo">
<link rel="stylesheet" href="{% static "css/webapp.css" %}">
<title>Aalto-yliopiston Sähköinsinöörikilta ry</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!-- DatePicker -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-messages.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-aria.min.js"></script>
<script src="{% static "js/controllers.js" %}"></script>
</head>
<body>
<div class="page-content">
{% include "navigation.html" %}
{% block content %}
{% endblock %}
</div>
{% include "footer.html" %}
</body>
</html>
webapp/templates/main_index.html
+7 -69
View File
@@ -1,73 +1,11 @@
<!DOCTYPE html>
<html lang="en" ng-app="webApp">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="uli uli">
<meta name="author" content="veedeeämkoo">
<title>Aalto-yliopiston Sähköinsinöörikilta ry</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!-- DatePicker -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-messages.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-aria.min.js"></script>
{%load staticfiles %}
</head>
<nav class="navbar navbar-default sidebar" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="/">SIK<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-home"></span></a></li>
<li><a href="/kilta">Kilta</a></li>
<li><a href="/fuksit">Fuksit</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Yritykset <span class="caret"></span><span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-user"></span></a>
<ul class="dropdown-menu forAnimate" role="menu">
<li><a href="#">Työpaikat</a></li>
<li><a href="#">Yritysdadaa</a></li>
<li><a href="#">Lisää yritysdadaa</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
<li class="divider"></li>
<li><a href="#">Informes</a></li>
</ul>
</li>
<li ><a href="/kalenteri">Tapahtumakalenteri<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-th-list"></span></a></li>
<li ><a href="/international">International<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-tags"></span></a></li>
<li ><a href="/sosso">Sosso</a></li>
<li ><a href="/contact">Yhteystiedot<span class="pull-right hidden-xs showopacity glyphicon glyphicon-book"></span></a></li>
</ul>
</div>
</div>
</nav>
{% extends "base.html" %}
{% load i18n %}
{% block content %}
<h3>HURDURR DUMMY SITE</h3>
<div>
<a href="/members">Members</a>
<a href="/infoscreen">Infoscreen</a>
<a href="/admin">Admin</a>
<a href="/members">{% trans "Members" %}</a>
<a href="/infoscreen">{% trans "Infoscreen" %}</a>
<a href="/admin">{% trans "Admin tools" %}</a>
</div>
{% endblock %}
webapp/templates/navigation.html
+36
View File
@@ -0,0 +1,36 @@
{% load i18n %}
<nav class="navbar navbar-default sidebar" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="/">SIK<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-home"></span></a></li>
<li><a href="/kilta">Kilta</a></li>
<li><a href="/fuksit">Fuksit</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Yritykset<span class="caret"></span><span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-user"></span></a>
<ul class="dropdown-menu forAnimate" role="menu">
<li><a href="#">Työpaikat</a></li>
<li><a href="#">Yritysdadaa</a></li>
<li><a href="#">Lisää yritysdadaa</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
<li class="divider"></li>
<li><a href="#">Informes</a></li>
</ul>
</li>
<li ><a href="/kalenteri">{% trans "Event calendar" %}<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-th-list"></span></a></li>
<li ><a href="/international">{% trans "International" %}<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-tags"></span></a></li>
<li ><a href="/sosso">{% trans "Sössö" %}</a></li>
<li ><a href="/contact">{% trans "Contact" %}<span class="pull-right hidden-xs showopacity glyphicon glyphicon-book"></span></a></li>
</ul>
</div>
</div>
</nav>
webapp/views.py
+9 -1
View File
@@ -1,6 +1,8 @@
from django.shortcuts import render, redirect
from django.contrib.auth import login, logout, authenticate
from django.views.decorators.http import require_http_methods
from django.views.decorators.csrf import ensure_csrf_cookie
from django.contrib.auth.decorators import permission_required
from django.conf import settings
import logging
@@ -10,7 +12,13 @@ logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s', level=setti
@require_http_methods(["GET"])
def main_index(request, *args, **kwargs):
return render(request, "main_index.html", {})
return render(request, "main_index.html", {})
@require_http_methods(["GET", "POST"])
@ensure_csrf_cookie
@permission_required('members.change_member', login_url='/login')
def admin_index(request, *args, **kwargs):
return render(request, "admin_index.html", {})
@require_http_methods(["GET", "POST"])
def login_view(request, *args, **kwargs):