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

Fix most of html templates

Browse Source
This commit is contained in:
Aarni Halinen
2022-08-03 22:46:14 +03:00
parent 2f0143a9ae
commit f51d71e045
73 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ohlhafv/templates/base.html
-28
View File
@@ -1,28 +0,0 @@
{% extends "project.html" %}
{% load static %}
{% load i18n %}
{% block styles %}
<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" %}">
{% endblock styles %}
{% block body %}
{% block header %}
{% include "ohlhafv:header.html" %}
{% endblock header %}
{% block navigation %}
{% include "ohlhafv:navigation.html" %}
{% endblock %}
{% block content %}
{% endblock %}
{% block footer %}
{% include "ohlhafv:footer.html" %}
{% endblock footer %}
{% endblock body %}
ohlhafv/templates/email.html
-10
View File
@@ -1,10 +0,0 @@
{% load i18n %}
{% trans "Moikka" %} {{ challenge.victim }},
{{ challenge.challenger }} {% trans "on haastanut sinut oluenjuontimittelöön" %} {{ challenge.get_series_display }} {% trans "-sarjassa" %}!
{{ challenge.message }}
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 26.5" %}.
{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}
ohlhafv/templates/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>
ohlhafv/templates/header.html
-8
View File
@@ -1,8 +0,0 @@
{% load i18n %}
{% load static %}
<div class="ohlhafv-header-content">
<div class="ohlhafv-banner logo">
<a href="/ohlhafv"><img class="ohlhafv-banner-image" src="{% static "ohlhafv/img/heevit.jpg" %}" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
</div>
</div>
ohlhafv/templates/list.html
-25
View File
@@ -1,25 +0,0 @@
{% extends "ohlhafv:base.html" %}
{% load static %}
{% load i18n %}
{% block content %}
<div>
<h3>{% trans "All challenges" %}</h3>
</div>
<div>
<h6 style="padding-bottom: 1rem">{% trans "Total challenges:" %} {{ challenge_count }}</h6>
</div>
{% for challenge in challenges %}
<div class="card">
<h4 class="card-header">{{ challenge.challenger }} vs. {{ challenge.victim }}</h4>
<div class="card-block">
<h5 class="card-subtitle mb-2">{{ challenge.get_series_display }}</h5>
<p class="card-text">{{ challenge.message|linebreaks|urlize }}</p>
</div>
</div>
{% endfor %}
{% endblock content %}
ohlhafv/templates/navigation.html
-9
View File
@@ -1,9 +0,0 @@
{% load i18n %}
<div class="ohlhafv_navigation">
<nav class="navbar-border navbar navbar-toggleable-md navbar-light bg-faded">
<div class="navbar-nav">
<a class="nav-item nav-link" href="/ohlhafv">{% trans "New challenge" %} <span class="sr-only">(current)</span></a>
<a class="nav-item nav-link" href="/ohlhafv/list">{% trans "List challenges" %}</a>
</div>
</nav>
</div>
ohlhafv/templates/new.html
-25
View File
@@ -1,25 +0,0 @@
{% extends "ohlhafv:base.html" %}
{% load bootstrap3 %}
{% load i18n %}
{% block navigation %}
{% include "ohlhafv:navigation.html" %}
{% endblock %}
{% block content %}
<div>
<h3>{% trans "Challenge your foe(s) to combat!" %}</h3>
<div id="input_form">
<form name="ohlhafvForm" action="/ohlhafv/submit/" method="post" class="form">{% csrf_token %}
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Challenge" %}
</button>
{% endbuttons %}
</form>
</div>
</div>
{% endblock content %}
ohlhafv/templates/tgmsg.tpl
-8
View File
@@ -1,8 +0,0 @@
Uusi Ohlhafv haaste!
====================
Haastaja: {{ challenge.challenger }}
Uhri: {{ challenge.victim }}
Sarja: {{ challenge.get_series_display }}
Terveiset: {{ challenge.message }}
Käy kurkkaamassa muutkin haasteet osoitteessa: {{ url }}
ohlhafv/views.py
+4 -4
View File
@@ -18,7 +18,7 @@ from webapp.models import processHooks
def ohlhafv_view(request, *args, **kwargs):
"""Render Ohlhafv form page."""
form = OhlhafvForm()
return render(request, "ohlhafv:new.html", {"form": form})
return render(request, "ohlhafv/new.html", {"form": form})
@ensure_csrf_cookie
@@ -32,7 +32,7 @@ def ohlhafv_submit(request, *args, **kwargs):
url = f"https://{URL}/ohlhafv/list"
email_body = render_to_string(
"ohlhafv:email.html",
"ohlhafv/email.html",
{
"challenge": challenge,
"url": url,
@@ -46,7 +46,7 @@ def ohlhafv_submit(request, *args, **kwargs):
try:
webhook_message = render_to_string(
"ohlhafv:tgmsg.tpl", {"challenge": challenge, "url": url}
"ohlhafv/tgmsg.tpl", {"challenge": challenge, "url": url}
)
processHooks(message=webhook_message, eventType="ohlhafv")
except Exception:
@@ -67,4 +67,4 @@ def ohlhafv_list(request, *args, **kwargs):
"challenges": challenges,
"challenge_count": len(challenges),
}
return render(request, "ohlhafv:list.html", context)
return render(request, "ohlhafv/list.html", context)