Reorganize merlin6 pages to follow navigation menu

The folders are only used for source organization; URLs remain flat.
This commit is contained in:
Spencer Bliven
2019-07-29 15:18:22 +02:00
parent b3f62ee51f
commit 95f511a203
23 changed files with 11 additions and 22 deletions

View File

@ -1,13 +0,0 @@
---
title: Merlin6 User Guide
#tags:
#keywords:
last_updated: 13 June 2019
#summary: "Merlin 6 cluster overview"
sidebar: merlin6_sidebar
permalink: /merlin6/user-guide.html
---
# Merlin6 User Guide
Wellcome to the PSI Merlin6 Cluster.

View File

@ -6,6 +6,8 @@ permalink: siteinfo.html
## Site
Some information about this jekyll site (for debugging):
- site.port: {{site.port}}
- site.host: {{site.host}}
- site.url: {{site.url}}
@ -24,27 +26,27 @@ Link processing in Jekyll
Code | Result | Baseurl
---- | ------ | -------
`{%raw%}[Normal link to source]{%endraw%}{%raw%}(/pages/merlin6/introduction.md){%endraw%}` | [Normal link to source](/pages/merlin6/introduction.md) | ✅
`{%raw%}[Normal link to source]{%endraw%}{%raw%}(/pages/merlin6/01 introduction/introduction.md){%endraw%}` | [Normal link to source](/pages/merlin6/01 introduction/introduction.md) | ✅
`{%raw%}[Normal link to result](/merlin6/introduction.html){%endraw%}` | [Normal link to result](/merlin6/introduction.html) | ❌
`{%raw%}[Invalid Escaped link to source]({{"/pages/merlin6/introduction.md"}}){%endraw%}` | [Invalid Escaped link to source]({{"/pages/merlin6/introduction.md"}}) | ❌❗
`{%raw%}[Invalid Escaped link to source]({{"/pages/merlin6/01 introduction/introduction.md"}}){%endraw%}` | [Invalid Escaped link to source]({{"/pages/merlin6/01 introduction/introduction.md"}}) | ❌❗
`{%raw%}[Escaped link to result]({{"/merlin6/introduction.html"}}){%endraw%}` | [Escaped link to result]({{"/merlin6/introduction.html"}}) | ❌
`{%raw%}[Reference link to source](srcRef){%endraw%}` | [Reference link to source][srcRef] | ✅
`{%raw%}[Reference link to result](dstRef){%endraw%}` | [Reference link to result][dstRef] | ❌
`{%raw%}[Liquid Link]({% link pages/merlin6/introduction.md %}){%endraw%}` | [Liquid Link]({% link pages/merlin6/introduction.md %}) | ❌
`{%raw%}[Liquid Link]({% link pages/merlin6/01 introduction/introduction.md %}){%endraw%}` | [Liquid Link]({% link pages/merlin6/01 introduction/introduction.md %}) | ❌
`{%raw%}![PSI Logo](/images/psi-logo.png){%endraw%}` | ![PSI Logo](/images/psi-logo.png) | ✅
`{%raw%}![Escaped PSI Logo]({{ "/images/psi-logo.png" }}){%endraw%}` | ![PSI Logo from liquid]({{ "/images/psi-logo.png" }}) | ❌
`{%raw%}{% include inline_image.html file="psi-logo.png" alt="Included PSI Logo" %}{%endraw%}` | {% include inline_image.html file="psi-logo.png" alt="Included PSI Logo" -%} | | ❌
`{%raw%}{{ "/pages/merlin6/introduction.md" | relative_url }}{%endraw%}` | {{ "/pages/merlin6/introduction.md" | relative_url }} | ✅❗
`{%raw%}{{ "/pages/merlin6/01 introduction/introduction.md" | relative_url }}{%endraw%}` | {{ "/pages/merlin6/01 introduction/introduction.md" | relative_url }} | ✅❗
`{%raw%}{{ "/merlin6/introduction.html" | relative_url }}{%endraw%}` | {{ "/merlin6/introduction.html" | relative_url }} | ✅
`{%raw%}{% link pages/merlin6/introduction.md %}{%endraw%}` | {% link pages/merlin6/introduction.md %} | ✅
`{%raw%}{% link pages/merlin6/01 introduction/introduction.md %}{%endraw%}` | {% link pages/merlin6/01 introduction/introduction.md %} | ✅
[srcRef]: /pages/merlin6/introduction.md
[srcRef]: /pages/merlin6/01 introduction/introduction.md
[dstRef]: /merlin6/introduction.html
Key:
- ✅ Baseurl prepended
- ❌ No baseurl
- ❗ Source not converted to result
- ✅ Baseurl gets prepended to the URL
- ❌ No baseurl in URL
- ❗ Source not expected to be converted to the result URL
### Conclusions: