Fix most of html templates

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
@@ -0,0 +1,24 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<div>
<div>
<h3>{% trans "Are you sure you want to delete this application?" %}</h3>
</div>
<div>
<table class="table readonly" >
{{ form }}
</table>
<form name="applicationForm" action="/members/delete_application" method="post" class="form">{% csrf_token %}
<input type="hidden" name="id" value="{{ application_id }}">
<button type="submit" class="btn btn-danger">
{% trans "Yes, I'm sure" %}
</button>
</form>
</div>
</div>
{% endblock content %}
+25
View File
@@ -0,0 +1,25 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<div>
<div>
<h3>{% trans "Edit application" %}</h3>
</div>
<div id="input_form">
<form name="applicationForm" action="/members/accept_application" method="post" class="form">{% csrf_token %}
<input type="hidden" name="id" value="{{ application_id }}">
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Accept" %}
</button>
<a href="/members/delete_application_confirm/{{ application_id }}" class="btn btn-danger">{% trans "Decline" %}</a>
{% endbuttons %}
</form>
</div>
</div>
{% endblock content %}
@@ -0,0 +1,40 @@
{% load static %}
{% load i18n %}
<!DOCTYPE html>
<html lang="en" ng-app="applicationApp">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
<meta name="author" content="veedeeämkoo">
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.png"/>
<title>Jäsenhakemus</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!-- reCaptcha -->
<script src="{% static "js/lib/angular-recaptcha.js" %}"></script>
<script src="https://www.google.com/recaptcha/api.js?onload=vcRecaptchaApiLoaded&render=explicit" async defer></script>
<script src="{% static "js/lib/jquery.noty.packaged.js" %}"></script>
<script src="{% static "js/lib/moment.js" %}"></script>
<link href="{% static "members/css/simple-sidebar.css" %}" rel="stylesheet">
<link rel="stylesheet" href="{% static "members/css/application.css" %}">
</head>
<body>
{% block content %}
{% endblock content %}
{% include "webapp/footer.html" %}
</body>
</html>
+20
View File
@@ -0,0 +1,20 @@
{% extends "members/application_form_base.html" %}
{% load static %}
{% load bootstrap3 %}
{% load i18n %}
{% block content %}
<h3>{% trans "Killan jäseneksi liittyminen on helppoa ja hauskaa!" %}</h3>
<h3>{% trans "Täytä vain alla oleva lomake" %}</h3>
<h4>{% trans "Muista myös maksaa jäsenmaksusi!" %}</h4>
<div class="form">
<form method="POST" action="/members/submit_application">{% csrf_token %}
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Send" %}
</button>
{% endbuttons %}
</form>
</div>
{% endblock content %}
+24
View File
@@ -0,0 +1,24 @@
{% extends "members/base.html" %}
{% load i18n %}
{% block content %}
<div>
<div>
<h2>{% trans "Member applications" %}</h2>
</div>
{% if notification %}
<div class="alert alert-success">
{{ notification }}
</div>
{% endif %}
{{ table|safe }}
<div>
<a href="/members/export_applications" class="btn btn-info">{% trans "Download Excel" %}</a>
</div>
</div>
{% endblock content %}
@@ -0,0 +1,11 @@
{% extends "members/application_form_base.html" %}
{% load static %}
{% load bootstrap3 %}
{% load i18n %}
{% block content %}
<link rel="stylesheet" href="{% static "css/application.css" %}">
<h3>{% trans "Hienoa! Jäsenhakemuksesi on nyt lähetetty." %}</h3>
<p>{% trans "Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä admin@sahkoinsinoorikilta.fi jos viestiä ei näy." %}</p>
<a href="https://sahkoinsinoorikilta.fi/"><h4>{% trans "Takaisin Sähköinsinöörikillan web-sivuille" %}</h4></a>
{% endblock content %}
+96
View File
@@ -0,0 +1,96 @@
<!DOCTYPE html>
{% load static %}
{% load i18n %}
<html lang="en">
<head>
<base href="/">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Member register">
<meta name="author" content="SIK ry">
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.png"/>
<title>{% trans "Member register" %}</title>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="{% static "members/css/simple-sidebar.css" %}">
<link rel="stylesheet" href="{% static "members/css/members.css" %}">
<link rel="stylesheet" href="{% static "webapp/css/footer.css" %}">
</head>
<body>
<div id="wrapper">
<div class="page-content-container">
<div id="header">
<h1>
{% trans "Member register of SIK ry" %}
</h1>
</div>
</div>
<!-- Sidebar -->
<div id="sidebar-wrapper">
<nav class="navbar navbar-inverse" id="sidebar-collapse">
<div class="navbar-header">
<span class="navbar-brand hidden-lg hidden-md">{% trans "Member register of SIK ry" %}</span>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-nav">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
</nav>
<ul class="sidebar-nav">
<li>
<span class="text-primary">{% trans "Members" %}</span>
<ul>
<li><a href="/members/list">{% trans "List members" %}</a></li>
<li><a href="/members/add">{% trans "Add member" %}</a></li>
<li><a href="/members/add_many">{% trans "Add multiple" %}</a></li>
</ul>
</li>
<li>
<span class="text-primary">{% trans "Payments" %}</span>
<ul>
<li><a href="/members/payments">{% trans "List payments" %}</a></li>
<li><a href="/members/add_payment">{% trans "Add payment" %}</a></li>
</ul>
</li>
<li>
<span class="text-primary">{% trans "Applications" %}</span>
<ul>
<li><a href="/members/applications">{% trans "List applications" %}</a></li>
<li><a href="/members/application">{% trans "Application form" %}</a></li>
</ul>
</li>
<li class="logout-container">
<ul>
<li><a href="/members/settings">{% trans "Settings" %}</a></li>
</ul>
<form action="/admin/logout/" method="post"> {% csrf_token %}
<input type="Submit" value="{% trans "Log out" %}" name="Logout" class="btn btn-danger"/>
</form>
</li>
</ul>
</div>
<!-- /#sidebar-wrapper -->
<div class="page-content-container">
<!-- Page Content -->
{% block content %}
{% endblock content %}
</div>
</div>
{% include "webapp/footer.html" %}
</body>
</html>
@@ -0,0 +1,15 @@
{% load i18n %}
<p>Moi {{first_name}}!</p>
<p>Onnittelut! Sinut on hyväksytty Sähköinsinöörikillan jäseneksi.</p>
<p>
Käy kurkkaamassa killan
<a href="https://sahkoinsinoorikilta.fi">nettisivuilta</a>
tulevia tapahtumia ja piipahda kiltahuoneella tutustumassa uusiin kiltatovereihisi!
</p>
<p>Liity myös killan TG-kanaville:</p>
<p><a href="https://t.me/+ubTeGSYKTvg3NmVk">Killan yleinen telegram</a></p>
<p><a href="https://t.me/+1PqQHRVMjiAxMTU0">SIK-fuksit 2022</a></p>
<p><a href="https://t.me/+Ln8TvQ-_id9kZTU0">SIK-fuksit 2022 -tiedotuskanava</a></p>
@@ -0,0 +1,21 @@
{% load i18n %}
{% trans "Moikka" %} {{ application.first_name }},
{% trans "Sait tämän viestin, sillä olet lähettänyt hakemuksen Aalto-yliopiston Sähköinsinöörikillan jäseneksi alla olevin tiedoin. Siistiä!" %}
{% trans "Etunimi" %}: {{ application.first_name }}
{% trans "Sukunimi" %}: {{ application.last_name }}
{% trans "Sähköposti" %}: {{ application.email }}
{% trans "Kotipaikkakunta" %}: {{ application.POR }}
{% trans "AYY:n jäsen" %}: {{ ayy }}
{% trans "Haluan jäsenmailin" %}: {{ jas }}
{% trans "Saat sähköpostiisi tiedon, kun sinut on hallituksen kokouksessa hyväksytty jäseneksi" %}.
{% trans "Muistathan maksaa jäsenmaksun! Alla maksutiedot" %}:
{% trans "Saaja" %}: Aalto-yliopiston Sähköinsinöörikilta ry
{% trans "Tilinumero" %}: FI97 1309 3000 1118 23
BIC: NDEAFIHH
{% trans "Viite" %}: 1313
{% trans "Summa" %}: 8 €
+21
View File
@@ -0,0 +1,21 @@
{% extends "members/base.html" %}
{% load bootstrap3 %}
{% load i18n %}
{% block content %}
<div>
<h3>{% trans "Add member" %}</h3>
<div id="input_form">
<form name="memberForm" action="/members/submit_member" method="post" class="form">{% csrf_token %}
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Save" %}
</button>
{% endbuttons %}
</form>
</div>
</div>
{% endblock content %}
+59
View File
@@ -0,0 +1,59 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load static %}
{% block content %}
<div>
<div>
<h3>{% trans "Add many members" %}</h3>
</div>
<div>
<p>
{% blocktrans %}
Enter member information in CSV format, separate members on separate lines.
If a new member already exists in the database, a new payment event will be created for that member instead.
{% endblocktrans %}
</p>
</div>
<div>
<label>{% trans "Format the member table like this:" %}</label>
<div>
<img src="{% static "members/img/excel_csv_save_example.png" %}">
</div>
<p>{% blocktrans %}Columns: First name, last name, email address, place of origin, AYY member, JAS recipient{% endblocktrans %}</p>
</div>
<div>
<label>{% trans "Save the file as CSV" %}</label>
<div><img src="{% static "members/img/excel_csv_save_tutorial.png" %}"></div>
</div>
<form name="memberTextForm" action="/members/import_csv" enctype="multipart/form-data" method="POST">{% csrf_token %}
<h3>{% trans "Upload file" %}</h3>
<input class="form-control-file" type="file" accept=".csv" name="csvFile" />
<div class="form-group">
<label>{% trans "Payment source" %}</label>
<select name="payment_source" class="form-control">
<option value="AYY">{% trans "AYY" %}</option>
<option value="bank_transfer">{% trans "Bank transfer" %}</option>
<option value="cash">{% trans "Cash payment" %}</option>
</select>
<small class="form-text text-muted">
{% trans "This payment source will be used to create any payments for new members that already exist in the database." %}
</small>
</div>
<div class="form-group">
<label>{% trans "CSV delimiter" %}</label>
<input type="text" name="delimiter" class="form-control" value=";" />
<small class="form-text text-muted">
{% blocktrans %}The symbol that is used to separate items in one line. Defaults to ';' (semicolon).{% endblocktrans %}
</small>
</div>
<div>
<button type="submit" class="btn btn-primary">{% trans "Send" %}</button>
</div>
</form>
</div>
{% endblock content %}
@@ -0,0 +1,26 @@
{% extends "members/base.html" %}
{% load i18n %}
{% block content %}
<div>
<div>
<h3>{% trans "Confirm adding these entries?" %}</h3>
</div>
<div class="form-group">
<label>{% trans "Members" %}</label>
{{ members|safe }}
</div>
<div class="form-group">
<label>{% trans "Payments" %}</label>
{{ payments|safe }}
</div>
</div>
<form name="memberTextForm" action="/members/add_many_confirm" method="POST">{% csrf_token %}
<div>
<button type="submit" class="btn btn-primary">{% trans "Send" %}</button>
</div>
</form>
</div>
{% endblock content %}
@@ -0,0 +1,24 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<div>
<div>
<h3>{% trans "Are you sure you want to delete this member?" %}</h3>
</div>
<div>
<table class="table readonly" >
{{ form }}
</table>
<form name="memberForm" action="/members/delete_member" method="post" class="form">{% csrf_token %}
<input type="hidden" name="id" value="{{ member_id }}">
<button type="submit" class="btn btn-danger">
{% trans "Yes, I'm sure" %}
</button>
</form>
</div>
</div>
{% endblock content %}
+25
View File
@@ -0,0 +1,25 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<div>
<div>
<h3>{% trans "Edit member" %}</h3>
</div>
<div id="input_form">
<form name="memberForm" action="/members/update_member" method="post" class="form">{% csrf_token %}
<input type="hidden" name="id" value="{{ member_id }}">
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Save" %}
</button>
<a href="/members/delete_member_confirm/{{ member_id }}" class="btn btn-danger">{% trans "Delete" %}</a>
{% endbuttons %}
</form>
</div>
</div>
{% endblock content %}
+47
View File
@@ -0,0 +1,47 @@
{% extends "members/base.html" %}
{% load static %}
{% load i18n %}
{% load django_tables2 %}
{% block content %}
<div>
<div>
<h2>{% trans "Member register" %}</h2>
</div>
{% if notification %}
<div class="alert alert-success">
{{ notification }}
</div>
{% endif %}
<div class="member_count">
<span>{% trans "Members in register:" %} {{ member_count }} ({{ paid_count }})</span>
</div>
<div>
<form class="input-group" method="GET" action="/members/list">
<input class="form-control" type="text" name="q" placeholder="Teemu Teekkari" />
<span class="input-group-btn">
<input type="submit" class="btn" value="{% trans "Search" %}" />
</span>
</form>
</div>
{% if request.GET.q %}
<div>
<div class="alert alert-info" role="alert">
{% trans "Showing results for" %} "{{ request.GET.q }}"
</div>
</div>
{% endif %}
{{ table|safe }}
<div>
<a href="/members/export_members" class="btn btn-info">{% trans "Download Excel" %}</a>
</div>
</div>
{% endblock content %}
+29
View File
@@ -0,0 +1,29 @@
{% extends "members/base.html" %}
{% load bootstrap3 %}
{% load i18n %}
{% block content %}
<script
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous"></script>
<div>
<h3>{% trans "Add payment" %}</h3>
<div id="input_form">
<form name="paymentForm" action="/members/submit_payment" method="post" class="form">{% csrf_token %}
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Save" %}
</button>
{% endbuttons %}
</form>
</div>
</div>
{{ form.media }}
{% endblock content %}
@@ -0,0 +1,24 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<div>
<div>
<h3>{% trans "Are you sure you want to delete this payment?" %}</h3>
</div>
<div>
<table class="table readonly" >
{{ form }}
</table>
<form name="paymentForm" action="/members/delete_payment" method="post" class="form">{% csrf_token %}
<input type="hidden" name="id" value="{{ payment_id }}">
<button type="submit" class="btn btn-danger">
{% trans "Yes, I'm sure" %}
</button>
</form>
</div>
</div>
{% endblock content %}
+25
View File
@@ -0,0 +1,25 @@
{% extends "members/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<div>
<div>
<h3>{% trans "Edit payment" %}</h3>
</div>
<div>
<form name="paymentForm" action="/members/update_payment" method="post" class="form">{% csrf_token %}
<input type="hidden" name="id" value="{{ payment_id }}">
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Save" %}
</button>
<a href="/members/delete_payment_confirm/{{ payment_id }}" class="btn btn-danger">{% trans "Delete" %}</a>
{% endbuttons %}
</form>
</div>
</div>
{% endblock content %}
+44
View File
@@ -0,0 +1,44 @@
{% extends "members/base.html" %}
{% load static %}
{% load i18n %}
{% block content %}
<div>
<div>
<h2>{% trans "Payment events" %}</h2>
</div>
{% if notification %}
<div class="alert alert-success">
{{ notification }}
</div>
{% endif %}
<div class="member_count">
<span>{% trans "Payments in register:" %} {{ payment_count }}</span>
</div>
<div>
<form class="input-group" method="GET" action="/members/payments">
<input class="form-control" type="text" name="q" placeholder="Teemu Teekkari" />
<span class="input-group-btn">
<input type="submit" class="btn" value="{% trans "Search" %}" />
</span>
</form>
</div>
{% if request.GET.q %}
<div>
<div class="alert alert-info" role="alert">
{% trans "Showing results for" %} "{{ request.GET.q }}"
</div>
</div>
{% endif %}
{{ table|safe }}
<div>
<a href="/members/export_payments" class="btn btn-info">{% trans "Download Excel" %}</a>
</div>
</div>
{% endblock content %}
+27
View File
@@ -0,0 +1,27 @@
{% extends "base.html" %}
{% load static %}
{% load i18n %}
{% block content %}
{% get_current_language as LANGUAGE_CODE %}
<div>
<div>
<h3>{% trans "Settings" %}</h3>
</div>
<div>
<form action="/i18n/setlang/" method="post" class="form-group"> {% csrf_token %}
<h4>{% trans "Language" %}</h4>
<select name="language" class="form-control">
<option value="fi" {% if LANGUAGE_CODE == "fi" %} selected {% endif %}>{% trans "Finnish" %}</option>
<option value="en" {% if LANGUAGE_CODE == "en" %} selected {% endif %}>{% trans "English" %}</option>
</select>
<input type="submit" class="btn btn-success" value="{% trans "Submit" %}">
</form>
</div>
</div>
{% endblock content %}
+10
View File
@@ -0,0 +1,10 @@
{% extends "members/base.html" %}
{% block content %}
<h1>{{ title }}</h1>
<h3>{{ header }}</h3>
<form method="POST" action="/members/import_excel" enctype="multipart/form-data">{% csrf_token %}
{{ form }}
<input type="submit" class="btn btn-primary">
</form>
{% endblock %}