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

Clean-up templates

Browse Source
This commit is contained in:
Aarni Halinen
2022-08-03 22:57:19 +03:00
parent f51d71e045
commit 30f59c36fb
24 changed files with 28 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kaehmy/views.py
+1 -1
View File
@@ -77,7 +77,7 @@ def comment(request, *args, **kwargs):
return redirect("/kaehmy")
else:
context = {"error": form.errors}
return render(request, "kaehmy/kaehmy_error.html", context)
return render(request, "kaehmy/error.html", context)
@require_http_methods(["GET"])
templates/about.html
-15
View File
@@ -1,15 +0,0 @@
<!DOCTYPE html>
{% load static %}
<html>
<head>
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.png"/>
<link rel="stylesheet" href="{% static "css/about.css" %}">
</head>
<body>
<h1>SIKWEB 2.0</h1>
<p>{{ commit }}</p>
<p>{{ date }}</p>
<p>{{ tag }}</p>
</body>
</html>
templates/admin/base_site.html
-76
View File
@@ -1,76 +0,0 @@
{% extends "admin/base.html" %}
{% load i18n %}
{% load static %}
{# Additional <head> content here, some extra meta tags or favicon #}
{% block extrahead %}
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.png"/>
{% endblock %}
{# Additional CSS includes #}
{% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% static 'css/sikadmin.css' %}" media="all">
{% endblock %}
{# Additional JS files in footer, right before </body> #}
{#{% block extrajs %}#}
{# <script type="text/javascript" src="{% static 'js/my_project.js' %}"></script>#}
{#{% endblock %}#}
{# Footer links (left side) #}
{#{% block footer_links %}#}
{# <a href="/docs/" class="icon"><i class="icon-question-sign"></i>Documentation</a>#}
{#{% endblock %}#}
{# Additional header content like notifications or language switcher #}
{% block header_content %}
{{ block.super }}
<div class="header-content">
<form action="{% url 'set_language' %}" method="post">{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select name="language" style="width: auto;">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
<input class="btn btn-high" type="submit" value="{% trans 'Go' %}" style="vertical-align: top;"/>
</form>
<!-- First icon column -->
<!--
<div class="header-column icon">
<i class="icon-home"></i><br>
<i class="icon-cog"></i>
</div>
<div class="header-column" style="margin-right: 20px">
<a href="/" class="grey">Front-end</a><br>
<a href="" class="grey">One more link</a>
</div>
Second icon column
<div class="header-column icon">
<i class="icon-comment"></i>
</div>
<div class="header-column">
<a href="" class="grey">5 new messages</a>
</div>
-->
</div>
{% endblock %}
{# Footer branding name (center) #}
{#{% block footer_branding %}#}
{#{% endblock %}#}
{# Footer copyright (right side) #}
{#{% block copyright %}#}
{# Copyright &copy; 2013 Client<br>Developed by <a href="http://yoursite.com" target="_blank">YourName</a> #}
{#{% endblock %}#}
templates/footer.html
+19 -37
View File
@@ -1,42 +1,24 @@
{% load i18n %}
{% load static %}
<link rel="stylesheet" href="{% static "css/footer.css" %}">
<footer class="footer">
<div class="container">
<div class="d-flex align-items-center justify-content-end">
<div class="p-2">
<span><i class="fa fa-copyright"></i>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
<div class="p-2">
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span class="form-group">
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
</div>
<div class="ml-auto p-2">
<span class="nav-item">
<a href="/members"><i class="fa fa-group fa-2x"></i></a>
</span>
<span class="nav-item">
<a href="/infoscreen"><i class="fa fa-info fa-2x"></i></a>
</span>
<span class="nav-item">
<a href="/admin"><i class="fa fa-gears fa-2x"></i></a>
</span>
</div>
</div>
<div class="footer-padder"></div>
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span>
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
</footer>
templates/infoscreen/infoscreen_admin.html
+1 -1
View File
@@ -40,5 +40,5 @@
</div>
</div>
{% include "webapp/footer.html" %}
{% include "footer.html" %}
{% endblock body %}
templates/kaehmy/base.html
+1 -1
View File
@@ -28,7 +28,7 @@
</div>
<div class="footer">
{% block footer %}
{% include "kaehmy/footer.html" %}
{% include "footer.html" %}
{% endblock footer %}
</div>
templates/kaehmy/footer.html
-23
View File
@@ -1,23 +0,0 @@
{% load i18n %}
{% load static %}
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span>
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
</footer>
templates/members/application_form_base.html
+1 -1
View File
@@ -35,6 +35,6 @@
<body>
{% block content %}
{% endblock content %}
{% include "webapp/footer.html" %}
{% include "footer.html" %}
</body>
</html>
templates/members/base.html
+1 -1
View File
@@ -91,6 +91,6 @@
</div>
</div>
{% include "webapp/footer.html" %}
{% include "footer.html" %}
</body>
</html>
templates/error.html → templates/members/error.html
View File
templates/ohlhafv/base.html
+2 -1
View File
@@ -7,6 +7,7 @@
<link rel="stylesheet" href="{% static "ohlhafv/css/base.css" %}">
<link rel="stylesheet" href="{% static "ohlhafv/css/header.css" %}">
<link rel="stylesheet" href="{% static "ohlhafv/css/nav.css" %}">
<link rel="stylesheet" href="{% static "ohlhafv/css/footer.css" %}">
{% endblock styles %}
{% block body %}
@@ -22,7 +23,7 @@
{% endblock %}
{% block footer %}
{% include "ohlhafv/footer.html" %}
{% include "footer.html" %}
{% endblock footer %}
{% endblock body %}
templates/ohlhafv/footer.html
-24
View File
@@ -1,24 +0,0 @@
{% load i18n %}
{% load static %}
<link rel="stylesheet" href="{% static "ohlhafv/css/footer.css" %}">
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span>
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
</footer>
templates/webapp/base.html
+2 -2
View File
@@ -1,7 +1,7 @@
{% extends "project.html" %}
{% load i18n %}
{% load static %}
{% load i18n %}
{% block styles %}
<link rel="stylesheet" href="{% static "webapp/css/base.css" %}">
@@ -33,6 +33,6 @@
</div>
</div>
{% block footer %}
{% include "webapp/footer.html" %}
{% include "footer.html" %}
{% endblock footer %}
{% endblock %}
templates/webapp/contact.html
-40
View File
@@ -1,40 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="contact_div">
{% load static %}
<link rel="stylesheet" href="{% static "css/contact.css" %}">
<h2>{% trans "Contact" %}</h2>
{% if committees %}
{% for committee in committees %}
<!--Committee title-->
<h4>{{ committee.name }}</h4>
{% for role in committee.current_roles %}
{% for official in role.official.all %}
<div class="role-container">
<div class="row">
<div class="col">
<img src="static/img/missing.png">
</div>
</div>
<div class="row">
<div class="col">
<h5>{{role.name}}</h5>
<p>{{official.first_name}}
{{official.last_name}}
{{official.email}}</p>
</div>
</div>
</div>
{% endfor %}
{% endfor %}
{% endfor %}
{% else%}
<p>Ei Toimikuntia</p>
{% endif %}
</div>
{% endblock %}
templates/webapp/event_calendar.html
-16
View File
@@ -1,16 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="event_calendar_div">
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Event calendar" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
templates/webapp/footer.html
-24
View File
@@ -1,24 +0,0 @@
{% load i18n %}
{% load static %}
<div class="footer-padder"></div>
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span>
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
</footer>
templates/webapp/freshmen.html
-16
View File
@@ -1,16 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="freshmen_div">
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Freshmen" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
templates/webapp/guild.html
-16
View File
@@ -1,16 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="guild_div">
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Kilta" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
templates/webapp/header.html
-7
View File
@@ -1,7 +0,0 @@
{% load i18n %}
{% load static %}
<div class="header-content">
<div class="logo">
<a href="/"><img src="{% static "webapp/img/logo_header.png" %}" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
</div>
</div>
templates/webapp/index.html
-36
View File
@@ -1,36 +0,0 @@
{% extends "webapp/base.html" %}
{% load i18n %}
{% block content %}
<div class="main_page">
<div class="container">
<div class="row">
<div class="col">
<h3>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</h3>
</div>
</div>
<div class="row">
<div class="col">
<h5>{% trans "This site is not yet ready." %}</h5>
</div>
</div>
<div class="row">
<div class="col">
<h6>{% trans "Are you perhaps looking for one of the following?" %}</h6>
</div>
</div>
<div class="row">
<ul>
<li><a href="/infoscreen/admin">{% trans "Infoscreen admin pane" %}</a></li>
<li><a href="/members">{% trans "Member register" %}</a></li>
<li><a href="/kaehmy">{% trans "Kaehmy application" %}</a></li>
</ul>
</div>
<div class="row">
<div class="col">
{% lorem 2 p %}
</div>
</div>
</div>
</div>
{% endblock %}
templates/webapp/international.html
-16
View File
@@ -1,16 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="international_div">
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "International" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
templates/webapp/jobs.html
-16
View File
@@ -1,16 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="jobs_div">
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Jobs" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
templates/webapp/navigation.html
-33
View File
@@ -1,33 +0,0 @@
{% load i18n %}
<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<ul class="navbar-nav mx-auto">
<li class="nav-item text-center">
<a class="nav-link" href="/guild">{% trans "Guild" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/international">{% trans "International" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/sosso">{% trans "Sössö" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="corpDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Corporate" %}
</a>
<div class="dropdown-menu" aria-labelledby="corpDropdown">
<a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a>
<a class="dropdown-item" href="/">Yritysdadaa</a>
<a class="dropdown-item" href="/">Something else here</a>
</div>
</li>
</ul>
</nav>
templates/webapp/sosso.html
-16
View File
@@ -1,16 +0,0 @@
{% extends "webapp/base.html" %}
{% block content %}
{% load i18n %}
<div class="sosso_div">
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Sössö" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}