Mergin upstream

src/project/static/css/style.css

@@ -348,3 +348,15 @@ footer {
 span.time_remaining {
   color : var(--fade);
 }
+
+.pagination {
+    display : flex;
+    justify-content : center;
+    list-style : none;
+    padding : 0;
+    margin : 0;
+}
+
+.pagination > li {
+    margin : 0 6px;
+}

src/project/templates/base.html

@@ -35,10 +35,31 @@
             </aside>
             <nav>
                 <ol>
-                    <li><a href="/" class="current">Dashboard</a></li>
+                    <li>
-                    <li><a href="/services">Services</a></li>
+                        <a href="/" class="{% active_path "index" "current" %}">
-                    <li><a href="#">Payment</a></li>
+                            Dashboard
-                    <li><a href="/membership">Settings</a></li>
+                        </a>
+                    </li>
+
+                    <li>
+                        <a href="/services" class="{% active_path "services" "current" %}">
+                            Services
+                        </a>
+                    </li>
+
+                    <li>
+                        <a href="{% url "account_email" %}" class="{% active_path "account_email" "current" %}">
+                            Email
+                        </a>
+                    </li>
+
+                    {% if perms.membership.administrate_memberships %}
+                    <li>
+                        <a href="{% url "admin-members" %}" class="{% active_path "admin-members" "current" %}">
+                            Admin
+                        </a>
+                    </li>
+                    {% endif %}
                 </ol>
             </nav>
             <article>

src/project/urls.py

@@ -13,7 +13,7 @@ from membership.views import membership_overview
 
 urlpatterns = [
     path("", login_required(index), name="index"),
-    path("services/", login_required(services_overview), name="services-overview"),
+    path("services/", login_required(services_overview), name="services"),
     path("membership/", membership_overview, name="membership-overview"),
     path("admin/members/", members_admin, name="admin-members"),
     path(

src/utils/templates/utils/list.html

@@ -48,7 +48,7 @@
     </table>
 
     {% if is_paginated %}
-        <nav aria-label="Page navigation example">
+        <nav>
             <ul class="pagination justify-content-center">
 
                 {% if not page.has_previous %}