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

Members style cleanup, starting to look good

Browse Source
This commit is contained in:
Jan Tuomi
2017-05-13 01:19:37 +03:00
parent 9a87ba56b5
commit 44e8ffb57d
10 changed files with 182 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
global_static/css/footer.css
+2 -8
View File
@@ -1,16 +1,10 @@
#footer-div { #footer-div {
height:10vh; height:10vh;
} }
.footer { .footer {
position: fixed;
bottom: 0;
left: 0;
right: 0;
text-align: center; text-align: center;
background-color: #cfcfcf; margin-top: 2rem;
padding: 1rem;
max-height: 10vh;
font-size: 3vh;
} }
#fi-button { #fi-button {
members/static/css/members.css
+29 -9
View File
@@ -8,6 +8,14 @@ div {
input { input {
padding: 0.5rem; padding: 0.5rem;
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
#wrapper {
padding-right: 0;
padding-top: 0;
padding-bottom: 0;
} }
/* fixes for the sidebar layout */ /* fixes for the sidebar layout */
@@ -23,6 +31,8 @@ input {
left: 0; left: 0;
width: 100%; width: 100%;
padding-top: 0.5rem; padding-top: 0.5rem;
height: 100%;
position: relative;
} }
.sidebar-nav li ul { .sidebar-nav li ul {
@@ -43,15 +53,10 @@ input {
margin-left: 20px; margin-left: 20px;
} }
.content-area { #header h1 {
padding-left: 15px; margin-bottom: 5rem;
padding-right: 15px; margin-top: 2rem;
padding-bottom: 2rem; text-align: center;
}
.content-area-title {
text-align: left;
float: left;
} }
.table-button { .table-button {
@@ -64,6 +69,11 @@ input {
text-align: right; text-align: right;
} }
.pagination li {
padding: 0.5rem;
margin: 0.5rem;
}
#filter-collapser { #filter-collapser {
float: right; float: right;
margin-left: 1rem; margin-left: 1rem;
@@ -114,4 +124,14 @@ input {
.inline-title { .inline-title {
display: inline; display: inline;
}
.logout-container {
bottom: 1rem;
position: absolute;
width: 100%;
}
.logout-container input {
width: 80%;
} }
members/templates/application_list.html
+4 -4
View File
@@ -4,10 +4,10 @@
{% block content %} {% block content %}
<div> <div>
<h3>{% trans "Member applications" %}</h3> <h3 class="inline-title">{% trans "Member applications" %}</h3>
</div>
<div> <div>
{{ table|safe }} {{ table|safe }}
</div>
</div> </div>
{% endblock content %} {% endblock content %}
members/templates/member_list.html
+44 -41
View File
@@ -6,52 +6,55 @@
{% block content %} {% block content %}
<div> <div>
<a id="filter-collapser" href="#collapse-filters" data-toggle="collapse" class="btn btn-info">
{% trans "Show filters" %} <div>
</a> <h3 class="inline-title">{% trans "Member register" %}</h3>
<a id="download-csv" class="btn btn-info">{% trans "Download CSV" %}</a>
</div>
{{ table|safe }}
<form action="/members/list" method="POST" id="collapse-filters" class="collapse filter-form"> <form action="/members/list" method="POST" id="collapse-filters" class="collapse filter-form">
<div class="filter-row"> <div class="filter-row">
<div class="filter-group"> <div class="filter-group">
<div class="filter-field"> <div class="filter-field">
<input class="form-control" type="text" id="search-filter" placeholder="{% trans "Search" %}" > <input class="form-control" type="text" id="search-filter" placeholder="{% trans "Search" %}" >
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<h5>{% trans "Added after" %}</h5>
<input type="datetime-local" id="addedAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Added before" %}</h5>
<input type="datetime-local" class="filter-field" id="addedBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<h5>{% trans "Paid after" %}</h5>
<input type="datetime-local" class="filter-field" id="paidAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Paid before" %}</h5>
<input type="datetime-local" class="filter-field" id="paidBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<input type="button" value="{% trans "Filter" %}" class="filter-button btn btn-success">
<input type="button" value="{% trans "Reset" %}" class="filter-button btn btn-warning">
</div>
</div> </div>
</div> </div>
</form> <div class="filter-group">
<div class="row content-area"> <div class="filter-field">
<div class="form-inline col-md-12 last-filter"> <h5>{% trans "Added after" %}</h5>
<div class="content-area-title form-group"> <input type="datetime-local" id="addedAfterDatePicker">
<h3 class="inline-title">{% trans "Member register" %}</h3> </div>
<input type="button" value="{% trans "Download CSV" %}" id="download-csv" class="btn btn-info" ng-click="loadCSV()"/> <div class="filter-field">
<h5>{% trans "Added before" %}</h5>
<input type="datetime-local" class="filter-field" id="addedBeforeDatePicker">
</div> </div>
</div> </div>
{{ table|safe }} <div class="filter-group">
<div class="filter-field">
<h5>{% trans "Paid after" %}</h5>
<input type="datetime-local" class="filter-field" id="paidAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Paid before" %}</h5>
<input type="datetime-local" class="filter-field" id="paidBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<input type="button" value="{% trans "Filter" %}" class="filter-button btn btn-success">
<input type="button" value="{% trans "Reset" %}" class="filter-button btn btn-warning">
</div>
</div>
</div>
</form>
<div>
<a id="filter-collapser" href="#collapse-filters" data-toggle="collapse" class="btn btn-info">
{% trans "Show filters" %}
</a>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}
members/templates/members_base.html
+23 -17
View File
@@ -47,40 +47,46 @@
<li> <li>
<span class="text-primary">{% trans "Payments" %}</span> <span class="text-primary">{% trans "Payments" %}</span>
<ul> <ul>
<a href="/members/payments">{% trans "List payments" %}</a></li> <li><a href="/members/payments">{% trans "List payments" %}</a></li>
<a href="/members/payment_add">{% trans "Add payment" %}</a></li> <li><a href="/members/payment_add">{% trans "Add payment" %}</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<span class="text-primary">{% trans "Applications" %}</span> <span class="text-primary">{% trans "Applications" %}</span>
<ul> <ul>
<a href="/members/applications">{% trans "List applications" %}</a></li> <li><a href="/members/applications">{% trans "List applications" %}</a></li>
<a href="/members/application">{% trans "Application form" %}</a></li> <li><a href="/members/application">{% trans "Application form" %}</a></li>
</ul> </ul>
</li> </li>
<li class="logout-container">
<ul>
<li><a href="/members/settings">{% trans "Settings" %}</a></li>
</ul>
<form action="/logout" method="post"> {% csrf_token %}
<input type="Submit" value="{% trans "Log out" %}" name="Logout" class="btn btn-danger"/>
</form>
</li>
</ul> </ul>
</div> </div>
<!-- /#sidebar-wrapper --> <!-- /#sidebar-wrapper -->
<div class="logout-button">
<form action="/logout" method="post"> {% csrf_token %}
<input type="Submit" value="{% trans "Log out" %}" name="Logout" class="btn btn-danger"/>
</form>
</div>
<!-- Page Content --> <div class="page-content-container">
<div class="col-xs-12 col-sm-12 col-lg-12"> <!-- Page Content -->
<div id="header" class="row"> <div id="header">
<div class="col-xs-11 col-sm-11 col-lg-11"> <h1>
<h1 style="text-align:center; margin-top:10px; margin-bottom: 10px;"> {% trans "Member register of SIK ry" %}
{% trans "Member register of SIK ry" %} </h1>
</h1>
</div>
</div> </div>
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}
</div> </div>
{% include "footer.html" %} {% include "footer.html" %}
</div> </div>
</body> </body>
members/templates/payment_list.html
+46 -46
View File
@@ -4,53 +4,53 @@
{% load i18n %} {% load i18n %}
{% block content %} {% block content %}
<div> <div>
<a id="filter-collapser" href="#collapse-filters" data-toggle="collapse" class="btn btn-info"> <div>
{% trans "Show filters" %} <h3 class="inline-title">{% trans "Payment events" %}</h3>
</a> <a id="download-csv" class="btn btn-info">{% trans "Download CSV" %}</a>
<form action="/members/list" method="POST" id="collapse-filters" class="collapse filter-form"> </div>
<div class="filter-row">
<div class="filter-group">
<div class="filter-field">
<input class="form-control" type="text" id="search-filter" placeholder="{% trans "Search" %}" >
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<h5>{% trans "Added after" %}</h5>
<input type="datetime-local" id="addedAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Added before" %}</h5>
<input type="datetime-local" class="filter-field" id="addedBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<h5>{% trans "Paid after" %}</h5>
<input type="datetime-local" class="filter-field" id="paidAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Paid before" %}</h5>
<input type="datetime-local" class="filter-field" id="paidBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<input type="button" value="{% trans "Filter" %}" class="filter-button btn btn-success">
<input type="button" value="{% trans "Reset" %}" class="filter-button btn btn-warning">
</div>
</div>
</div>
</form>
<div class="row content-area">
<div class="form-inline col-md-12 last-filter">
<div class="content-area-title form-group">
<h3 class="inline-title">{% trans "Member register" %}</h3>
<input type="button" value="{% trans "Download CSV" %}" id="download-csv" class="btn btn-info" ng-click="loadCSV()"/>
</div>
</div>
{{ table|safe }} {{ table|safe }}
<form action="/members/list" method="POST" id="collapse-filters" class="collapse filter-form">
<div class="filter-row">
<div class="filter-group">
<div class="filter-field">
<input class="form-control" type="text" id="search-filter" placeholder="{% trans "Search" %}" >
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<h5>{% trans "Added after" %}</h5>
<input type="datetime-local" id="addedAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Added before" %}</h5>
<input type="datetime-local" class="filter-field" id="addedBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<h5>{% trans "Paid after" %}</h5>
<input type="datetime-local" class="filter-field" id="paidAfterDatePicker">
</div>
<div class="filter-field">
<h5>{% trans "Paid before" %}</h5>
<input type="datetime-local" class="filter-field" id="paidBeforeDatePicker">
</div>
</div>
<div class="filter-group">
<div class="filter-field">
<input type="button" value="{% trans "Filter" %}" class="filter-button btn btn-success">
<input type="button" value="{% trans "Reset" %}" class="filter-button btn btn-warning">
</div>
</div>
</div>
</form>
<div>
<a id="filter-collapser" href="#collapse-filters" data-toggle="collapse" class="btn btn-info">
{% trans "Show filters" %}
</a>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}
members/templates/settings.html
+24
View File
@@ -0,0 +1,24 @@
{% extends "members_base.html" %}
{% load static %}
{% load i18n %}
{% block content %}
<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">{% trans "Finnish" %}</option>
<option value="en">{% trans "English" %}</option>
</select>
<input type="submit" class="btn btn-success">
</form>
</div>
</div>
{% endblock content %}
members/urls.py
+4 -1
View File
@@ -2,7 +2,7 @@ from django.conf.urls import url
from django.views.generic.base import RedirectView from django.views.generic.base import RedirectView
# members # members
from members.views import member_list, payment_add, payment_submit from members.views import member_list, payment_add, payment_submit, settings_page
from members.views import member_add from members.views import member_add
from members.views import member_add_many from members.views import member_add_many
from members.views import member_edit from members.views import member_edit
@@ -62,6 +62,9 @@ urlpatterns = [
# add payment event # add payment event
url(r'^payment_add', payment_add), url(r'^payment_add', payment_add),
# settings page
url(r'^settings', settings_page),
# favourite icon # favourite icon
url(r'^favicon\.ico$', favicon_view), url(r'^favicon\.ico$', favicon_view),
] ]
members/views.py
+6
View File
@@ -257,6 +257,12 @@ def payment_submit(request, *args, **kwargs):
print(form.errors) print(form.errors)
return HttpResponse('oh shit') return HttpResponse('oh shit')
@ensure_csrf_cookie
@require_http_methods(["GET"])
@permission_required('members.change_member', login_url='/login')
def settings_page(request, *args, **kwargs):
return render(request, 'settings.html', {})
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.change_member', login_url='/login') @permission_required('members.change_member', login_url='/login')
templates/footer.html
-4
View File
@@ -3,10 +3,6 @@
{% load staticfiles %} {% load staticfiles %}
<link rel="stylesheet" href="{% static "css/footer.css" %}"> <link rel="stylesheet" href="{% static "css/footer.css" %}">
<div class="footer"> <div class="footer">
<form action="/i18n/setlang/" method="post"> {% csrf_token %}
<button id="fi-button" class="lang-button" name="language" value="fi"></button>
<button id="en-button" class="lang-button" name="language" value="en"></button>
</form>
<div> <div>
{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %} {% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}
</div> </div>