From c464ef6cf7b247cceecb640685a24a1ed9b4841b Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 22 Dec 2010 22:55:40 +0000
Subject: [PATCH] New character layout

---
 media/css/style.css          |  25 +++++++-
 settings.py                  |   2 +-
 templates/sso/character.html | 116 +++++++++++++++++++++++++----------
 templates/sso/profile.html   |   2 +-
 4 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/media/css/style.css b/media/css/style.css
index 76efdfa..0d3b1e6 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -101,12 +101,16 @@ border-collapse: collapse;
 border-spacing: 0px;}
 
 table td 
-{background-color: #CCC;
+{
 color: #000;
 padding: 4px;
 text-align: left;
 border: 1px #fff solid;}
 
+table tr { background-color: #CCC; }
+table tr:nth-child(odd) { background-color: #ddd; }
+table tr:hover { background-color: #eed; }
+
 table th
 {background-color: #333;
 color: #fff;
@@ -115,3 +119,22 @@ text-align: left;
 border-bottom: 2px #fff solid;
 font-size: 12px;
 font-weight: bold;}
+
+.character_info > div { margin-bottom: 2em; }
+.character_info .character_portrait, .character_info .character_corporation, .character_info .character_alliance { float: right; }
+.character_info .character_corporation { clear: right; margin-left: 2em; }
+.character_info .character_corporation span, .character_info .character_alliance span { font-weight: bold; display: block; text-align: center; }
+.character_info .character_attributes ul { margin: .25em 2em; padding: 0; }
+.character_info .character_skills table { width: 100%; }
+.character_info .character_stats table { width: 300px; }
+.character_info .character_attributes .stat { font-weight: bold; }
+.character_skills th { cursor:pointer;cursor:hand; }
+.toggle_off th { background-color: #000; }
+.skill_controls { margin-bottom: .5em; }
+.skill_controls a {
+    background: none repeat scroll 0 0 #CC6600;
+    color: #FFFFFF;
+    display: inline-block;
+    padding: 4px 12px;
+    text-decoration: none;
+}
diff --git a/settings.py b/settings.py
index 04cb246..b2c7cfb 100755
--- a/settings.py
+++ b/settings.py
@@ -103,7 +103,7 @@ INSTALLED_APPS = (
     'reddit',
     'hr',
     'sso',
-    'groups',
+#    'groups',
     'api',
 )
 
diff --git a/templates/sso/character.html b/templates/sso/character.html
index b39f6c1..fec5230 100644
--- a/templates/sso/character.html
+++ b/templates/sso/character.html
@@ -4,43 +4,93 @@
 
 {% block content %}
 
-<h1>{{ character.name }}</h1>
+<div class="character_info">
+	<h1>{{ character.name }}</h1>
 
-<img src="http://img.eve.is/serv.asp?s=256&c={{ character.id }}"/>
+	<div class="character_portrait">
+		<img src="http://img.eve.is/serv.asp?s=256&c={{ character.id }}" />
+	</div>
+	
+	<div class="character_corporation">
+		<span><a href="http://evemaps.dotlan.net/ajax/opensearch?q={{ character.corporation.name }}">{{ character.corporation.ticker }}</a></span>
+		<img src="http://www.evecorplogo.net/logo.php?id={{ character.corporation.id }}" />
+	</div>
+	
+	<div class="character_alliance">
+		<span><a href="http://evemaps.dotlan.net/ajax/opensearch?q={{ character.corporation.alliance.name }}">{{ character.corporation.alliance.ticker }}</a></span>
+		<img src="http://image.eveonline.com/Alliance/{{ character.corporation.alliance.id }}_64.png" />
+	</div>
 
-<img src="http://www.evecorplogo.net/logo.php?id={{ character.corporation.id }}" width="128" height="128" />
+	<div class="character_attributes">
+		<h2>Attributes</h2>
+		
+		<ul>
+			<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/ajax/opensearch?q={{ 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">Alliance:</span> <span class="value"><a href="http://evemaps.dotlan.net/ajax/opensearch?q={{ 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>
+		</ul>
+	</div>
 
+	<div class="character_stats">
+		<h2>Stats</h2>
+		
+		<table>
+			<tr><th>Stat</th><th>Value</th></tr>
+			<tr><td class="stat">Intelligence</td><td> {{ character.attrib_intelligence }}</td></tr>
+			<tr><td class="stat">Memory</td><td>{{ character.attrib_memory }}</td></tr>
+			<tr><td class="stat">Charisma</td><td>{{ character.attrib_charisma }}</td></tr>
+			<tr><td class="stat">Perception</td><td>{{ character.attrib_perception }}</td></tr>
+			<tr><td class="stat">Willpower</td><td>{{ character.attrib_willpower }}</td></tr>
+		</table>
+	</div>
 
-<ul>
-<li>Race: {{ character.get_race_display }}</li>
-<li>Gender: {{ character.get_gender_display }}</li>
-<li>Corporation: {{ character.corporation.name }}</li>
-<li>Joined Corporation: {{ character.corporation_date }}</li>
-<li>Alliance: {{ character.corporation.alliance.name }}</li>
-<li>Security Status: {{ character.security_status }}</li>
-<li>Director: {{ character.director }}</li>
-</ul>
+	<div class="character_skills">
+		<h2>Skills</h2>
+		
+		<div class="skill_controls">
+			<a href=#" id="openAll">Open All</a>
+			<a href=#" id="collapseAll">Collapse All</a>
+		</div>
+		<table>
+			{% for g ,v in skills.items %}
+			<tr class="skill_heading"><th colspan=3>{{ g }}</th</tr>
+			{% for skill in v %}
+			<tr style="display:none;"><td>{{ skill.skill.name }} </td><td>Level {{ skill.level }}</td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
+			{% endfor %}
+			{% endfor %}
+			<tr><th colspan=2>Total SP</th><th>{{ character.total_sp|intcomma }} SP</td></tr>
+		</table>
+	</div>
+</div>
 
-<table>
-<tr><th>Stat</th><th>Value</th></tr>
-<tr><td>Intelligence</td><td> {{ character.attrib_intelligence }}</td></tr>
-<tr><td>Memory</td><td>{{ character.attrib_memory }}</td></tr>
-<tr><td>Charisma</td><td>{{ character.attrib_charisma }}</td></tr>
-<tr><td>Perception</td><td>{{ character.attrib_perception }}</td></tr>
-<tr><td>Willpower</td><td>{{ character.attrib_willpower }}</td></tr>
-</table>
-<br/>
-
-<h2>Skills</h2>
-
-<table width="350px">
-{% for g ,v in skills.items %}
-<tr><th colspan=3>{{ g }}</th</tr>
-{% for skill in v %}
-<tr><td>{{ skill.skill.name }} </td><td>Level {{ skill.level }}</td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
-{% endfor %}
-{% endfor %}
-<tr><th colspan=2>Total SP</th><th>{{ character.total_sp|intcomma }} SP</td></tr>
-</table>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+	$(function(){
+		$(".skill_heading").bind("click", function(){
+			$this = $(this);
+			$this.nextUntil(".skill_heading").toggle();
+			
+			if($this.hasClass("toggle_off")){
+				$this.removeClass("toggle_off").removeClass("toggle_on");
+			}else{
+				$this.removeClass("toggle_on").removeClass("toggle_off");
+			}
+		});
+		
+		$("#openAll").bind("click", function(e){
+			e.preventDefault();
+			$(".character_skills tr").css({ display: "table-row" });
+		});
+		
+		$("#collapseAll").bind("click", function(e){
+			e.preventDefault();
+			$(".character_skills tr:not(.skill_heading)").css({ display: "none" });
+		});
+	});
+</script>
 
 {% endblock %}
diff --git a/templates/sso/profile.html b/templates/sso/profile.html
index 3469723..88c5d58 100644
--- a/templates/sso/profile.html
+++ b/templates/sso/profile.html
@@ -7,7 +7,7 @@
 
 {% block content %}
 
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.js"></script>
+<script type="text/javascript" src="/media/js/jquery.min.js"></script>
 <script type="text/javascript">
 
 function refresh_apikey(key) {