From 9dc7d548aef01945c0e975c7e80135ed04007e13 Mon Sep 17 00:00:00 2001
From: Trever Fischer <tdfischer@fedoraproject.org>
Date: Sat, 21 Apr 2012 12:09:50 -0400
Subject: [PATCH] Unify profile tiles

---
 static/css/main.css          | 41 +++++++++++++++++++++---------------
 templates/_profile_tile.html |  9 ++++++++
 templates/base_with_nav.html | 17 +++++++++++++++
 templates/forums/_reply.html | 10 +--------
 templates/forums/topic.html  | 36 +++++++++++++++++++------------
 templates/local/list.html    |  4 ++--
 templates/local/profile.html | 14 ++++++++----
 7 files changed, 85 insertions(+), 46 deletions(-)
 create mode 100644 templates/_profile_tile.html
 create mode 100644 templates/base_with_nav.html

diff --git a/static/css/main.css b/static/css/main.css
index b7ad30b..3ea977b 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -141,19 +141,28 @@ tbody tr:nth-child(odd) {
     background: url(img/adminium.png);
 }
 
-.forum-post-user {
-    float: left;
-    width: 100px;
+.user-tile {
+    display: block;
+    width: 150px;
+    height: 150px;
     text-align: center;
 }
 
-.forum-post-user .byline {
+.post .user-tile {
+    float: left;
+}
+
+.user-tile .byline {
     padding: 1em;
 }
 
+.user-tile a {
+    color: #fff;
+}
+
 .forum-post-content {
     padding: 1em;
-    margin-left: 100px;
+    margin-left: 150px;
     background: #222;
     border-left: 3px solid black;
 }
@@ -254,11 +263,13 @@ tr.sticky a:link {
 
 .profile-list li {
     float: left;
-    border:3px solid black;
-    padding: 3px;
-    width: 128px;
-    height: 128px;
+    margin: 1em;
     text-align: center;
+    background: url(img/wood.png)
+}
+
+.profile-list .user-tile {
+    border: 3px solid black;
 }
 
 #epicenter ul {
@@ -317,10 +328,6 @@ fieldset {
     color: #f33;
 }
 
-.forum .avatar {
-    float: left;
-}
-
 .forum .author-info ul {
     list-style: none;
     margin-left: 32;
@@ -354,10 +361,6 @@ fieldset {
   border-bottom: #aaa solid 1px;
 }
 
-.topic .avatar {
-    float: left;
-}
-
 .topic h2 {
     margin-left: 42px;
 }
@@ -417,3 +420,7 @@ fieldset {
 #statbox .avatar {
     padding: 5px;
 }
+
+.topic .avatar {
+    float: left;
+}
diff --git a/templates/_profile_tile.html b/templates/_profile_tile.html
new file mode 100644
index 0000000..2e53b52
--- /dev/null
+++ b/templates/_profile_tile.html
@@ -0,0 +1,9 @@
+{% load minecraft %}
+<div class="user-tile">
+<div class="byline">
+<a href="{{user.get_absolute_url}}">
+<div class="avatar">{%avatar user%}</div>
+{{user}}
+</a>
+</div>
+</div>
diff --git a/templates/base_with_nav.html b/templates/base_with_nav.html
new file mode 100644
index 0000000..470fcf6
--- /dev/null
+++ b/templates/base_with_nav.html
@@ -0,0 +1,17 @@
+{% extends 'base.html' %}
+{% block main %}
+<div id="content">
+    <div class="grid_12">
+        <div id="localnav">
+          {% block localnav %}
+          {% endblock %}
+        </div>
+    </div>
+    <div class="grid_8">
+        {% block content %}
+        {% endblock %}
+    </div>
+</div>
+{% include '_sidebar.html' %}
+{% endblock main %}
+
diff --git a/templates/forums/_reply.html b/templates/forums/_reply.html
index 4b29bba..db2d9c0 100644
--- a/templates/forums/_reply.html
+++ b/templates/forums/_reply.html
@@ -1,15 +1,7 @@
 {% load markup %}
-{% load minecraft %}
 <div class="post">
 <a name="reply-{{post.id}}"></a>
-<div class="forum-post-user">
-<div class="byline">
-<a href="{{post.user.get_absolute_url}}">
-<div class="avatar">{%avatar post.user%}</div>
-{{post.user}}
-</a>
-</div>
-</div>
+{% include "_profile_tile.html" %}
 <div class="dateline">
 Posted {{post.created}}
 {% if post.created != post.updated %}
diff --git a/templates/forums/topic.html b/templates/forums/topic.html
index 802e701..b011ec9 100644
--- a/templates/forums/topic.html
+++ b/templates/forums/topic.html
@@ -1,21 +1,10 @@
-{% extends "forum_base.html" %}
+{% extends "base_with_nav.html" %}
 {% load minecraft %}
 {% load mptt_tags %}
-{%block title %}{{topic.title}}{%endblock%}
 
-{%block breadcrumb %}
-Home
-{%for f in topic.forum.get_ancestors%}
-&gt; <a href="{{f.get_absolute_url}}">{{f}}</a>
-{%endfor%}
-&gt; <a href="{{topic.forum.get_absolute_url}}">{{topic.forum}}</a>
-{%endblock%}
+{% block sectiontitle %}Forums{% endblock %}
 
-{%block content %}
-<div class="topic">
-<div class="avatar">{% avatar topic.rootPost.user 32 %}</div>
-<h2>{{topic.title}}</h2>
-<div class="byline">Started by <span itemprop="author">{{topic.rootPost.user}}</span> {{ topic.created|timesince }} ago.<br />Last updated {{topic.updated|timesince}} ago.</div>
+{% block localnav %}
 {% if perms.forums %}
 <ul>
 {% if perms.forums.delete_topic %}
@@ -32,6 +21,25 @@ Make Sticky
 {% endif %}
 </ul>
 {% endif %}
+{% endblock %}
+
+{%block title %}{{topic.title}}{%endblock%}
+
+{%block breadcrumb %}
+Home
+{%for f in topic.forum.get_ancestors%}
+&gt; <a href="{{f.get_absolute_url}}">{{f}}</a>
+{%endfor%}
+&gt; <a href="{{topic.forum.get_absolute_url}}">{{topic.forum}}</a>
+{%endblock%}
+
+{%block content %}
+<div class="item">
+<div class="topic">
+<div class="avatar">{% avatar topic.rootPost.user 32 %}</div>
+<h2>{{topic.title}}</h2>
+<div class="byline">Started by <span itemprop="author">{{topic.rootPost.user}}</span> {{ topic.created|timesince }} ago.<br />Last updated {{topic.updated|timesince}} ago.</div>
+</div>
 <br style="clear:both;"/>
 {% include "forums/_post.html" with post=topic.rootPost %}
 </div>
diff --git a/templates/local/list.html b/templates/local/list.html
index 61a3580..efb0800 100644
--- a/templates/local/list.html
+++ b/templates/local/list.html
@@ -9,7 +9,7 @@
   <h2>{{group}}</h2>
   <ul class='profile-list'>
     {% for user in group.user_set.all %}
-    <li><a href="{% url local.views.profile username=user.username %}">{% avatar user %}<p>{{user}}</p></a></li>
+    <li>{% include '_profile_tile.html' with user=user %}</li>
     {% endfor %}
   </ul>
   <br style="clear:both"/>
@@ -17,7 +17,7 @@
 <h2>All Players</h2>
 <ul class='profile-list'>
 {% for user in profiles %}
-<li><a href="{% url local.views.profile username=user.username %}">{% avatar user %}<p>{{user}}</p></a></li>
+  <li>{% include '_profile_tile.html' with user=user %}</li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/templates/local/profile.html b/templates/local/profile.html
index 234fc96..beae087 100644
--- a/templates/local/profile.html
+++ b/templates/local/profile.html
@@ -1,5 +1,14 @@
-{% extends "profile_base.html" %}
+{% extends "base_with_nav.html" %}
 {% load minecraft %}
+
+{% block localnav %}
+{% if user == profile %}
+<ul>
+<li><a href="{%url local.views.edit %}">Edit profile</a></li>
+</ul>
+{% endif %}
+{% endblock%}
+
 {%block title%}{{profile}}{%endblock%}
 
 {% block sectiontitle %}{{profile}}{%endblock%}
@@ -7,9 +16,6 @@
 {%block content %}
 <div class="item">
 <div class="avatar">{% avatar profile 128 %}</div>
-{% if user == profile %}
-<a href="{%url local.views.edit %}">Edit profile</a>
-{% endif %}
 <ul>
 <li>Member Since: {{profile.date_joined|date:"SHORT_DATE_FORMAT"}}</li>
 <li>Last seen: {{profile.last_login|date:"SHORT_DATE_FORMAT"}}</li>