diff options
Diffstat (limited to 'templates/main/jams')
| -rw-r--r-- | templates/main/jams/index.html | 40 | ||||
| -rw-r--r-- | templates/main/jams/team_list.html | 17 |
2 files changed, 37 insertions, 20 deletions
diff --git a/templates/main/jams/index.html b/templates/main/jams/index.html index 9a228b74..3546bd71 100644 --- a/templates/main/jams/index.html +++ b/templates/main/jams/index.html @@ -58,7 +58,7 @@ {% if jams %} {% for jam in jams %} - <h1 class="uk-article-title uk-heading-divider"> + <h1 class="uk-article-title"> Code Jam {{ jam.number }}: {{ jam.title }} <span class="uk-float-right"> {% if jam.state == "announced" %} @@ -86,25 +86,29 @@ State: {{ jam.state.title() }} </p> </h1> - - <p> + <div class="uk-grid-match uk-grid-small uk-text-center uk-grid-gap-none uk-grid-collapse jam-tiles uk-margin-small-top" uk-grid> + <div class="uk-width-1-2@m uk-tile uk-tile-success uk-padding-small"> + <p class="uk-h4 jam-tile-text">Start: {{ format_datetime(jam.date_start) }} UTC</p> + </div> + <div class="uk-width-1-2@m uk-tile uk-tile-danger uk-padding-small"> + <p class="uk-h4 jam-tile-text">End: {{ format_datetime(jam.date_end) }} UTC</p> + </div> {% if jam.participants %} - <span class="uk-label uk-label"> - Participants: {{ jam.participants | length }} - </span> + {% if jam.winning_team %} + <a href="{{ url_for('main.jams.jam_team_list', jam_id=jam.number) }}" class="uk-link-reset uk-width-1-2@m uk-tile uk-tile-primary uk-padding-small"> + <p class="uk-h4 jam-tile-text">Participants: {{ jam.participants | length }}</p> + </a> + <a href="{{ url_for('main.jams.team_view', team_id=jam.winning_team.id) }}" class="uk-link-reset uk-width-1-2@m uk-tile uk-tile-winner uk-padding-small"> + <p class="uk-h4 jam-tile-text">Champions: {{ jam.winning_team.name }}</p> + </a> + {% else %} + <a href="{{ url_for('main.jams.jam_team_list', jam_id=jam.number) }}" class="uk-link-reset uk-width-1-1@m uk-tile uk-tile-primary uk-padding-small"> + <p class="uk-h4 jam-tile-text">Participants: {{ jam.participants | length }}</p> + </a> + {% endif %} {% endif %} - <span class="uk-label uk-label-success"> - {{ format_datetime(jam.date_start) }} UTC - </span> - - <span class="date-separator"> - <i class="uk-icon fa-fw far fa-arrow-right" ></i> - </span> - - <span class="uk-label uk-label-danger"> - {{ format_datetime(jam.date_end) }} UTC - </span> - + </div> + <p> {% if jam.state in ["running", "judging", "finished"] %} <span class="uk-label uk-align-right theme-label"> Theme: {{ jam.theme }} diff --git a/templates/main/jams/team_list.html b/templates/main/jams/team_list.html index 65d58f8a..75c48337 100644 --- a/templates/main/jams/team_list.html +++ b/templates/main/jams/team_list.html @@ -38,12 +38,25 @@ <div class="uk-flex uk-flex-row uk-flex-wrap uk-flex-center team-list-cards"> {% for team in teams %} <div class="uk-card uk-card-default uk-margin-small-bottom uk-margin-small-right uk-margin-small-top uk-margin-small-left - {% if not user_teams and logged_in and user.user_id in member_ids(team.members) %} - team-card-own + {% if not user_teams %} + {% if logged_in and user.user_id in member_ids(team.members) %} + team-card-own + {% endif %} + {% if jam.winning_team and jam.winning_team == team.id %} + team-card-winner + {% endif %} {% endif %} "> <div class="uk-card-body"> <div class="uk-card-title"> + {% if not user_teams %} + {% if logged_in and user.user_id in member_ids(team.members) %} + <i class="uk-icon fa-fw far fa-user team-badge-own" uk-tooltip="Your Team"></i> + {% endif %} + {% if jam.winning_team and jam.winning_team == team.id %} + <i class="uk-icon fa-fw far fa-trophy team-badge-winner" uk-tooltip="Champions"></i> + {% endif %} + {% endif %} Team <strong>{{ team.name }}</strong> {% if user_teams %} <p class="uk-article-meta team-subtitle"> |