diff --git a/meshview/templates/base.html b/meshview/templates/base.html index dbf1838..e6fad96 100644 --- a/meshview/templates/base.html +++ b/meshview/templates/base.html @@ -1,59 +1,74 @@ - - Meshview - {{ site_config["site"]["title"] }} {% if node and node.short_name %}-- {{node.short_name}}{% endif %} - - - - - - - - - {% block head %} - {% endblock %} + + + Meshview - {{ site_config.get("site", {}).get("title", "") }} + {% if node and node.short_name %}-- {{ node.short_name }}{% endif %} + + + - - - -
{{ site_config["site"]["title"] }} {{ site_config["site"]["domain"] }}
-
{{ site_config["site"]["message"] }}
-
Quick Links:   - {% if site_config["site"].get("nodes") == "True" %}Nodes - {% endif %} - {% if site_config["site"].get("conversations") == "True" %}Conversations - {% endif %} - {% if site_config["site"].get("everything") == "True" %}See everything - {% endif %} - {% if site_config["site"].get("graphs") == "True" %}Mesh Graphs - {% endif %} - {% if site_config["site"].get("net") == "True" %}Weekly Net - {% endif %} - {% if site_config["site"].get("map") == "True" %}Map - {% endif %} - {% if site_config["site"].get("stats") == "True" %}Stats - {% endif %} - {% if site_config["site"].get("top") == "True" %}Top Traffic{% endif %} -
+ + + + + + + + + + + {% block head %}{% endblock %} + + + + + {% set site = site_config.get("site", {}) %} + +
+
+ {{ site.get("title", "") }} {{ site.get("domain", "") }} +
+
+ {{ site.get("message", "") }} +
+ +
+ {% if site.get("nodes") == "True" %}Nodes - {% endif %} + {% if site.get("conversations") == "True" %}Conversations - {% endif %} + {% if site.get("everything") == "True" %}See everything - {% endif %} + {% if site.get("graphs") == "True" %}Mesh Graphs - {% endif %} + {% if site.get("net") == "True" %}Weekly Net - {% endif %} + {% if site.get("map") == "True" %}Map - {% endif %} + {% if site.get("stats") == "True" %}Stats - {% endif %} + {% if site.get("top") == "True" %}Top Traffic{% endif %} +
+ + {% include "search_form.html" %} + + {% block body %}{% endblock %} - {% include "search_form.html" %} - {% block body %} - {% endblock %}
Visit Meshview on Github. - ver. {{SOFTWARE_RELEASE}} + ver. {{ SOFTWARE_RELEASE | default("unknown") }}

- - \ No newline at end of file + + diff --git a/meshview/templates/packet_details.html b/meshview/templates/packet_details.html index 021aef5..2bf4d31 100644 --- a/meshview/templates/packet_details.html +++ b/meshview/templates/packet_details.html @@ -41,7 +41,7 @@ markers.addTo(details_map); L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', { - maxZoom: 19, + maxZoom: 10, attribution: '© OpenStreetMap' }).addTo(details_map);