mirror of
https://github.com/smittix/intercept.git
synced 2026-07-07 17:18:11 -07:00
Merge branch 'smittix:main' into main
This commit is contained in:
@@ -944,10 +944,12 @@ def stream_adsb():
|
|||||||
@adsb_bp.route('/dashboard')
|
@adsb_bp.route('/dashboard')
|
||||||
def adsb_dashboard():
|
def adsb_dashboard():
|
||||||
"""Popout ADS-B dashboard."""
|
"""Popout ADS-B dashboard."""
|
||||||
|
embedded = request.args.get('embedded', 'false') == 'true'
|
||||||
return render_template(
|
return render_template(
|
||||||
'adsb_dashboard.html',
|
'adsb_dashboard.html',
|
||||||
shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
|
shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
|
||||||
adsb_auto_start=ADSB_AUTO_START,
|
adsb_auto_start=ADSB_AUTO_START,
|
||||||
|
embedded=embedded,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -540,7 +540,9 @@ def get_vessel_dsc(mmsi: str):
|
|||||||
@ais_bp.route('/dashboard')
|
@ais_bp.route('/dashboard')
|
||||||
def ais_dashboard():
|
def ais_dashboard():
|
||||||
"""Popout AIS dashboard."""
|
"""Popout AIS dashboard."""
|
||||||
|
embedded = request.args.get('embedded', 'false') == 'true'
|
||||||
return render_template(
|
return render_template(
|
||||||
'ais_dashboard.html',
|
'ais_dashboard.html',
|
||||||
shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
|
shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
|
||||||
|
embedded=embedded,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -166,9 +166,11 @@ def _fetch_iss_realtime(observer_lat: Optional[float] = None, observer_lon: Opti
|
|||||||
@satellite_bp.route('/dashboard')
|
@satellite_bp.route('/dashboard')
|
||||||
def satellite_dashboard():
|
def satellite_dashboard():
|
||||||
"""Popout satellite tracking dashboard."""
|
"""Popout satellite tracking dashboard."""
|
||||||
|
embedded = request.args.get('embedded', 'false') == 'true'
|
||||||
return render_template(
|
return render_template(
|
||||||
'satellite_dashboard.html',
|
'satellite_dashboard.html',
|
||||||
shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
|
shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
|
||||||
|
embedded=embedded,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -54,8 +54,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
{% if not embedded %}
|
||||||
{% set active_mode = 'adsb' %}
|
{% set active_mode = 'adsb' %}
|
||||||
{% include 'partials/nav.html' with context %}
|
{% include 'partials/nav.html' with context %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<!-- Slim Statistics Bar -->
|
<!-- Slim Statistics Bar -->
|
||||||
<div class="stats-strip">
|
<div class="stats-strip">
|
||||||
|
|||||||
@@ -54,8 +54,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
{% if not embedded %}
|
||||||
{% set active_mode = 'ais' %}
|
{% set active_mode = 'ais' %}
|
||||||
{% include 'partials/nav.html' with context %}
|
{% include 'partials/nav.html' with context %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<div class="stats-strip">
|
<div class="stats-strip">
|
||||||
<div class="stats-strip-inner">
|
<div class="stats-strip-inner">
|
||||||
|
|||||||
@@ -166,7 +166,9 @@
|
|||||||
|
|
||||||
{% block navigation %}
|
{% block navigation %}
|
||||||
{# Include the unified nav partial with active_mode set #}
|
{# Include the unified nav partial with active_mode set #}
|
||||||
|
{% if not embedded %}
|
||||||
{% include 'partials/nav.html' with context %}
|
{% include 'partials/nav.html' with context %}
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block main %}
|
{% block main %}
|
||||||
|
|||||||
@@ -74,8 +74,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
{% if not embedded %}
|
||||||
{% set active_mode = 'satellite' %}
|
{% set active_mode = 'satellite' %}
|
||||||
{% include 'partials/nav.html' with context %}
|
{% include 'partials/nav.html' with context %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<main class="dashboard">
|
<main class="dashboard">
|
||||||
<!-- Polar Plot -->
|
<!-- Polar Plot -->
|
||||||
|
|||||||
Reference in New Issue
Block a user