diff --git a/db.py b/db.py index 94b1862f..3b13056c 100644 --- a/db.py +++ b/db.py @@ -121,6 +121,7 @@ class Royal(Base, Mini): role = Column(String) fiorygi = Column(Integer, default=0) member_since = Column(Date) + special_title = Column(String) _mini_full_name = "Royalnet" _mini_name = "ryg" diff --git a/static/nryg.less b/static/nryg.less index 3fa07b14..cb2dcec6 100644 --- a/static/nryg.less +++ b/static/nryg.less @@ -723,31 +723,78 @@ img { .ryg { background-color: rgba(red(@text-color), green(@text-color), blue(@text-color), 0.1); padding: 18px; - grid-template-columns: 80% 20%; + grid-template-rows: 32px 16px 16px 36px; + grid-template-columns: 33.3% 33.3% 33.3%; - .player { + .username { grid-row: 1; - grid-column-start: 1; - grid-column-end: 3; - font-weight: bold; + grid-column: 1 / 3; + font-size: x-large; + align-self: center; + justify-self: flex-start; } - .member-status { + .special-title { + grid-row: 1; + grid-column: 3; + font-size: small; + align-self: center; + justify-self: flex-end; + font-style: italic; + color: @accent-color; + } + + .join-date-title { + grid-row: 3; grid-column: 1; - grid-row-start: 2; - grid-row-end: 4; - font-size: x-large; - margin-top: auto; - margin-bottom: auto; + font-size: xx-small; + align-self: center; + justify-self: center; + } + + .join-date { + grid-row: 4; + grid-column: 1; + font-size: large; + align-self: center; + justify-self: center; + + } + + .wiki-edits-title { + grid-row: 3; + grid-column: 2; + font-size: xx-small; + align-self: center; + justify-self: center; + } + + .wiki-edits { + grid-row: 4; + grid-column: 2; + font-size: large; + align-self: center; + justify-self: center; + } + + .fiorygi-title { + grid-row: 3; + grid-column: 3; + font-size: xx-small; + align-self: center; + justify-self: center; } .fiorygi { - grid-column: 2; - text-align: center; + grid-row: 4; + grid-column: 3; + font-size: large; + align-self: center; + justify-self: center; } - .fiorygi.game-score { - font-size: x-large; + .unknown { + opacity: 0.3; } } diff --git a/templates/minis/ryg.html b/templates/minis/ryg.html index 0fde5b94..0f4ae4e4 100644 --- a/templates/minis/ryg.html +++ b/templates/minis/ryg.html @@ -1,16 +1,64 @@
-
- -
- {{ record.role }} dal {% if record.member_since %}{{ record.member_since }}{% else %}????-??-??{% endif %} -
-
- Fiorygi -
-
- {{ record.fiorygi }} +
+ + {% if record.special_title %} +
+ {{ record.special_title }} +
+ {% endif %} + {% if record.username == "Steffo" %} +
+ Admin dall' +
+
+ inizio! +
+ {% elif record.member_since %} +
+ {{ record.role }} dal +
+
+ {{ record.member_since.isoformat() }} +
+ {% else %} +
+ {{ record.role }} dal +
+
+ --- +
+ {% endif %} + {% if record.wiki_edits|length > 0 %} +
+ Contributi wiki +
+
+ {{ record.wiki_edits|length }} +
+ {% else %} +
+ Contributi wiki +
+
+ --- +
+ {% endif %} + {% if record.fiorygi > 0 %} +
+ Fiorygi +
+
+ {{ record.fiorygi }} +
+ {% else %} +
+ Fiorygi +
+
+ --- +
+ {% endif %}