Support for Incarna v1.1, Customizable API Keys

- Support CAK keys and their spinoffs
- Add support for the Employment History data available in CharacterInfo.xml.aspx
- Add a Gargoyle flag to disable backend processing when needed
- Clean up a few inconsistancies with how the models are handled

app/eve_api/templates/eve_api/add.html

@@ -1,11 +1,16 @@
 {% extends "base.html" %}
 
+{% load gargoyle_tags %}
+
 {% block title %}Add EVE API Key{% endblock %}
 
 {% block content %}
-<p>Please fill in your API key as provided on the <a
-href="http://eve-online.com/api">EVE Online API
-page</a> and a optional description.</p>
+
+{% ifswitch switch_name %}
+<p>Please fill in your API key as provided on the <a href="http://eve-online.com/api">EVE Online API page</a> and a optional description.</p>
+{% else %}
+<p>Please fill in your API key details and a optional description. You can create a API key on the <a href="https://support.eveonline.com/api/Key/CreatePredefined/59638024/0/false">API support site</a></p>
+{% endifswitch %}
 
 <form action="{% url eve_api.views.eveapi_add %}" method="post">
 <table>

app/eve_api/templates/eve_api/character_list.html

@@ -4,15 +4,11 @@
 
 <h1>Character List</h1>
 
-{% if characters %}
-
-{% regroup characters by account as acc_list %}
-
 <table>
 <tr><th>Character Name</th><th>Corporation</th><th>Alliance</th><th>Skillpoints</th><th>Training</th></tr>
-{% for acc in acc_list %}
-<tr><th colspan=5>Account {{ acc.grouper }} {% if acc.grouper.training == 0 %}<font color="#F87217">(No Character Training)</font>{% endif %}</th></tr>
-{% for char in acc.list %}
+{% for acc in accounts %}
+<tr><th colspan=5>Key {{ acc.pk }} {% if acc.training == 0 %}<font color="#F87217">(No Character Training)</font>{% endif %}</th></tr>
+{% for char in acc.characters.all %}
 <tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td>
     <td><a href="{% url eveapi-corporation char.corporation.id %}">{{ char.corporation }}</a></td>
     <td>{% if char.corporation.alliance %}<a href="{% url eveapi-alliance char.corporation.alliance.id %}">{{ char.corporation.alliance }}</a>{% endif %}</td>
@@ -22,6 +18,5 @@
 {% endfor %}
 {% endfor %}
 </table>
-{% endif %}
 
 {% endblock %}