From 4797c7df657b9a95b99f9dfadf123dbf2c227b3d Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 4 Jan 2011 21:29:37 +0000
Subject: [PATCH] Various template updates from live

---
 templates/hr/applications/view.html | 11 +++++------
 templates/sso/character.html        |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/templates/hr/applications/view.html b/templates/hr/applications/view.html
index 1aab136..38128e4 100644
--- a/templates/hr/applications/view.html
+++ b/templates/hr/applications/view.html
@@ -45,10 +45,10 @@
 
 {% if audit %}
 <h3>Event Log</h3>
-<table>
-<tr><th>Event Type</th><th>User</th><th>Date</th><th>Event Details</th></tr>
+<table width="100%">
+<tr><th width="50px">Event Type</th><th width="75px">User</th><th width="50px">Date</th><th>Event Details</th></tr>
 {% for a in audit %}
-<tr><td>{{ a.get_event_display }}</td><td>{{ a.user }}</td><td>{{ a.date }}</td><td>{{ a.text }}</td></tr>
+<tr><td>{{ a.get_event_display }}</td><td>{{ a.user }}</td><td>{{ a.date|date:"Y/m/d H:i:s" }}</td><td>{{ a.text|linebreaks }}</td></tr>
 {% endfor %}
 </table>
 {% endif %}
@@ -65,17 +65,16 @@
 
 {% if app.recommendation_set.all %}
 <h3>Recommendations</h3>
-<ul>
 <table>
 <tr><th>User</th><th>Character</th><th>Corporation</th><th>Valid Recommendation</th></tr>
 {% for rec in app.recommendation_set.all %}
 <tr><td><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a></td>
-<td><a href="{% sso.views.characters rec.user_character.id %}">{{ rec.user_character }}</a></td>
+<td><a href="{% url sso.views.characters rec.user_character.id %}">{{ rec.user_character }}</a></td>
 <td><a href="http://evemaps.dotlan.net/corp/{{ rec.user_character.corporation.name }}">{{ rec.user_character.corporation }}</a></td>
 <td>{% if rec.is_valid %}<font color="green">Yes</font>{% else %}<font color="red">No</font>{% endif %}</td>
 </tr>
 {% endfor %}
-</ul>
+</table>
 {% endif %}
 
 {% if hrstaff %}
diff --git a/templates/sso/character.html b/templates/sso/character.html
index 5618ce3..ff82974 100644
--- a/templates/sso/character.html
+++ b/templates/sso/character.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% load humanize %}
-
+{% load naturaltimediff %}
 {% block content %}
 
 <div class="character_info">
@@ -30,7 +30,7 @@
 			<li><span class="stat">Race:</span> <span class="value">{{ character.get_race_display }}</span></li>
 			<li><span class="stat">Gender:</span> <span class="value">{{ character.get_gender_display }}</span></li>
 			<li><span class="stat">Corporation:</span> <a href="http://evemaps.dotlan.net/corp/{{ character.corporation.name }}">{{ character.corporation.name }}</a></span></li>
-			<li><span class="stat">Joined Corporation:</span> <span class="value">{{ character.corporation_date }}</span></li>
+			<li><span class="stat">Joined Corporation:</span> <span class="value">{{ character.corporation_date|date:"Y/m/d H:i:s" }} ({{ character.corporation_date|naturaltimediff }})</span></li>
 			<li><span class="stat">Alliance:</span> <span class="value"><a href="http://evemaps.dotlan.net/alliance/{{ character.corporation.alliance.name }}">{{ character.corporation.alliance.name }}</a></span></li>
 			<li><span class="stat">Security Status:</span> {{ character.security_status }}</span></li>
 			<li><span class="stat">Director:</span> <span class="value">{{ character.director }}</span></li>
@@ -76,7 +76,7 @@
 	$(function(){
 		$(".skill_heading").bind("click", function(){
 			$this = $(this);
-			$this.nextUntil(".skill_heading").toggle();
+			$this.nextUntil(".skill_heading").toggle('fast');
 			
 			if($this.hasClass("toggle_off")){
 				$this.removeClass("toggle_off").removeClass("toggle_on");