Further theme updating changes.

app/hr/templates/hr/applications/add.html

@@ -3,6 +3,11 @@
 {% block title %}Create Application{% endblock %}
 
 {% 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>
 
 <form action="{% url hr-addapplication %}" method="post">
@@ -10,6 +15,6 @@
 {{ form.as_table }}
 </table>
 {% csrf_token %}
-<input type="submit" value="Apply" />
+<input type="submit" value="Create Application" class="btn primary"/>
 </form>
 {% endblock %}

app/hr/templates/hr/applications/admin/view_list.html

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

app/hr/templates/hr/applications/view.html

@@ -9,146 +9,179 @@
 {% block title %}View Application{% endblock %}
 
 {% block content %}
-<h3>Application Details</h3>
+<div class="page-header">
+<h1>Application - {{ app.character }} to {{ app.corporation }} </h1>
+</div>
 
 <ul>
 <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 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 %}
-<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 %}
 </ul>
 
 {% ifnotequal app.status 5 %}
 {% ifnotequal app.status 2 %}
 <h3>Actions</h3>
-<div class="skill_controls">
+
 <p>
 {% 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 %}
-<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 %}
-<a href="{% url hr-addmessage app.id %}">Add Message</a>
+<a class="btn" href="{% url hr-addmessage app.id %}">Add Message</a>
 {% 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 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 %}
-<a href="{% url hr-acceptapplication app.id %}">Accept Application</a>
+<a class="btn success" href="{% url hr-acceptapplication app.id %}">Accept Application</a>
 {% endifequal %}
 {% endif %}
 {% 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 %}
 {% 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 %}
 {% endif %}
 {% 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 %}
 {% endif %}
 </p>
-</div>
 {% endifnotequal %}
 {% endifnotequal %}
 
 {% if audit %}
 <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>
-{% 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 %}
+
+<table class="zebra-striped">
+  <thead>
+    <tr><th width="50px">Event Type</th><th width="75px">User</th><th width="50px">Date</th><th>Event Details</th></tr>
+  </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>
 {% endif %}
 
 {% if hrstaff %}
 {% if app.blacklist_values %}
 <h3>Blacklist Triggers</h3>
-<table>
-<tr><th>Blacklist Type</th><th>Blacklisted Value</th><th>Level</th><th>Reason</th><th>Source</th></tr>
-{% 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 %}
+
+<table class="zebra-striped">
+  <thead>
+    <tr><th>Blacklist Type</th><th>Blacklisted Value</th><th>Level</th><th>Reason</th><th>Source</th></tr>
+  </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>
 {% endif %}
 {% endif %}
 
 {% if app.recommendation_set.all %}
 <h3>Recommendations</h3>
-<table>
-<tr><th>User</th><th>Character</th><th>Corporation</th><th>Valid Recommendation</th><th>Total User Recomendations</th></tr>
-{% for rec in app.recommendation_set.all %}
-<tr><td><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a></td>
-<td><a href="{% url eve_api.views.eveapi_character rec.user_character.id %}">{{ rec.user_character }}</a></td>
-<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 %}
+
+<table class="zebra-striped">
+  <thead>
+    <tr><th>User</th><th>Character</th><th>Corporation</th><th>Valid Recommendation</th><th>Total User Recomendations</th></tr>
+  </thead>
+  <tbody>
+    {% for rec in app.recommendation_set.all %}
+    <tr><td><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a></td>
+      <td><a href="{% url eve_api.views.eveapi_character rec.user_character.id %}">{{ rec.user_character }}</a></td>
+      <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>
 {% endif %}
 
 {% if hrstaff %}
 {% if app.corporation.application_config.api_view %}
 <h3>API Keys</h3>
+
 <table>
-<tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr>
-{% for acc in app.user.eveaccount_set.all %}
-<tr><td>{{ acc.api_user_id }}</td>
-    <td>{{ acc.api_key }}</td>
-    <td>{{ acc.description }}</td>
-    <td>{{ acc.get_api_keytype_display }}</td>
-    <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 %}
+  <thead>
+    <tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr>
+  </thead>
+  <tbody>
+    {% for acc in app.user.eveaccount_set.all %}
+    <tr><td>{{ acc.api_user_id }}</td>
+      <td>{{ acc.api_key }}</td>
+      <td>{{ acc.description }}</td>
+      <td>{{ acc.get_api_keytype_display }}</td>
+      <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>
 {% endif %}
 
 <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>
-{% 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 %} / 
+
+<table class="zebra-striped" id="characters">
+  <thead>
+    <tr><th>Character</th><th>Corp / Alliance</th><th>ISK</th><th>SP</th><th>Training</th><th>Links</th></tr>
+  </thead>
+  <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 %}
-    </td>
-    <td style="text-align: right;">{{ char.balance|intcomma }} ISK</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 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>
-{% endfor %}
-{% endfor %}
+      </td>
+      <td style="text-align: right;">{{ char.balance|intcomma }} ISK</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 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>
+    {% endfor %}
+    {% endfor %}
+  </tbody>
 </table>
+
+
 {% if "reddit"|installed %}
 {% ifswitch reddit %}
 {% if app.user.redditaccount_set.all %}
 <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>
-{% for acc in app.user.redditaccount_set.all %}
-<tr><td><a href="http://reddit.com/user/{{ acc.username }}/">{{ acc.username }}</a></td>
-    <td>{{ acc.link_karma }} / {{ acc.comment_karma }}</td>
-    <td>{% if acc.validated %}Validated{%else %}<b>NOT VALIDATED</b>{% endif %}</td>
-    <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 %}
+
+<table class="zebra-striped" id="reddit">
+  <thead>
+    <tr><th>Account</th><th>Karma</th><th>Validated</th><th>Creation Date</th><th>Matches Criteria?</th><th>Links</th></tr>
+  </thead>
+  <tbody>
+    {% for acc in app.user.redditaccount_set.all %}
+    <tr><td><a href="http://reddit.com/user/{{ acc.username }}/">{{ acc.username }}</a></td>
+      <td>{{ acc.link_karma }} / {{ acc.comment_karma }}</td>
+      <td>{% if acc.validated %}<span class="label success">Validated</span>{%else %}<span class="label warning">NOT VALIDATED</span>{% endif %}</td>
+      <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>
 
 <h3>Recent Reddit Posts</h3>
 
 <span id="loadlink">
-<a href="javascript:redditposts()">Load recent Reddit posts</a>
+<a href="javascript:redditposts()" class="btn">Load recent Reddit posts</a>
 </span>
 
 <script type="text/javascript">

app/hr/templates/hr/applications/view_list.html

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

app/hr/templates/hr/blacklist_add.html

@@ -2,15 +2,17 @@
 {% block title %}Add Blacklist Entry{% endblock %}
 
 {% 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">
 <table>
-{{ form.as_table }}
+  {{ form.as_table }}
 </table>
 {% csrf_token %}
 
-<input type="submit" value="Blacklist" />
+<input type="submit" value="Add Blacklist" class="btn primary"/>
 </form>
 {% endblock %}
 

app/hr/templates/hr/blacklist_list.html

@@ -3,22 +3,24 @@
 {% block title %}Blacklist{% endblock %}
 
 {% block content %}
-<h1>Blacklist</h1>
+<div class="page-header">
+  <h1>Blacklist</h1>
+</div>
 
 {% if object_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 %}"/>
+    <input type="text" name="q" id="query" value="{% if query %}{{ query }}{% endif %}" placeholder="Search..."/>
 </form>
+
 <table>
-<thead>
-  <th>ID</th><th>Type</th><th>Value</th><th>Level</th><th>Reason</th><th>Expiry</th>
-</thead>
-<tbody>
-  {% 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>
-  {% endfor %}
-</tbody>
+  <thead>
+    <th>ID</th><th>Type</th><th>Value</th><th>Level</th><th>Reason</th><th>Expiry</th>
+  </thead>
+  <tbody>
+    {% 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>
+    {% endfor %}
+  </tbody>
 </table>
 
 {% if is_paginated %}
@@ -37,7 +39,7 @@
 {% endif %}
 
 {% 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 %}
 {% endblock %}
 

app/hr/templates/hr/index.html

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

app/hr/templates/hr/recommendations/add.html

@@ -3,6 +3,11 @@
 {% block title %}Add Recommendation{% endblock %}
 
 {% 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.
 
 The person you are recommending needs to have created their application before you can add a recommendation.</p>

app/hr/templates/hr/recommendations/view_list.html

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