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 'dev' into bug/plus-sign-path

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,7 +3,7 @@
### New features ### New features
TBD TBD
### Bug fixes ### 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 ### Tweaks
TBD TBD
### Lang ### Lang

4
app/frontend/templates/panel/dashboard.html
View File

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