Skip to content

Commit 4ed0f5b

Browse files
gonXgonX
authored
Merge pull request #293 from gonX/remove-wiki-subpage
Remove wiki subpage
2 parents 5216082 + cec8c52 commit 4ed0f5b

4 files changed

Lines changed: 35 additions & 40 deletions

File tree

‎site/_includes/header.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
<li class="nav-item">
2020
<a class="nav-link text-light" href="{% link _sections/Plugins.md %}">Plugins</a>
2121
</li>
22-
<li class="nav-item">
23-
<a class="nav-link text-light" href="{% link _sections/Wiki.md %}">Wiki</a>
24-
</li>
2522
<li class="nav-item">
2623
<a class="nav-link text-light" href="{{ site.data.links.project.UpstreamRepo }}/releases">Changelog</a>
2724
</li>

‎site/_layouts/frontpage.html‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,29 @@ <h1 class="col-lg-6 col-md-8 mx-auto">{{ site.title }}</h1>
66
<h5 class="my-2 text-center">v{{ site.data.otd-versions | last }}</h5>
77
{{ content }}
88
</section>
9-
{% include platformcards.html %}
9+
<div class="pb-2">
10+
{%- include platformcards.html -%}
11+
12+
{% assign wikifiles = site.collections | where: "label", "wiki" | first %}
13+
{% assign folders = site.wiki |
14+
where_exp: "item", "item.hide_from_auto_list == false" |
15+
group_by_exp: "item", "item.path | split: '/' | slice: 1" |
16+
reverse %}
17+
18+
{%- for folder in folders -%}
19+
{% assign folderTitle = site.data.wiki.title-remaps |
20+
where: "OldTitle", folder.name[0] |
21+
map: "NewTitle" | first |
22+
default: folder.name[0] %}
23+
24+
<h3 id="{{ folderTitle | slugify }}">{{ folderTitle }}</h3>
25+
<ul>
26+
{% assign sortedItems = folder.items | sort: "title" %}
27+
{%- for file in sortedItems -%}
28+
<li>
29+
<a class="link-light" href="{{ file.url }}">{{ file.title }}</a>
30+
</li>
31+
{%- endfor -%}
32+
</ul>
33+
{%- endfor -%}
34+
</div>

‎site/_layouts/redirect.html‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{% if page.redirect == "special_discord" %}
22
{% assign redirect = site.data.links.project.DiscordInvite %}
3-
{% assign redirect_set = True %}
4-
{% endif %}
5-
{% if redirect_set %}
6-
{% assign redirect = page.redirect | replace: "@@OTD_VERSION@@", site.latest_otd_version %}
73
{% endif %}
4+
{% unless redirect %}
5+
{% if page.redirect %}
6+
{% assign redirect = page.redirect | replace: "@@OTD_VERSION@@", site.latest_otd_version %}
7+
{% else if layout.redirect %}
8+
{% assign redirect = layout.redirect %}
9+
{% endif %}
10+
{% endunless %}
811
<html>
912
<head>
1013
<style>

‎site/_layouts/wiki.html‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
---
2-
layout: default
2+
layout: redirect
3+
redirect: /
34
---
4-
5-
{%- include wiki/header.html -%}
6-
7-
<div class="pb-2">
8-
{%- include platformcards.html -%}
9-
10-
{% assign wikifiles = site.collections | where: "label", "wiki" | first %}
11-
{% assign folders = site.wiki |
12-
where_exp: "item", "item.hide_from_auto_list == false" |
13-
group_by_exp: "item", "item.path | split: '/' | slice: 1" |
14-
reverse %}
15-
16-
{%- for folder in folders -%}
17-
{% assign folderTitle = site.data.wiki.title-remaps |
18-
where: "OldTitle", folder.name[0] |
19-
map: "NewTitle" | first |
20-
default: folder.name[0] %}
21-
22-
<h3 id="{{ folderTitle | slugify }}">{{ folderTitle }}</h3>
23-
<ul>
24-
{% assign sortedItems = folder.items | sort: "title" %}
25-
{%- for file in sortedItems -%}
26-
<li>
27-
<a class="link-light" href="{{ file.url }}">{{ file.title }}</a>
28-
</li>
29-
{%- endfor -%}
30-
</ul>
31-
{%- endfor -%}
32-
33-
{{ content }}
34-
</div>

0 commit comments

Comments
 (0)