diff --git a/get5/match.html b/get5/match.html deleted file mode 100755 index 056452d..0000000 --- a/get5/match.html +++ /dev/null @@ -1,256 +0,0 @@ -{% from "macros.html" import score_symbol %} - -{% extends "layout.html" %} - -{% macro ind_team_table(team, map_stats) %} -

{{team.name}}

- - - - - - - - - - - - - - - - - - - {% for player in map_stats.player_stats.filter_by(team_id=team.id)|sort(attribute='kills', reverse=True) %} - {% if player.roundsplayed > 0 %} - - - - - - - - - - - - - - - - - {% endif %} - {% endfor %} - - -
PlayerKillsDeathsAssistsFlash assists1v11v21v3RatingFPRADRHSP
{{ player.get_player_name() }} {{ player.kills }} {{ player.deaths }} {{ player.assists }} {{ player.flashbang_assists }} {{ player.v1 }} {{ player.v2 }} {{ player.v3 }} {{ player.get_rating() | round(2) }} {{ player.get_fpr() | round(2) }} {{ player.get_adr() | round(1) }} {{ player.get_hsp() | round(2) }}
-{% endmacro %} - - -{% block content %} - -{% with messages = get_flashed_messages(with_categories=true) %} -{% if messages %} -
-
Command response
- -
- {% for message in messages %} - {{ message[1] }} -
- {% endfor %} -
- -
-
-{% endif %} -{% endwith %} - -
- -
- -

- {{ team1.get_logo_or_flag_html(1.0, team2) }} {{team1.name}} - {{ match.team1_score }} - {{ score_symbol(match.team1_score, match.team2_score) }} - {{ match.team2_score }} - {{ team2.get_logo_or_flag_html(1.0, team1) }} {{team2.name}} - - {% if (admin_access or match_owner or super_admin_access) and (match.live() or match.pending()) %} -
- - -
- {% endif %} - -

- - -
- {% if match.cancelled %} - - {% endif %} - - {% if match.forfeit %} - - {% endif %} - - {% if connect_string is not none and not match.finalized() and not match.live() %} - - Connect - - {% endif %} - - {% if gotv_string is not none and not match.finalized() and not match.live() %} - Connect to GoTV - {% endif %} - - {% if match.start_time is none %} - - {% endif %} - - - {% if vetoes.count() > 0 %} -
-
Vetoes
- - - - - - - - - - - - {% for veto in vetoes %} - - - - - - {% endfor %} - - - -
Veto/PickMapTeam Name
{{ veto.pick_or_veto }} {{ veto.map }} {{ veto.team_name }}
-
- {% endif %} - {% for map_stats in map_stat_list %} -
-
-
- Map {{map_stats.map_number + 1}}: {{ map_stats.map_name }}, - {{team1.name}} {{ score_symbol(map_stats.team1_score, map_stats.team2_score) }} {{team2.name}}, - {{map_stats.team1_score}}:{{map_stats.team2_score}} -
- -
- {% if map_stats.demoFile is not none and map_stats.demoFile != '' %} - Download Demo - {% endif %} -

Started at {{ map_stats.start_time.strftime('%Y-%m-%d %H:%M') }}

- - {% if map_stats.end_time is not none %} -

Ended at {{ map_stats.end_time.strftime('%Y-%m-%d %H:%M') }}

- {% endif %} - - {{ind_team_table(team1, map_stats)}} - {{ind_team_table(team2, map_stats)}} - -
- -
- {% endfor %} - -
- - -
-
- - - - -{% endblock %} \ No newline at end of file diff --git a/get5/server_create.html b/get5/server_create.html deleted file mode 100755 index fc82460..0000000 --- a/get5/server_create.html +++ /dev/null @@ -1,82 +0,0 @@ -{% from "macros.html" import show_flashed_messages %} - -{% extends "layout.html" %} -{% block content %} - -
- - {{ show_flashed_messages() }} - - - - -
- - {{ form.csrf_token }} - -
- {{ form.display_name.label(class="col-sm-2 control-label") }} -
- {{ form.display_name(class="form-control", placeholder="Optional") }} -
-
- -
- {{ form.ip_string.label(class="col-sm-2 control-label") }} -
- {{ form.ip_string(class="form-control", placeholder="Server IP") }} -
-
- -
- {{ form.port.label(class="col-sm-2 control-label") }} -
- {{ form.port(class="form-control", placeholder="27015") }} -
-
- -
- {{ form.rcon_password.label(class="col-sm-2 control-label") }} -
- {{ form.rcon_password(class="form-control", placeholder="RCON password") }} -

Your server information will not be exposed to other users, and encrypted in the database.

-
-
- - {% if is_admin or is_sadmin %} -
- {{ form.public_server.label(class="col-sm-2 control-label") }} -
- {{ form.public_server(class="col-sm-offset-1") }} -
-
- {% endif %} - - {% if edit %} -
- -
- {% else %} -
- -
- {% endif %} - -
- -
- - -
- - - -{% endblock %} diff --git a/get5/servers.html b/get5/servers.html deleted file mode 100755 index 6166586..0000000 --- a/get5/servers.html +++ /dev/null @@ -1,81 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
- -
- - - - - -{% endblock %} diff --git a/get5/templates/match.html b/get5/templates/match.html old mode 100644 new mode 100755 index 8c34bfa..056452d --- a/get5/templates/match.html +++ b/get5/templates/match.html @@ -78,7 +78,7 @@

{{ match.team2_score }} {{ team2.get_logo_or_flag_html(1.0, team1) }} {{team2.name}} - {% if admin_access and (match.live() or match.pending()) %} + {% if (admin_access or match_owner or super_admin_access) and (match.live() or match.pending()) %}
- {% if is_admin %} + {% if is_admin or is_sadmin %}
{{ form.public_server.label(class="col-sm-2 control-label") }}
diff --git a/get5/templates/servers.html b/get5/templates/servers.html old mode 100644 new mode 100755 index 536af2a..6166586 --- a/get5/templates/servers.html +++ b/get5/templates/servers.html @@ -59,4 +59,23 @@ $("#myservers").parent().parent().addClass("active"); }) + + {% endblock %}