Skip to content

Commit

Permalink
Add more geotag/note icon markers
Browse files Browse the repository at this point in the history
  • Loading branch information
kz26 committed Mar 5, 2014
1 parent ff23475 commit 8f8f7fd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 4 additions & 2 deletions uchicagohvz/templates/game/show.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ <h2>My Info</h2>
{% endif %}
</dl>
{% if game.status == "finished" and player.renting_gun and not player.gun_returned %}
<p class="text-danger">Please return your gun as soon as possible!</p>
<p class="text-danger">Please return your gun as soon as possible!</p>
{% endif %}
{% if player.active and game.status == 'in_progress' %}
{% if player.user.profile.phone_number %}
Expand Down Expand Up @@ -236,7 +236,7 @@ <h2>Survival by Dorm</h2>
</table>
<h2>Human Survival</h2>
<div id="hphChart"></div>
<h2>Most Courageous Dorms</h2>
<h2>Most Courageous Dorms</h2>
<p>Where courageousness = (total human points earned by dorm / # players in dorm) * 100</p>
<table class="table table-bordered table-striped">
<thead>
Expand Down Expand Up @@ -425,6 +425,8 @@ <h2>Global Kill Tree</h2>
{% recursetree game.get_kills %}
<li>
<a href="{{ node.get_absolute_url }}">{{ node.victim.display_name }} - killed on {{ node.date }}</a>
{% if node.geotagged %}<span class="glyphicon glyphicon-globe"></span>{% endif %}
{% if node.notes %}<span class="glyphicon glyphicon-pencil"></span>{% endif %}
{% if not node.is_leaf_node %}
<ul>
{{ children }}
Expand Down
2 changes: 2 additions & 0 deletions uchicagohvz/templates/game/show_player.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ <h2>Kill Tree</h2>
{% recursetree kill_tree %}
<li>
<a href="{{ node.get_absolute_url }}">{{ node.victim.display_name }} - killed on {{ node.date }}</a>
{% if node.geotagged %}<span class="glyphicon glyphicon-globe"></span>{% endif %}
{% if node.notes %}<span class="glyphicon glyphicon-pencil"></span>{% endif %}
{% if not node.is_leaf_node %}
<ul>
{{ children }}
Expand Down
2 changes: 2 additions & 0 deletions uchicagohvz/templates/game/show_squad.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ <h2>Members ({{ squad.size }})</h2>
<td><a class="text-danger" href="{{ kill.get_absolute_url }}">{{ kill.killer.display_name }} killed
{{ kill.victim.display_name }} on {{ kill.date }}</a>
{% if kill.hvd %}<span class="text-info">HVD</span>{% endif %}{% if kill.hvt %} <span class="text-info">HVT</span>{% endif %}
{% if kill.geotagged %}<span class="glyphicon glyphicon-globe"></span>{% endif %}
{% if kill.notes %}<span class="glyphicon glyphicon-pencil"></span>{% endif %}
</td>
</tr>
{% endfor %}
Expand Down

0 comments on commit 8f8f7fd

Please sign in to comment.