Merge branch 'dev' into bug/plus-sign-path

This commit is contained in:
Zedifus 2022-12-07 13:33:19 +00:00
commit d127fc6e3d
2 changed files with 4 additions and 2 deletions

View File

@ -3,7 +3,7 @@
### New features
TBD
### Bug fixes
TBD
- Fix port tooltip not showing on dash while server online ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/503))
### Tweaks
TBD
### Lang

View File

@ -278,9 +278,10 @@
{% end %}
</td>
<td draggable="false" id="server_running_status_{{server['server_data']['server_id']}}">
<td draggable="false">
<span class="port" data-toggle="tooltip" title="{{
server['server_data']['server_port'] }}">
<div id="server_running_status_{{server['server_data']['server_id']}}">
{% if server['stats']['running'] %}
<span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online',
data['lang']) }}</span>
@ -299,6 +300,7 @@
data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"></span>
</tr>
{% end %}
</div>
</span>
{% for server in data['failed_servers'] %}
<tr id="{{server['server_id']}}" draggable="false">