Skip to content

Fleet events always shown as own fleet in tooltip #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
piciolo wants to merge 6 commits into from
Closed

Fleet events always shown as own fleet in tooltip #1314

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5aaf042
Localize fleet status in event rows
piciolo Mar 23, 2026
37bae8d
Precompute fleet type label for tooltips
piciolo Mar 24, 2026
6c1bc7f
Compute fleet type label inline in view
piciolo Mar 24, 2026
8504179
Compute fleet type label inline in view
piciolo Mar 24, 2026
fd945fa
Merge branch 'Fleet-events-always-shown-as-Own-Fleet-in-tooltip-#1216…
piciolo Mar 24, 2026
a70c2fd
Use t_ingame.fleet translations in event row
piciolo Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions resources/views/ingame/fleetevents/eventrow.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<td class="arrivalTime">{{ date('H:i:s', $fleet_event_row->mission_time_arrival) }} Clock</td>
<td class="missionFleet">
<img src="/img/fleet/{{ $fleet_event_row->mission_type }}.gif" class="tooltipHTML"
title="Own fleet | {{ $fleet_event_row->mission_label }} (R)" alt=""/>
title="{{ $fleet_event_row->friendly_status === 'hostile' ? __('t_ingame.fleet.enemy_fleet') : ($fleet_event_row->friendly_status === 'neutral' ? __('t_ingame.fleet.neutral_fleet') : __('t_ingame.fleet.own_fleet')) }} | {{ $fleet_event_row->mission_label }} (R)" alt=""/>

@Geda173 Geda173 Mar 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is one instance missing, namely that of friendly fleets, which should display Friendly fleet. This only happens in the case of ACS Defend.

</td>

<td class="originFleet">
Expand All @@ -31,7 +31,7 @@
<figure class="planetIcon tf js_hideTipOnMobile" title="Debris Field"></figure>debris field
@break
@case (OGame\Models\Enums\PlanetType::DeepSpace)
<span class="deep-space-text">{{ __('Deep space') }}</span>
<span class="deep-space-text">{{ __('t_ingame.fleet.deep_space') }}</span>

@Geda173 Geda173 Mar 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not belong in this PR.

@break
@endswitch
</td>
Expand All @@ -48,11 +48,11 @@
<td class="icon_movement_reserve">
<span class="tooltip tooltipRight tooltipClose"
title="&lt;div class=&quot;htmlTooltip&quot;&gt;
&lt;h1&gt;@lang('Fleet details'):&lt;/h1&gt;
&lt;h1&gt;{{ __('t_ingame.fleet.fleet_details') }}:&lt;/h1&gt;

@Geda173 Geda173 Mar 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also doesn't belong in this PR, as well as the other 20+ changes, which belong in #1297.

&lt;div class=&quot;splitLine&quot;&gt;&lt;/div&gt;
&lt;table cellpadding=&quot;0&quot; cellspacing=&quot;0&quot; class=&quot;fleetinfo&quot;&gt;
&lt;tr&gt;
&lt;th colspan=&quot;3&quot;&gt;@lang('Ships'):&lt;/th&gt;
&lt;th colspan=&quot;3&quot;&gt;{{ __('t_ingame.fleet.ships') }}:&lt;/th&gt;
&lt;/tr&gt;
@php /** @var \OGame\GameObjects\Models\Units\UnitCollection $fleet_unit */ @endphp
@foreach ($fleet_event_row->fleet_units->units as $fleet_unit)
Expand All @@ -67,20 +67,20 @@
&lt;/tr&gt;

&lt;tr&gt;
&lt;th colspan=&quot;3&quot;&gt;@lang('Shipment'):&lt;/th&gt;
&lt;th colspan=&quot;3&quot;&gt;{{ __('t_ingame.fleet.shipment') }}:&lt;/th&gt;
&lt;/tr&gt;

&lt;tr&gt;
&lt;td colspan=&quot;2&quot;&gt;@lang('Metal'):&lt;/td&gt;
&lt;td colspan=&quot;2&quot;&gt;{{ __('t_ingame.fleet.metal') }}:&lt;/td&gt;
&lt;td class=&quot;value&quot;&gt;{{ $fleet_event_row->resources->metal->getFormattedLong() }}&lt;/td&gt;
&lt;/tr&gt;

&lt;tr&gt;
&lt;td colspan=&quot;2&quot;&gt;@lang('Crystal'):&lt;/td&gt;
&lt;td colspan=&quot;2&quot;&gt;{{ __('t_ingame.fleet.crystal') }}:&lt;/td&gt;
&lt;td class=&quot;value&quot;&gt;{{ $fleet_event_row->resources->crystal->getFormattedLong() }}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td colspan=&quot;2&quot;&gt;@lang('Deuterium'):&lt;/td&gt;
&lt;td colspan=&quot;2&quot;&gt;{{ __('t_ingame.fleet.deuterium') }}:&lt;/td&gt;
&lt;td class=&quot;value&quot;&gt;{{ $fleet_event_row->resources->deuterium->getFormattedLong() }}&lt;/td&gt;
&lt;/tr&gt;
&lt;/table&gt;
Expand All @@ -104,7 +104,7 @@
<figure class="planetIcon tf js_hideTipOnMobile" title="Debris Field"></figure>debris field
@break
@case (OGame\Models\Enums\PlanetType::DeepSpace)
<span class="deep-space-text">{{ __('Deep space') }}</span>
<span class="deep-space-text">{{ __('t_ingame.fleet.deep_space') }}</span>
@break
@endswitch
</td>
Expand Down Expand Up @@ -136,7 +136,7 @@
<td class="arrivalTime">{{ date('H:i:s', $fleet_event_row->mission_time_arrival) }} Clock</td>
<td class="missionFleet">
<img src="/img/fleet/{{ $fleet_event_row->mission_type }}.gif" class="tooltipHTML"
title="Own fleet | {{ $fleet_event_row->mission_label }}" alt=""/>
title="{{ $fleet_event_row->friendly_status === 'hostile' ? __('t_ingame.fleet.enemy_fleet') : ($fleet_event_row->friendly_status === 'neutral' ? __('t_ingame.fleet.neutral_fleet') : __('t_ingame.fleet.own_fleet')) }} | {{ $fleet_event_row->mission_label }}" alt=""/>
</td>

<td class="originFleet">
Expand All @@ -153,7 +153,7 @@
<figure class="planetIcon tf js_hideTipOnMobile" title="Debris Field"></figure>debris field
@break
@case (OGame\Models\Enums\PlanetType::DeepSpace)
<span class="deep-space-text">{{ __('Deep space') }}</span>
<span class="deep-space-text">{{ __('t_ingame.fleet.deep_space') }}</span>
@break
@endswitch
</td>
Expand All @@ -170,11 +170,11 @@
<td class="icon_movement">
<span class="tooltip tooltipRight tooltipClose"
title="&lt;div class=&quot;htmlTooltip&quot;&gt;
&lt;h1&gt;@lang('Fleet details'):&lt;/h1&gt;
&lt;h1&gt;{{ __('t_ingame.fleet.fleet_details') }}:&lt;/h1&gt;
&lt;div class=&quot;splitLine&quot;&gt;&lt;/div&gt;
&lt;table cellpadding=&quot;0&quot; cellspacing=&quot;0&quot; class=&quot;fleetinfo&quot;&gt;
&lt;tr&gt;
&lt;th colspan=&quot;3&quot;&gt;@lang('Ships'):&lt;/th&gt;
&lt;th colspan=&quot;3&quot;&gt;{{ __('t_ingame.fleet.ships') }}:&lt;/th&gt;
&lt;/tr&gt;
@php /** @var \OGame\GameObjects\Models\Units\UnitCollection $fleet_unit */ @endphp
@foreach ($fleet_event_row->fleet_units->units as $fleet_unit)
Expand All @@ -189,20 +189,20 @@
&lt;/tr&gt;

&lt;tr&gt;
&lt;th colspan=&quot;3&quot;&gt;@lang('Shipment'):&lt;/th&gt;
&lt;th colspan=&quot;3&quot;&gt;{{ __('t_ingame.fleet.shipment') }}:&lt;/th&gt;
&lt;/tr&gt;

&lt;tr&gt;
&lt;td colspan=&quot;2&quot;&gt;@lang('Metal'):&lt;/td&gt;
&lt;td colspan=&quot;2&quot;&gt;{{ __('t_ingame.fleet.metal') }}:&lt;/td&gt;
&lt;td class=&quot;value&quot;&gt;{{ $fleet_event_row->resources->metal->getFormattedLong() }}&lt;/td&gt;
&lt;/tr&gt;

&lt;tr&gt;
&lt;td colspan=&quot;2&quot;&gt;@lang('Crystal'):&lt;/td&gt;
&lt;td colspan=&quot;2&quot;&gt;{{ __('t_ingame.fleet.crystal') }}:&lt;/td&gt;
&lt;td class=&quot;value&quot;&gt;{{ $fleet_event_row->resources->crystal->getFormattedLong() }}&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td colspan=&quot;2&quot;&gt;@lang('Deuterium'):&lt;/td&gt;
&lt;td colspan=&quot;2&quot;&gt;{{ __('t_ingame.fleet.deuterium') }}:&lt;/td&gt;
&lt;td class=&quot;value&quot;&gt;{{ $fleet_event_row->resources->deuterium->getFormattedLong() }}&lt;/td&gt;
&lt;/tr&gt;
&lt;/table&gt;
Expand All @@ -226,7 +226,7 @@
<figure class="planetIcon tf js_hideTipOnMobile" title="Debris Field"></figure>debris field
@break
@case (OGame\Models\Enums\PlanetType::DeepSpace)
<span class="deep-space-text">{{ __('Deep space') }}</span>
<span class="deep-space-text">{{ __('t_ingame.fleet.deep_space') }}</span>
@break
@endswitch
</td>
Expand All @@ -240,7 +240,7 @@
@if ($fleet_event_row->is_recallable)
<span class="reversal reversal_time" ref="{{ $fleet_event_row->id }}">
<a class="icon_link tooltipHTML recallFleet" data-fleet-id="{{ $fleet_event_row->real_mission_id }}"
title="Recall:| {{ \Carbon\Carbon::parse($fleet_event_row->active_recall_time)->format('d.m.Y') }}<br>
title="{{ __('t_ingame.fleet.recall') }}:| {{ \Carbon\Carbon::parse($fleet_event_row->active_recall_time)->format('d.m.Y') }}<br>
{{ \Carbon\Carbon::parse($fleet_event_row->active_recall_time)->format('H:i:s') }}">
<img src="/img/icons/89624964d4b06356842188dba05b1b.gif" height="16" width="16"/>
</a>
Expand Down Expand Up @@ -281,5 +281,4 @@
};
wrappedCountdown();
})(jQuery);
</script>

</script>
Loading