monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chris Wilson 2020-07-25 17:27:07 -04:00
parent 1d22c7fb97 9f5d9847f0
commit d1af7de6fe
1 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
WebHostLib/templates/tracker.html
View File

@ -5,18 +5,16 @@
<link rel="stylesheet" type="text/css" href="{{ static_autoversion("tracker.css") }}"/> <link rel="stylesheet" type="text/css" href="{{ static_autoversion("tracker.css") }}"/>
<script type="application/ecmascript" src="{{ static_autoversion("jquery.scrollsync.js") }}"></script> <script type="application/ecmascript" src="{{ static_autoversion("jquery.scrollsync.js") }}"></script>
<script type="application/ecmascript" src="{{ static_autoversion("tracker.js") }}"></script> <script type="application/ecmascript" src="{{ static_autoversion("tracker.js") }}"></script>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<div id="tracker-wrapper" data-tracker="{{ room.tracker }}"> <div id="tracker-wrapper" data-tracker="{{ room.tracker }}">
<div id="tracker-header-bar"> <div id="tracker-header-bar">
<input placeholder="Search" id="search" /> <input placeholder="Search" id="search" />
{% if video %}<span><a target="_blank" href="https://multistream.me/ {%- if video -%}<span><a target="_blank" href="https://multistream.me/
{%- for teamslot, (platform, link) in video.items()-%} {%- for teamslot, (platform, link) in video.items()-%}
{%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{ link }}/">Multistream</a></span> {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
{% endfor %} {%- endfor -%}">Multistream</a></span>
{% endif %} {%- endif -%}
</div> </div>
{% for team, players in inventory.items() %} {% for team, players in inventory.items() %}
<div class="table-wrapper"> <div class="table-wrapper">
@ -25,46 +23,46 @@
<tr> <tr>
<th>#</th> <th>#</th>
<th>Name</th> <th>Name</th>
{% for name in tracking_names %} {%- for name in tracking_names -%}
{% if name in icons %} {%- if name in icons -%}
<th class="center-column"> <th class="center-column">
<img class="alttp-sprite" src="{{ icons[name] }}" alt="{{ name|e }}"> <img class="alttp-sprite" src="{{ icons[name] }}" alt="{{ name|e }}">
</th> </th>
{% else %} {%- else -%}
<th class="center-column">{{ name|e }}</th> <th class="center-column">{{ name|e }}</th>
{% endif %} {%- endif -%}
{% endfor %} {%- endfor -%}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for player, items in players.items() %} {%- for player, items in players.items() -%}
<tr> <tr>
<td>{{ loop.index }}</td> <td>{{ loop.index }}</td>
{% if (team, loop.index) in video %} {%- if (team, loop.index) in video -%}
{% if video[(team, loop.index)][0] == "Twitch" %} {%- if video[(team, loop.index)][0] == "Twitch" -%}
<td> <td>
<a target="_blank" href="https://www.twitch.tv/{{ video[(team, loop.index)][1] }}"> <a target="_blank" href="https://www.twitch.tv/{{ video[(team, loop.index)][1] }}">
{{ player_names[(team, loop.index)] }} {{ player_names[(team, loop.index)] }}
▶️</a></td> ▶️</a></td>
{% elif video[(team, loop.index)][0] == "Youtube" %} {%- elif video[(team, loop.index)][0] == "Youtube" -%}
<td> <td>
<a target="_blank" href="youtube.com/c/{{ video[(team, loop.index)][1] }}/live"> <a target="_blank" href="youtube.com/c/{{ video[(team, loop.index)][1] }}/live">
{{ player_names[(team, loop.index)] }} {{ player_names[(team, loop.index)] }}
▶️</a></td> ▶️</a></td>
{% endif %} {%- endif -%}
{% else %} {%- else -%}
<td>{{ player_names[(team, loop.index)] }}</td> <td>{{ player_names[(team, loop.index)] }}</td>
{% endif %} {%- endif -%}
{% for id in tracking_ids %} {%- for id in tracking_ids -%}
{% if items[id] %} {%- if items[id] -%}
<td class="center-column item-acquired"> <td class="center-column item-acquired">
{% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %}</td> {% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %}</td>
{% else %} {%- else -%}
<td></td> <td></td>
{% endif %} {%- endif -%}
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} {%- endfor -%}
</tbody> </tbody>
</table> </table>
</div> </div>
@ -88,10 +86,10 @@
{% if area in icons %} {% if area in icons %}
<th colspan="{{ colspan }}" class="center-column upper-row"> <th colspan="{{ colspan }}" class="center-column upper-row">
<img class="alttp-sprite" src="{{ icons[area] }}" alt="{{ area }}"></th> <img class="alttp-sprite" src="{{ icons[area] }}" alt="{{ area }}"></th>
{% else %} {%- else -%}
<th colspan="{{ colspan }}" class="center-column">{{ area }}</th> <th colspan="{{ colspan }}" class="center-column">{{ area }}</th>
{% endif %} {%- endif -%}
{% endfor %} {%- endfor -%}
<th rowspan="2" class="center-column">Last<br>Activity</th> <th rowspan="2" class="center-column">Last<br>Activity</th>
</tr> </tr>
<tr> <tr>
@ -108,38 +106,38 @@
<th class="center-column lower-row"> <th class="center-column lower-row">
<img class="alttp-sprite" src="{{ icons["Big Key"] }}" alt="Big Key"> <img class="alttp-sprite" src="{{ icons["Big Key"] }}" alt="Big Key">
</th> </th>
{% endif %} {%- endif -%}
{% endfor %} {%- endfor -%}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for player, checks in players.items() %} {%- for player, checks in players.items() -%}
<tr> <tr>
<td>{{ loop.index }}</td> <td>{{ loop.index }}</td>
<td>{{ player_names[(team, loop.index)]|e }}</td> <td>{{ player_names[(team, loop.index)]|e }}</td>
{% for area in ordered_areas %} {%- for area in ordered_areas -%}
{% set checks_done = checks[area] %} {%- set checks_done = checks[area] -%}
{% set checks_total = checks_in_area[area] %} {%- set checks_total = checks_in_area[area] -%}
{% if checks_done == checks_total %} {%- if checks_done == checks_total -%}
<td class="item-acquired center-column"> <td class="item-acquired center-column">
{{ checks_done }}/{{ checks_total }}</td> {{ checks_done }}/{{ checks_total }}</td>
{% else %} {%- else -%}
<td class="center-column">{{ checks_done }}/{{ checks_total }}</td> <td class="center-column">{{ checks_done }}/{{ checks_total }}</td>
{% endif %} {%- endif -%}
{% if area in key_locations %} {%- if area in key_locations -%}
<td class="center-column">{{ inventory[team][player][small_key_ids[area]] }}</td> <td class="center-column">{{ inventory[team][player][small_key_ids[area]] }}</td>
{% endif %} {%- endif -%}
{% if area in big_key_locations %} {%- if area in big_key_locations -%}
<td class="center-column">{% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %}</td> <td class="center-column">{% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %}</td>
{% endif %} {%- endif -%}
{% endfor %} {%- endfor -%}
{% if activity_timers[(team, player)] %} {%- if activity_timers[(team, player)] -%}
<td class="center-column">{{ activity_timers[(team, player)] | render_timedelta }}</td> <td class="center-column">{{ activity_timers[(team, player)] | render_timedelta }}</td>
{% else %} {%- else -%}
<td class="center-column">None</td> <td class="center-column">None</td>
{% endif %} {%- endif -%}
</tr> </tr>
{% endfor %} {%- endfor -%}
</tbody> </tbody>
</table> </table>
</div> </div>