Minor styling fixes

Author: JBorrow

CHANGELOG.txt

@@ -1,5 +1,15 @@
 Changelog for the ``swiftpipeline`` repository.
 
+Version 0.1.7
+-------------
+
+Styling bug-fixes:
+
++ Ensured that the navigation bar always appears above the MathJax rendered
+  text on all browsers by setting it's z-order explicitly.
++ Allowed for mixing between `auto_plotter` and those generated by scripts
+  within a single section.
+
 Version 0.1.6
 -------------
 

example/config/auto_plotter/mass_function.yml

@@ -68,4 +68,22 @@ adaptive_stellar_mass_function_100:
   metadata:
     title: Stellar Mass Function (100 kpc aperture, adaptive)
     caption: 100 kpc aperture GSMF, showing all galaxies with an adaptive bin-width.
-    section: Stellar Mass Function
+    section: Stellar Mass Function
+
+stellar_mass_function_in_density_temp:
+  type: "adaptivemassfunction"
+  legend_loc: "lower left"
+  number_of_bins: 25
+  x:
+    quantity: "apertures.mass_star_100_kpc"
+    units: Solar_Mass
+    start: 1e7
+    end: 1e12
+  y:
+    units: 1/Mpc**3
+    start: 1e-6
+    end: 0.316 # (1e-0.5)
+  metadata:
+    title: Stellar Mass Function (100 kpc aperture, adaptive)
+    caption: 100 kpc aperture GSMF, showing all galaxies with an adaptive bin-width. Desinged to appear in the Density-Temperature section to show how auto_plotter and scripts can be mixed.
+    section: Density-Temperature

swiftpipeline/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"

swiftpipeline/html.py

@@ -111,7 +111,7 @@ def __init__(self):
             pipeline_version=pipeline_version,
             velociraptor_version=velociraptor_version,
             creation_date=strftime(r"%Y-%m-%d"),
-            sections=[],
+            sections={},
             runs=[],
         )
 
@@ -183,8 +183,14 @@ def add_auto_plotter_metadata(self, auto_plotter_metadata: AutoPlotterMetadata):
                 if plot.section == section and plot.show_on_webpage
             ]
 
-            self.variables["sections"].append(
-                dict(title=section, plots=plots, id=abs(hash(section)))
+            current_section_plots = (
+                self.variables["sections"].get(section, {"plots": []}).get("plots", [])
+            )
+
+            self.variables["sections"][section] = dict(
+                title=section,
+                plots=plots + current_section_plots,
+                id=abs(hash(section)),
             )
 
         return
@@ -217,8 +223,14 @@ def add_config_metadata(self, config: Config):
                 if script.section == section and script.show_on_webpage
             ]
 
-            self.variables["sections"].append(
-                dict(title=section, plots=plots, id=abs(hash(section)))
+            current_section_plots = (
+                self.variables["sections"].get(section, {"plots": []}).get("plots", [])
+            )
+
+            self.variables["sections"][section] = dict(
+                title=section,
+                plots=plots + current_section_plots,
+                id=abs(hash(section)),
             )
 
         return

swiftpipeline/templates/plot_viewer.html

@@ -5,7 +5,7 @@
 {% block navigation %}
 {# Purely internal navigation links to take you up/down the page #}
 <ul class="nav">
-    {% for section in sections | sort(attribute="title") %}
+    {% for section in sections.values() | sort(attribute="title") %}
     <li><a href="#{{ section.id }}">{{ section.title }}</a></li>
     {% endfor %}
 </ul>
@@ -25,7 +25,7 @@ <h1>Included Runs</h1>
 </div>
 
 {# Show off our figures! #}
-{% for section in sections | sort(attribute="title") %}
+{% for section in sections.values() | sort(attribute="title") %}
 <div class="section" id="{{ section.id }}">
     <h1>{{ section.title }}</h1>
     <div class="plot-container">
@@ -47,4 +47,4 @@ <h3>{{ plot.title }}</h3>
     with version {{ velociraptor_version }} of the velociraptor
     python library on {{ creation_date }}.
 </p>
-{% endblock %}
+{% endblock %}

swiftpipeline/templates/style.css

@@ -28,6 +28,7 @@ h1 {
     position: sticky;
     top: 0;
     width: 100%;
+    z-index: 100;
 }
 
 .nav {