Be consistent about calling it profile and not account.

This commit is contained in:
Víðir Valberg Guðmundsson 2019-03-26 21:58:15 +01:00
parent bda1d77275
commit 241bc650b3
6 changed files with 18 additions and 22 deletions

View file

@ -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

View file

@ -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

View file

@ -2,8 +2,6 @@
{% load bootstrap3 %}
{% block head_title %}Account{% endblock %}
{% block profile_content %}
<div class="row">

View file

@ -6,7 +6,7 @@
{% block content %}
<div class="page-header">
<h2>Your BornHack account</h2>
<h2>Your BornHack Profile</h2>
</div>
<div class="row">

View file

@ -2,11 +2,17 @@
{% load bootstrap3 %}
{% block profile_content %}
<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 %}

View file

@ -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