From aaf7714aea19e78d3c6121a314c96aab87fb3469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Fri, 4 Nov 2016 20:28:22 +0100 Subject: [PATCH] Show photo albums to members only and only the albums made during their membership --- .../photos/css/{style.css => style.scss} | 0 website/photos/templates/photos/album.html | 50 +++++----- website/photos/templates/photos/index.html | 96 +++++++++++-------- website/photos/views.py | 58 ++++++++++- 4 files changed, 136 insertions(+), 68 deletions(-) rename website/photos/static/photos/css/{style.css => style.scss} (100%) diff --git a/website/photos/static/photos/css/style.css b/website/photos/static/photos/css/style.scss similarity index 100% rename from website/photos/static/photos/css/style.css rename to website/photos/static/photos/css/style.scss diff --git a/website/photos/templates/photos/album.html b/website/photos/templates/photos/album.html index 713b41b2..7cd5334a 100644 --- a/website/photos/templates/photos/album.html +++ b/website/photos/templates/photos/album.html @@ -1,9 +1,11 @@ {% extends 'base.html' %} {% load staticfiles i18n thumbnail shared_thumbnail %} +{% block title %}{{ album.title }} — {% trans "Photos" %} — {{ block.super }}{% endblock %} + {% block css_head %} {{ block.super }} - + {% endblock %} {% block body %} @@ -18,29 +20,29 @@

{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/website/photos/templates/photos/index.html b/website/photos/templates/photos/index.html index e0b9eb67..f83801dc 100644 --- a/website/photos/templates/photos/index.html +++ b/website/photos/templates/photos/index.html @@ -1,53 +1,69 @@ {% extends 'base.html' %} {% load i18n thumbnail staticfiles %} +{% block title %}{% trans "Photos" %} — {{ block.super }}{% endblock %} + {% block css_head %} {{ block.super }} - + {% endblock %} {% block body %}

{% trans "Photos" %}

-
-