nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 06:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the character skill list order

Browse Source
This commit is contained in:
Andrew Williams
2010-12-23 09:49:34 +00:00
parent 0871770756
commit 5df62d7188
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sso/views.py
View File

@@ -50,12 +50,7 @@ def characters(request, charid=0):
if charid:
character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid)
skills = {}
for s in character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill'):
if not s.skill.group.name in skills:
skills[s.skill.group.name] = [s]
else:
skills[s.skill.group.name].append(s)
skills = character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill__name')
return render_to_response('sso/character.html', locals(), context_instance=RequestContext(request))
characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name')

18
templates/sso/character.html
View File

@@ -12,14 +12,16 @@
</div>
<div class="character_corporation">
<span><a href="http://evemaps.dotlan.net/ajax/opensearch?q={{ character.corporation.name }}">{{ character.corporation.ticker }}</a></span>
<span><a href="http://evemaps.dotlan.net/corp/{{ character.corporation.name }}">{{ character.corporation.ticker }}</a></span>
<img src="http://www.evecorplogo.net/logo.php?id={{ character.corporation.id }}" />
</div>
{% if character.corporation.alliance %}
<div class="character_alliance">
<span><a href="http://evemaps.dotlan.net/ajax/opensearch?q={{ character.corporation.alliance.name }}">{{ character.corporation.alliance.ticker }}</a></span>
<span><a href="http://evemaps.dotlan.net/alliance/{{ character.corporation.alliance.name }}">{{ character.corporation.alliance.ticker }}</a></span>
<img src="http://image.eveonline.com/Alliance/{{ character.corporation.alliance.id }}_64.png" />
</div>
{% endif %}
<div class="character_attributes">
<h2>Attributes</h2>
@@ -27,9 +29,9 @@
<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">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">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">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>
</ul>
@@ -56,9 +58,11 @@
<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 %}
{% regroup skills by skill.group as skill_group %}
{% for group in skill_group %}
<tr class="skill_heading"><th colspan=3>{{ group.grouper }}</th</tr>
{% for skill in group.list %}
<tr style="display:none;"><td>{{ skill.skill.name }} </td><td>Level {{ skill.level }}</td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% endfor %}
{% endfor %}