From a79204b8ce8a31eae62c192220d6b2313a35fa0c Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 9 Dec 2011 15:03:59 +0000 Subject: [PATCH] Fix the character sheet --- app/eve_api/templates/eve_api/character.html | 16 ++++++++-------- app/eve_api/views.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/eve_api/templates/eve_api/character.html b/app/eve_api/templates/eve_api/character.html index ae9ad42..2a763a8 100644 --- a/app/eve_api/templates/eve_api/character.html +++ b/app/eve_api/templates/eve_api/character.html @@ -62,15 +62,15 @@ Collapse All

- +
{% for group in skillTree %} {{group.items}} - + {% for skill in group.2 %} {% if skill.in_training %} - + {% else %} - + {% endif %} {% endfor %} {% endfor %} @@ -98,16 +98,16 @@ $(".skill_heading") .css("cursor", "pointer") .attr("title", "Click to expand/collapse section") - .click(function(){ $('tr[parent$=' + $(this).attr('id') + ']').toggle(); }); + .click(function(){ $('tr.child[group=' + $(this).attr('id') + ']').toggle(); }); $("#openAll").bind("click", function(e){ e.preventDefault(); - $(".child").show(); + $("tr.child").show(); }); $("#collapseAll").bind("click", function(e){ e.preventDefault(); - $(".child").hide(); + $("tr.child").hide(); }); - $('tr[parent]').hide(); + $('tr.child').hide(); }); diff --git a/app/eve_api/views.py b/app/eve_api/views.py index 59a7c67..4dcf6c9 100644 --- a/app/eve_api/views.py +++ b/app/eve_api/views.py @@ -169,7 +169,7 @@ def eveapi_character(request, charid=None, template='eve_api/character.html', li for skill in skills: if not skill.skill.group.id == currentSkillGroup: currentSkillGroup = skill.skill.group.id - skillTree.append([0, skill.skill.group.name, []]) + skillTree.append([0, skill.skill.group.name, [], skill.skill.group.id]) skillTree[-1][0] += skill.skillpoints skillTree[-1][2].append(skill)
{{ group.1 }}{{ group.0|intcomma }} SP
{{ group.1 }}{{ group.0|intcomma }} SP
{{ skill.skill.name }} - Training to Level {{ skill.in_training }}Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP
{{ skill.skill.name }} - Training to Level {{ skill.in_training }}Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP
{{ skill.skill.name }} Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP
{{ skill.skill.name }} Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP