diff --git a/games/templates/add_purchase.html b/games/templates/add_purchase.html index 5a09d96..2fa0ec8 100644 --- a/games/templates/add_purchase.html +++ b/games/templates/add_purchase.html @@ -26,7 +26,9 @@ - Delete + Delete {% endif %} diff --git a/games/templates/base.html b/games/templates/base.html index bfc83de..edc6e7d 100644 --- a/games/templates/base.html +++ b/games/templates/base.html @@ -77,47 +77,47 @@ {% endif %} - - {% if session_count > 0 %} -
  • - Stats - +
    • +
  • + All Sessions +
    • +
  • + Log Out +
    • {% endif %} - - + {% endif %} + - -
    - {% block content %} - No content here. - {% endblock content %}
    - {% load version %} - {% version %} ({% version_date %}) + +
    + {% block content %} + No content here. + {% endblock content %}
    - {% block scripts %} - {% endblock scripts %} - - + {% load version %} + {% version %} ({% version_date %}) + + {% block scripts %} + {% endblock scripts %} + + diff --git a/games/templates/components/game_link.html b/games/templates/components/game_link.html index ae3fa4a..bcb7cfe 100644 --- a/games/templates/components/game_link.html +++ b/games/templates/components/game_link.html @@ -1,9 +1,10 @@ - + {% if children %} {{ children }} {% else %} {{ name }} {% endif %} - \ No newline at end of file + diff --git a/games/templates/components/popover.html b/games/templates/components/popover.html index 4bb218a..74d4ea0 100644 --- a/games/templates/components/popover.html +++ b/games/templates/components/popover.html @@ -1,9 +1,10 @@ - diff --git a/games/templates/list_sessions.html b/games/templates/list_sessions.html index 414261a..0f62f50 100644 --- a/games/templates/list_sessions.html +++ b/games/templates/list_sessions.html @@ -32,42 +32,43 @@ {% for session in dataset %} {% partialdef session-row inline=True %} - - - - - {{ session.purchase.edition.name }} - - - - - {{ session.timestamp_start | date:"d/m/Y H:i" }} - - - {% if not session.timestamp_end %} - {% url 'list_sessions_end_session' session.id as end_session_url %} - - Finish now? - - {% elif session.duration_manual %} - -- - {% else %} - {{ session.timestamp_end | date:"d/m/Y H:i" }} - {% endif %} - - {{ session.duration_formatted }} - - {% endpartialdef %} - {% endfor %} - - - {% else %} -
    No sessions found.
    - {% endif %} - + + + + + {{ session.purchase.edition.name }} + + + + + {{ session.timestamp_start | date:"d/m/Y H:i" }} + + + {% if not session.timestamp_end %} + {% url 'list_sessions_end_session' session.id as end_session_url %} + + Finish now? + + {% elif session.duration_manual %} + -- + {% else %} + {{ session.timestamp_end | date:"d/m/Y H:i" }} + {% endif %} + + {{ session.duration_formatted }} + + {% endpartialdef %} + {% endfor %} + + + {% else %} +
    No sessions found.
    + {% endif %} + {% endblock content %} diff --git a/games/templates/registration/login.html b/games/templates/registration/login.html index 8df4f0d..94bb70a 100644 --- a/games/templates/registration/login.html +++ b/games/templates/registration/login.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load static %} - {% block title %} Login {% endblock title %} diff --git a/games/templates/stats.html b/games/templates/stats.html index 567e03b..f08ba1b 100644 --- a/games/templates/stats.html +++ b/games/templates/stats.html @@ -3,17 +3,15 @@ {{ title }} {% endblock title %} {% load static %} - {% partialdef purchase-name %} - {% if purchase.type != 'game' %} - {% #gamelink game_id=purchase.edition.game.id %} - {{ purchase.name }} ({{ purchase.edition.name }} {{ purchase.get_type_display }}) - {% /gamelink %} - {% else %} - {% gamelink game_id=purchase.edition.game.id name=purchase.edition.name %} - {% endif %} +{% if purchase.type != 'game' %} + {% #gamelink game_id=purchase.edition.game.id %} + {{ purchase.name }} ({{ purchase.edition.name }} {{ purchase.get_type_display }}) + {% /gamelink %} +{% else %} + {% gamelink game_id=purchase.edition.game.id name=purchase.edition.name %} +{% endif %} {% endpartialdef %} - {% block content %}
    @@ -66,11 +64,15 @@ Longest session - {{ longest_session_time }} ({% gamelink game_id=longest_session_game.id name=longest_session_game.name %}) + + {{ longest_session_time }} ({% gamelink game_id=longest_session_game.id name=longest_session_game.name %}) + Most sessions - {{ highest_session_count }} ({% gamelink game_id=highest_session_count_game.id name=highest_session_count_game.name %}) + + {{ highest_session_count }} ({% gamelink game_id=highest_session_count_game.id name=highest_session_count_game.name %}) + Highest session average @@ -80,15 +82,18 @@ First play - {% gamelink game_id=first_play_game.id name=first_play_game.name %} ({{ first_play_date }}) + + {% gamelink game_id=first_play_game.id name=first_play_game.name %} ({{ first_play_date }}) + Last play - {% gamelink game_id=last_play_game.id name=last_play_game.name %} ({{ last_play_date }}) + + {% gamelink game_id=last_play_game.id name=last_play_game.name %} ({{ last_play_date }}) + - {% if month_playtime %}

    Playtime per month

    @@ -102,7 +107,6 @@
    {% endif %} -

    Purchases

    @@ -118,9 +122,7 @@ - + @@ -149,9 +151,7 @@ {% for game in top_10_games_by_playtime %} - + {% endfor %} @@ -174,7 +174,6 @@ {% endfor %}
    Dropped - {{ dropped_count }} ({{ dropped_percentage }}%) - {{ dropped_count }} ({{ dropped_percentage }}%)
    Unfinished
    - {% gamelink game_id=game.id name=game.name %} - {% gamelink game_id=game.id name=game.name %} {{ game.formatted_playtime }}
    - {% if all_finished_this_year %}

    Finished

    @@ -187,16 +186,13 @@ {% for purchase in all_finished_this_year %} - + {% endfor %}
    - {% partial purchase-name %} - {% partial purchase-name %} {{ purchase.date_finished | date:"d/m/Y" }}
    {% endif %} - {% if this_year_finished_this_year %}

    Finished ({{ year }} games)

    @@ -209,16 +205,13 @@ {% for purchase in this_year_finished_this_year %} - + {% endfor %}
    - {% partial purchase-name %} - {% partial purchase-name %} {{ purchase.date_finished | date:"d/m/Y" }}
    {% endif %} - {% if purchased_this_year_finished_this_year %}

    Bought and Finished ({{ year }})

    @@ -231,16 +224,13 @@ {% for purchase in purchased_this_year_finished_this_year %} - + {% endfor %}
    - {% partial purchase-name %} - {% partial purchase-name %} {{ purchase.date_finished | date:"d/m/Y" }}
    {% endif %} - {% if purchased_unfinished %}

    Unfinished Purchases

    @@ -254,9 +244,7 @@ {% for purchase in purchased_unfinished %} - + @@ -264,7 +252,6 @@
    - {% partial purchase-name %} - {% partial purchase-name %} {{ purchase.price }} {{ purchase.date_purchased | date:"d/m/Y" }}
    {% endif %} - {% if all_purchased_this_year %}

    All Purchases

    @@ -278,9 +265,7 @@ {% for purchase in all_purchased_this_year %} - + diff --git a/games/templates/view_game.html b/games/templates/view_game.html index 7a3891e..bb566c0 100644 --- a/games/templates/view_game.html +++ b/games/templates/view_game.html @@ -11,62 +11,85 @@ {{ game.name }} {{ game.year_released }} {% #popover id="popover-year" %} - Original release year + Original release year {% /popover %}
    - + {{ hours_sum }} {% #popover id="popover-hours" %} - Total hours played + Total hours played {% /popover %} - - + + {{ session_count }} {% #popover id="popover-sessions" %} - Number of sessions + Number of sessions {% /popover %} - + {{ session_average_without_manual }} {% #popover id="popover-average" %} - Average playtime per session + Average playtime per session {% /popover %} - - + + {{ playrange }} {% #popover id="popover-playrange" %} - Earliest and latest dates played + Earliest and latest dates played {% /popover %}
    - -
    -

    Editions ({{ edition_count }}) and Purchases ({{ purchase_count }})

    @@ -110,55 +133,55 @@ ({{ session_count }}) {% if latest_session_id %} {% url 'view_game_start_session_from_session' latest_session_id as add_session_link %} - New + New {% endif %} and Notes ({{ sessions_with_notes_count }}) - - + {% endblock content %}
    - {% partial purchase-name %} - {% partial purchase-name %} {{ purchase.price }} {{ purchase.date_purchased | date:"d/m/Y" }}