From 241bc650b37a24120bf200f56991eddf0aa91945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Tue, 26 Mar 2019 21:58:15 +0100
Subject: [PATCH] Be consistent about calling it profile and not account.

---
 src/bornhack/urls.py                      |  9 +++------
 src/profiles/models.py                    |  5 -----
 src/profiles/templates/account/email.html |  2 --
 src/profiles/templates/profile_base.html  |  2 +-
 src/profiles/templates/profile_form.html  | 20 +++++++++++++-------
 src/templates/base.html                   |  2 +-
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/bornhack/urls.py b/src/bornhack/urls.py
index ba387fc6..e7cf17e7 100644
--- a/src/bornhack/urls.py
+++ b/src/bornhack/urls.py
@@ -19,10 +19,9 @@ from villages.views import *
 admin.site.login = login_required(admin.site.login)
 
 urlpatterns = [
-    path(
-        'profile/',
-        include('profiles.urls', namespace='profiles')
-    ),
+    path('account/', include('allauth.urls')),
+    path('account/', include('allauth_2fa.urls')),
+    path('account/', include('profiles.urls', namespace='profiles')),
     path(
         'tickets/',
         include('tickets.urls', namespace='tickets')
@@ -65,8 +64,6 @@ urlpatterns = [
         TemplateView.as_view(template_name='legal/general_terms_and_conditions.html'),
         name='general-terms'
     ),
-    path('accounts/', include('allauth.urls')),
-    path('accounts/', include('allauth_2fa.urls')),
     path('admin/', admin.site.urls),
 
     # We don't need CSRF checks for the API
diff --git a/src/profiles/models.py b/src/profiles/models.py
index 986ea120..44a2af88 100644
--- a/src/profiles/models.py
+++ b/src/profiles/models.py
@@ -1,12 +1,7 @@
 from django.contrib.auth.models import User
 from django.db import models
-from django.conf import settings
-from django.utils import timezone
-from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
 
-from datetime import timedelta
-
 from utils.models import UUIDModel, CreatedUpdatedModel
 
 
diff --git a/src/profiles/templates/account/email.html b/src/profiles/templates/account/email.html
index a5817f61..998d1b98 100644
--- a/src/profiles/templates/account/email.html
+++ b/src/profiles/templates/account/email.html
@@ -2,8 +2,6 @@
 
 {% load bootstrap3 %}
 
-{% block head_title %}Account{% endblock %}
-
 {% block profile_content %}
 
 <div class="row">
diff --git a/src/profiles/templates/profile_base.html b/src/profiles/templates/profile_base.html
index 3d01a025..070428c9 100644
--- a/src/profiles/templates/profile_base.html
+++ b/src/profiles/templates/profile_base.html
@@ -6,7 +6,7 @@
 {% block content %}
 
 <div class="page-header">
-  <h2>Your BornHack account</h2>
+  <h2>Your BornHack Profile</h2>
 </div>
 
 <div class="row">
diff --git a/src/profiles/templates/profile_form.html b/src/profiles/templates/profile_form.html
index 01a632ad..eed90371 100644
--- a/src/profiles/templates/profile_form.html
+++ b/src/profiles/templates/profile_form.html
@@ -2,11 +2,17 @@
 {% load bootstrap3 %}
 
 {% block profile_content %}
-<h4>Update Profile</h4>
-<form method="POST">
-  {% csrf_token %}
-  {% bootstrap_form form %}
-  <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Submit</button>
-  <a href="{% url 'profiles:detail' %}" class="btn btn-danger"><i class="fas fa-times"></i> Cancel</a>
-</form>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h4>Update Profile</h4>
+  </div>
+  <div class="panel-body">
+    <form method="POST">
+      {% csrf_token %}
+      {% bootstrap_form form %}
+      <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Submit</button>
+      <a href="{% url 'profiles:detail' %}" class="btn btn-danger"><i class="fas fa-times"></i> Cancel</a>
+    </form>
+  </div>
+</div>
 {% endblock profile_content %}
diff --git a/src/templates/base.html b/src/templates/base.html
index 50515f51..813764ce 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -81,7 +81,7 @@
           </ul>
           <ul class="nav navbar-nav navbar-right">
             {% if user.is_authenticated %}
-            <li><a href="{% url 'profiles:detail' %}">Account</a></li>
+            <li><a href="{% url 'profiles:detail' %}">Profile</a></li>
             <li>
               <a href="{% url 'account_logout' %}">
                 Logout