Adding profiles and adminship

templates/edit_profile.html

@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block body %}
+<h2>Edit Profile</h2>
+
+<form method="POST">
+  <dl>
+    <dt>Username:</dt>
+    <dd><input type="text" class="username_input" name="username" required value="{{ current_user.username }}" autocomplete="off"></dd>
+    <dd><input type="submit" value="Save"></dd>
+  </dl>
+</form>
+{% endblock %}

templates/includes/infobox_profile.html

@@ -0,0 +1,30 @@
+{% set profile = user.profile %}
+<div class="infobox">
+  <h3>{{ profile.full_name }}</h3>
+  <p>{{ profile.biography|enrich }}</p>
+  {% if profile.location %}
+    <p><span class="weak">Location:</span> {{ profile.location }}</p>
+  {% endif %}
+  {% if profile.year %}
+    <p><span class="weak">Year:</span> {{ profile.year }}</p>
+  {% endif %}
+  {% if profile.website %}
+    <p><span class="weak">Website:</span> {{ profile.website|urlize }}</p>
+  {% endif %}
+  {% if profile.instagram %}
+    <p><span class="weak">Instagram:</span> <a href="https://www.instagram.com/{{ profile.instagram }}">{{ profile.instagram }}</a></p>
+  {% endif %}
+  {% if profile.facebook %}
+    <p><span class="weak">Facebook:</span> <a href="https://facebook.com/{{ profile.facebook }}">{{ profile.facebook }}</a></p>
+  {% endif %}
+  <p>
+    <strong>{{ user.messages|count }}</strong> messages
+    -
+    <strong>{{ user.followers()|count }}</strong> followers
+    -
+    <strong>{{ user.following()|count }}</strong> following
+  </p>
+  {% if user == current_user %}
+    <p><a href="/edit_profile/">Edit profile</a></p>
+  {% endif %}
+</div>

templates/join.html

@@ -1,16 +1,34 @@
 {% extends "base.html" %}
 {% block body %}
   <h2>Join {{ site_name }}</h2>
-  <form action="{{ url_for('register') }}" method="post">
+  <form action="{{ url_for('register') }}" method="POST">
     <dl>
       <dt>Username:</dt>
-      <dd><input type="text" class="username-input" name="username"></dd>
+      <dd><input type="text" class="username-input" name="username" autocomplete="off"></dd>
+      <dt>Full name:</dt>
+      <dd>
+        <small class="field_desc">If not given, defaults to your username.</small>
+        <input type="text" name="full_name">
+      </dd>
       <dt>Password:</dt>
       <dd><input type="password" name="password"></dd>
       <dt>Email:</dt>
       <dd><input type="text" name="email"></dd>
-      <dt>Birthday:
-      <dd><input type="text" name="birthday" placeholder="yyyy-mm-dd">
+      <dt>Birthday:</dt>
+      <dd>
+        <small class="field_desc">Your birthday won't be shown to anyone.</small>
+        <input type="text" name="birthday" placeholder="yyyy-mm-dd">
+      </dd>
+      {% if not current_user.is_anonymous %}
+      <dd>
+        <input type="checkbox" name="confirm_another" value="1">
+        <label for="confirm_another">I want to create another account</label>
+      </dd>
+      {% endif %}
+      <dd>
+        <input type="checkbox" name="legal" value="1">
+        <label for="legal">I've read the <a href="/terms/">Terms of Service</a> and <a href="/privacy/">Privacy Policy</a>.</label>
+      </dd>
       <dd><input type="submit" value="Join">
     </dl>
   </form>

templates/user_detail.html

@@ -1,13 +1,7 @@
 {% extends "base.html" %}
 {% block body %}
+  {% include "includes/infobox_profile.html" %}
   <h2>Messages from {{ user.username }}</h2>
-  <p>
-    <strong>{{ user.messages|count }}</strong> messages
-    -
-    <strong>{{ user.followers()|count }}</strong> followers
-    - 
-    <strong>{{ user.following()|count }}</strong> following
-  </p>
   {% if not current_user.is_anonymous %}
     {% if user.username != current_user.username %}
       {% if current_user|is_following(user) %}
@@ -21,8 +15,7 @@
       {% endif %}
       <p><a href="/create/?preload=%2B{{ user.username }}">Mention this user in a message</a></p>
     {% else %}
-      <!-- here should go the "edit profile" button -->
-      <a href="/create/">Create a status</a>
+      <a href="/create/">Create a message</a>
     {% endif %}
   {% endif %}
   <ul>