NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 17:55:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enhancement/dashboard-port' into 'dev'

Browse Source 
Add port tooltip over status on dash

See merge request crafty-controller/crafty-4!496
This commit is contained in:
Iain Powrie 2022-11-30 20:59:22 +00:00
commit 55d924d45f
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## --- [4.0.17] - 2022/TBD ## --- [4.0.17] - 2022/TBD
### New features ### New features
- Automate forge install process through Crafty server creation for Forge server version 1.16 and greater. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/495)) - Automate forge install process through Crafty server creation for Forge server version 1.16 and greater. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/495))
- Tooltip for server port on dashboard. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/496))
### Bug fixes ### Bug fixes
- Fix no port on bedrock server creation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/493)) - Fix no port on bedrock server creation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/493))
### Tweaks ### Tweaks

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

@ -279,22 +279,27 @@
</td> </td>
<td draggable="false" id="server_running_status_{{server['server_data']['server_id']}}"> <td draggable="false" id="server_running_status_{{server['server_data']['server_id']}}">
{% if server['stats']['running'] %} <span class="port" data-toggle="tooltip" title="{{
<span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online', server['server_data']['server_port'] }}">
data['lang']) }}</span> {% if server['stats']['running'] %}
{% elif server['stats']['crashed'] %} <span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online',
<span class="text-danger"><i class="fas fa-exclamation-triangle"></i> {{ translate('dashboard', data['lang']) }}</span>
'crashed', {% elif server['stats']['crashed'] %}
data['lang']) }}</span> <span class="text-danger"><i class="fas fa-exclamation-triangle"></i> {{ translate('dashboard',
{% else %} 'crashed',
<span class="text-warning"><i class="fas fa-ban"></i> {{ translate('dashboard', 'offline', data['lang']) }}</span>
data['lang']) }}</span> {% else %}
{% end %} <span class="text-warning"><i class="fas fa-ban"></i> {{ translate('dashboard', 'offline',
data['lang']) }}</span>
{% end %}
<br />
<br />
</td> </td>
<span class="server-player-totals" id="server_players_{{server['server_data']['server_id']}}" <span class="server-player-totals" id="server_players_{{server['server_data']['server_id']}}"
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 %}
</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">
<td class="text-warning"><i class="fas fa-server"></i>&nbsp;<a class="text-warning" <td class="text-warning"><i class="fas fa-server"></i>&nbsp;<a class="text-warning"