nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-17 11:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further theme updating changes.

Browse Source
This commit is contained in:
Andrew Williams
2011-12-04 01:39:03 +00:00
parent 1bf5099dab
commit 76c6df0fd2
20 changed files with 461 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/api/templates/api/view_tokens.html
View File

@@ -3,21 +3,27 @@
{% block title %}Application Access{% endblock %} {% block title %}Application Access{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>Application Access</h1> <h1>Application Access</h1>
</div>
<p>This is the list of external applications that can access your data stored on Auth, this includes any EVE API data and also any linked information (Reddit accounts, service accounts).</p> <p>This is the list of external applications that can access your data stored on Auth, this includes any EVE API data and also any linked information (Reddit accounts, service accounts).</p>
{% if tokens %} {% if tokens %}
<table> <table class="zebra-striped" id="oauth-keys">
<tr><th>Application</th><th>Granted Date/Time</th><th>Action</th></tr> <thead>
{% for token in tokens %} <tr><th>Application</th><th>Granted Date/Time</th><th>Action</th></tr>
<tr> </thead>
<tr><td>{{ token.consumer.name }}</td><td></td><td><a href="{% url oauth-revoke-token token.key %}">Revoke</a></td> <tbody>
</tr> {% for token in tokens %}
{% endfor %} <tr>
<tr><td>{{ token.consumer.name }}</td><td></td><td><a href="{% url oauth-revoke-token token.key %}">Revoke</a></td>
</tr>
{% endfor %}
</tobdy>
</table>
{% else %} {% else %}
<p><b>You have not granted any applications access to your data</b></p> <p><b>You have not granted any applications access to your data.</b></p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

181
app/eve_api/templates/eve_api/character.html
View File

@@ -9,126 +9,115 @@
</div> </div>
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">
<h2>Attributes</h2> <h2>Attributes</h2>
<ul> <ul>
<li><span class="stat">Race:</span> <span class="value">{{ character.get_race_display }}</span></li> <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> {% if character.gender %}<li><span class="stat">Gender:</span> <span class="value">{{ character.get_gender_display }}</span></li>{% endif %}
<li><span class="stat">Corporation:</span> <a href="{% url eveapi-corporation character.corporation.id %}">{{ character.corporation.name }}</a></span></li> <li><span class="stat">Corporation:</span> <a href="{% url eveapi-corporation character.corporation.id %}">{{ character.corporation.name }}</a></span></li>
<li><span class="stat">Joined Corporation:</span> <span class="value">{{ character.corporation_date|date:"Y/m/d H:i:s" }}</span></li> {% if character.corporation.alliance %}<li><span class="stat">Alliance:</span> <span class="value"><a href="{% url eveapi-alliance character.corporation.alliance.id %}">{{ character.corporation.alliance.name }}</a><span></li>{% endif %}
{% if character.corporation.alliance %} <li><span class="stat">Joined Corporation:</span> <span class="value">{{ character.corporation_date|date:"Y/m/d H:i:s" }}</span></li>
<li><span class="stat">Alliance:</span> <span class="value"><a href="{% url eveapi-alliance character.corporation.alliance.id %}">{{ character.corporation.alliance.name }}</a><span></li> <li><span class="stat">Security Status:</span> {{ character.security_status|floatformat:2 }}</span></li>
{% endif %} <li><span class="stat">Director:</span> <span class="value">{{ character.director }}</span></li>
<li><span class="stat">Security Status:</span> {{ character.security_status|floatformat:2 }}</span></li> {% if character.current_training %}
<li><span class="stat">Director:</span> <span class="value">{{ character.director }}</span></li> <li><spam class="stat">Training:</span> <span class="Value">{{ character.current_training.skill.name}} to Level</span></li>
{% if character.current_training %} {% endif %}
<li><spam class="stat">Training:</span> <span class="Value">{{ character.current_training.skill.name}} to Level {{ ch$ </ul>
{% endif %}
</ul>
</div>
<div class="span5 offset3">
<div class="row pull-right">
<img src="https://image.eveonline.com/Character/{{ character.id }}_256.jpg" />
</div>
<div class="row pull-right">
<div class="span2">
<div class="row">
<span><a href="{% url eveapi-corporation character.corporation.id %}">{{ character.corporation.ticker }}</a></span>
</div>
<div class="row">
<img src="https://image.eveonline.com/Corporation/{{ character.corporation.id }}_64.png" class="pull-right"/>
</div>
</div>
<div class="span2"> {% if character.attrib_intelligence %}
{% if character.corporation.alliance %} <h2>Stats</h2>
<div class="row">
<span><a href="{% url eveapi-alliance character.corporation.alliance.id %}">{{ character.corporation.alliance.ticker }}</a></span>
</div>
<div class="row">
<img src="https://image.eveonline.com/Alliance/{{ character.corporation.alliance.id }}_64.png" class="pull-left"/>
</div>
{% endif %}
</div>
</div>
</div>
</div>
<div class="character_stats"> <table>
<h2>Stats</h2> <thead>
<tr><th>Stat</th><th>Value</th></tr>
<table> </thead>
<tr><th>Stat</th><th>Value</th></tr> <tbody>
<tr><td class="stat">Intelligence</td><td> {{ character.attrib_intelligence }}</td></tr> <tr><td>Intelligence</td><td> {{ character.attrib_intelligence }}</td></tr>
<tr><td class="stat">Memory</td><td>{{ character.attrib_memory }}</td></tr> <tr><td>Memory</td><td>{{ character.attrib_memory }}</td></tr>
<tr><td class="stat">Charisma</td><td>{{ character.attrib_charisma }}</td></tr> <tr><td>Charisma</td><td>{{ character.attrib_charisma }}</td></tr>
<tr><td class="stat">Perception</td><td>{{ character.attrib_perception }}</td></tr> <tr><td>Perception</td><td>{{ character.attrib_perception }}</td></tr>
<tr><td class="stat">Willpower</td><td>{{ character.attrib_willpower }}</td></tr> <tr><td>Willpower</td><td>{{ character.attrib_willpower }}</td></tr>
</table> </tbody>
</div> </table>
<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 group in skillTree %}
{{group.items}}
<tr class="skill_heading" id="{{ group.1 }}"><th colspan=2>{{ group.1 }}</th><th>{{ group.0|intcomma }}</th></tr>
{% for skill in group.2 %}
{% if skill.in_training %}
<tr class="child intraining" parent="{{ group.1 }}"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}t.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% else %}
<tr class="child" parent="{{ group.1 }}"><td>{{ skill.skill.name }} </td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% endif %}
{% endfor %}
{% endfor %}
<tr><th colspan=2>Total SP</th><th>{{ character.total_sp|intcomma }} SP</th></tr>
</table>
</div>
{% if employmenthistory.count %}
<div class="character_employmenthistory">
<h2>Employment History</h2>
<table>
<tr><th>Corporation</th><th>Join Date</th><th>Leave Date</th></tr>
{% for hist in employmenthistory %}
<tr><td><a href="{% url eveapi-corporation hist.corporation.id %}">{{ hist.corporation.name }}</a></td><td>{{ hist.start_date }}</td><td>{% if hist.end_date %}{{ hist.end_date }}{% endif %}</td></tr>
{% endfor %}
</table>
</div>
{% endif %} {% endif %}
</div>
<div class="span5 offset3">
<div class="row pull-right">
<img src="https://image.eveonline.com/Character/{{ character.id }}_256.jpg" />
</div>
<div class="row pull-right">
<div class="span5">
{% if character.corporation.alliance %}
<img src="https://image.eveonline.com/Alliance/{{ character.corporation.alliance.id }}_64.png" class="pull-right" title="{{ character.corporation.alliance }} ({{ character.corporation.alliance.ticker }})"/>
{% endif %}
<img src="https://image.eveonline.com/Corporation/{{ character.corporation.id }}_64.png" class="pull-right" title="{{ character.corporation }} ({{ character.corporation.ticker }})"/>
</div>
</div>
</div>
</div> </div>
{% if skillTree %}
<h2>Skills</h2>
<p>
<a href=#" id="openAll" class="btn">Open All</a>
<a href=#" id="collapseAll" class="btn">Collapse All</a>
</p>
<table>
{% for group in skillTree %}
{{group.items}}
<tr class="fill skill_heading" id="{{ group.1 }}"><th colspan=2>{{ group.1 }}</th><th>{{ group.0|intcomma }} SP</th></tr>
{% for skill in group.2 %}
{% if skill.in_training %}
<tr class="child intraining" parent="{{ group.1 }}"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}t.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% else %}
<tr class="child" parent="{{ group.1 }}"><td>{{ skill.skill.name }} </td><td><img src="{{ STATIC_URL }}img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% endif %}
{% endfor %}
{% endfor %}
<tr><th colspan=2>Total SP</th><th>{{ character.total_sp|intcomma }} SP</th></tr>
</table>
{% endif %}
{% if employmenthistory.count %}
<h2>Employment History</h2>
<table>
<thead>
<tr><th>Corporation</th><th>Join Date</th><th>Leave Date</th></tr>
</thead>
<tbody>
{% for hist in employmenthistory %}
<tr><td><a href="{% url eveapi-corporation hist.corporation.id %}">{{ hist.corporation.name }}</a></td><td>{{ hist.start_date }}</td><td>{% if hist.end_date %}{{ hist.end_date }}{% endif %}</td></tr>
{% endfor %}
</tbody>
</table>
{% endif %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" type="text/javascript"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$(".skill_heading") $(".skill_heading")
.css("cursor", "pointer") .css("cursor", "pointer")
.attr("title", "Click to expand/collapse") .attr("title", "Click to expand/collapse section")
.click(function(){ .click(function(){
$('tr[parent$=' + $(this).attr('id') + ']').toggle(); $('tr[parent$=' + $(this).attr('id') + ']').toggle();
}); });
$("#openAll").bind("click", function(e){ $("#openAll").bind("click", function(e){
e.preventDefault(); e.preventDefault();
$(".child").show(); $(".child").show();
}); });
$("#collapseAll").bind("click", function(e){ $("#collapseAll").bind("click", function(e){
e.preventDefault(); e.preventDefault();
$(".child").hide(); $(".child").hide();
}); });
$('tr[parent]').hide(); $('tr[parent]').hide();
}); });
</script> </script>

32
app/eve_api/templates/eve_api/character_list.html
View File

@@ -2,29 +2,45 @@
{% load humanize %} {% load humanize %}
{% block content %} {% block content %}
<script src="/static/js/jquery.tablesorter.min.js"></script>
<script >
$(function() {
$("table#characters").tablesorter({ sortList: [[0,0]] });
});
</script>
<div class="page-header"> <div class="page-header">
<h1>Your Characters</h1> <h1>Your Characters</h1>
</div> </div>
<table> {% if accounts %}
{% if characters %}
<table class="zebra-striped" id="characters">
<thead> <thead>
<tr><th>Character Name</th><th>Corporation</th><th>Alliance</th><th>Skillpoints</th><th>Training</th></tr> <tr><th>Character Name</th><th>Corporation</th><th>Alliance</th><th>Skillpoints</th><th>Training</th></tr>
</thead> </thead>
<tbody> <tbody>
{% for acc in accounts %} {% for char in characters %}
{% if acc.characters.count %} <tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td>
<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><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> <td>{% if char.corporation.alliance %}<a href="{% url eveapi-alliance char.corporation.alliance.id %}">{{ char.corporation.alliance }}</a>{% endif %}</td>
<td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td> <td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td>
<td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td> <td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td>
</tr> </tr>
{% endfor %}
{% endif %}
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% for acc in accounts %}
{% if acc.training == 0 %}<p><span class="label warning">No Character Training</span> on the account linked to API Key ID {{ acc.api_user_id }}.</p>{% endif %}
{% endfor %}
{% else %}
<p>You have no characters available on the API keys provided.</p>
{% endif %}
{% else %}
<p>You have no API keys linked to your auth account.</p>
{% endif %}
{% endblock %} {% endblock %}

2
app/eve_api/templates/eve_api/corporation.html
View File

@@ -30,7 +30,7 @@
</table> </table>
{% paginate %} {% paginate %}
<p><a href="{% url eveapi-corporation-members-csv corporation.id %}">Export as CSV</a></p> <p><a href="{% url eveapi-corporation-members-csv corporation.id %}" class="btn" title="Exports the membership list of this corporation to a CSV file.">Export as CSV</a></p>
{% endif %} {% endif %}
</div> </div>

5
app/eve_api/views.py
View File

@@ -41,7 +41,7 @@ def eveapi_add(request, post_save_redirect='/', template='eve_api/add.html'):
if out: if out:
msg = "Key %d successfully added." % form.cleaned_data['api_user_id'] msg = "Key %d successfully added." % form.cleaned_data['api_user_id']
else: else:
msg = "An issue was encountered why trying to import key %s, please recheck and try again." % form.cleaned_data['api_user_id'] msg = "An issue was encountered while trying to import key %s, Please check that you are using the correct information and try again." % form.cleaned_data['api_user_id']
messages.success(request, msg, fail_silently=True) messages.success(request, msg, fail_silently=True)
return redirect(post_save_redirect) return redirect(post_save_redirect)
else: else:
@@ -183,7 +183,8 @@ def eveapi_character(request, charid=None, template='eve_api/character.html', li
return render_to_response(template, context, context_instance=RequestContext(request)) return render_to_response(template, context, context_instance=RequestContext(request))
context = { context = {
'accounts': EVEAccount.objects.select_related('characters', 'characters__corporation', 'characters__corporation__alliance').filter(user=request.user), 'accounts': EVEAccount.objects.select_related('characters__name').filter(user=request.user).exclude(api_keytype=API_KEYTYPE_CORPORATION),
'characters': EVEPlayerCharacter.objects.filter(eveaccount__user=request.user).distinct().order_by('name'),
} }
return render_to_response(list_template, context, context_instance=RequestContext(request)) return render_to_response(list_template, context, context_instance=RequestContext(request))

7
app/hr/templates/hr/applications/add.html
View File

@@ -3,6 +3,11 @@
{% block title %}Create Application{% endblock %} {% block title %}Create Application{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>New Application</h1>
</div>
<p>Select the character you wish to apply with, then the corporation you wish to apply for.</p> <p>Select the character you wish to apply with, then the corporation you wish to apply for.</p>
<form action="{% url hr-addapplication %}" method="post"> <form action="{% url hr-addapplication %}" method="post">
@@ -10,6 +15,6 @@
{{ form.as_table }} {{ form.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Apply" /> <input type="submit" value="Create Application" class="btn primary"/>
</form> </form>
{% endblock %} {% endblock %}

8
app/hr/templates/hr/applications/admin/view_list.html
View File

@@ -4,10 +4,12 @@
{% block content %} {% block content %}
<h1>Search All Applications</h1> <div class="page-header">
<h1>All Applications</h1>
</div>
<form method="GET" action="{% url hr-admin %}"> <form method="GET" action="{% url hr-admin %}">
<input type="text" name="q" /> <input type="text" name="q" placeholder="Search..."/>
<input type="submit" value="Search" />
</form> </form>
{% if apps %} {% if apps %}

173
app/hr/templates/hr/applications/view.html
View File

@@ -9,146 +9,179 @@
{% block title %}View Application{% endblock %} {% block title %}View Application{% endblock %}
{% block content %} {% block content %}
<h3>Application Details</h3> <div class="page-header">
<h1>Application - {{ app.character }} to {{ app.corporation }} </h1>
</div>
<ul> <ul>
<li>Applying Auth User: <a href="{% url sso.views.user_view app.user %}">{{ app.user }}</a></li> <li>Applying Auth User: <a href="{% url sso.views.user_view app.user %}">{{ app.user }}</a></li>
<li>Applying Character: <a href="{% url eve_api.views.eveapi_character app.character.id %}">{{ app.character }}</a></li> <li>Applying Character: <a href="{% url eve_api.views.eveapi_character app.character.id %}">{{ app.character }}</a></li>
<li>Applying To: <a href="{% url eve_api.views.eveapi_corporation app.corporation.id %}">{{ app.corporation }}</a></li> <li>Applying To: <a href="{% url eve_api.views.eveapi_corporation app.corporation.id %}">{{ app.corporation }}</a></li>
<li>Application Status: <b>{{ app.get_status_display }}</b></li> <li>Application Status: {{ app.get_status_display }}</li>
{% if hrstaff %} {% if hrstaff %}
<li>Blacklist Status: <b>{% if app.blacklisted %}<font color='red'>BLACKLISTED</font>{% else %}<font color='geen'>OK</font>{% endif %}</b></li> <li>Blacklist Status: <b>{% if app.blacklisted %}<span class="label important">>BLACKLISTED</span>{% else %}<span class="label success">OK</span>{% endif %}</b></li>
{% endif %} {% endif %}
</ul> </ul>
{% ifnotequal app.status 5 %} {% ifnotequal app.status 5 %}
{% ifnotequal app.status 2 %} {% ifnotequal app.status 2 %}
<h3>Actions</h3> <h3>Actions</h3>
<div class="skill_controls">
<p> <p>
{% if app.status < 1 %} {% if app.status < 1 %}
<a href="{% url hr-updateapplication app.id 1 %}">Submit Application</a> <a class="btn success" href="{% url hr-updateapplication app.id 1 %}">Submit Application</a>
{% else %} {% else %}
<a href="{% url hr-updateapplication app.id 0 %}">Withdraw Application</a> <a class="btn" href="{% url hr-updateapplication app.id 0 %}">Withdraw Application</a>
{% endif %} {% endif %}
<a href="{% url hr-addmessage app.id %}">Add Message</a> <a class="btn" href="{% url hr-addmessage app.id %}">Add Message</a>
{% if hrstaff %} {% if hrstaff %}
<a href="{% url hr-addnote app.id %}">Add Staff Note</a> <a class="btn" href="{% url hr-addnote app.id %}">Add Staff Note</a>
{% if app.status < 2 or app.status = 4 or app.status = 6 %} {% if app.status < 2 or app.status = 4 or app.status = 6 %}
{% if perms.hr.can_accept %} {% if perms.hr.can_accept %}
<a href="{% url hr-rejectapplication app.id %}">Reject Application</a> <a class="btn error" href="{% url hr-rejectapplication app.id %}">Reject Application</a>
{% ifequal app.blacklisted 0 %} {% ifequal app.blacklisted 0 %}
<a href="{% url hr-acceptapplication app.id %}">Accept Application</a> <a class="btn success" href="{% url hr-acceptapplication app.id %}">Accept Application</a>
{% endifequal %} {% endifequal %}
{% endif %} {% endif %}
{% ifnotequal app.status 4 %} {% ifnotequal app.status 4 %}
<a href="{% url hr-updateapplication app.id 4 %}">Mark as In Query</a> <a class="btn" href="{% url hr-updateapplication app.id 4 %}">Mark as In Query</a>
{% endifnotequal %} {% endifnotequal %}
{% ifnotequal app.status 6 %} {% ifnotequal app.status 6 %}
<a href="{% url hr-updateapplication app.id 6 %}">Flag for Review</a> <a class="btn" href="{% url hr-updateapplication app.id 6 %}">Flag for Review</a>
{% endifnotequal %} {% endifnotequal %}
{% endif %} {% endif %}
{% ifequal app.status 3 %} {% ifequal app.status 3 %}
<a href="{% url hr-updateapplication app.id 5 %}">Mark as Complete</a> <a class="btn success" href="{% url hr-updateapplication app.id 5 %}">Mark as Complete</a>
{% endifequal %} {% endifequal %}
{% endif %} {% endif %}
</p> </p>
</div>
{% endifnotequal %} {% endifnotequal %}
{% endifnotequal %} {% endifnotequal %}
{% if audit %} {% if audit %}
<h3>Event Log</h3> <h3>Event Log</h3>
<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> <table class="zebra-striped">
{% for a in audit %} <thead>
<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> <tr><th width="50px">Event Type</th><th width="75px">User</th><th width="50px">Date</th><th>Event Details</th></tr>
{% endfor %} </thead>
<tbody>
{% for a in audit %}
<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 %}
</tbody>
</table> </table>
{% endif %} {% endif %}
{% if hrstaff %} {% if hrstaff %}
{% if app.blacklist_values %} {% if app.blacklist_values %}
<h3>Blacklist Triggers</h3> <h3>Blacklist Triggers</h3>
<table>
<tr><th>Blacklist Type</th><th>Blacklisted Value</th><th>Level</th><th>Reason</th><th>Source</th></tr> <table class="zebra-striped">
{% for a in app.blacklist_values %} <thead>
<tr><td>{{ a.get_type_display }}</td><td>{{ a.value }}</td><td>{{ a.get_level_display }}</td><td>{{ a.reason }}</td><td>{{ a.source }}</td></tr> <tr><th>Blacklist Type</th><th>Blacklisted Value</th><th>Level</th><th>Reason</th><th>Source</th></tr>
{% endfor %} </thead>
<tbody>
{% for a in app.blacklist_values %}
<tr><td>{{ a.get_type_display }}</td><td>{{ a.value }}</td><td>{{ a.get_level_display }}</td><td>{{ a.reason }}</td><td>{{ a.source }}</td></tr>
{% endfor %}
</tbody>
</table> </table>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if app.recommendation_set.all %} {% if app.recommendation_set.all %}
<h3>Recommendations</h3> <h3>Recommendations</h3>
<table>
<tr><th>User</th><th>Character</th><th>Corporation</th><th>Valid Recommendation</th><th>Total User Recomendations</th></tr> <table class="zebra-striped">
{% for rec in app.recommendation_set.all %} <thead>
<tr><td><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a></td> <tr><th>User</th><th>Character</th><th>Corporation</th><th>Valid Recommendation</th><th>Total User Recomendations</th></tr>
<td><a href="{% url eve_api.views.eveapi_character rec.user_character.id %}">{{ rec.user_character }}</a></td> </thead>
<td><a href="http://evemaps.dotlan.net/corp/{{ rec.user_character.corporation.name }}">{{ rec.user_character.corporation }}</a></td> <tbody>
<td>{% if rec.is_valid %}<font color="green">Yes</font>{% else %}<font color="red">No</font>{% endif %}</td> {% for rec in app.recommendation_set.all %}
<td>{{ rec.user.recommendation_set.all.count }}</td> <tr><td><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a></td>
</tr> <td><a href="{% url eve_api.views.eveapi_character rec.user_character.id %}">{{ rec.user_character }}</a></td>
{% endfor %} <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>
<td>{{ rec.user.recommendation_set.all.count }}</td>
</tr>
{% endfor %}
</tbody>
</table> </table>
{% endif %} {% endif %}
{% if hrstaff %} {% if hrstaff %}
{% if app.corporation.application_config.api_view %} {% if app.corporation.application_config.api_view %}
<h3>API Keys</h3> <h3>API Keys</h3>
<table> <table>
<tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr> <thead>
{% for acc in app.user.eveaccount_set.all %} <tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr>
<tr><td>{{ acc.api_user_id }}</td> </thead>
<td>{{ acc.api_key }}</td> <tbody>
<td>{{ acc.description }}</td> {% for acc in app.user.eveaccount_set.all %}
<td>{{ acc.get_api_keytype_display }}</td> <tr><td>{{ acc.api_user_id }}</td>
<td id="api-status-{{ acc.api_user_id }}">{{ acc.get_api_status_display }}</td> <td>{{ acc.api_key }}</td>
<td id="api-time-{{ acc.api_user_id }}">{{ acc.api_last_updated|naturaltimediff }}</td> <td>{{ acc.description }}</td>
</tr> <td>{{ acc.get_api_keytype_display }}</td>
{% endfor %} <td id="api-status-{{ acc.api_user_id }}">{{ acc.get_api_status_display }}</td>
<td id="api-time-{{ acc.api_user_id }}">{{ acc.api_last_updated|naturaltimediff }}</td>
</tr>
{% endfor %}
</tbody>
</table> </table>
{% endif %} {% endif %}
<h3>EVE Characters</h3> <h3>EVE Characters</h3>
<table>
<tr><th>Character</th><th>Corp / Alliance</th><th>ISK</th><th>SP</th><th>Training</th><th>Links</th></tr> <table class="zebra-striped" id="characters">
{% for acc in app.user.eveaccount_set.all %} <thead>
{% for char in acc.characters.all %} <tr><th>Character</th><th>Corp / Alliance</th><th>ISK</th><th>SP</th><th>Training</th><th>Links</th></tr>
<tr><td><a href="{% url eve_api.views.eveapi_character char.id %}">{{ char.name }}</a></td> </thead>
<td><a href="http://evemaps.dotlan.net/corp/{{ char.corporation }}">{{ char.corporation }}</a>{% if char.corporation.alliance %} / <tbody>
{% for acc in app.user.eveaccount_set.all %}
{% for char in acc.characters.all %}
<tr><td><a href="{% url eve_api.views.eveapi_character char.id %}">{{ char.name }}</a></td>
<td><a href="http://evemaps.dotlan.net/corp/{{ char.corporation }}">{{ char.corporation }}</a>{% if char.corporation.alliance %} /
<a href="http://evemaps.dotlan.net/alliance/{{ char.corporation.alliance }}">{{ char.corporation.alliance }}</a>{% endif %} <a href="http://evemaps.dotlan.net/alliance/{{ char.corporation.alliance }}">{{ char.corporation.alliance }}</a>{% endif %}
</td> </td>
<td style="text-align: right;">{{ char.balance|intcomma }} ISK</td> <td style="text-align: right;">{{ char.balance|intcomma }} ISK</td>
<td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td> <td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td>
<td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td> <td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td>
<td>{% if request.is_igb %}<a href="javascript:CCPEVE.showInfo(1377, {{ char.id }})">Show In Eve</a> / {% endif %}<a href="https://gate.eveonline.com/Profile/{{ char.name }}/">EveGate Profile</a> / <a href="http://eve-search.com/search/author/{{ char.name }}">EveSearch</a> / <a href="https://forums.eveonline.com/default.aspx?g=search&postedby={{ char.name}}">EVEGate Forums</a></td> <td>{% if request.is_igb %}<a href="javascript:CCPEVE.showInfo(1377, {{ char.id }})">Show In Eve</a> / {% endif %}<a href="https://gate.eveonline.com/Profile/{{ char.name }}/">EveGate Profile</a> / <a href="http://eve-search.com/search/author/{{ char.name }}">EveSearch</a> / <a href="https://forums.eveonline.com/default.aspx?g=search&postedby={{ char.name}}">EVEGate Forums</a></td>
</tr> </tr>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</tbody>
</table> </table>
{% if "reddit"|installed %} {% if "reddit"|installed %}
{% ifswitch reddit %} {% ifswitch reddit %}
{% if app.user.redditaccount_set.all %} {% if app.user.redditaccount_set.all %}
<h3>Reddit Accounts</h3> <h3>Reddit Accounts</h3>
<table>
<tr><th>Account</th><th>Karma</th><th>Validated</th><th>Creation Date</th><th>Matches Criteria?</th><th>Links</th></tr> <table class="zebra-striped" id="reddit">
{% for acc in app.user.redditaccount_set.all %} <thead>
<tr><td><a href="http://reddit.com/user/{{ acc.username }}/">{{ acc.username }}</a></td> <tr><th>Account</th><th>Karma</th><th>Validated</th><th>Creation Date</th><th>Matches Criteria?</th><th>Links</th></tr>
<td>{{ acc.link_karma }} / {{ acc.comment_karma }}</td> </thead>
<td>{% if acc.validated %}Validated{%else %}<b>NOT VALIDATED</b>{% endif %}</td> <tbody>
<td>{{ acc.date_created }}</td> {% for acc in app.user.redditaccount_set.all %}
<td>{% if acc.is_valid %}<font color="green">Yes</font>{% else %}<font color="red">No</font>{% endif %}</td> <tr><td><a href="http://reddit.com/user/{{ acc.username }}/">{{ acc.username }}</a></td>
<td><a href="http://metareddit.com/stalk?user={{ acc.username}}">Metareddit</a></td> <td>{{ acc.link_karma }} / {{ acc.comment_karma }}</td>
</tr> <td>{% if acc.validated %}<span class="label success">Validated</span>{%else %}<span class="label warning">NOT VALIDATED</span>{% endif %}</td>
{% endfor %} <td>{{ acc.date_created }}</td>
<td>{% if acc.is_valid %}<font color="green">Yes</font>{% else %}<font color="red">No</font>{% endif %}</td>
<td><a href="http://metareddit.com/stalk?user={{ acc.username}}">Metareddit</a></td>
</tr>
{% endfor %}
</tbody>
</table> </table>
<h3>Recent Reddit Posts</h3> <h3>Recent Reddit Posts</h3>
<span id="loadlink"> <span id="loadlink">
<a href="javascript:redditposts()">Load recent Reddit posts</a> <a href="javascript:redditposts()" class="btn">Load recent Reddit posts</a>
</span> </span>
<script type="text/javascript"> <script type="text/javascript">

23
app/hr/templates/hr/applications/view_list.html
View File

@@ -3,20 +3,29 @@
{% block title %}Applications{% endblock %} {% block title %}Applications{% endblock %}
{% block content %} {% block content %}
<p>This list shows your current open applications</p>
<div class="page-header">
<h1>You Applications</h1>
</div>
{% if applications %} {% if applications %}
<table> <p>This is a list of all your applications. The current status of each application is shown in the Application Status field.</p>
<tr><th>Application ID</th><th>Character</th><th>Corporation</th><th>Application Status</th></tr>
{% for app in applications %} <table class="zebra-striped" id="applications">
<tr><td><a href="{% url hr-viewapplication app.id %}">{{ app.id }}</a></td> <tr><th>Application ID</th><th>Character</th><th>Corporation</th><th>Application Status</th></tr>
{% for app in applications %}
<tr><td><a href="{% url hr-viewapplication app.id %}">{{ app.id }}</a></td>
<td>{{ app.character }}</td> <td>{{ app.character }}</td>
<td>{{ app.corporation }}</td> <td>{{ app.corporation }}</td>
<td>{{ app.get_status_display }}</td> <td>{{ app.get_status_display }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% else %} {% else %}
<p>You have no current applications</p> <p>You have no current applications</p>
{% endif %} {% endif %}
<p><a href="{% url hr-addapplication %}" class="btn">Apply to a corporation</a></p>
{% endblock %} {% endblock %}

8
app/hr/templates/hr/blacklist_add.html
View File

@@ -2,15 +2,17 @@
{% block title %}Add Blacklist Entry{% endblock %} {% block title %}Add Blacklist Entry{% endblock %}
{% block content %} {% block content %}
<h1>Add Blacklist Entry</h1> <div class="page-header">
<h1>Add Blacklist Entry</h1>
</div>
<form action="{% url hr-blacklist-add %}" method="post"> <form action="{% url hr-blacklist-add %}" method="post">
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Blacklist" /> <input type="submit" value="Add Blacklist" class="btn primary"/>
</form> </form>
{% endblock %} {% endblock %}

26
app/hr/templates/hr/blacklist_list.html
View File

@@ -3,22 +3,24 @@
{% block title %}Blacklist{% endblock %} {% block title %}Blacklist{% endblock %}
{% block content %} {% block content %}
<h1>Blacklist</h1> <div class="page-header">
<h1>Blacklist</h1>
</div>
{% if object_list %} {% if object_list %}
<form method="get" action="{% url hr-blacklist-list %}"> <form method="get" action="{% url hr-blacklist-list %}">
<label for="query">Search:</label> <input type="text" name="q" id="query" value="{% if query %}{{ query }}{% endif %}" placeholder="Search..."/>
<input type="text" name="q" id="query" value="{% if query %}{{ query }}{% endif %}"/>
</form> </form>
<table> <table>
<thead> <thead>
<th>ID</th><th>Type</th><th>Value</th><th>Level</th><th>Reason</th><th>Expiry</th> <th>ID</th><th>Type</th><th>Value</th><th>Level</th><th>Reason</th><th>Expiry</th>
</thead> </thead>
<tbody> <tbody>
{% for obj in object_list %} {% for obj in object_list %}
<tr><td>{{ obj.id }}</td><td>{{ obj.get_type_display }}</td><td>{{ obj.value }}</td><td>{{ obj.get_level_display }}</td><td>{{ obj.reason }}</td><td>{{ obj.expiry_date }}</td></tr> <tr><td>{{ obj.id }}</td><td>{{ obj.get_type_display }}</td><td>{{ obj.value }}</td><td>{{ obj.get_level_display }}</td><td>{{ obj.reason }}</td><td>{{ obj.expiry_date }}</td></tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% if is_paginated %} {% if is_paginated %}
@@ -37,7 +39,7 @@
{% endif %} {% endif %}
{% if perms.hr.add_blacklist %} {% if perms.hr.add_blacklist %}
<p><a href="{% url hr-blacklist-add %}">Add a blacklist entry</a></p> <p><a href="{% url hr-blacklist-add %}" class="btn">Add a blacklist entry</a></p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

22
app/hr/templates/hr/index.html
View File

@@ -3,24 +3,34 @@
{% block title %}HR{% endblock %} {% block title %}HR{% endblock %}
{% block content %} {% block content %}
<H1>HR</H1> <div class="page-header">
<H1>HR</H1>
</div>
<h3>Applications</h3> <h3>Applications</h3>
<p><a href="{% url hr-userapplications %}">View your current open applications</a><br/> <p>
<a href="{% url hr-addapplication %}">Create a application</a><br/></p> <ul>
<li><a href="{% url hr-userapplications %}">View your current open applications</a></li>
<li><a href="{% url hr-addapplication %}">Create a application</a></li>
</ul>
</p>
{% if can_recommend %} {% if can_recommend %}
<h3>Recommendations</h3> <h3>Recommendations</h3>
<p> <p>
<a href="{% url hr-viewrecommendations %}">View your current open recommendations</a><br/> <ul>
<a href="{% url hr-addrecommendation %}">Add a recommendation</a><br/> <li><a href="{% url hr-viewrecommendations %}">View your current open recommendations</a></li>
<li><a href="{% url hr-addrecommendation %}">Add a recommendation</a></li>
</ul>
</p> </p>
{% endif %} {% endif %}
{% if is_hr_staff %} {% if is_hr_staff %}
<h3>HR Admin</h3> <h3>HR Admin</h3>
<p> <p>
<a href="{% url hr-admin %}">View applications</a><br/> <ul>
<li><a href="{% url hr-admin %}">View applications</a></li>
</ul>
</p> </p>
{% endif %} {% endif %}

5
app/hr/templates/hr/recommendations/add.html
View File

@@ -3,6 +3,11 @@
{% block title %}Add Recommendation{% endblock %} {% block title %}Add Recommendation{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>Add Recommendation<h1>
</div>
<p>Select a character you wish to recommend from, then select your friend's current application. <p>Select a character you wish to recommend from, then select your friend's current application.
The person you are recommending needs to have created their application before you can add a recommendation.</p> The person you are recommending needs to have created their application before you can add a recommendation.</p>

31
app/hr/templates/hr/recommendations/view_list.html
View File

@@ -3,24 +3,31 @@
{% block title %}Recommendations{% endblock %} {% block title %}Recommendations{% endblock %}
{% block content %} {% block content %}
<script src="/static/js/jquery.tablesorter.min.js"></script>
<p>This list shows your current open recommendations that are yet to be submitted, as <p>This list shows your current open recommendations that are yet to be submitted, as
soon as the recommended user submits their application your recommendation will be removed from this list.</p> soon as the recommended user submits their application your recommendation will be removed from this list.</p>
{% if recommendations %} {% if recommendations %}
<table> <table class="zebra-striped" id="recommendations">
<thead> <thead>
<tr><th>Recommender</th><th>Recommended Application</th><th>Application Status</th></tr> <tr><th>Recommender</th><th>Recommended Application</th><th>Application Status</th></tr>
</thead> </thead>
<tbody> <tbody>
{% for rec in recommendations %} {% for rec in recommendations %}
<tr><td>{{ rec.user_character }}</td> <tr><td>{{ rec.user_character }}</td>
<td>{{ rec.application }}</td> <td>{{ rec.application }}</td>
<td>{{ rec.application.get_status_display }}</td> <td>{{ rec.application.get_status_display }}</td>
</tr> </tr>
</tbody> {% endfor %}
{% endfor %} </tbody>
</table> </table>
{% else %} {% else %}
<p>You have no current recommendations</p> <p>You have no current recommendations</p>
{% endif %} {% endif %}
<script>
$(function() {
$("table#recommendations").tablesorter({ sortList: [[0,0]] });
});
</script>
{% endblock %} {% endblock %}

4
app/sso/forms.py
View File

@@ -99,12 +99,12 @@ class UserLookupForm(forms.Form):
choices = [(1, "Auth Username"), choices = [(1, "Auth Username"),
(2, "Character"), (2, "Character"),
(4, "Email Address"), (4, "Email Address"),
(5, "EVE API User ID"), ] (5, "EVE API Key ID"), ]
if installed('reddit') and gargoyle.is_active('reddit', request): if installed('reddit') and gargoyle.is_active('reddit', request):
choices.append((3, "Reddit ID")) choices.append((3, "Reddit ID"))
self.fields['type'] = forms.ChoiceField(label=u'Search type', choices=choices) self.fields['type'] = forms.ChoiceField(label=u'Search type', choices=choices)
self.fields['username'] = forms.CharField(label=u'User ID', max_length=64) self.fields['username'] = forms.CharField(label=u'Value', max_length=64)
class APIPasswordForm(forms.Form): class APIPasswordForm(forms.Form):

154
app/sso/templates/sso/lookup/user.html
View File

@@ -6,7 +6,9 @@
{% block content %} {% block content %}
<div class="page-header">
<h1>{{user.username}}'s Profile</h1> <h1>{{user.username}}'s Profile</h1>
</div>
<p> <p>
<li><b>Username:</b> {{ user.username }}</li> <li><b>Username:</b> {{ user.username }}</li>
@@ -19,81 +21,90 @@
</p> </p>
<p> <p>
<div class="skill_controls"> <a href="{% url sso.views.refresh_access user.id %}" class="btn error">Update Access</a>
<a href="{% url sso.views.refresh_access user.id %}">Update Access</a>
{% if "hr"|installed %} {% if "hr"|installed %}
{% if perms.hr.add_blacklist %} {% if perms.hr.add_blacklist %}
<a href="{% url hr-blacklistuser user.id %}">Blacklist User</a> <a href="{% url hr-blacklistuser user.id %}" class="btn error">Blacklist User</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div>
</p> </p>
<br/>
{% if services %} {% if services %}
<h2>Service Accounts</h2> <section id="services">
<table> <h2>Service Accounts</h2>
<tr><th>Service</th><th>Username</th><th>Active</th></tr>
{% for acc in services %} <table>
<tr><td>{{ acc.service }}</td> <tr><th>Service</th><th>Username</th><th>Active</th></tr>
<td>{{ acc.service_uid }}</td> {% for acc in services %}
<td>{% if acc.active %}Yes{% else %}No{% endif %}</td> <tr><td>{{ acc.service }}</td>
</tr> <td>{{ acc.service_uid }}</td>
{% endfor %} <td>{% if acc.active %}Yes{% else %}No{% endif %}</td>
</table> </tr>
{% endfor %}
</table>
</section>
{% endif %} {% endif %}
<br/>
{% if user.application_set.all %} {% if user.application_set.all %}
<h2>Applications</h2> <section id="applications">
<table> <h2>Applications</h2>
<tr><th>ID</th><th>Character</th><th>Applied To</th><th>Status</th></tr>
{% for app in user.application_set.all %} <table class="zebra-striped">
<tr><td><a href="{% url hr-viewapplication app.id %}">{{ app.id }}</a></td> <tr><th>ID</th><th>Character</th><th>Applied To</th><th>Status</th></tr>
<td>{{ app.character }}</td> {% for app in user.application_set.all %}
<td>{{ app.corporation }}</td> <tr><td><a href="{% url hr-viewapplication app.id %}">{{ app.id }}</a></td>
<td>{{ app.get_status_display }}</td></tr> <td>{{ app.character }}</td>
{% endfor %} <td>{{ app.corporation }}</td>
</table> <td>{{ app.get_status_display }}</td></tr>
{% endfor %}
</table>
</section>
{% endif %} {% endif %}
{% if user.recommendation_set.all %} {% if user.recommendation_set.all %}
<br /> <section id="recommendations">
<h2>Recommendations</h2> <h2>Recommendations</h2>
<table>
<tr><th>Recommended Application</th><th>Recommendation Character</th><th>Recommendation Date</th></tr> <table>
{% for rec in user.recommendation_set.all %} <thead>
<tr><td><a href="{% url hr-viewapplication rec.application.id %}">{{ rec.application.character.name }}</a></td> <tr><th>Recommended Application</th><th>Recommendation Character</th><th>Recommendation Date</th></tr>
<td>{{ rec.user_character }}</td> </thead>
<td>{{ rec.recommendation_date }}</td></tr> <tbody>
{% endfor %} {% for rec in user.recommendation_set.all %}
</table> <tr><td><a href="{% url hr-viewapplication rec.application.id %}">{{ rec.application.character.name }}</a></td>
<td>{{ rec.user_character }}</td>
<td>{{ rec.recommendation_date }}</td></tr>
{% endfor %}
</tbody>
</table>
</section>
{% endif %} {% endif %}
{% if perms.sso.can_view_users %} {% if perms.sso.can_view_users %}
<br/>
<h2>Eve API Keys</h2>
{% if user.eveaccount_set.all %} {% if user.eveaccount_set.all %}
<table> <section id="api">
<thead> <h2>Eve API Keys</h2>
<tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr>
</thead> <table>
<tbody> <thead>
{% for acc in user.eveaccount_set.all %} <tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr>
<tr><td>{{ acc.api_user_id }}</td> </thead>
<td>{{ acc.api_key }}</td> <tbody>
<td>{{ acc.description }}</td> {% for acc in user.eveaccount_set.all %}
<td>{{ acc.get_api_keytype_display }}</td> <tr><td>{{ acc.api_user_id }}</td>
<td>{{ acc.get_api_status_display }}</td> <td>{{ acc.api_key }}</td>
<td>{{ acc.api_last_updated|naturaltimediff }}</td> <td>{{ acc.description }}</td>
</tr> <td>{{ acc.get_api_keytype_display }}</td>
</tbody> <td>{{ acc.get_api_status_display }}</td>
{% endfor %} <td>{{ acc.api_last_updated|naturaltimediff }}</td>
</table> </tr>
{% endfor %}
</tbody>
</table>
</section>
{% endif %} {% endif %}
{% endif %} {% endif %}
<br/>
{% if user.eveaccount_set.all %} {% if user.eveaccount_set.all %}
<table> <table>
<tr><th>Character Name</th><th>Corp</th></tr> <tr><th>Character Name</th><th>Corp</th></tr>
@@ -110,22 +121,23 @@
{% if "reddit"|installed %} {% if "reddit"|installed %}
{% ifswitch reddit %} {% ifswitch reddit %}
<br/> <section id="reddit">
<h2>Reddit Accounts</h2> <h2>Reddit Accounts</h2>
{% if user.redditaccount_set.all %} {% if user.redditaccount_set.all %}
<table> <table class="zebra-striped">
<thead> <thead>
<tr><th>Username</th><th>Created Date</th><th>Validated</th></tr> <tr><th>Username</th><th>Created Date</th><th>Validated</th></tr>
</thead> </thead>
<tbody> <tbody>
{% for acc in user.redditaccount_set.all %} {% for acc in user.redditaccount_set.all %}
<tr><td><a href="http://reddit.com/user/{{ acc.username }}/">{{ acc.username }}</a></td> <tr><td><a href="http://reddit.com/user/{{ acc.username }}/">{{ acc.username }}</a></td>
<td>{{ acc.date_created }}</td> <td>{{ acc.date_created }}</td>
<td>{% if acc.validated %}Yes{% else %}No{% endif %}</td> <td>{% if acc.validated %}Yes{% else %}No{% endif %}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</section>
{% endif %} {% endif %}
{% endifswitch %} {% endifswitch %}
{% endif %} {% endif %}

30
app/sso/templates/sso/lookup/userlookup.html
View File

@@ -3,13 +3,29 @@
{% block title %}User Lookup{% endblock %} {% block title %}User Lookup{% endblock %}
{% block content %} {% block content %}
<h1>User Lookup</h1> <div class="page-header">
<h1>Search / User Lookup</h1>
</div>
<p>This will search Auth's database for any users matching the values you provide.</p>
<p>
<form action="{% url sso.views.user_lookup %}" method="post"> <form action="{% url sso.views.user_lookup %}" method="post">
{% csrf_token %} <formset>
<table> {% csrf_token %}
{{ form.as_table }} <div class="clearfix">
</table> {{ form.type.label_tag }}
<br /> <div class="input">
<input type="submit" value="Lookup" /> {{ form.type }}
</div>
</div>
<div class="clearfix">
{{ form.username.label_tag }}
<div class="input">
{{ form.username }}
</div>
</div>
<input type="submit" value="Lookup" class="btn primary"/>
</formset>
</form> </form>
</p>
{% endblock %} {% endblock %}

29
app/sso/templates/sso/profile.html
View File

@@ -23,7 +23,6 @@
<li><a href="#reddit">Reddit</a></li> <li><a href="#reddit">Reddit</a></li>
{% endifswitch %} {% endifswitch %}
{% endif %} {% endif %}
<li><a href="#services">Services</a></li>
</ul> </ul>
<div class="pill-content"> <div class="pill-content">
@@ -32,30 +31,20 @@
<div class="active" id="overview"> <div class="active" id="overview">
<p> <p>
<b>Username:</b> {{ user.username }}<br/> <b>Username:</b> {{ user.username }}<br/>
<b>Email:</b> {{ user.email }}<br/> <b>Email:</b> {{ user.email }} (<a href="{% url sso.views.email_change %}">change</a>)<br/>
<b>Primary Character:</b> {{ user.get_profile.primary_character }}<br/> <b>Primary Character:</b> {{ user.get_profile.primary_character }} (<a href="{% url sso.views.primarychar_change %}">change</a>)<br/>
<b>Groups:</b> {{ user.groups.all|join:", " }}<br/> <b>Groups:</b> {{ user.groups.all|join:", " }}<br/>
</p> </p>
<h2>Passwords</h2>
<p> <p>
<a href="{% url sso.views.refresh_access %}" class="btn">Update Access</a> <a href="{% url django.contrib.auth.views.password_change %}" class="btn">Change Auth Login Password</a>
<a href="{% url django.contrib.auth.views.password_change %}" class="btn">Change Password</a> <a href="{% url sso.views.set_apipasswd %}" class="btn">Change Services Password</a><br/><br/>
<a href="{% url sso.views.email_change %}" class="btn">Change E-mail</a> <span class="label info">Note</span> Changing your services password will change it for all linked sites (forums, wiki, reimbursement tool)
<a href="{% url sso.views.primarychar_change %}" class="btn">Change Primary Character</a>
</p> </p>
</div>
<!-- Services Tabs -->
<div id="services">
<h2>Auth API Services</h2>
<p>Auth API Servies use Auth for your login information with the use of a seperate password. To reset your services password click the link below</p>
<p><a href="{% url sso.views.set_apipasswd %}" class="btn">Change External Services Password</a></p>
<br/>
{% if user.eveaccount_set.all %} {% if user.eveaccount_set.all %}
<h2>Service Accounts</h2> <h2>Service Accounts</h2>
<p>Services not fully integrated into Auth, and which a seperate username/password is required.</p> <p>These are services that cannot talk to auth and require a seperate username/password.</p>
{% if user.serviceaccount_set.all %} {% if user.serviceaccount_set.all %}
<table> <table>
<tr><th>Service</th><th>Username</th><th>URL</th><th>Active</th><th>Actions</th></tr> <tr><th>Service</th><th>Username</th><th>URL</th><th>Active</th><th>Actions</th></tr>
@@ -119,7 +108,9 @@
<p> <p>
{% ifswitch api-disableprocessing %} {% ifswitch api-disableprocessing %}
{% else %} {% else %}
<a href="{% url eve_api.views.eveapi_add %}" class="btn">Add a Eve API key</a> <a href="{% url eve_api.views.eveapi_add %}" class="btn primary" title="Adds a new EVE API key to your account">Add a Eve API key</a>
<a href="https://support.eveonline.com/api/Key/CreatePredefined/59638024/0/false" class="btn" title="Create a API key with all the permissions Auth needs">Create API Key</a>
<a href="{% url sso.views.refresh_access %}" class="btn {% if not user.eveaccount_set.all %}disabled{% else %}danger{% endif %}" title="Forces auth to recheck your permissions and update your services as needed">Force Access Update</a>
{% endifswitch %} {% endifswitch %}
</p> </p>

43
app/templates/base.html
View File

@@ -2,25 +2,29 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en"> <html lang="en">
<head> <head>
<title>TEST Auth</title> <title>Auth</title>
<link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.css" type="text/css" media="screen"> <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.css" type="text/css" media="screen">
<style type="text/css"> <style type="text/css">
html { html {
background-color: #9FB190; background-color: #D8DDE8;
//background-color: #9FB190;
} }
body { body {
background-color: #9FB190; //background-color: #9FB190;
background-color: #D8DDE8;
padding-top: 40px; padding-top: 40px;
} }
div.topbar div.fill { div.topbar div.fill {
background-color: #5F6757; //background-color: #5F6757;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#5F6757)); background-color: #204066;
background-image: -moz-linear-gradient(top, #333333, #5F6757); background-image: url(https://forum.pleaseignore.com/public/style_images/master/branding_bg.png);
background-image: -ms-linear-gradient(top, #333333, #5F6757); //background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#5F6757));
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #5F6757)); //background-image: -moz-linear-gradient(top, #333333, #5F6757);
background-image: -webkit-linear-gradient(top, #333333, #5F6757); //background-image: -ms-linear-gradient(top, #333333, #5F6757);
background-image: -o-linear-gradient(top, #333333, #5F6757); //background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #5F6757));
background-image: linear-gradient(top, #333333, #5F6757); //background-image: -webkit-linear-gradient(top, #333333, #5F6757);
//background-image: -o-linear-gradient(top, #333333, #5F6757);
//background-image: linear-gradient(top, #333333, #5F6757);
} }
div.content { div.content {
background-color: white; background-color: white;
@@ -43,19 +47,14 @@
<div class="topbar"> <div class="topbar">
<div class="fill"> <div class="fill">
<div class="container"> <div class="container">
<a class="brand" href="/">TEST Auth</a> <a class="brand" href="/">Auth</a>
<ul class="nav"> <ul class="nav">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li class="dropdown" data-dropdown="dropdown"><a href="#" class="dropdown-toggle">{{ request.user.username}}</a> <li><a href="{% url sso.views.profile %}">Your Profile</a></li>
<ul class="dropdown-menu"> {% if "groups"|installed %}<li><a href="{% url groups.views.group_list %}"> Your Groups</a></li>{% endif %}
<li><a href="{% url sso.views.profile %}">Your Profile</a></li> <li><a href="{% url eve_api.views.eveapi_character %}">Your Characters</a></li>
{% if "groups"|installed %}<li><a href="{% url groups.views.group_list %}"> Your Groups</a></li>{% endif %} {% if "api"|installed %}<li><a href="{% url oauth-list-tokens %}">3rd Party App Access</a></li>{% endif %}
<li><a href="{% url eve_api.views.eveapi_character %}">Your Characters</a></li>
<li class="divider"></li>
{% if "api"|installed %}<li><a href="{% url oauth-list-tokens %}">3rd Party App Access</a></li>{% endif %}
</ul>
</li>
{% if "hr"|installed %} {% if "hr"|installed %}
<li><a href="{% url hr-index %}">HR</a></li> <li><a href="{% url hr-index %}">HR</a></li>
{% endif %} {% endif %}
@@ -69,8 +68,6 @@
<li><a href="{% url sentry %}">Sentry</a></li> <li><a href="{% url sentry %}">Sentry</a></li>
{% endif %} {% endif %}
<li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li> <li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
{% else %}
<li><a href="{% url django.contrib.auth.views.login %}">Login</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

9
app/templates/registration/login.html
View File

@@ -9,19 +9,22 @@
</div> </div>
{% endif %} {% endif %}
<div class="page-header">
<h1>Login</h1>
</div>
<form method="post" action="{% url django.contrib.auth.views.login %}"> <form method="post" action="{% url django.contrib.auth.views.login %}">
<fieldset> <fieldset>
<legend>Login</legend>
<div class="clearfix"> <div class="clearfix">
{{ form.username.label_tag }} {{ form.username.label_tag }}
<div class="input"> <div class="input">
<td>{{ form.username }}</td> {{ form.username }}
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
{{ form.password.label_tag }} {{ form.password.label_tag }}
<div class="input"> <div class="input">
<td>{{ form.password }}</td> {{ form.password }}
</div> </div>
</div> </div>