Merge pull request #2442 from bilke/web-stuff

Web improvements

Jenkinsfile

 #!/usr/bin/env groovy
-@Library('jenkins-pipeline@1.0.19') _
+@Library('jenkins-pipeline@1.0.21') _
 
 def stage_required = [build: false, data: false, full: false, docker: false]
 def build_shared = 'ON'
@@ -30,7 +30,7 @@ pipeline {
         sh "git config core.whitespace -blank-at-eof"
         sh "git diff --check `git merge-base origin/master HEAD` HEAD -- . ':!*.md' ':!*.pandoc' ':!*.asc'"
         dir('scripts/jenkins') { stash(name: 'known_hosts', includes: 'known_hosts') }
-        ciSkip action: 'check' // Check for [ci skip] commit message.
+        ciSkip action: 'check' // Check for [ci skip] or [web] commit message.
 
         // ********* Check changesets for conditional stage execution **********
         script {

web/assets/js/fancybox.js

@@ -7,4 +7,23 @@ $(document).ready(function(){
     autoplaySpeed: 3000,
   });
   $('.carousel-play').slick('slickPlay');
+
+  // wrap all img elements in fancybox wrapper
+  var imgs = document.querySelectorAll("img");
+
+  for(var index=0; index < imgs.length; index++) {
+    var img = imgs[index];
+    // Check for other fancybox
+    if(img.parentNode.hasAttribute("data-fancybox")) {
+      continue;
+    }
+    var wrapper = document.createElement("a");
+    wrapper.setAttribute("data-fancybox", "");
+    if(img.hasAttribute("alt")) {
+      wrapper.setAttribute("data-caption", img.getAttribute("alt"));
+    }
+    wrapper.setAttribute("href", img.getAttribute("src"));
+    img.parentNode.insertBefore(wrapper, img);
+    wrapper.appendChild(img);
+  }
 });

web/assets/scss/main.scss

@@ -222,6 +222,19 @@ a.btn-inverse:hover {
   color: config('mycolors.text-accent');
 }
 
+/* -------------------------------- Images ---------------------------------- */
+body {
+  counter-reset: figcaption;
+}
+figcaption::before {
+  counter-increment: figcaption;
+  content: "Fig. " counter(figcaption) ": "
+}
+figcaption {
+  @apply .text-center;
+  @apply .mb-6;
+}
+
 /* ------------------------------- Components ------------------------------- */
 .btn {
   @apply text-grey-darkest;

web/content/_index.pandoc

@@ -27,7 +27,7 @@ features:
 
     Parametrize the model with material parameters, boundary conditions and source terms.
   visual:
-    permalink: "/docs/tools/meshing/extract-surface/TopBottomSideSurface.png"
+    permalink: "/docs/tools/meshing-submeshes/extract-surface/TopBottomSideSurface.png"
     alt: Extracted surfaces
   links:
     - text: See Docs

web/layouts/partials/components/feature.html

@@ -16,9 +16,7 @@
       </div>
       <div class="w-full md:w-1/2 md:px-4">
         {{ if .feature.visual }}
-          <a data-fancybox data-caption="{{ .feature.visual.alt | default ""}}" href="{{ .feature.visual.permalink }}">
-            <img class="{{ if .feature.visual.rounded }}rounded shadow-lg{{ end }}" src="{{ .feature.visual.permalink }}" alt="{{ .feature.visual.alt }}">
-          </a>
+          <img class="{{ if .feature.visual.rounded }}rounded shadow-lg{{ end }}" src="{{ .feature.visual.permalink }}" alt="{{ .feature.visual.alt }}">
         {{ end }}
         {{ if .feature.carousel }}
           {{ partial "components/carousel" (dict "carousel" .feature.carousel "page" .page) }}

web/resources/_gen/assets/js/bundle.js_d11fe7b62c27961c87ecd0f2490357b9.json

-{"Target":"bundle.min.cdaa95be2c953bb3c7fa6b71864b8ff07f823120c380311532f319f7fae436ee.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-zaqVviyVO7PH+mtxhkuP8H+CMSDDgDEVMvMZ9/rkNu4="}}
+{"Target":"bundle.min.66f99318de88f6d8f1b19886d32881654c1f339439987a23e5c765ba2b2782cd.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-ZvmTGN6I9tjxsZiG0yiBZUwfM5Q5mHoj5cdluisngs0="}}
\ No newline at end of file

web/resources/_gen/assets/scss/scss/main.scss_4e7f57577ae5587f96f0311b7197bce0.json

-{"Target":"main.min.2ae350b937be7c2840ce93fd86eff932de7f1c643a0dd9f1be580575e9b4a61c.css","MediaType":"text/css","Data":{"Integrity":"sha256-KuNQuTe+fChAzpP9hu/5Mt5/HGQ6DdnxvlgFdem0phw="}}
+{"Target":"main.min.a87dd5842d01ae39d018d113a1eb50ddc1b7fe92bcaec5b15119dbdff230805f.css","MediaType":"text/css","Data":{"Integrity":"sha256-qH3VhC0BrjnQGNEToetQ3cG3/pK8rsWxURnb3/IwgF8="}}
\ No newline at end of file