diff --git a/web/README.md b/web/README.md
index 2fa4e69e0f3a4c899a728e672c02e7fc871c0cc9..d6890ca84c8d80a67868edabc98bcde3235995c7 100644
--- a/web/README.md
+++ b/web/README.md
@@ -47,9 +47,11 @@ This fetches articles from the CMS to e.g. `ogs/web/data/news.json`.
- [Hugo](https://gothugo.com) - Static site generator for technical documentation
- [Contenful](https://www.contentful.com/) - API-based CMS for news, articles, ..
- [flexboxgrid](http://flexboxgrid.com/) - CSS grid
+- [Tachyons](http://tachyons.io) - CSS framework
- [vtk.js](https://kitware.github.io/vtk-js/) - 3D Visualizations
- [webpack](https://webpack.github.io/) - Packaging JavaScript
- [gulp](http://gulpjs.com/) - Automation toolkit
+- [FontAwesome](https://fontawesome.com) - Icons, see [icon search](https://fontawesome.com/icons?d=gallery)
## How-Tos
diff --git a/web/archetypes/benchmark.md b/web/archetypes/benchmark.md
index 830a13c61fa2a014a7f424b234a6f0cfb655957e..59bb444719e59b588416953691679fa5f72b0482 100644
--- a/web/archetypes/benchmark.md
+++ b/web/archetypes/benchmark.md
@@ -8,7 +8,7 @@ weight = 101
parent = "[TODO]"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/config.toml b/web/config.toml
index af6bbeb43e2c5b21e7b8a11445d09349550a4efc..2377dca0e692f2b10232a3c37bfd95e3c6b13b72 100644
--- a/web/config.toml
+++ b/web/config.toml
@@ -7,7 +7,7 @@ pygmentsstyle = 'friendly'
enableGitInfo = true
[params]
- alert = "Preliminary test page! Current documentation is at <a href='https://docs.opengeosys.org'>docs.opengeosys.org</a>."
+ alert = "Benchmarks only documentation; the Developer Guide can be found at <a href='https://docs.opengeosys.org'>docs.opengeosys.org</a>."
[taxonomies]
news = "news"
diff --git a/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet-nodal-source-term.md b/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet-nodal-source-term.md
index 1e06da84eaae98746a299015142fc4d736da187b..663136f63649b7cd9111e1321d5eae2430eae4c3 100644
--- a/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet-nodal-source-term.md
+++ b/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet-nodal-source-term.md
@@ -13,7 +13,7 @@ aliases = [ "/docs/benchmarks/" ] # First benchmark page
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet.md b/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet.md
index 07bab2b2e07dfeca2082a409ba687502e89b115c..393d8427faac1f88af460734bf2249956e1322e8 100644
--- a/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet.md
+++ b/web/content/docs/benchmarks/elliptic/groundwater-flow-dirichlet.md
@@ -3,7 +3,7 @@ date = "2017-02-15T11:17:39+01:00"
title = "Groundwater Flow (Dirichlet)"
project = "Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj"
author = "Dmitri Naumov"
-weight = 101
+weight = 102
aliases = [ "/docs/benchmarks/" ] # First benchmark page
@@ -13,7 +13,7 @@ aliases = [ "/docs/benchmarks/" ] # First benchmark page
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/elliptic/groundwater-flow-neumann.md b/web/content/docs/benchmarks/elliptic/groundwater-flow-neumann.md
index 264f4f9a1e68c1dc604a25b89c2bead5f36f15d8..2b98d5e50846c0f1c99cf30e4c68a5f4b8174982 100644
--- a/web/content/docs/benchmarks/elliptic/groundwater-flow-neumann.md
+++ b/web/content/docs/benchmarks/elliptic/groundwater-flow-neumann.md
@@ -3,7 +3,7 @@ date = "2017-01-31T14:27:10+01:00"
author = "Dmitri Naumov"
title = "Groundwater Flow (Neumann)"
project = "Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj"
-weight = 102
+weight = 103
[menu]
[menu.benchmarks]
diff --git a/web/content/docs/benchmarks/elliptic/groundwater-flow-robin.md b/web/content/docs/benchmarks/elliptic/groundwater-flow-robin.md
index 009754c495d5978d481d63a8a895c34dc8f0e372..45b44a2ccc9cac5140ee72239e40fe46f8eea7c4 100644
--- a/web/content/docs/benchmarks/elliptic/groundwater-flow-robin.md
+++ b/web/content/docs/benchmarks/elliptic/groundwater-flow-robin.md
@@ -3,7 +3,7 @@ date = "2017-02-15T11:46:49+01:00"
title = "Groundwater Flow (Robin)"
project = "Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj"
author = "Dmitri Naumov"
-weight = 103
+weight = 104
[menu]
@@ -13,7 +13,7 @@ weight = 103
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md
index abfa88622497bc7274307665244f7a00d960a9f7..ef514b8eaffd69816829a75c4d1124eb7c033fe2 100644
--- a/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md
+++ b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md
@@ -11,7 +11,7 @@ project = "Parabolic/T/1D_dirichlet/line_60_heat.prj"
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md
index 0cd3cbfd809c218d27bc7372ed7e613e11a82ae0..8b7dd7aa2f862dd5bc0dad513275800ea7d02f9e 100644
--- a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md
+++ b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md
@@ -11,7 +11,7 @@ author = "Tianyuan Zheng"
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/hydro-component/elder.md b/web/content/docs/benchmarks/hydro-component/elder.md
index d5b44385722f24cf323244fb5e3ef6c2aa1d7da8..ca82385430f758b90d7153c2dac09d71aabe9667 100644
--- a/web/content/docs/benchmarks/hydro-component/elder.md
+++ b/web/content/docs/benchmarks/hydro-component/elder.md
@@ -11,7 +11,7 @@ title = "Saturated Variable-Density Flow and Mass Transport (Elder)"
+++
-{{< project-link >}}
+{{< data-link >}}
## Overview
@@ -32,7 +32,7 @@ A comparison of the numerical data is shown in the figure below. The numerical r
{{< img src="../gif/elder.gif" title="Results for numerical (OGS-5 - green, OGS-6 - white) results together with concentration distribution in the domain and mesh resolution for different time steps.">}}
-[The project files are here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/elder)
+{{< data-link >}}
## Literature
diff --git a/web/content/docs/benchmarks/hydro-component/goswami.md b/web/content/docs/benchmarks/hydro-component/goswami.md
index 442750de3dd6040280c951b016af229ddfc7f2d7..e15eedb045d5c417050612af10c53e96c20c7dcb 100644
--- a/web/content/docs/benchmarks/hydro-component/goswami.md
+++ b/web/content/docs/benchmarks/hydro-component/goswami.md
@@ -11,7 +11,7 @@ title = "Saturated Variable-Density Flow and Mass Transport (Goswami)"
+++
-{{< project-link >}}
+{{< data-link >}}
## Overview
@@ -33,7 +33,7 @@ A comparison of numerical and laboratory data is shown in the figure below. The
{{< img src="../goswami.png" title="Results for numerical (OGS5 - green, ogs6 - white) and laboratory data (black squares) together with concentration distribution in the domain and mesh resolution for steady state 1 (see original research paper).">}}
-[The project files are here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/gosami)
+{{< data-link >}}
## Literature
diff --git a/web/content/docs/benchmarks/hydro-component/hydro-component.md b/web/content/docs/benchmarks/hydro-component/hydro-component.md
index 381dfe62a4e487254140796e288e3d364a30dbcc..3f9ed1175bc0dd1c691a1d4e7508791d0be6c5bb 100644
--- a/web/content/docs/benchmarks/hydro-component/hydro-component.md
+++ b/web/content/docs/benchmarks/hydro-component/hydro-component.md
@@ -11,7 +11,7 @@ title = "Saturated Mass Transport"
+++
-{{< project-link >}}
+{{< data-link >}}
## Overview
@@ -33,8 +33,8 @@ Boundary conditions vary on the left side individually for each setup; right sid
Left side boundary conditions for these two setups are pressure $p=0$ and concentration $c=1$. The *Diffusion only* setup results in the final state of the *Diffusion and Storage* setup. For the former, retardation is set to $R=0$, while for the latter, $R=1$.
-[The *Diffusion only* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj)
-[The *Diffusion and Storage* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj)
+{{< data-link "The *Diffusion only* project file" "Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj" >}}
+{{< data-link "The *Diffusion and Storage* project file" "Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj" >}}
{{< img src="../gif/DiffusionAndStorage.gif" title="*Diffusion and Storage*">}}
@@ -42,7 +42,7 @@ Left side boundary conditions for these two setups are pressure $p=0$ and concen
Left side boundary conditions for this setup are pressure $p=1$ and concentration $c=1$.
-[The *Diffusion, Storage, and Advection* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj)
+{{< data-link "The *Diffusion, Storage, and Advection* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj" >}}
{{< img src="../gif/DiffusionAndStorageAndAdvection.gif" title="*Diffusion, Storage, and Advection*">}}
@@ -50,8 +50,8 @@ Left side boundary conditions for this setup are pressure $p=1$ and concentratio
Left side boundary conditions for these setups are pressure $p=1$ and concentration $c=1$. The latter is once given over the full left side, and in a second setup over half of the left side. Longitudinal and transverse dispersivity is $\alpha_l = 1 m$ and $\alpha_t = 0.1 m$.
-[The *Diffusion, Storage, Advection, and Dispersion* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj)
-[The *Diffusion, Storage, Advection, and Dispersion Half* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj)
+{{< data-link "The *Diffusion, Storage, Advection, and Dispersion* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj" >}}
+{{< data-link "The *Diffusion, Storage, Advection, and Dispersion Half* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj" >}}
{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersion.gif" title="*Diffusion, Storage, Advection, and Dispersion*">}}
{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif" title="*Diffusion, Storage, Advection, and Dispersion Half*">}}
@@ -60,7 +60,7 @@ Left side boundary conditions for these setups are pressure $p=1$ and concentrat
Boundary condition for this setup is pressure $p=0$ for the top left corner and concentration $c=1$ for half of the left side. Relation between concentration and gravity is $\beta_c = 1$.
-[The *Diffusion, Storage, Gravity, and Dispersion* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj)
+{{< data-link "The *Diffusion, Storage, Gravity, and Dispersion* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj" >}}
{{< img src="../gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif" title="*Diffusion, Storage, Gravity, and Dispersion Half*">}}
@@ -69,6 +69,6 @@ Boundary condition for this setup is pressure $p=0$ for the top left corner and
Left side boundary conditions for this setup are pressure $p=1$ and concentration $c=1$. Decay rate is $\theta = 0.001 s^{-1}$.
-[The *Diffusion, Storage, Advection, and Decay* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj)
+{{< data-link "The *Diffusion, Storage, Advection, and Decay* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj" >}}
{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDecay.gif" title="*Diffusion, Storage, Advection, and Decay*">}}
diff --git a/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md b/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md
index 16b3c78a4731429633b803a9b2578e9d10fd35b2..86cf4738ad39659d85e412d1d6380224265a23d5 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md
@@ -11,7 +11,7 @@ author = "Dmitri Naumov"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md
index b53d16ca8e1fcdb9f9bcc6a518ddbfb5da693de6..9811dff96aac13720dc936976d425bd985c097ac 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md
@@ -11,7 +11,7 @@ weight = 153
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md
index 90a151e8f064b4ca5de4bd70d43a53170a696ad8..311c1bd46d1ec3105fa78b5e9fcee46e1b669c76 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md
@@ -12,7 +12,7 @@ author = "Norihiro Watanabe"
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md
index ee5c3860756c0cc2a1766eeea0a02e8a491306bd..53b4e742f5752a575718e8c081ea3df00615c1ef 100644
--- a/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md
+++ b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md
@@ -11,7 +11,7 @@ weight = 161
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md
index d85be93786c58dfff6333f7ba1e089fa3390ea3f..f499ddfef5b4a9ba8247c42e77c7c8c583233e6b 100644
--- a/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md
+++ b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md
@@ -11,7 +11,7 @@ author = "Wenqing Wang"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/phase-field/phasefield.md b/web/content/docs/benchmarks/phase-field/phasefield.md
index af1d34b6b75c70f58b3b3f1e61d820acd6c4adc9..27a3cbca62b0ea385002779d96d04a1c9819abf5 100644
--- a/web/content/docs/benchmarks/phase-field/phasefield.md
+++ b/web/content/docs/benchmarks/phase-field/phasefield.md
@@ -11,7 +11,7 @@ weight = 158
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
@@ -47,4 +47,4 @@ $$
\begin{equation}
I (\varepsilon, k) = \int_0^1 \dfrac{1}{d (x)^2 + k} \mathrm{d}x
\end{equation}
-$$
\ No newline at end of file
+$$
diff --git a/web/content/docs/benchmarks/richards-flow/richards-component-transport.md b/web/content/docs/benchmarks/richards-flow/richards-component-transport.md
index 76d821f75d54afa3264800f994bf483b861d5a06..8f5bf2e7d9dad6a8d31291623f47edf9d6c79356 100644
--- a/web/content/docs/benchmarks/richards-flow/richards-component-transport.md
+++ b/web/content/docs/benchmarks/richards-flow/richards-component-transport.md
@@ -11,7 +11,7 @@ title = "Unsaturated Mass Transport"
+++
-{{< project-link >}}
+{{< data-link >}}
## Overview
@@ -34,8 +34,8 @@ Saturated intrinsic permeability is calculated from given flux and pressure grad
Initial conditions are $c = 0$ and hydrostatic pressure conditions with steady state flow for both scenarios.
-[The NaCl1 project file is here. ](../../../../../Tests/Data/Parabolic/RichardsComponentTransport/Padilla_NaCl1.prj)
-[The NaCl6 project file is here. ](../../../../../Tests/Data/Parabolic/RichardsComponentTransport/Padilla_NaCl6.prj)
+{{< data-link "The NaCl1 project file" "Parabolic/RichardsComponentTransport/Padilla_NaCl1.prj" >}}
+{{< data-link "The NaCl6 project file" "Parabolic/RichardsComponentTransport/Padilla_NaCl6.prj" >}}
### Results
@@ -46,8 +46,9 @@ The figure below shows breakthrough curves vs experimental result at the bottom
It can be seen, that with decreasing saturation, breakthrough curves exhibit stronger dispersion through the decreased angle of the breakthrough curve. Both simulation results follow the experimental observations closely; deviations, especially in the unsaturated case, can be attributed to known tailing effects from secondary porosity.
-Here are digitized data from the [NaCl1](../../../../../Tests/Data/Parabolic/RichardsComponentTransport/Padilla_NaCl1_poreVolume-conc.csv) and [NaCl6](../../../../../Tests/Data/Parabolic/RichardsComponentTransport/Padilla_NaCl6_poreVolume-conc.csv) experiments and a [ParaView state file](../../../../../Tests/Data/Parabolic/RichardsComponentTransport/Padilla_state.pvsm) for comparison.
+Here is the [ParaView state file]({{< data-url "Parabolic/RichardsComponentTransport/Padilla/Padilla_state.pvsm" >}}) for comparison.
+{{< data-link "" "" >}}
## References
diff --git a/web/content/docs/benchmarks/richards-flow/richards-flow.md b/web/content/docs/benchmarks/richards-flow/richards-flow.md
index 134497a410498a6d1d616ea13a6ae574a684291c..9b5bd87a18738e5215e6e84421c188ac7871e41a 100644
--- a/web/content/docs/benchmarks/richards-flow/richards-flow.md
+++ b/web/content/docs/benchmarks/richards-flow/richards-flow.md
@@ -11,7 +11,7 @@ title = "Richards Flow"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md
index 7ba84ab7570d0bdb75e20bd72d60dc5f8e437d06..78fdd52ef5d41de8892d343c4fd61a9462de77c3 100644
--- a/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md
+++ b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md
@@ -11,7 +11,7 @@ title = "Linear; Single fracture"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md
index a09365bc6b22cc368aaea64b36abaf00c2232a1c..f768f11eee36ddfa803b41f1bacef64319e652e4 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md
@@ -11,7 +11,7 @@ weight = 111
+++
-{{< project-link >}}
+{{< data-link >}}
## Equations
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md
index 56faf51d740f3e6b0df8b663bd517f2e138715a5..b83440b7e9c2be618fb171393acbf4fa72e14d39 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md
@@ -11,7 +11,7 @@ weight = 112
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md
index 83a13482165e2cfb452d46adf78545dd7b310a3b..46f4fcdb685b5f56882c6ee3d89245b6e119f6d6 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md
@@ -11,7 +11,7 @@ author = "Xing-Yuan Miao"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md
index 2888a6568acc423e1aaeb0805a7ad07121ecfe8e..76f806fb4d06599c54590385bd7501e6b15a1e1f 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md
@@ -12,7 +12,7 @@ title = "Ehlers; Single-surface yield function"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md
index 73df208af8126defb89e6c13697a09b217f4f9b6..006594f99a18c08515db7f87e532e93a7ee4195c 100644
--- a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md
+++ b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md
@@ -11,7 +11,7 @@ title = "Heat pipe problem"
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md
index ceb08d282d8b4afc77763bd5062559b4418ffb6d..f796bf2dffa5c97e7518bcc602feeb5ff197349f 100644
--- a/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md
+++ b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md
@@ -11,7 +11,7 @@ weight = 156
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/content/docs/benchmarks/two-phase-flow/momas.md b/web/content/docs/benchmarks/two-phase-flow/momas.md
index d816a5d0e7268b43eef3b3ea66b26501a49f309c..41f736486029a51fc265b32e23dc161c531cba27 100644
--- a/web/content/docs/benchmarks/two-phase-flow/momas.md
+++ b/web/content/docs/benchmarks/two-phase-flow/momas.md
@@ -11,7 +11,7 @@ weight = 101
+++
-{{< project-link >}}
+{{< data-link >}}
## Problem description
diff --git a/web/layouts/_default/single.html b/web/layouts/_default/single.html
index 23dce35d22c033c6bce7fa98d9d353c6a8bd4fe3..4ac7d3063e1f6fc5ecfd5ea8818599868816f3c6 100644
--- a/web/layouts/_default/single.html
+++ b/web/layouts/_default/single.html
@@ -1,6 +1,6 @@
{{ define "main" }}
- <div class="col-xs-12">
+ <div class="mw5 mw7-ns center pa3 ph5-ns">
<h1>{{ .Title }}</h1>
{{ .Content }}
</div>
diff --git a/web/layouts/index.html b/web/layouts/index.html
index 54335808736d6d70903782988f598d1e6c32fcd0..dc49f9b253869299c5eee0677b0969805a5a1286 100644
--- a/web/layouts/index.html
+++ b/web/layouts/index.html
@@ -16,7 +16,7 @@
<div class="col-xs-8">
<h1>Benchmark documentation site</h1>
- <p>For the moment this site contains just the <a href="/docs/benchmarks">➥ benchmark documentation</a> for <a href="https://github.com/ufz/ogs6">OpenGeoSys-6</a>.
+ <p>For the moment this site contains just the <a href="/docs/benchmarks"><i class="fas fa-arrow-right"></i> benchmark documentation</a> for <a href="https://github.com/ufz/ogs6">OpenGeoSys-6</a>.
</p>
</div>
diff --git a/web/layouts/partials/header.html b/web/layouts/partials/header.html
index 03107aeed5d58ab46d0e79f9c9b82abbfeb36eb9..d7481ce750ba1df8f4303ffbb6618f231b30f7e3 100644
--- a/web/layouts/partials/header.html
+++ b/web/layouts/partials/header.html
@@ -18,6 +18,7 @@
<script type="text/javascript" async
src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
+ <script defer src="https://use.fontawesome.com/releases/v5.0.1/js/all.js"></script>
<title>{{ .Title }}</title>
</head>
@@ -25,18 +26,15 @@
<body>
<div class="container">
<nav>
- <a href="/" class="black b">opengeosys.org</a>
+ <a href="/" class="black b">benchmarks.opengeosys.org</a>
{{ $currentPage := . }}
{{ range .Site.Menus.main }}
<a href="{{ .URL }}" {{if $currentPage.IsMenuCurrent "main" . }} class="active"{{end}}>{{ .Name }}</a>
{{ end }}
</nav>
{{ if .Site.Params.alert }}
- <div class="flex items-center justify-center pa2 bg-lightest-blue navy">
- <svg class="w1" data-icon="info" viewBox="0 0 32 32" style="fill:currentcolor">
- <title>info icon</title>
- <path d="M16 0 A16 16 0 0 1 16 32 A16 16 0 0 1 16 0 M19 15 L13 15 L13 26 L19 26 z M16 6 A3 3 0 0 0 16 12 A3 3 0 0 0 16 6"></path>
- </svg>
+ <div class="f6 flex items-center justify-center pa2 bg-lightest-blue navy">
+ <i class="fas fa-exclamation-triangle"></i>
<span class="lh-title ml3">{{ .Site.Params.alert | safeHTML }}</span>
</div>
{{ end }}
diff --git a/web/layouts/shortcodes/data-link.html b/web/layouts/shortcodes/data-link.html
new file mode 100644
index 0000000000000000000000000000000000000000..df450a269f737f584f831f2f09d42c411b2a0dc5
--- /dev/null
+++ b/web/layouts/shortcodes/data-link.html
@@ -0,0 +1,12 @@
+{{ if .Get 1 }}
+<a href="https://github.com/ufz/ogs-data/blob/master/{{ .Get 1 }}">
+{{ else }}
+<a href="https://github.com/ufz/ogs-data/blob/master/{{ .Page.Params.project }}">
+{{ end }}
+<i class="fas fa-arrow-right"></i>
+{{ if .Get 0 }}
+{{ .Get 0 | markdownify }}
+{{ else }}
+Project file on GitHub
+{{ end }}
+</a>
diff --git a/web/layouts/shortcodes/data-url.html b/web/layouts/shortcodes/data-url.html
new file mode 100644
index 0000000000000000000000000000000000000000..e5a30429979a6e5c80acf575913b08ab3fb122a3
--- /dev/null
+++ b/web/layouts/shortcodes/data-url.html
@@ -0,0 +1 @@
+https://github.com/ufz/ogs-data/blob/master/{{ .Get 0 }}
diff --git a/web/layouts/shortcodes/img.html b/web/layouts/shortcodes/img.html
index 78905f1182aa0283cc1ae36c9d9499a084f941af..e35514f8403ad783e340a1abff4c2d30ca640566 100644
--- a/web/layouts/shortcodes/img.html
+++ b/web/layouts/shortcodes/img.html
@@ -5,9 +5,9 @@
{{ if .Get "link"}}</a>{{ end }}
{{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
<figcaption>{{ if isset .Params "title" }}
- <h4>{{ .Get "title" }}</h4>{{ end }}
+ <h4>{{ .Get "title" | markdownify }}</h4>{{ end }}
{{ if or (.Get "caption") (.Get "attr")}}<p>
- {{ .Get "caption" }}
+ {{ .Get "caption" | markdownify }}
{{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
{{ .Get "attr" }}
{{ if .Get "attrlink"}}</a> {{ end }}
diff --git a/web/layouts/shortcodes/project-link.html b/web/layouts/shortcodes/project-link.html
deleted file mode 100644
index b09e2dbd37bbe07d8ad7cf178b48fe9569c190f7..0000000000000000000000000000000000000000
--- a/web/layouts/shortcodes/project-link.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="https://github.com/ufz/ogs-data/blob/master/{{ .Page.Params.project }}">
- Project file on GitHub <i class="fi-arrow-right"></i>
-</a>
diff --git a/web/package.json b/web/package.json
index 007630e1ece1b3ef40d81776c894a63cb59034ca..26a26eddab074ddd7bb7957f5b0f7a2a966606c1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -8,7 +8,7 @@
"scripts": {
"clean": "gulp clean",
"gulp": "gulp",
- "hugo": "hugo server --disableRSS",
+ "hugo": "hugo server --disableKinds=RSS",
"build": "webpack && gulp build && hugo",
"build:release": "webpack --env=production && gulp build && hugo",
"import": "cd import && python import.py",
@@ -162,6 +162,7 @@
"gulp-size": "^2.1.0",
"kw-web-suite": "^3.1.1",
"merge-stream": "^1.0.1",
+ "node-sass": "^4.7.2",
"normalize.css": "^7.0.0",
"pygments-css": "^1.0.0",
"string-replace-loader": "^1.3.0",
diff --git a/web/src/scss/main.scss b/web/src/scss/main.scss
index ac355f35ca09d27e92ee0aa408790668e2c251a2..8420e3f5aaf9c613bd5acbe9306785d452bd2c66 100644
--- a/web/src/scss/main.scss
+++ b/web/src/scss/main.scss
@@ -6,7 +6,7 @@ $code-font-family: code;
// Fonts
h1, h2, h3, h4, h5, h6 { @extend .#{$header-font-family}; }
-p, li { @extend .#{$text-font-family}; }
+body { @extend .#{$text-font-family}; }
code, pre { @extend .#{$code-font-family}; }
// Header
diff --git a/web/yarn.lock b/web/yarn.lock
index 93a6d8321e2785f23f1f66b02acb28f8d3b10716..1e683a2f0023b94f1c675f7abb2c6495db6609f7 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2936,6 +2936,16 @@ glob@^4.3.1:
minimatch "^2.0.1"
once "^1.3.0"
+glob@^6.0.4:
+ version "6.0.4"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+ dependencies:
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "2 || 3"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4496,18 +4506,18 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ dependencies:
+ brace-expansion "^1.1.7"
+
minimatch@^2.0.1:
version "2.0.10"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
dependencies:
brace-expansion "^1.0.0"
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
- dependencies:
- brace-expansion "^1.1.7"
-
minimatch@~0.2.11:
version "0.2.14"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
@@ -4698,6 +4708,30 @@ node-sass@^4.2.0:
sass-graph "^2.1.1"
stdout-stream "^1.4.0"
+node-sass@^4.7.2:
+ version "4.7.2"
+ resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
+ dependencies:
+ async-foreach "^0.1.3"
+ chalk "^1.1.1"
+ cross-spawn "^3.0.0"
+ gaze "^1.0.0"
+ get-stdin "^4.0.1"
+ glob "^7.0.3"
+ in-publish "^2.0.0"
+ lodash.assign "^4.2.0"
+ lodash.clonedeep "^4.3.2"
+ lodash.mergewith "^4.6.0"
+ meow "^3.7.0"
+ mkdirp "^0.5.1"
+ nan "^2.3.2"
+ node-gyp "^3.3.1"
+ npmlog "^4.0.0"
+ request "~2.79.0"
+ sass-graph "^2.2.4"
+ stdout-stream "^1.4.0"
+ "true-case-path" "^1.0.2"
+
node-uuid@~1.4.7:
version "1.4.8"
resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
@@ -5619,6 +5653,10 @@ qs@~6.2.0:
version "6.2.3"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+qs@~6.3.0:
+ version "6.3.2"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+
qs@~6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
@@ -5998,6 +6036,31 @@ request@~2.74.0:
tough-cookie "~2.3.0"
tunnel-agent "~0.4.1"
+request@~2.79.0:
+ version "2.79.0"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+ dependencies:
+ aws-sign2 "~0.6.0"
+ aws4 "^1.2.1"
+ caseless "~0.11.0"
+ combined-stream "~1.0.5"
+ extend "~3.0.0"
+ forever-agent "~0.6.1"
+ form-data "~2.1.1"
+ har-validator "~2.0.6"
+ hawk "~3.1.3"
+ http-signature "~1.1.0"
+ is-typedarray "~1.0.0"
+ isstream "~0.1.2"
+ json-stringify-safe "~5.0.1"
+ mime-types "~2.1.7"
+ oauth-sign "~0.8.1"
+ qs "~6.3.0"
+ stringstream "~0.0.4"
+ tough-cookie "~2.3.0"
+ tunnel-agent "~0.4.1"
+ uuid "^3.0.0"
+
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6116,7 +6179,7 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-sass-graph@^2.1.1:
+sass-graph@^2.1.1, sass-graph@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
dependencies:
@@ -6843,6 +6906,12 @@ trim-right@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+"true-case-path@^1.0.2":
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
+ dependencies:
+ glob "^6.0.4"
+
tryit@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"