Skip to content
GitLab
Commit 1fbda93a authored by Luko van der Maas's avatar Luko van der Maas
Browse files

Merge branch 'fix/new-template-members' into 'master' 

Fix pizzas classes in HTML, better member ordering by default and fix event…

See merge request thalia/concrexit!1033
parents 44ea0425 a6ba523c
Hide whitespace changes
Inline Side-by-side
website/activemembers/templates/activemembers/membergroup_detail.html
View file @ 1fbda93a
......@@ -20,6 +20,20 @@
</div>
</section>
{% if membergroup.description %}
<section id="activemembers-membergroup-description" class="page-section">
<div class="container">
<h1 class="text-center section-title">
{% trans 'Description' %}
</h1>
<div class="text-center">
{{ membergroup.description|safe }}
</div>
</div>
</section>
{% endif %}
<section id="activemembers-membergroup-members" class="page-section">
<div class="container">
<h1 class="text-center section-title">
......
website/documents/static/documents/css/style.scss
View file @ 1fbda93a
.association-document-card, .annual-document-card {
.name {
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}
.overlay {
h5 {
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}
}
&:after {
padding-bottom: 141%;
}
......@@ -27,8 +43,8 @@
}
#documents-annual {
.dropdown-years {
max-height: 200px;
overflow-y: scroll;
}
.dropdown-years {
max-height: 200px;
overflow-y: scroll;
}
}
website/education/templates/education/course.html
View file @ 1fbda93a
......@@ -125,7 +125,7 @@
{% trans "Submit Exam" %}
</a>
<a href="{% url 'education:submit-summary' course.id %}"
class="btn btn-primary">
class="btn btn-primary mt-2">
{% trans "Submit Summary" %}
</a>
{% endif %}
......
website/events/static/events/css/style.scss
View file @ 1fbda93a
......@@ -93,11 +93,11 @@
#events-index {
.fc-right {
> div {
margin-bottom: 1rem;
margin-bottom: 0.5rem;
float: right;
clear: both;
}
> button {
clear: both;
float: right;
}
}
......
website/events/static/events/js/calendarlistview.js
View file @ 1fbda93a
......@@ -20,7 +20,7 @@ ListView = View.extend({
break;
}
var date = e.start.format('YYYY-MM-DD HH:mm:ss');
var date = e.start.format('YYYY-MM-DD HH:mm');
var eventCard = $("<div>").addClass("card mb-0");
......
website/events/templates/events/event.html
View file @ 1fbda93a
......@@ -19,12 +19,12 @@
{% endfor %}
{% endif %}
<div class="m-4">
<div class="mx-4 m-lg-4">
{{ event.description|bleach }}
</div>
<div class="clearfix row">
<div class="col-6">
<div class="col-12 col-md-6 order-1">
<table class="table table-borderless">
<tbody>
<tr>
......@@ -214,7 +214,7 @@
</table>
</div>
<div class="col-6">
<div class="col-12 col-md-6 order-0 order-md-1 mb-4 mb-md-0">
<div class="location-map">
<img src="{% google_map_url event.map_location %}" alt="{{ event.location }}" />
</div>
......
website/events/templates/events/index.html
View file @ 1fbda93a
......@@ -68,7 +68,6 @@
var tmpView = ($(window).width() < 979) ? 'list' : 'agendaWeek';
if (Cookies.get('agendaview') !== undefined) {
tmpView = Cookies.get('agendaview');
console.log(tmpView);
}
// History idea and code parts from
......@@ -91,6 +90,7 @@
}
calendarElement.fullCalendar({
aspectRatio: 1.8,
theme: 'bootstrap4',
eventSources: eventSources,
defaultView: tmpView,
......@@ -155,8 +155,37 @@
}
if (view.name !== prevView) {
var windowWidth = $(window).width();
Cookies.set('agendaview', view.name);
if (view.name === 'list') {
if (windowWidth <= 768) {
calendarElement.fullCalendar('option', 'header', {
right: 'prev,next today'
});
} else {
if (view.name === 'list') {
calendarElement.fullCalendar('option', 'header', {
right: 'list,agendaWeek,month prev,next today'
});
} else {
calendarElement.fullCalendar('option', 'header', {
right: 'showBirthdays, list,agendaWeek,month prev,next today'
});
}
}
}
},
windowResize: function () {
var windowWidth = $(window).width();
var view = (windowWidth <= 768) ? 'list' : Cookies.get('agendaview');
var currentView = $('#calendar').fullCalendar('getView');
if (view !== currentView.name) {
calendarElement.fullCalendar('changeView', view);
} else if (windowWidth <= 768) {
calendarElement.fullCalendar('option', 'header', {
right: 'prev,next today'
});
} else {
if (currentView.name === 'list') {
calendarElement.fullCalendar('option', 'header', {
right: 'list,agendaWeek,month prev,next today'
});
......@@ -177,18 +206,26 @@
date.getDate() !== moment.format('DD')) {
calendarElement.fullCalendar('gotoDate', date);
}
if (view.name !== tmpView) {
calendarElement.fullCalendar('changeView', tmpView);
}
if (view.name === 'list') {
var windowWidth = $(window).width();
if (windowWidth <= 768) {
calendarElement.fullCalendar('option', 'header', {
right: 'list,agendaWeek,month prev,next today'
right: 'prev,next today'
});
} else {
calendarElement.fullCalendar('option', 'header', {
right: 'showBirthdays, list,agendaWeek,month prev,next today'
});
if (view.name === 'list') {
calendarElement.fullCalendar('option', 'header', {
right: 'list,agendaWeek,month prev,next today'
});
} else {
calendarElement.fullCalendar('option', 'header', {
right: 'showBirthdays, list,agendaWeek,month prev,next today'
});
}
}
});
</script>
......
website/members/templates/members/profile.html
View file @ 1fbda93a
......@@ -62,6 +62,7 @@
{% endif %}
</ul>
{% if achievements %}
<hr class="separator">
<h4>{% trans "Achievements for Thalia" %}</h4>
......@@ -85,6 +86,7 @@
</li>
{% endfor %}
</ul>
{% endif %}
</div>
</div>
</div>
......
website/members/views.py
View file @ 1fbda93a
......@@ -3,7 +3,7 @@ import json
from datetime import date, datetime
from django.contrib.auth.decorators import login_required, permission_required
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
from django.db.models import Q
from django.db.models import Q, F
from django.http import HttpResponse, Http404
from django.shortcuts import get_object_or_404, render
from django.template.response import TemplateResponse
......@@ -84,7 +84,8 @@ def filter_users(tab, keywords, year_range):
members_query &= Q(pk__in=memberships.values('user__pk'))
return (models.Member.objects
.filter(members_query)
.order_by('-profile__starting_year',
.annotate()
.order_by(F('profile__starting_year').desc(nulls_last=True),
'first_name'))
......
website/partners/static/partners/css/style.scss
View file @ 1fbda93a
......@@ -100,8 +100,8 @@
img {
width: auto;
height: auto;
max-width: 100%;
max-height: 100%;
max-width: 90%;
max-height: 90%;
}
}
}
......
website/partners/templates/partners/vacancies.html
View file @ 1fbda93a
......@@ -34,7 +34,7 @@
<div class="row">
{% for vacancy in vacancies %}
<div class="col-6 col-md-4 my-3 mix {% for cat in vacancy.categories.all %}category-{{ cat.id }} {% endfor %}">
<div class="col-12 col-md-6 col-lg-4 my-3 mix {% for cat in vacancy.categories.all %}category-{{ cat.id }} {% endfor %}">
{% vacancy_card vacancy %}
</div>
{% endfor %}
......
website/photos/static/photos/css/style.scss
View file @ 1fbda93a
/* Solving this with dynamic a data attribute (i.e. attr(data-rotation)) does not work, as that's a string. */
#photos-index, #photos-album {
.rotate90 {
img {
transform: rotate(90deg);
#page-content {
#photos-index, #photos-album {
.rotate90 {
img {
transform: rotate(90deg);
}
}
}
.rotate180 {
img {
transform: rotate(180deg);
.rotate180 {
img {
transform: rotate(180deg);
}
}
}
.rotate270 {
img {
transform: rotate(270deg);
.rotate270 {
img {
transform: rotate(270deg);
}
}
}
.grayscale {
img {
filter: grayscale(1);
.grayscale {
img {
filter: grayscale(1);
}
}
.grid-item.grayscale {
.overlay {
background-color: rgba(88, 88, 88, 0.6);
}
}
}
.grid-item.grayscale {
.overlay {
background-color: rgba(88, 88, 88, 0.6);
h1.section-title {
padding: 20px 40px 0 40px;
}
}
}
website/pizzas/templates/pizzas/orders.html
View file @ 1fbda93a
......@@ -7,7 +7,7 @@
{{ block.super }}{% endblock %}
{% block body %}
<section class="page-section" id="events-detail">
<section class="page-section" id="pizzas-orders">
<div class="container">
<h1 class="text-center section-title">
{% blocktrans trimmed with title=event.title %}
......
website/pizzas/templates/pizzas/overview.html
View file @ 1fbda93a
......@@ -8,7 +8,7 @@
{% block body %}
<section class="page-section" id="events-detail">
<section class="page-section" id="pizzas-overview">
<div class="container">
<h1 class="text-center section-title">
{% blocktrans trimmed with title=event.title %}
......
website/registrations/locale/nl/LC_MESSAGES/django.po
View file @ 1fbda93a
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-31 19:22+0100\n"
"PO-Revision-Date: 2018-10-31 19:20+0100\n"
"POT-Creation-Date: 2018-11-06 21:48+0100\n"
"PO-Revision-Date: 2018-11-06 21:49+0100\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -844,14 +844,13 @@ msgstr ""
#: templates/registrations/renewal.html
msgid ""
"You currently have an active membership for your entire study duration.<br/> "
"Did you graduate or stop with your studies for some other reason?<br/> "
"Please let us know by sending an email to info@thalia.nu."
"You currently have an active membership for your entire study duration. Did "
"you graduate or stop with your studies for some other reason? Please let us "
"know by sending an email to info@thalia.nu."
msgstr ""
"Je hebt op dit moment een actief lidmaatschap dat geldig is totdat je "
"afstudeert.<br/>Ben je klaar met studeren of ben je om een andere reden "
"gestopt?<br/>Laat ons dat alsjeblieft weten door een mail te sturen naar "
"info@thalia.nu."
"afstudeert. Ben je klaar met studeren of ben je om een andere reden gestopt? "
"Laat ons dat alsjeblieft weten door een mail te sturen naar info@thalia.nu."
#: templates/registrations/renewal.html
msgid "Benefactor"
......
website/registrations/templates/registrations/renewal.html
View file @ 1fbda93a
......@@ -117,14 +117,12 @@
{% endblocktrans %}
</p>
{% elif latest_membership.until is None %}
<p class="text-center">
<p class="col-12 col-md-6 offset-md-3 text-center">
{% blocktrans trimmed %}
You currently have an active membership for your entire
study duration.<br/>
Did you graduate or stop with your studies for some
other reason?<br/>
Please let us know by sending an email to
info@thalia.nu.
study duration. Did you graduate or stop with your
studies for some other reason? Please let us know by
sending an email to info@thalia.nu.
{% endblocktrans %}
</p>
{% else %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment