Merge branch 'fix-links' into 'master'

[web] Fix links and layout See merge request ogs/ogs!4829
ufz · Dec 4, 2023 · c7a8dac · c7a8dac
2 parents e8c9da8 + 7a9ba2d
commit c7a8dac
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 71 deletions.
diff --git a/scripts/ci/jobs/web-check.yml b/scripts/ci/jobs/web-check.yml
@@ -27,6 +27,7 @@ check web links:
       --ignore-url='https://ogsstorage.blob.core.windows.net/binaries/ogs6'
       --ignore-url='https://gitlab.opengeosys.org/ogs/ogs/-/graphs/master'
       --ignore-url='https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse'
+      --ignore-url='https://docs.gitlab.com/ee/ci/pipelines/pipelines_for_merged_results.html'
       --ignore-url='/css/all.css'
       --ignore-url='www.grs.de'
       --ignore-url='www.smartkd-concept.de'

diff --git a/web/content/docs/devguide/procedures/publish-a-release/index.md b/web/content/docs/devguide/procedures/publish-a-release/index.md
@@ -11,7 +11,7 @@ weight = 1080
 
 ## Publication procedure
 
-- Update [merge request template](https://gitlab.opengeosys.org/ogs/ogs/-/settings/merge_requests) to point to a new changelog wiki page
+- Update merge request template (settings / merge_requests) to point to a new changelog wiki page
 - Update `CHANGELOG.md` to point to new GitLab release
 - Create new web release page with generated artifact names (frontmatter only!)
 - Add a link to the (upcoming) Doxygen documentation for this tag in `Documentation/mainpage.dox.in` (with `v`-prefix)

diff --git a/web/content/docs/userguide/basics/jupyter-notebooks/index.md b/web/content/docs/userguide/basics/jupyter-notebooks/index.md
@@ -62,7 +62,7 @@ This mounts your current directory into `~/work` inside the container. Use image
 The above command only works when you run Docker from within a WSL2 Linux shell!
 
 - Install [Docker Desktop on Windows](https://docs.docker.com/desktop/windows/install/), it automatically configures WSL2.
-- Install a Linux distribution from the Microsoft App Store. We recommend [Ubuntu 20.04](https://www.microsoft.com/en-us/p/ubuntu-2004-lts/9n6svws3rx71).
+- Install a Linux distribution from the Microsoft App Store. We recommend [Ubuntu 22.04](https://apps.microsoft.com/search?query=ubuntu).
 - In the Docker Desktop application under *Settings / Resources / WSL integration* add your Linux distribution.
 - Open a command prompt in your Linux distribution (At the start menu type the name of the distribution) and run the container.
   - If your current working contains spaces write out `$PWD`, e.g.:

diff --git a/web/layouts/releases/list.html b/web/layouts/releases/list.html
@@ -1,8 +1,8 @@
 {{ define "main" }}
 <div class="flex overflow-hidden">
 
-  <div class="hidden md:flex md:shrink-0">
-    <nav class="flex flex-col w-56 lg:w-64 pl-2 pr-4 mt-1 text-sm lg:text-base text-gray-700">
+  <div class="flex-initial w-56 lg:w-64">
+    <nav class="flex flex-col pl-2 pr-4 mt-1 text-sm lg:text-base text-gray-700">
       <div class="mb-2 border-b-2 mr-2 text-gray-500">Table of contents</div>
       <div class="mb-2 hover:text-gray-900">
         <a href="#latest">Latest development version</a>
@@ -19,85 +19,88 @@
     </nav>
   </div>
 
-  <div class="prose prose-sm lg:prose max-w-none lg:max-w-none">
-    <h1 id="latest"><i class="far fa-wrench"></i> Latest development version</h1>
-    <p>
-      Here you can find the latest version of OpenGeoSys. But be warned: although this version was
-      successfully tested by the continuous integration system it may be unstable or incomplete...
-    </p>
-    <div class="bg-red-50 py-1 px-4 rounded-lg shadow mb-12">
-      <h3><i class="far fa-download"></i> Downloads</h3>
+  <div class="flex-auto w-64">
+    <h1 class="text-3xl font-extrabold sm:text-4xl mb-8" id="latest"><i class="far fa-wrench"></i> Latest development
+      version</h1>
+    <div class="prose prose-sm lg:prose max-w-none lg:max-w-none">
       <p>
-        Downloads for the current development version of OpenGeoSys can be found on our continuous integration system:
+        Here you can find the latest version of OpenGeoSys. But be warned: although this version was
+        successfully tested by the continuous integration system it may be unstable or incomplete...
       </p>
-      <ul>
-        <!-- TODO: does work only if the latest build was successful!
+      <div class="bg-red-50 py-1 px-4 rounded-lg shadow mb-12">
+        <h3><i class="far fa-download"></i> Downloads</h3>
+        <p>
+          Downloads for the current development version of OpenGeoSys can be found on our continuous integration system:
+        </p>
+        <ul>
+          <!-- TODO: does work only if the latest build was successful!
                  see https://gitlab.com/gitlab-org/gitlab/-/issues/20230
                  Replace with API call and JavaScript?
       -->
-        {{ range .Params.head_downloads }}
-        <li>
-          <i class="{{ .icon }}"></i> <a href="{{ .url }}">{{ .name }}</a>
-          {{ if .note }} <span class="text-sm">({{ .note | markdownify }})</span>{{ end }}
-        </li>
-        {{ end }}
-      </ul>
-    </div>
+          {{ range .Params.head_downloads }}
+          <li>
+            <i class="{{ .icon }}"></i> <a href="{{ .url }}">{{ .name }}</a>
+            {{ if .note }} <span class="text-sm">({{ .note | markdownify }})</span>{{ end }}
+          </li>
+          {{ end }}
+        </ul>
+      </div>
+
+      <hr>
+      {{ range first 1 .Data.Pages }}
+      {{ $vtag := (print "v" .Params.tag ) }}
+      <h1 id="bugfixes">Current release with bug-fixes: {{ .Params.tag }}</h1>
+      <p>
+        Here you can find the last released version ({{ .Params.tag }}) of OpenGeoSys
+        <a href="https://gitlab.opengeosys.org/ogs/ogs/-/compare/{{ .Params.tag }}...{{ $vtag }}">
+          enhanced with bug-fixes
+        </a>.
+        We recommend to use this version for production.
+      </p>
+      <div class="bg-green-50 py-1 px-4 rounded-lg shadow mb-12">
+        <h3><i class="far fa-download"></i> Downloads</h3>
+        <ul>
+          {{ range after 1 $.Params.head_downloads }} <!-- skip pip download -->
+          <li>
+            <i class="{{ .icon }}"></i>
+            <a href='{{ replace .url "master" $vtag }}'>{{ replace .name "Latest" $vtag }}</a>
+            {{ if .note }} <span class="text-sm">({{ .note | markdownify }})</span>{{ end }}
+          </li>
+          {{ end }}
+        </ul>
+      </div>
+
+      <h1 class="mt-0" id="current"><i class="far fa-stars"></i> Current Release: <a style="text-decoration: none;"
+          href="{{ .Permalink }}">{{ .Title }}</a></h1>
+
+      {{ partial "releases/single.html" . }}
+      {{ end }}
 
-    <hr>
-    {{ range first 1 .Data.Pages }}
-    {{ $vtag := (print "v" .Params.tag ) }}
-    <h1 id="bugfixes">Current release with bug-fixes: {{ .Params.tag }}</h1>
-    <p>
-      Here you can find the last released version ({{ .Params.tag }}) of OpenGeoSys
-      <a href="https://gitlab.opengeosys.org/ogs/ogs/-/compare/{{ .Params.tag }}...{{ $vtag }}">
-        enhanced with bug-fixes
-      </a>.
-      We recommend to use this version for production.
-    </p>
-    <div class="bg-green-50 py-1 px-4 rounded-lg shadow mb-12">
-      <h3><i class="far fa-download"></i> Downloads</h3>
+      <h1 id="old"><i class="far fa-archive"></i> Older releases</h1>
       <ul>
-        {{ range after 1 $.Params.head_downloads }} <!-- skip pip download -->
+        {{ range $index, $element := .Data.Pages }}
+        {{ if (ne $index 0) }}
+        <li><a href="{{ .Permalink }}">{{ .Title }}</a>, {{.Params.release_date}}</li>
+        {{ end }}
+        {{ end }}
+        {{ $urlPre := "https://api.github.com" }}
+        {{ $releases := getJSON $urlPre "/repos/ufz/ogs/releases" }}
+        {{ range $index, $element := $releases }}
+        {{ if not (eq $index 0) }}
+        {{ if and (not .draft) (not .prerelease) }}
         <li>
-          <i class="{{ .icon }}"></i>
-          <a href='{{ replace .url "master" $vtag }}'>{{ replace .name "Latest" $vtag }}</a>
-          {{ if .note }} <span class="text-sm">({{ .note | markdownify }})</span>{{ end }}
+          <a href="{{ .html_url }}" target="_blank">
+            OpenGeoSys {{ .tag_name }}
+          </a>
         </li>
         {{ end }}
+        {{ end }}
+        {{ end }}
       </ul>
-    </div>
-
-    <h1 class="mt-0" id="current"><i class="far fa-stars"></i> Current Release: <a style="text-decoration: none;"
-        href="{{ .Permalink }}">{{ .Title }}</a></h1>
-
-    {{ partial "releases/single.html" . }}
-    {{ end }}
 
-    <h1 id="old"><i class="far fa-archive"></i> Older releases</h1>
-    <ul>
-      {{ range $index, $element := .Data.Pages }}
-      {{ if (ne $index 0) }}
-      <li><a href="{{ .Permalink }}">{{ .Title }}</a>, {{.Params.release_date}}</li>
-      {{ end }}
-      {{ end }}
-      {{ $urlPre := "https://api.github.com" }}
-      {{ $releases := getJSON $urlPre "/repos/ufz/ogs/releases" }}
-      {{ range $index, $element := $releases }}
-      {{ if not (eq $index 0) }}
-      {{ if and (not .draft) (not .prerelease) }}
-      <li>
-        <a href="{{ .html_url }}" target="_blank">
-          OpenGeoSys {{ .tag_name }}
-        </a>
-      </li>
-      {{ end }}
-      {{ end }}
-      {{ end }}
-    </ul>
-
-    <h1 id="ogs-5">OpenGeoSys-5</h1>
-    {{ with .Site.GetPage "/ogs-5" }}{{ .Content | markdownify }}{{ end }}
+      <h1 id="ogs-5">OpenGeoSys-5</h1>
+      {{ with .Site.GetPage "/ogs-5" }}{{ .Content | markdownify }}{{ end }}
+    </div>
   </div>
 </div>
 {{ end }}