account and social logic/templates

cookbook/templates/account/email.html

@@ -6,6 +6,14 @@
 {% block title %}{% trans "E-mail Addresses" %}{% endblock %}
 
 {% block content %}
+
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="{% url 'view_settings' %}">{% trans 'Settings' %}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{% trans 'Email' %}</li>
+        </ol>
+    </nav>
+
     <h3>{% trans "E-mail Addresses" %}</h3>
     {% if user.emailaddress_set.all %}
         <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>

cookbook/templates/account/password_change.html

@@ -6,6 +6,13 @@
 {% block head_title %}{% trans "Change Password" %}{% endblock %}
 
 {% block content %}
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="{% url 'view_settings' %}">{% trans 'Settings' %}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{% trans 'Password' %}</li>
+        </ol>
+    </nav>
+
     <h1>{% trans "Change Password" %}</h1>
 
     <form method="POST" action="{% url 'account_change_password' %}" class="password_change">

cookbook/templates/account/password_set.html

@@ -6,6 +6,13 @@
 {% block head_title %}{% trans "Set Password" %}{% endblock %}
 
 {% block content %}
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="{% url 'view_settings' %}">{% trans 'Settings' %}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{% trans 'Password' %}</li>
+        </ol>
+    </nav>
+
     <h1>{% trans "Set Password" %}</h1>
 
     <form method="POST" action="{% url 'account_set_password' %}" class="password_set">

cookbook/templates/settings.html

@@ -44,23 +44,12 @@
                         class="fas fa-save"></i> {% trans 'Save' %}</button>
             </form>
 
-            <h4>{% trans 'Password Settings' %}</h4>
-            <form action="." method="post">
-                {% csrf_token %}
-                {{ password_form|crispy }}
-                <button class="btn btn-success" type="submit" name="password_form"><i
-                        class="fas fa-save"></i> {% trans 'Save' %}</button>
-            </form>
+            <h4>{% trans 'Account Settings' %}</h4>
 
-            <h4>{% trans 'Email Settings' %}</h4>
+            <a href="{% url 'account_email'%}" class="btn btn-primary">{% trans 'Emails' %}</a>
+            <a href="{% url 'account_change_password'%}" class="btn btn-primary">{% trans 'Password' %}</a>
 
-            <a href="{% url 'account_email'%}" class="btn btn-primary">{% trans 'Manage Email Settings' %}</a>
-
-            <br/><br/>
-
-            <h4>{% trans 'Social' %}</h4>
-
-            <a href="{% url 'socialaccount_connections' %}" class="btn btn-primary">{% trans 'Manage Social Accounts' %}</a>
+            <a href="{% url 'socialaccount_connections' %}" class="btn btn-primary">{% trans 'Social' %}</a>
             <br/>
             <br/>
             <br/>

cookbook/templates/socialaccount/connections.html

@@ -4,6 +4,14 @@
 {% block head_title %}{% trans "Account Connections" %}{% endblock %}
 
 {% block content %}
+
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="{% url 'view_settings' %}">{% trans 'Settings' %}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{% trans 'Social' %}</li>
+        </ol>
+    </nav>
+
     <h3>{% trans "Account Connections" %}</h3>
 
     {% if form.accounts %}

cookbook/templates/socialaccount/signup.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load crispy_forms_filters %}
 {% load i18n %}
 
 {% block head_title %}{% trans "Signup" %}{% endblock %}
@@ -6,16 +7,54 @@
 {% block content %}
     <h1>{% trans "Sign Up" %}</h1>
 
-<p>{% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to
-{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}</p>
+    <p>{% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your
+        {{ provider_name }} account to login to
+        {{ site_name }}. As a final step, please complete the following form:{% endblocktrans %}</p>
 
-<form class="signup" id="signup_form" method="post" action="{% url 'socialaccount_signup' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
-  {% endif %}
-  <button type="submit">{% trans "Sign Up" %} &raquo;</button>
-</form>
+    <form class="signup" id="signup_form" method="post" action="{% url 'socialaccount_signup' %}">
+        {% csrf_token %}
+        {% if redirect_field_value %}
+            <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
+        {% endif %}
+
+        <div class="form-group">
+            {{ form.username |as_crispy_field }}
+        </div>
+        <div class="form-group">
+            {{ form.email |as_crispy_field }}
+        </div>
+        <div class="form-group">
+            {{ form.email2 |as_crispy_field }}
+        </div>
+        {% if TERMS_URL != '' or PRIVACY_URL != '' %}
+            <div class="form-group">
+                {{ form.terms |as_crispy_field }}
+                <small>
+                    {% trans 'I accept the follwoing' %}
+                    {% if TERMS_URL != '' %}
+                        <a href="{{ TERMS_URL }}" target="_blank"
+                           rel="noreferrer nofollow">{% trans 'Terms and Conditions' %}</a>
+                    {% endif %}
+                    {% if TERMS_URL != '' or PRIVACY_URL != '' %}
+                        {% trans 'and' %}
+                    {% endif %}
+                    {% if PRIVACY_URL != '' %}
+                        <a href="{{ PRIVACY_URL }}" target="_blank"
+                           rel="noreferrer nofollow">{% trans 'Privacy Policy' %}</a>
+                    {% endif %}
+                </small>
+            </div>
+        {% endif %}
+
+        {% if CAPTCHA_ENABLED %}
+            <div class="form-group">
+                {{ form.captcha.errors }}
+                {{ form.captcha }}
+            </div>
+        {% endif %}
+
+
+        <button type="submit" class="btn btn-primary">{% trans "Sign Up" %} &raquo;</button>
+    </form>
 
 {% endblock %}

cookbook/views/views.py

@@ -303,8 +303,6 @@ def user_settings(request):
     up = request.user.userpreference
 
     user_name_form = UserNameForm(instance=request.user)
-    password_form = PasswordChangeForm(request.user)
-    password_form.fields['old_password'].widget.attrs.pop("autofocus", None)
 
     if request.method == "POST":
         if 'preference_form' in request.POST:
@@ -338,12 +336,6 @@ def user_settings(request):
                 request.user.last_name = user_name_form.cleaned_data['last_name']
                 request.user.save()
 
-        if 'password_form' in request.POST:
-            password_form = PasswordChangeForm(request.user, request.POST)
-            if password_form.is_valid():
-                user = password_form.save()
-                update_session_auth_hash(request, user)
-
     if up:
         preference_form = UserPreferenceForm(instance=up)
     else:
@@ -355,7 +347,6 @@ def user_settings(request):
     return render(request, 'settings.html', {
         'preference_form': preference_form,
         'user_name_form': user_name_form,
-        'password_form': password_form,
         'api_token': api_token,
     })