Skip to content

Commit

Permalink
plot_app: switch to cdnjs.cloudflare.com hosted font-awesome & update…
Browse files Browse the repository at this point in the history
… to 6.5.1

Reduces the load a bit and should be a bit faster.
  • Loading branch information
bkueng committed Jan 16, 2024
1 parent 6baefd8 commit 4936f59
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 994 deletions.
4 changes: 2 additions & 2 deletions app/plot_app/plotted_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ def get_info_table_html(ulog, px4_ulog, db_data, vehicle_data, vtol_states):
'title="'+tooltip+'" '
table_text_left.append(
('Logging Start '+
'<i '+tooltip+' class="fa fa-question" aria-hidden="true" '+
'style="font-size: larger; color:#666"></i>',
'<i '+tooltip+' class="fa-solid fa-question" aria-hidden="true" '+
'style="color:#666"></i>',
'<span style="display:none" id="logging-start-element">'+
str(logging_start_time)+'</span>'))
except:
Expand Down
4 changes: 0 additions & 4 deletions app/plot_app/static/css/font-awesome.min.css

This file was deleted.

Binary file removed app/plot_app/static/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed app/plot_app/static/fonts/fontawesome-webfont.eot
Binary file not shown.
685 changes: 0 additions & 685 deletions app/plot_app/static/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed app/plot_app/static/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed app/plot_app/static/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed app/plot_app/static/fonts/fontawesome-webfont.woff2
Binary file not shown.
Binary file not shown.
288 changes: 0 additions & 288 deletions app/plot_app/static/fonts/glyphicons-halflings-regular.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
20 changes: 5 additions & 15 deletions app/plot_app/templates/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<link href='https://fonts.googleapis.com/css?family=Play:400' rel='stylesheet' type='text/css'>
<link href='https://cdnjs.cloudflare.com/ajax/libs/chosen/1.8.3/chosen.css' rel='stylesheet' type='text/css'>
<link href="plot_app/static/css/bootstrap.min.css" rel="stylesheet">
<link href="plot_app/static/css/font-awesome.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/fontawesome.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/solid.min.css" rel="stylesheet">
<link href="plot_app/static/css/animate.min.css" rel="stylesheet">
<link href="plot_app/static/css/main.css" rel="stylesheet">
<link rel="icon" type="image/x-icon" href="plot_app/static/images/favicon-32x32.png">
Expand Down Expand Up @@ -53,7 +54,7 @@ <h1>

{% if is_plot_page %}
<li class="nav-item dropdown" id="download-menu">
<a class="nav-link" data-toggle="dropdown" href="javascript:;">Download <i class="fa fa-angle-down"></i></a>
<a class="nav-link" data-toggle="dropdown" href="javascript:;">Download <i class="fa-solid fa-angle-down" style="font-size: smaller"></i></a>
<div class="dropdown-menu">
<a class="dropdown-item" href="download?log={{ log_id }}">Log File</a>
<a class="dropdown-item" href="download?log={{ log_id }}&type=1" target="_blank">Parameters</a>
Expand All @@ -64,7 +65,7 @@ <h1>
</div>
</li>
<li class="nav-item dropdown" id="navigation-menu">
<a class="nav-link" data-toggle="dropdown" href="javascript:;">Navigation <i class="fa fa-angle-down"></i></a>
<a class="nav-link" data-toggle="dropdown" href="javascript:;">Navigation <i class="fa-solid fa-angle-down" style="font-size: smaller"></i></a>
<div class="dropdown-menu dropdown-menu-right" id="ul-fragments">
{% for cur_plot in plots %}
{% set cur_title = cur_plot.title %}
Expand All @@ -73,19 +74,8 @@ <h1>
{% endfor %}
</div>
</li>
<!-- FIXME: resizing is currently broken
<li class="nav-item dropdown" id="size-menu">
<a class="nav-link" role="button" data-toggle="dropdown" href="javascript:;">Size <i class="fa fa-angle-down"></i></a>
<div class="dropdown-menu">
<a class="dropdown-item" id="size-small-menu" href="javascript:setSize('small');">Small</a>
<a class="dropdown-item active" id="size-medium-menu" href="javascript:setSize('medium');">Normal</a>
<a class="dropdown-item" id="size-large-menu" href="javascript:setSize('large');">Large</a>
<a class="dropdown-item" id="size-xlarge-menu" href="javascript:setSize('xlarge');">Extra Large</a>
</div>
</li>
-->
<li class="nav-item dropdown" id="plot-legend-menu">
<a class="nav-link" role="button" data-toggle="dropdown" href="javascript:;">Plot Legend <i class="fa fa-angle-down"></i></a>
<a class="nav-link" role="button" data-toggle="dropdown" href="javascript:;">Plot Legend <i class="fa-solid fa-angle-down" style="font-size: smaller"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="javascript:;"><b>Flight Modes:</b></a>
{% for cur_flight_mode in flight_modes %}
Expand Down

0 comments on commit 4936f59

Please sign in to comment.