sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes server allocation display

This commit is contained in:
Dane Everitt 2016-09-28 18:11:07 -04:00
parent b2cd7cc5c9
commit b1de054a9d
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
### Changed ### Changed
### Fixed ### Fixed
* Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux)) * Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux))
* Server allocation listing display now showing the connection IP unless an alias was assigned.
### Deprecated ### Deprecated
### Removed ### Removed

4
resources/views/server/index.blade.php
View File

@ -83,9 +83,9 @@
<ul class="nav nav-pills nav-stacked" id="conn_options"> <ul class="nav nav-pills nav-stacked" id="conn_options">
@foreach ($allocations as $allocation) @foreach ($allocations as $allocation)
<li role="presentation" @if($allocation->id === $server->allocation) class="active" @endif> <li role="presentation" @if($allocation->id === $server->allocation) class="active" @endif>
<a href="#/set-connnection/{{ $allocation->ip }}:{{ $allocation->port }}" data-action="set-connection" data-connection="{{ $allocation->ip }}:{{ $allocation->port }}">{{ $allocation->ip_alias }} <a href="#/set-connnection/{{ $allocation->ip }}:{{ $allocation->port }}" data-action="set-connection" data-connection="{{ $allocation->ip }}:{{ $allocation->port }}">@if(!is_null($allocation->ip_alias)){{ $allocation->ip_alias }}@else{{ $allocation->ip }}@endif
<span class="badge">{{ $allocation->port }}</span> <span class="badge">{{ $allocation->port }}</span>
@if($allocation->ip !== $allocation->ip_alias)<small><span class="pull-right">Alias for {{ $allocation->ip }}</span></small>@endif @if(!is_null($allocation->ip_alias))<small><span class="pull-right">Alias for {{ $allocation->ip }}</span></small>@endif
</a> </a>
</li> </li>
@endforeach @endforeach