Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/correct-tag-styles' into 'dev'

Browse Source 
bugfix/correct-tag-styles

See merge request crafty-controller/crafty-commander!92
This commit is contained in:
Iain Powrie 2021-11-23 23:35:41 +00:00
commit d0b6b65a0d
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/config/credits.json
View File

@ -103,7 +103,7 @@
], ],
null null
], ],
"blurb": "Developper at work and at home, testing his own code is a pain, so his coding precept is \"Testing is Doubting\"", "blurb": "Developer at work and at home, testing his own code is a pain, so his coding precept is \"Testing is Doubting\"",
"pic": "/static/assets/images/credits/silversthorn.png" "pic": "/static/assets/images/credits/silversthorn.png"
}, },
{ {
@ -156,8 +156,11 @@
"loc": null, "loc": null,
"tags": [ "tags": [
"Staff", "Staff",
"Developer", [
null "Developer",
"https://gitlab.com/qub3d"
],
"Wiki"
], ],
"blurb": "Hosts Minecraft servers for his weird friends, works for an IoT company as his dayjob. The 's' in IoT stands for 'secure'.", "blurb": "Hosts Minecraft servers for his weird friends, works for an IoT company as his dayjob. The 's' in IoT stands for 'secure'.",
"pic": "/static/assets/images/credits/qub3d.png" "pic": "/static/assets/images/credits/qub3d.png"
@ -244,10 +247,6 @@
"name": "scott m", "name": "scott m",
"level": "Crafty Sustainer" "level": "Crafty Sustainer"
}, },
{
"name": "zedifus",
"level": "Crafty Sustainer"
},
{ {
"name": "Lino", "name": "Lino",
"level": "Crafty Sustainer" "level": "Crafty Sustainer"
@ -295,7 +294,15 @@
{ {
"name": "Row H", "name": "Row H",
"level": "Crafty Supporter" "level": "Crafty Supporter"
},
{
"name": "vorboid",
"level": "Crafty Supporter"
},
{
"name": "Justman",
"level": "Crafty Sustainer"
} }
], ],
"lastUpdate": 1637281075498 "lastUpdate": 1637635758855
} }

6
app/frontend/templates/panel/credits.html
View File

@ -67,7 +67,7 @@
{% if type(person['tags'][1]) is list %} {% if type(person['tags'][1]) is list %}
<a href="{{ person['tags'][1][1] }}" class="btn btn-sm btn-primary mr-2">{{ person['tags'][1][0] }}</a> <a href="{{ person['tags'][1][1] }}" class="btn btn-sm btn-primary mr-2">{{ person['tags'][1][0] }}</a>
{% else %} {% else %}
<span class="btn btn-sm btn-inverse-success mr-2">{{ person['tags'][1] }}</span> <span class="btn btn-sm btn-primary mr-2">{{ person['tags'][1] }}</span>
{% end %} {% end %}
{% end %} {% end %}
{% if person['tags'][2] %} {% if person['tags'][2] %}
@ -136,7 +136,7 @@
{% if type(person['tags'][1]) is list %} {% if type(person['tags'][1]) is list %}
<a href="{{ person['tags'][1][1] }}" class="btn btn-sm btn-primary mr-2">{{ person['tags'][1][0] }}</a> <a href="{{ person['tags'][1][1] }}" class="btn btn-sm btn-primary mr-2">{{ person['tags'][1][0] }}</a>
{% else %} {% else %}
<span class="btn btn-sm btn-inverse-success mr-2">{{ person['tags'][1] }}</span> <span class="btn btn-sm btn-primary mr-2">{{ person['tags'][1] }}</span>
{% end %} {% end %}
{% end %} {% end %}
{% if person['tags'][2] %} {% if person['tags'][2] %}
@ -206,7 +206,7 @@
{% if type(person['tags'][1]) is list %} {% if type(person['tags'][1]) is list %}
<a href="{{ person['tags'][1][1] }}" class="btn btn-sm btn-primary mr-2">{{ person['tags'][1][0] }}</a> <a href="{{ person['tags'][1][1] }}" class="btn btn-sm btn-primary mr-2">{{ person['tags'][1][0] }}</a>
{% else %} {% else %}
<span class="btn btn-sm btn-inverse-success mr-2">{{ person['tags'][1] }}</span> <span class="btn btn-sm btn-primary mr-2">{{ person['tags'][1] }}</span>
{% end %} {% end %}
{% end %} {% end %}
{% if person['tags'][2] %} {% if person['tags'][2] %}