From 2e4b09fecd5f4c500848e342d9e3188428dfe008 Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Mon, 4 Mar 2019 23:17:12 +1100
Subject: [PATCH] Start reworking user page

---
 assets/css/ojuso.css                     |  2 ++
 ojusomap/templates/auth/user_detail.html | 15 +++++++-------
 ojusomap/templates/auth/user_form.html   | 26 ++++++++++++++++--------
 ojusomap/templates/base.html             |  6 ++----
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/assets/css/ojuso.css b/assets/css/ojuso.css
index 345f519..efe1acc 100644
--- a/assets/css/ojuso.css
+++ b/assets/css/ojuso.css
@@ -28,6 +28,8 @@ h1 {
 .ojuso-yellow { color: #f9db3c; }
 .ojuso-blue { color: #008ad5; }
 
+.mx-1 { margin-left: 10px; }
+
 
 /*
  * LAYOUT
diff --git a/ojusomap/templates/auth/user_detail.html b/ojusomap/templates/auth/user_detail.html
index 892fd9f..17823cc 100644
--- a/ojusomap/templates/auth/user_detail.html
+++ b/ojusomap/templates/auth/user_detail.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load avatar_tags %}
 {% load static %}
 {% load i18n %}
 
@@ -10,10 +11,12 @@
   <div class="row">
     <div class="col-sm-12">
 
-      <h2>{{ object.username }}</h2>
-      {% if object.name %}
-        <p>{{ object.name }}</p>
+      <img src="{% avatar_url user %}">
+
+      {% if object.first_name and object.last_name %}
+        <h2>{{ object.first_name }} {{ object.last_name }} <i>({{ object.username }})</i></h2>
       {% endif %}
+
     </div>
   </div>
 
@@ -22,13 +25,11 @@
 <div class="row">
 
   <div class="col-sm-12">
-    <a class="btn btn-primary" href="{% url 'profile:update' %}" role="button">{% trans 'Change Name' %}</a>
-    <a class="btn btn-primary" href="" role="button">E-Mail</a>
-    <!-- Your Stuff: Custom user template urls -->
+    <a class="btn btn-primary" href="{% url 'profile:update' %}">{% trans 'Change Name' %}</a>
+    <a class="btn btn-primary mx-1" href="{% url 'avatar_change' %}">Change Avatar</a>
   </div>
 
 </div>
-<!-- End Action buttons -->
 {% endif %}
 
 
diff --git a/ojusomap/templates/auth/user_form.html b/ojusomap/templates/auth/user_form.html
index 51f2d6d..389978f 100644
--- a/ojusomap/templates/auth/user_form.html
+++ b/ojusomap/templates/auth/user_form.html
@@ -4,14 +4,22 @@
 {% block title %}{{ user.username }}{% endblock %}
 
 {% block content %}
-  <h1>{{ user.username }}</h1>
-  <form class="form-horizontal" method="post" action="{% url 'profile:update' %}">
-    {% csrf_token %}
-    {{ form|crispy }}
-    <div class="control-group">
-      <div class="controls">
-        <button type="submit" class="btn">Update</button>
-      </div>
+<div class="container">
+  <div class="row">
+    <div class="col-sm-12">
+
+      <h1>{{ user.username }}</h1>
+      <form class="form-horizontal" method="post" action="{% url 'profile:update' %}">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <div class="control-group">
+          <div class="controls">
+            <button type="submit" class="btn">Update</button>
+          </div>
+        </div>
+      </form>
+
     </div>
-  </form>
+  </div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/ojusomap/templates/base.html b/ojusomap/templates/base.html
index 302db3f..4bb329d 100644
--- a/ojusomap/templates/base.html
+++ b/ojusomap/templates/base.html
@@ -75,10 +75,8 @@
               <img src="{% avatar_url user %}" class="img-circle" width="40" height="40" style="position:relative;margin-right:5px"/><span>{{user}}</span>
             </a>
             <ul class="dropdown-menu dropdown-menu-right" style="padding-bottom:0px" aria-labelledby="navbarDropdown">
-              <li><a href="{% url 'avatar_change' %}"><i class="fa fa-cog" aria-hidden="true"></i> Change Avatar</a></li>
-              <li><a href="{% url 'profile:detail' %}"><i class="fa fa-cog" aria-hidden="true"></i> Profile</a></li>
-              <li role="separator" style="margin-bottom:0px"></li>
-              <li><a class="dropdown-item no-hover" style="background-color:red;color:white;padding:0.5rem 1.5rem" href="{% url 'auth_logout' %}"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans 'Logout' %}</a></li>
+              <li><a href="{% url 'profile:detail' %}"><i class="fa fa-cog" aria-hidden="true"></i> {%trans 'Profile' %}</a></li>
+              <li><a href="{% url 'auth_logout' %}"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans 'Logout' %}</a></li>
             </ul>
           </li>