Merge branch 'feature/new-template' into 'master'

Introduce new base template and design

Closes #714, #137, and #705

See merge request !965

Pipfile

@@ -27,6 +27,7 @@ django_celery_results = "*"
 bcrypt = "*"
 "argon2_cffi" = "*"
 uWSGI = "*"
+"django-bootstrap4" = "*"
 
 [dev-packages]
 django-template-check = "*"

Pipfile.lock

 {
     "_meta": {
         "hash": {
-            "sha256": "7750f2ad7d1e987b593d8967ec80439c691a1d15611647391de52d8e78e906eb"
+            "sha256": "c80e130e95a1fe6db47eed9c691f4dc14326b1e95747fc2b4edc07d11f731cb2"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -41,6 +41,7 @@
                 "sha256:d371fcd42e01c78c76397120d07c67f6e16f5fef97d327ad372c8debe38f9f56",
                 "sha256:ec12248d4c1e045a736beebf55daf1430c45a29ab8d773d8540c224555784275"
             ],
+            "markers": "python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version >= '2.7'",
             "version": "==18.3.0"
         },
         "bcrypt": {
@@ -147,6 +148,7 @@
                 "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
                 "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
             ],
+            "markers": "python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version >= '2.7'",
             "version": "==1.11.5"
         },
         "chardet": {
@@ -171,6 +173,13 @@
             ],
             "version": "==1.0.2"
         },
+        "django-bootstrap4": {
+            "hashes": [
+                "sha256:32ffee49c4c8ca7df543aac8733a5d45ad304078f920a0167819525bd33a955a"
+            ],
+            "index": "pypi",
+            "version": "==0.0.7"
+        },
         "django-celery-results": {
             "hashes": [
                 "sha256:8bca2605eeff4418be7ce428a6958d64bee0f5bdf1f8e563fbc09a9e2f3d990f",
@@ -283,24 +292,21 @@
         },
         "libsass": {
             "hashes": [
-                "sha256:0f2e421d3e5a53833243e0a5f2cf7ebe9812725a7f27a797c38f3c7190ce2a82",
-                "sha256:1b74aff85f1560d629a070552ec67f9f0ff9a47446ffafddafad9944f7589ae1",
-                "sha256:1cf80c04a77d36fd77f00b1ae0a269eee780d971fabd9d493b15d30de9857ae5",
-                "sha256:1d55dfe8e91a15a7d72d7f8aca16e74da36899e70d911af66d7184f1c82e2b39",
-                "sha256:23755425149fe0f576fd0ab7bcd151fe09400b2d980fe176c28f6c19e053c830",
-                "sha256:4a434d5b713b97c4141fb71c59341d4ebff8669114b14c626af51e145a48710e",
-                "sha256:4dcd5b546bed977276f97eb7a2a13cb7cbf0a38d672e7b5525b7587c8cabcf27",
-                "sha256:62771c8ead9227579891814dd714be645243741aa23e5cb232ac0c245cf29a37",
-                "sha256:727fb84326ffa930bc09fad8b706e77ada4d13b3adf35cce134962a434d7eccb",
-                "sha256:7b9e7179b5f4fc32bc716f86e9ccaeb48ab90e7eb6648b339440346733af8828",
-                "sha256:a0ffca466b35fb57f2afe1f1c5fd39b4c51a4107596d28ef8c0d3bb0962244b5",
-                "sha256:bb9735066391189b3c0383254d20d59aaafb438d632d7de551c264f16486e773",
-                "sha256:cbd5ee83d3603a2b2c2937d8f06acc07b30fd22642ea2460c966d4fd6217f1d0",
-                "sha256:de1eae502764b3dde294d6652a0046489cf31008de190c4dd8d05e7f4b5e0d71",
-                "sha256:e00b6c6d75a6e912990cbc23d48ddfdbfefc3e400c20be6593988839292248c5",
-                "sha256:ed8beef197efc6e6ab0ad03cea0885b31cc11f226290783649b4dafe1fb2ea27"
-            ],
-            "version": "==0.14.5"
+                "sha256:2313f0e82de034eea59443c8f69420c60c55f7c07fd3b59ea7e7a108b36e9d86",
+                "sha256:81d63f915d12bbff9931beac3eb6e20c17c40a0da06c3f0173bbacd6568c302c",
+                "sha256:8731fb9b4d3151b82d46a4495c8e2b322705cacbcb963c4bfe51d8a5a0c016e7",
+                "sha256:938518d827905c83d774a190cc6257b8183edea577485c20de7d49af5ccbeea6",
+                "sha256:95109c996ea5cf598344971e7c50847930f1d5dc110b4fc989c047d3b63c0c92",
+                "sha256:99d952ac9315af4494eedb1c38e13a16c7c49a6ca056262353e9433f086a1fe3",
+                "sha256:9c87df48b541276cc8b03316ab558b4019f16e158786923950926a6ce756124a",
+                "sha256:9f740659ec137cafbfd2298e77f21ceb1e40d30c578bd047e55e09da9220048e",
+                "sha256:a1315327c134d5ec8f90b4185e1ff2369be0108733f1be0c2ae8ba629c514ef1",
+                "sha256:bcbbb4fdd3117e00dc43594fe7e3b10fe17ada8932734287b2680fca18e118c9",
+                "sha256:daa7ea2b3b24585cff907320d071992ffea3ba36c4523f90798f27d1c4a9ef66",
+                "sha256:e0046d841469df8f578d7bbeb6859502cd4b09b9d559451a35392256423559ea",
+                "sha256:e39800d946b9b11d956f02e158eeb85b86ae5b801e63c335f83609d2811b643a"
+            ],
+            "version": "==0.15.1"
         },
         "pillow": {
             "hashes": [
@@ -336,7 +342,7 @@
                 "sha256:f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab"
             ],
             "index": "pypi",
-            "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*'",
+            "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'",
             "version": "==5.2.0"
         },
         "psycopg2-binary": {
@@ -377,9 +383,10 @@
         },
         "pycparser": {
             "hashes": [
-                "sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"
+                "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"
             ],
-            "version": "==2.18"
+            "markers": "python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version >= '2.7'",
+            "version": "==2.19"
         },
         "pyfcm": {
             "hashes": [
@@ -439,6 +446,7 @@
                 "sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1",
                 "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"
             ],
+            "markers": "python_version != '3.2.*' and python_version >= '2.6' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version < '4'",
             "version": "==2.19.1"
         },
         "requests-toolbelt": {
@@ -446,6 +454,7 @@
                 "sha256:42c9c170abc2cacb78b8ab23ac957945c7716249206f90874651971a4acff237",
                 "sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"
             ],
+            "markers": "python_version != '3.2.*' and python_version >= '2.6' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version < '4'",
             "version": "==0.8.0"
         },
         "rjsmin": {
@@ -466,7 +475,7 @@
                 "sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf",
                 "sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5"
             ],
-            "markers": "python_version != '3.2.*' and python_version < '4' and python_version != '3.3.*' and python_version >= '2.6' and python_version != '3.0.*' and python_version != '3.1.*'",
+            "markers": "python_version != '3.2.*' and python_version >= '2.6' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version < '4'",
             "version": "==1.23"
         },
         "uwsgi": {
@@ -561,11 +570,11 @@
         },
         "faker": {
             "hashes": [
-                "sha256:ea7cfd3aeb1544732d08bd9cfba40c5b78e3a91e17b1a0698ab81bfc5554c628",
-                "sha256:f6d67f04abfb2b4bea7afc7fa6c18cf4c523a67956e455668be9ae42bccc21ad"
+                "sha256:74b32991f8e08e4f2f84858b919eca253becfaec4b3fa5fcff7fdbd70d5d78b1",
+                "sha256:c2ce42dd8361e6d392276006d757532562463c8642b1086709584200b7fd7758"
             ],
             "index": "pypi",
-            "version": "==0.9.0"
+            "version": "==0.9.1"
         },
         "flake8": {
             "hashes": [
@@ -581,7 +590,7 @@
                 "sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8",
                 "sha256:ec9ef8f4a9bc6f71eec99e1806bfa2de401650d996c59330782b89a5555c1497"
             ],
-            "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*'",
+            "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'",
             "version": "==4.3.4"
         },
         "lazy-object-proxy": {
@@ -659,7 +668,7 @@
                 "sha256:f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab"
             ],
             "index": "pypi",
-            "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*'",
+            "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'",
             "version": "==5.2.0"
         },
         "pluggy": {
@@ -667,7 +676,7 @@
                 "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1",
                 "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1"
             ],
-            "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*'",
+            "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'",
             "version": "==0.7.1"
         },
         "py": {
@@ -675,7 +684,7 @@
                 "sha256:06a30435d058473046be836d3fc4f27167fd84c45b99704f2fb5509ef61f9af1",
                 "sha256:50402e9d1c9005d759426988a492e0edaadb7f4e68bcddfea586bc7432d009c6"
             ],
-            "markers": "python_version != '3.3.*' and python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'",
+            "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'",
             "version": "==1.6.0"
         },
         "pycodestyle": {
@@ -749,20 +758,27 @@
             ],
             "version": "==1.2"
         },
+        "toml": {
+            "hashes": [
+                "sha256:380178cde50a6a79f9d2cf6f42a62a5174febe5eea4126fe4038785f1d888d42",
+                "sha256:a7901919d3e4f92ffba7ff40a9d697e35bbbc8a8049fe8da742f34c83606d957"
+            ],
+            "version": "==0.9.6"
+        },
         "tox": {
             "hashes": [
-                "sha256:37cf240781b662fb790710c6998527e65ca6851eace84d1595ee71f7af4e85f7",
-                "sha256:eb61aa5bcce65325538686f09848f04ef679b5cd9b83cc491272099b28739600"
+                "sha256:7f802b37fffd3b5ef2aab104943fa5dad24bf9564bb7e732e54b8d0cfec2fca0",
+                "sha256:cc97859bd7f38aa5b3b8ba55ffe7ee9952e7050faad1aedc0829cd3db2fb61d6"
             ],
             "index": "pypi",
-            "version": "==3.2.1"
+            "version": "==3.4.0"
         },
         "virtualenv": {
             "hashes": [
                 "sha256:2ce32cd126117ce2c539f0134eb89de91a8413a29baac49cbab3eb50e2026669",
                 "sha256:ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752"
             ],
-            "markers": "python_version != '3.0.*' and python_version != '3.1.*' and python_version >= '2.7' and python_version != '3.2.*'",
+            "markers": "python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'",
             "version": "==16.0.0"
         },
         "wrapt": {

docs/thaliawebsite.templatetags.rst

@@ -33,6 +33,14 @@ thaliawebsite.templatetags.fieldtype module
     :undoc-members:
     :show-inheritance:
 
+thaliawebsite.templatetags.grid\_item module
+--------------------------------------------
+
+.. automodule:: thaliawebsite.templatetags.grid_item
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 thaliawebsite.templatetags.menu module
 --------------------------------------
 

website/activemembers/templates/activemembers/board_detail.html

-{% extends 'base.html' %}
-{% load i18n thumbnail static bleach_tags %}
+{% extends 'activemembers/membergroup_detail.html' %}
+{% load i18n %}
 
-{% block title %}{% trans "Board" %} {{ board.since.year }}-{{ board.until.year }} — {% trans "Boards" %} — {{ block.super }}{% endblock %}
-{% block opengraph_title %}{% trans "Board" %} {{ board.since.year }}-{{ board.until.year }} — {% trans "Boards" %} — {{ block.super }}{% endblock %}
-
-{% block body %}
-<h1>
-  {% trans "Board" %} {{ board.since.year }}-{{ board.until.year }}
-  <span class="title-meta clearfix">
-    <span>
-      <a class="back" href="{% url 'activemembers:boards' %}" id="collectionButton"></a>
-    </span>
-  </span>
-</h1>
-<div class="portfolio"></div>
-<div class="clearfix portfolio">
-  <div id="committee-div">
-    <div class="row">
-      {% if board.photo %}
-      <img alt="{{ board.name }}" class="span12" src="{% thumbnail board.photo '1024x683' fit=False %}">
-      {% else %}
-      <img alt="{{ board.name }}" class="span12" src="{% static 'activemembers/images/placeholder.png' %}">
-      {% endif %}
-    </div>
-    {% if board.description %}
-      <div class="text-center">
-          <h1 class="midhead">{% blocktrans with name=board.name%}About {{ name }}{% endblocktrans %}</h1>
-          {{ board.description|bleach }}
-      </div>
-    {% endif %}
-    <div class="clearfix member-directory">
-      <h1 class="midhead">{% trans 'Board members' %}</h1>
-      <ul class="row" id="commissieleden">
-        {% for member in members %}
-        <li class="post member-item span3 has-overlay">
-          <a href="{{ member.get_absolute_url }}">
-            <div class="post-inner">
-              <div class="inner-img">
-                {% if not member.profile.photo %}
-                <img alt="{{ member.profile.display_name }}" src="{% static 'members/images/default-avatar.jpg' %}" height="220" width="220" />
-                {% else %}
-                <img alt="{{ member.profile.display_name }}" src="{% thumbnail member.profile.photo '220x220' %}" width="220" height="220" />
-                {% endif %}
-              </div>
-              {% if member.chair %}
-              <div class="ribbon-wrapper-basiskleur">
-                <div class="ribbon-basiskleur">
-                  {% trans "Chair" %}
-                </div>
-              </div>
-              {% endif %}
-              <div class="post-overlay">
-                <div class="post-overlay-meta">
-                  <h2>{{ member.profile.display_name }}</h2>
-                  <p>{{ member.role }}</p>
-                </div>
-              </div>
-              <div class="post-body avatar-subtitle">
-                {{ member.profile.display_name }}
-              </div>
-            </div>
-          </a>
-        </li>
-        {% empty %}
-        <li>{% trans "This board doesn't have any members?" %}</li>
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-</div>
-{% endblock %}
+{% block title %}{{ membergroup.name }} — {% trans "Boards" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{{ membergroup.name }} — {% trans "Boards" %} — {{ block.super }}{% endblock %}

website/activemembers/templates/activemembers/board_index.html

 {% extends "base.html" %}
-{% load i18n thumbnail static %}
+{% load i18n thumbnail static activemembers_cards %}
 {% block title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %}
 {% block opengraph_title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %}
 
 {% block body %}
-<h1>{% trans 'The board' %}</h1>
-
-<p style="text-align: center;">
-{% blocktrans trimmed %}
-  Thalia's board makes sure all operations during the academic year are taken care of, in front or behind the scenes. If you have any questions then you can address them during the day or, if you're not always on the campus, you're always welcome to <a href="mailto:info@thalia.nu">send them an email</a>.
-{% endblocktrans %}
-</p>
-
-<div class="clearfix portfolio">
-  <div id="committee-div">
-    <a href="{{ board.get_absolute_url }}">
-        <div class="row">
-          {% if board.photo %}
-          <img alt="{{ board.name }}" class="span12" src="{% thumbnail board.photo '1024x683' fit=False %}">
-          {% else %}
-          <img alt="{{ board.name }}" class="span12" src="{% static 'activemembers/images/placeholder.png' %}">
-          {% endif %}
+    <section id="activemembers-boards" class="page-section">
+        <div class="container">
+            <h1 class="text-center section-title">
+                {% trans 'The board' %}
+            </h1>
+
+            <p class="text-center">
+                {% blocktrans trimmed %}
+                    Thalia's board makes sure all operations during the academic year are taken care of, in front or
+                    behind the scenes. If you have any questions then you can address them during the day or, if you're
+                    not always on the campus, you're always welcome to
+                    <a href="mailto:info@thalia.nu">send them an email</a>.
+                {% endblocktrans %}
+            </p>
+
+            <div class="row">
+                <a href="{{ board.get_absolute_url }}" class="current-board col-12 text-center">
+                    {% if board.photo %}
+                        <img alt="{{ board.name }}"
+                             src="{% thumbnail board.photo '1024x683' fit=False %}">
+                    {% else %}
+                        <img alt="{{ board.name }}"
+                             src="{% static 'activemembers/images/placeholder.png' %}">
+                    {% endif %}
+                </a>
+            </div>
         </div>
-    </a>
-
-    <div class="clearfix">
-      <h1 class="midhead">{% trans 'Old boards' %}</h1>
-      <div id="committees">
-        <ul class="row committees">
-          {% for board in old_boards %}
-          <li class="post member-item span3 has-overlay">
-            <a href="{{ board.get_absolute_url }}">
-
-              <div class="post-inner">
-                <div class="inner-img">
-                  {% if board.photo %}
-                  <img src="{% thumbnail board.photo '220x220' fit=False %}" alt="{% blocktrans with name=board.name %}Photo of {{ name }}{% endblocktrans %}">
-                  {% else %}
-                  <img height="220" width="220" src="{% static 'activemembers/images/placeholder.png' %}">
-                  {% endif %}
-                </div>
-
-                <div class="post-overlay">
-                  <div class="post-overlay-meta">
-                    <h2>{% trans "Board" %} {{ board.since.year }}-{{ board.until.year }}</h2>
-                  </div>
-                </div>
-
-                <div class="post-body avatar-subtitle">
-                  {% trans "Board" %} {{ board.since.year }}-{{ board.until.year }}
-                </div>
-              </div>
-            </a>
-          </li>
-
-          {% empty %}
-          {% trans 'There are no boards!' %}
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
+    </section>
+    <section class="page-section">
+        <div class="container">
+            <h1 class="text-center section-title">
+                {% trans 'Old boards' %}
+            </h1>
+
+            <div class="row mt-4">
+                {% for board in old_boards %}
+                    <div class="col-4 col-md-3 my-3">
+                        {% membergroup_card board %}
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    </section>
 {% endblock %}

website/activemembers/templates/activemembers/committee_detail.html

-{% extends "base.html" %}
-{% load i18n static thumbnail bleach_tags %}
-{% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
-{% block opengraph_title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
+{% extends "activemembers/membergroup_detail.html" %}
+{% load i18n %}
 
-{% block body %}
-<h1>{{ committee.name }}
-  <span class="title-meta clearfix">
-    <span>
-      <a class="back" href="{% url 'activemembers:committees' %}" id="collectionButton"></a>
-    </span>
-  </span>
-</h1>
-<div class="portfolio"></div>
-<div class="clearfix portfolio">
-  <div id="committee-div">
-    <div class="row">
-      {% if committee.photo %}
-      <img alt="{% blocktrans with name=committee.name %}Photo of {{ name }}{% endblocktrans %}" class="span12" src="{% thumbnail committee.photo '1024x683' fit=False %}">
-      {% else %}
-      <img alt="{% blocktrans with name=committee.name %}Photo of {{ name }}{% endblocktrans %}" class="span12" src="{% static 'activemembers/images/placeholder.png' %}">
-      {% endif %}
-    </div>
-    <div class="text-center">
-      <h1 class="midhead">{% blocktrans with name=committee.name %}About the {{ name }}{% endblocktrans %}</h1>
-      {{ committee.description|bleach }}
-    </div>
-    <div class="clearfix member-directory">
-      <h1 class="midhead">{% trans 'Committee members' %}</h1>
-      <ul class="row" id="members">
-        {% for member in members %}
-        <li class="post member-item span3 has-overlay">
-          <a href="{{ member.get_absolute_url }}">
-            <div class="post-inner">
-              <div class="inner-img">
-                {% if not member.profile.photo %}
-                <img alt="{{ member.profile.display_name }}" src="{% static 'members/images/default-avatar.jpg' %}" height="220" width="220" />
-                {% else %}
-                <img alt="{{ member.profile.display_name }}" src="{% thumbnail member.profile.photo '220x220' %}" width="220" height="220" />
-                {% endif %}
-              </div>
-              {% if member.chair %}
-              <div class="ribbon-wrapper-basiskleur">
-                <div class="ribbon-basiskleur">
-                  {% trans "Chair" %}
-                </div>
-              </div>
-              {% endif %}
-              <div class="post-overlay">
-                <div class="post-overlay-meta">
-                  <h2>{{ member.profile.display_name }}</h2>
-                  <p>
-                  {% if member.member_since.year == 1970 %}
-                  {% blocktrans %}Committee member since: ?{% endblocktrans %}
-                  {% else %}
-                  {% blocktrans with since=member.member_since|date:"Y" %}Committee member since: {{ since }}{% endblocktrans %}
-                  {% endif %}
-                  </p>
-                  {% if member.role %}
-                  <p>{{ member.role }}</p>
-                  {% endif %}
-                </div>
-              </div>
-              <div class="post-body avatar-subtitle">
-                {{ member.profile.display_name }}
-              </div>
-            </div>
-          </a>
-        </li>
-        {% empty %}
-        <li>{% trans "This committee doesn't have any members?" %}</li>
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-</div>
-{% endblock %}
+{% block title %}{{ membergroup.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{{ membergroup.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}

website/activemembers/templates/activemembers/committee_index.html

 {% extends "base.html" %}
-{% load i18n thumbnail static %}
+{% load i18n thumbnail static activemembers_cards %}
 {% block title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %}
 {% block opengraph_title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %}
 
 {% block body %}
-<h1>{% trans 'committees'|capfirst %}</h1>
+    <section id="activemembers-committees" class="page-section">
+        <div class="container">
+            <h1 class="text-center section-title">
+                {% trans 'committees'|capfirst %}
+            </h1>
 
-<div class="clearfix portfolio">
-  <div id="committees">
-    <ul class="row committees">
-      {% for committee in committees %}
-      <li class="post member-item span3 has-overlay">
-        <a href="{{ committee.get_absolute_url }}">
-
-          <div class="post-inner">
-            <div class="inner-img">
-              {% if committee.photo %}
-              <img src="{% thumbnail committee.photo '220x220' fit=False %}" alt="Photo of {{ committee.name }}">
-              {% else %}
-              <img height="220" width="220" src="{% static 'activemembers/images/placeholder.png' %}">
-              {% endif %}
-            </div>
-
-            <div class="post-overlay">
-              <div class="post-overlay-meta">
-                <h2>{{ committee.name }}</h2>
-              </div>
+            <div class="row mt-4">
+                {% for committee in committees %}
+                    <div class="col-4 col-md-3 my-3">
+                        {% membergroup_card committee %}
+                    </div>
+                {% empty %}
+                    <div class="alert alert-danger col-10 offset-1">
+                        {% trans 'There are no committees!' %}
+                    </div>
+                {% endfor %}
             </div>
-
-            <div class="post-body avatar-subtitle">
-              {{ committee.name }}
-            </div>
-          </div>
-        </a>
-      </li>
-
-
-      {% empty %}
-      {% trans 'There are no committees!' %}
-      {% endfor %}
-    </ul>
-  </div>
-</div>
+        </div>
+    </section>
 {% endblock %}

website/activemembers/templates/activemembers/membergroup_detail.html

+{% extends "base.html" %}
+{% load i18n static thumbnail bleach_tags activemembers_cards %}
+{% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
+
+{% block body %}
+    <section id="activemembers-membergroup" class="page-section">
+        <div class="container">
+            <h1 class="text-center section-title">
+                {{ membergroup.name }}
+            </h1>
+
+            <div class="row">
+                {% if membergroup.photo %}
+                    <img alt="{{ membergroup.name }}" class="col-12"
+                         src="{% thumbnail membergroup.photo '1024x683' fit=False %}">
+                {% else %}
+                    <img alt="{{ membergroup.name }}" class="col-12"
+                         src="{% static 'activemembers/images/placeholder.png' %}">
+                {% endif %}
+            </div>
+        </div>
+    </section>
+
+    <section id="activemembers-membergroup-members" class="page-section">
+        <div class="container">
+            <h1 class="text-center section-title">
+                {% trans 'Members' %}
+            </h1>
+
+            <div class="row">
+                {% for member in members %}
+                    <div class="col-4 col-md-3 my-3">
+                        {% membergroup_member_card member %}
+                    </div>
+
+                {% empty %}
+                    <div class="alert alert-danger col-10 offset-1">
+                        {% trans "This group doesn't have any members?" %}
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    </section>
+{% endblock %}

website/activemembers/templates/activemembers/society_detail.html

 {% extends "base.html" %}