diff options
| author |   Clément Bénier <clement.benier@iot.bzh> | 2019-02-24 20:05:42 +0100 |
|---|---|---|
| committer | Clément Bénier <clement.benier@iot.bzh> | 2019-02-24 20:05:42 +0100 |
| commit | 1bd7ddd7abcd245d215d4150d09a1c32a6b6f3b0 (patch) | |
| tree | 7b45981b52b1136a92d7700cdd4498a2509dd5f5 /site/_layouts/doc.html | |
| parent | 0cb3c080e0e9d5d08db657d4433cf39b7d43b97e (diff) | |
| parent | c0fafcb577abb8108490540f7ecfe949a92c7fd0 (diff) | |
Merge branch 'sandbox/benierc/newdocstmp' into master-next
Diffstat (limited to 'site/_layouts/doc.html')
| -rw-r--r-- | site/_layouts/doc.html | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/site/_layouts/doc.html b/site/_layouts/doc.html index 21f54ff..61ffdf0 100644 --- a/site/_layouts/doc.html +++ b/site/_layouts/doc.html @@ -11,8 +11,6 @@ scripts: - process-uml.js --- -{% include header.html %} - {% comment %} set some constants {% endcomment %} @@ -21,11 +19,20 @@ set some constants {% assign TOCSDIR = site.data.tocs %} {% assign TOCFILE = TOCSDIR[page.tocdir][page.tocfile] %} -{% capture VERSION_ROOT %}{{DOCSDIR}}/{{page.tocdir}}/{{ page.language }}/{{ page.version }}/{% endcapture %} -{% capture LANGUAGE_ROOT %}{{DOCSDIR}}/{{page.tocdir}}/{{ page.language }}/{% endcapture %} +{% capture VERSION_ROOT %}{{DOCSDIR}}/{{ page.language }}/{{ page.version }}/{{page.tocdir}}/{% endcapture %} +{% capture VERSION_URL %}{{DOCSDIR}}/{{ page.language }}/{{ page.version }}/{% endcapture %} +{% capture LANGUAGE_ROOT %}{{DOCSDIR}}/{{ page.language }}/{% endcapture %} -{% assign MY_ENTRY = page.url | replace: VERSION_ROOT,"" %} +{% assign MY_ENTRY = page.url | replace: VERSION_ROOT,"" %} {% assign my_entry_parts = MY_ENTRY | split: "/" %} +<!-- + LANGUAGE_ROOT {{ LANGUAGE_ROOT }} + VERSION_ROOT {{VERSION_ROOT}} + DOCSDIR {{DOCSDIR}} + page.language {{page.language}} +--> + +{% include header.html version=page.version language=page.language %} <div class="docs container"> @@ -196,13 +203,14 @@ set some constants layouts change from version to version {% endcomment %} {% capture other_version_root %}/docs/{{ page.language }}/{{ other_version_string }}/{% endcapture %} - {% assign other_version_url = page.url | replace:VERSION_ROOT,other_version_root %} + {% assign other_version_url = page.url | replace:VERSION_URL,other_version_root %} + {% comment %} {% unless ALL_PAGES contains other_version_url %} {% assign other_version_url = other_version_root %} {% endunless %} - - <a href="{{ site.docsurl }}{{ other_version_url }}" class="{% unless ALL_PAGES contains other_version_url %}missing-page{% endunless %}"> + {% endcomment %} + <a href="{{ site.baseurl }}{{ other_version_url }}" class="{% unless ALL_PAGES contains other_version_url %}missing-page{% endunless %}"> {% if page.version == other_version %} <span class="selected"> {{ version_entry_string }} |