From bb4d116aac6c969ec28e821c6490fecf4aa3db54 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 3 Jan 2019 14:13:23 +0100 Subject: [PATCH] More small website improvements --- db.py | 16 ++++++++++++++++ static/nryg.less | 2 +- templates/500.html | 14 ++++++++------ templates/main.html | 22 +++++++++++----------- templates/minis/discord.html | 2 +- templates/minis/dota.html | 8 ++++---- templates/minis/lol.html | 16 ++++++++-------- templates/minis/osu.html | 10 +++++----- templates/minis/ow.html | 4 ++-- templates/minis/steam.html | 4 ++-- 10 files changed, 58 insertions(+), 40 deletions(-) diff --git a/db.py b/db.py index 3b9742a5..61a9a749 100644 --- a/db.py +++ b/db.py @@ -650,6 +650,22 @@ class Overwatch(Base): n = 7 return f"https://d1u1mce87gyfbn.cloudfront.net/game/rank-icons/season-2/rank-{n}.png" + def rank_name(self): + if self.rank < 1500: + return "Bronze" + elif self.rank < 2000: + return "Silver" + elif self.rank < 2500: + return "Gold" + elif self.rank < 3000: + return "Platinum" + elif self.rank < 3500: + return "Diamond" + elif self.rank < 4000: + return "Master" + else: + return "Grandmaster" + class Diario(Base): __tablename__ = "diario" diff --git a/static/nryg.less b/static/nryg.less index 69e56625..06342985 100644 --- a/static/nryg.less +++ b/static/nryg.less @@ -564,7 +564,7 @@ table { grid-column: 2; text-align: right; - img { + .game-image { height: 58px; border-radius: 4px; } diff --git a/templates/500.html b/templates/500.html index 31d25174..34fb14dd 100644 --- a/templates/500.html +++ b/templates/500.html @@ -11,12 +11,14 @@

Il server è crashato mentre cercava di generare questa pagina. Oops.

+
+

+ I am sorry, unknown error occured during working with your request, Admin were notified +

+

-

-

- I am sorry, unknown error occured during working with your request, Admin were notified -

-
- @OcteonRygBot, 2017 + L'errore dovrebbe essere stato segnalato a Steffo. + Se riesci e ne hai voglia, spiegagli anche cosa ha provocato l'errore.

+ @OcteonRygBot, 2017 {% endblock %} \ No newline at end of file diff --git a/templates/main.html b/templates/main.html index 30373de6..a5b66d2b 100644 --- a/templates/main.html +++ b/templates/main.html @@ -32,7 +32,7 @@
{% include "components/diarioentry.html" %} - Visualizza tutto + Visualizza tutto
{% include "components/wikibox.html" %} @@ -58,7 +58,7 @@
  • /r/RoyalGames
  • Statistiche su Royal Music
  • File in cache di Royal Music
    • -
  • Statistiche sull'attività
    • +
  • Statistiche sull'attività
    • @@ -80,15 +80,15 @@
    diff --git a/templates/minis/discord.html b/templates/minis/discord.html index 7099ee0d..9d4622d9 100644 --- a/templates/minis/discord.html +++ b/templates/minis/discord.html @@ -7,7 +7,7 @@
    - + {{ record["name"] }}#{{ record["discriminator"] }}
    {% if record["last_song"] %} diff --git a/templates/minis/dota.html b/templates/minis/dota.html index 7ec1c2c5..94587041 100644 --- a/templates/minis/dota.html +++ b/templates/minis/dota.html @@ -10,7 +10,7 @@
    - + {{ record.steam.persona_name }}
    @@ -22,13 +22,13 @@
    {% if record.rank_tier is none %} - + Non classificato {% elif record.rank_tier < 10 %} - + {{ record.rank_tier }} piazzamenti completati {% else %} - {% if record.get_rank_stars_url() %}{% endif %} + {% if record.get_rank_stars_url() %}{% endif %} {{ record.get_rank_name() }}[{{ record.get_rank_number() }}] {% endif %}
    diff --git a/templates/minis/lol.html b/templates/minis/lol.html index d751127d..d35639d4 100644 --- a/templates/minis/lol.html +++ b/templates/minis/lol.html @@ -7,7 +7,7 @@
    - + {{ record.summoner_name }}
    @@ -21,7 +21,7 @@
    {% if record.highest_mastery_champ %} - + {{ record.highest_mastery_champ_name() }} {% endif %}
    @@ -29,9 +29,9 @@
    {% if record.solo_division is none %} - + Non classificato {% else %} - + {{ record.solo_division.name|capitalize }} {{ record.solo_rank.name }} {% endif %}
    @@ -39,9 +39,9 @@
    {% if record.flex_division is none %} - + Non classificato {% else %} - + {{ record.flex_division.name|capitalize }} {{ record.flex_rank.name }} {% endif %}
    @@ -49,9 +49,9 @@
    {% if record.twtr_division is none %} - + Non classificato {% else %} - + {{ record.twtr_division.name|capitalize }} {{ record.twtr_rank.name }} {% endif %}
    diff --git a/templates/minis/osu.html b/templates/minis/osu.html index d9724a89..d3810c4b 100644 --- a/templates/minis/osu.html +++ b/templates/minis/osu.html @@ -4,30 +4,30 @@
    - + {{ record.osu_name }}
    - osu! + osu!
    {{ record.std_pp | int }}pp
    - taiko + taiko
    {{ record.taiko_pp | int }}pp
    - catch + catch
    {{ record.catch_pp | int }}pp
    - mania + mania
    {{ record.mania_pp | int }}pp diff --git a/templates/minis/ow.html b/templates/minis/ow.html index 7957618c..aa6989ce 100644 --- a/templates/minis/ow.html +++ b/templates/minis/ow.html @@ -10,7 +10,7 @@
    - + {{ record }}
    @@ -25,7 +25,7 @@
    Non classificato {% else %} - + {{ record.rank_name() }} {{ record.rank }} {% endif %}
    diff --git a/templates/minis/steam.html b/templates/minis/steam.html index 8f935f0e..3bf15d4f 100644 --- a/templates/minis/steam.html +++ b/templates/minis/steam.html @@ -37,12 +37,12 @@ {% if record.most_played_game_id %}
    - + {{ record.most_played_game_id }}
    {% else %}
    - +
    {% endif %}