From fd64742b175bd7983541bc587865e6cebd0d2a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sat, 20 Feb 2016 23:39:02 +0100
Subject: [PATCH] Revamping profile pages

---
 bornhack/settings/base.py                     |  6 +-
 bornhack/templates/account/email_confirm.html | 32 -------
 bornhack/templates/account/logout.html        | 18 ----
 bornhack/urls.py                              | 30 ++-----
 profiles/templates/account/email.html         | 85 +++++++++++++++++++
 profiles/templates/account/email_confirm.html | 34 ++++++++
 .../templates/account/email_confirmed.html    |  0
 .../templates/account/login.html              |  0
 profiles/templates/account/logout.html        | 19 +++++
 .../password_change.html}                     |  8 +-
 .../templates/account/password_reset.html     |  0
 .../account/password_reset_done.html          |  0
 .../account/password_reset_from_key.html      |  0
 .../account/password_reset_from_key_done.html |  0
 .../templates/account/signup.html             |  0
 .../templates/account/verification_sent.html  |  0
 profiles/templates/profiles/profile_base.html | 24 ++++++
 .../templates/profiles/profile_detail.html    | 15 ++--
 18 files changed, 180 insertions(+), 91 deletions(-)
 delete mode 100644 bornhack/templates/account/email_confirm.html
 delete mode 100644 bornhack/templates/account/logout.html
 create mode 100644 profiles/templates/account/email.html
 create mode 100644 profiles/templates/account/email_confirm.html
 rename {bornhack => profiles}/templates/account/email_confirmed.html (100%)
 rename {bornhack => profiles}/templates/account/login.html (100%)
 create mode 100644 profiles/templates/account/logout.html
 rename profiles/templates/{profiles/profile_form.html => account/password_change.html} (69%)
 rename {bornhack => profiles}/templates/account/password_reset.html (100%)
 rename {bornhack => profiles}/templates/account/password_reset_done.html (100%)
 rename {bornhack => profiles}/templates/account/password_reset_from_key.html (100%)
 rename {bornhack => profiles}/templates/account/password_reset_from_key_done.html (100%)
 rename {bornhack => profiles}/templates/account/signup.html (100%)
 rename {bornhack => profiles}/templates/account/verification_sent.html (100%)
 create mode 100644 profiles/templates/profiles/profile_base.html

diff --git a/bornhack/settings/base.py b/bornhack/settings/base.py
index 0190ed7b..f0d7a5b8 100644
--- a/bornhack/settings/base.py
+++ b/bornhack/settings/base.py
@@ -21,12 +21,12 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.sites',
 
+    'profiles',
+    'camps',
+
     'allauth',
     'allauth.account',
     'bootstrap3',
-
-    'profiles',
-    'camps',
 ]
 
 STATIC_URL = '/static/'
diff --git a/bornhack/templates/account/email_confirm.html b/bornhack/templates/account/email_confirm.html
deleted file mode 100644
index e9ef07fd..00000000
--- a/bornhack/templates/account/email_confirm.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% load account %}
-
-{% block content %}
-
-<div class="cover center">
-  <h1>{% trans "Confirm E-mail Address" %}</h1>
-
-  {% if confirmation %}
-
-    {% user_display confirmation.email_address.user as user_display %}
-
-    <p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
-
-    <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
-      {% csrf_token %}
-      <button type="submit" class="btn btn-lg btn-primary">
-        {% trans 'Confirm' %}
-      </button>
-    </form>
-
-  {% else %}
-
-    {% url 'account_email' as email_url %}
-
-    <p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
-
-  {% endif %}
-</div>
-
-{% endblock %}
diff --git a/bornhack/templates/account/logout.html b/bornhack/templates/account/logout.html
deleted file mode 100644
index b391c8d8..00000000
--- a/bornhack/templates/account/logout.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-  <div class="cover center">
-
-    <p class="lead">
-      Sure you want to logout?
-    </p>
-
-    <form method="post">
-      {% csrf_token %}
-      <button type="submit"
-              class="btn btn-danger btn-lg">
-        Logout
-      </button>
-    </form>
-  </div>
-{% endblock %}
diff --git a/bornhack/urls.py b/bornhack/urls.py
index 77754947..39b270f8 100644
--- a/bornhack/urls.py
+++ b/bornhack/urls.py
@@ -16,36 +16,16 @@ urlpatterns = [
         TemplateView.as_view(template_name='frontpage.html'),
         name='frontpage'
     ),
-    #url(
-        #r'^login/$',
-        #LoginView.as_view(),
-        #name='account_login',
-    #),
+    url(
+        r'^login/$',
+        LoginView.as_view(),
+        name='account_login',
+    ),
     url(
         r'^logout/$',
         LogoutView.as_view(),
         name='account_logout',
     ),
-    #url(
-        #r'^confirm/(?P<key>\S+)$',
-        #ConfirmEmailView.as_view(),
-        #name='account_confirm_email',
-    #),
-    #url(
-        #r'^signup/done/$',
-        #EmailVerificationSentView.as_view(),
-        #name='account_email_verification_sent',
-    #),
-    #url(
-        #r'^signup/$',
-        #SignupView.as_view(),
-        #name='account_signup',
-    #),
-    #url(
-        #r'^reset-password/$',
-        #PasswordResetView.as_view(),
-        #name='account_reset_password',
-    #),
     url(
         r'^profile/',
         include('profiles.urls', namespace='profiles')
diff --git a/profiles/templates/account/email.html b/profiles/templates/account/email.html
new file mode 100644
index 00000000..fe7e92ba
--- /dev/null
+++ b/profiles/templates/account/email.html
@@ -0,0 +1,85 @@
+{% extends 'profiles/profile_base.html' %}
+
+{% load i18n %}
+{% load bootstrap3 %}
+
+{% block head_title %}{% trans "Account" %}{% endblock %}
+
+{% block profile_content %}
+
+  <div class="row">
+    <div class="col-md-12">
+
+    <h1>{% trans "E-mail Addresses" %}</h1>
+{% if user.emailaddress_set.all %}
+<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
+
+<form action="{% url 'account_email' %}" class="email_list" method="post">
+{% csrf_token %}
+<fieldset class="blockLabels">
+
+  {% for emailaddress in user.emailaddress_set.all %}
+<div class="ctrlHolder">
+      <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+
+      <input
+        id="email_radio_{{forloop.counter}}"
+        type="radio"
+        name="email"
+        value="{{emailaddress.email}}"
+        {% if emailaddress.primary or user.emailaddress_set.count == 1 %}
+          checked="checked"
+        {%endif %}
+        />
+
+{{ emailaddress.email }}
+    {% if emailaddress.verified %}
+    <span class="verified">{% trans "Verified" %}</span>
+    {% else %}
+    <span class="unverified">{% trans "Unverified" %}</span>
+    {% endif %}
+      {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
+</label>
+</div>
+  {% endfor %}
+
+<div class="buttonHolder">
+      <button class="btn btn-black" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
+      <button class="btn btn-black" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
+      <button class="btn btn-black" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+</div>
+
+</fieldset>
+</form>
+
+{% else %}
+<p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
+
+{% endif %}
+
+
+    <h2>{% trans "Add E-mail Address" %}</h2>
+
+    <form method="post" action="{% url 'account_email' %}" class="add_email">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button name="action_add" class="btn btn-black" type="submit">{% trans "Add E-mail" %}</button>
+    </form>
+  </div>
+</div>
+
+<script type="text/javascript">
+(function() {
+  var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+  var actions = document.getElementsByName('action_remove');
+  if (actions.length) {
+    actions[0].addEventListener("click", function(e) {
+      if (! confirm(message)) {
+        e.preventDefault();
+      }
+    });
+  }
+})();
+</script>
+
+{% endblock %}
diff --git a/profiles/templates/account/email_confirm.html b/profiles/templates/account/email_confirm.html
new file mode 100644
index 00000000..e7950cd3
--- /dev/null
+++ b/profiles/templates/account/email_confirm.html
@@ -0,0 +1,34 @@
+{% extends 'profile_base.html' %}
+{% load i18n %}
+{% load account %}
+
+{% block content %}
+
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <h1>{% trans "Confirm E-mail Address" %}</h1>
+
+    {% if confirmation %}
+
+      {% user_display confirmation.email_address.user as user_display %}
+
+      <p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
+
+      <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
+        {% csrf_token %}
+        <button type="submit" class="btn btn-black">
+          {% trans 'Confirm' %}
+        </button>
+      </form>
+
+    {% else %}
+
+      {% url 'account_email' as email_url %}
+
+      <p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
+
+    {% endif %}
+  </div>
+</div>
+
+{% endblock %}
diff --git a/bornhack/templates/account/email_confirmed.html b/profiles/templates/account/email_confirmed.html
similarity index 100%
rename from bornhack/templates/account/email_confirmed.html
rename to profiles/templates/account/email_confirmed.html
diff --git a/bornhack/templates/account/login.html b/profiles/templates/account/login.html
similarity index 100%
rename from bornhack/templates/account/login.html
rename to profiles/templates/account/login.html
diff --git a/profiles/templates/account/logout.html b/profiles/templates/account/logout.html
new file mode 100644
index 00000000..4318f042
--- /dev/null
+++ b/profiles/templates/account/logout.html
@@ -0,0 +1,19 @@
+{% extends 'base.html' %}
+
+{% block content %}
+  <div class="row">
+    <div class="col-md-6 col-md-offset-3">
+      <p class="lead">
+        Sure you want to logout?
+      </p>
+
+      <form method="post">
+        {% csrf_token %}
+        <button type="submit"
+                class="btn btn-black form-control">
+          Logout
+        </button>
+      </form>
+    </div>
+  </div>
+{% endblock %}
diff --git a/profiles/templates/profiles/profile_form.html b/profiles/templates/account/password_change.html
similarity index 69%
rename from profiles/templates/profiles/profile_form.html
rename to profiles/templates/account/password_change.html
index cd2760d1..d2835066 100644
--- a/profiles/templates/profiles/profile_form.html
+++ b/profiles/templates/account/password_change.html
@@ -1,13 +1,13 @@
-{% extends "base.html" %}
+{% extends 'profiles/profile_base.html' %}
 
 {% load account %}
 {% load bootstrap3 %}
 
-{% block content %}
+{% block profile_content %}
 
   <div class="row">
-    <div class="col-md-6 col-md-offset-3">
-      <h1>Edit profile</h1>
+    <div class="col-md-12">
+      <h1>Change password</h1>
 
       <form class="login" method="POST">
         {% csrf_token %}
diff --git a/bornhack/templates/account/password_reset.html b/profiles/templates/account/password_reset.html
similarity index 100%
rename from bornhack/templates/account/password_reset.html
rename to profiles/templates/account/password_reset.html
diff --git a/bornhack/templates/account/password_reset_done.html b/profiles/templates/account/password_reset_done.html
similarity index 100%
rename from bornhack/templates/account/password_reset_done.html
rename to profiles/templates/account/password_reset_done.html
diff --git a/bornhack/templates/account/password_reset_from_key.html b/profiles/templates/account/password_reset_from_key.html
similarity index 100%
rename from bornhack/templates/account/password_reset_from_key.html
rename to profiles/templates/account/password_reset_from_key.html
diff --git a/bornhack/templates/account/password_reset_from_key_done.html b/profiles/templates/account/password_reset_from_key_done.html
similarity index 100%
rename from bornhack/templates/account/password_reset_from_key_done.html
rename to profiles/templates/account/password_reset_from_key_done.html
diff --git a/bornhack/templates/account/signup.html b/profiles/templates/account/signup.html
similarity index 100%
rename from bornhack/templates/account/signup.html
rename to profiles/templates/account/signup.html
diff --git a/bornhack/templates/account/verification_sent.html b/profiles/templates/account/verification_sent.html
similarity index 100%
rename from bornhack/templates/account/verification_sent.html
rename to profiles/templates/account/verification_sent.html
diff --git a/profiles/templates/profiles/profile_base.html b/profiles/templates/profiles/profile_base.html
new file mode 100644
index 00000000..d8b076bd
--- /dev/null
+++ b/profiles/templates/profiles/profile_base.html
@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+
+{% load account %}
+{% load bootstrap3 %}
+
+{% block content %}
+  <div class="row">
+    <div class="col-md-12">
+      <p>
+        <a href="{% url 'account_change_password' %}" class="btn btn-black">
+          Change password
+        </a>
+        <a href="{% url 'account_email' %}" class="btn btn-black">
+          Manage email
+        </a>
+      </p>
+    <hr />
+    </div>
+  </div>
+
+
+  {% block profile_content %}{% endblock %}
+
+{% endblock %}
diff --git a/profiles/templates/profiles/profile_detail.html b/profiles/templates/profiles/profile_detail.html
index de27f23e..60f7c9f3 100644
--- a/profiles/templates/profiles/profile_detail.html
+++ b/profiles/templates/profiles/profile_detail.html
@@ -1,14 +1,11 @@
-{% extends 'base.html' %}
+{% extends 'profiles/profile_base.html' %}
 
-{% block content %}
-  <div class="cover">
-    <p class="lead">
-      Yeah! You now have a BornHack user!
-    </p>
+{% block profile_content %}
+<div class="row" >
+  <div class="col-md-12">
     <p>
-        <a href="{% url 'profiles:update' %}">
-            Edit your profile
-        </a>
+      Not much going on here yet.
     </p>
   </div>
+</div>
 {% endblock %}