Refatoring

This commit is contained in:
Alexis Hassler 2019-05-18 16:49:05 +02:00
parent e285abc65b
commit a47fa3720f
5 changed files with 14 additions and 26 deletions

View File

@ -3,17 +3,10 @@ layout: default
title: Redirects title: Redirects
menu: ['global'] menu: ['global']
--- ---
{%- assign redirect_pages = site.special | where_exp: 'page', 'page.redirect' -%}
<ul> <ul>
{%- for source_page in redirect_pages -%} {%- for source_page in site.data.wiki_redirects -%}
<li> <li>
{%- assign redirect = source_page.redirect | liquify | prepend: '/' -%} {%- assign redirect_page = source_page.redirect_target -%}
{%- for other_page in site.data.wiki_pages -%}
{%- if other_page.id == redirect -%}
{%- assign redirect_page = other_page -%}
{%- endif -%}
{%- endfor -%}
<a href="{{ source_page.url }}.html">{{ source_page.id }}</a><a href="{{ redirect_page.url }}.html">{{ redirect_page.title }}</a> <a href="{{ source_page.url }}.html">{{ source_page.id }}</a><a href="{{ redirect_page.url }}.html">{{ redirect_page.title }}</a>
</li> </li>
{%- endfor -%} {%- endfor -%}

View File

@ -5,8 +5,8 @@
</a> </a>
</div> </div>
<div id="footer-center"> <div id="footer-center">
{{ site.data.i18n[site.lang].label.modified }}: {{ page.modified }}<br/> {%- if page.modified -%} {{ site.data.i18n[site.lang].label.modified }}: {{ page.modified }} {%- endif -%}<br/>
{{ site.data.i18n[site.lang].label.created }}: {{ page.created }} {%- if page.created -%} {{ site.data.i18n[site.lang].label.created }}: {{ page.created }} {%- endif -%}
</div> </div>
<div id="footer-right"> <div id="footer-right">
<a href="https://jekyllrb.com/" title="Jekyll" id="poweredby"> <a href="https://jekyllrb.com/" title="Jekyll" id="poweredby">

View File

@ -1,12 +0,0 @@
{%- if include.page -%}
{%- assign source_page = include.source_page -%}
{%- else -%}
{%- assign source_page = page -%}
{%- endif -%}
{%- assign redirect = source_page.redirect | liquify -%}
{%- for other_page in site.data.wiki_pages -%}
{%- if other_page.id == redirect -%}
{%- assign redirect_page = other_page -%}
{%- endif -%}
{%- endfor -%}

View File

@ -1,9 +1,9 @@
<html> <html>
{%- include /functions/redirect-page.html -%}
<head> <head>
{%- assign redirect_url = redirect_page.url | default: site.data.i18n[site.lang].home | append: ".html" -%} {%- assign redirect_page = page.redirect_target -%}
{%- include head.html redirect_url = redirect_url -%} {%- include head.html redirect_url = redirect_page.url -%}
</head> </head>
<body> <body>
<div id="main"> <div id="main">
<h1 id="title">{{ redirect_page.title }}</h1> <h1 id="title">{{ redirect_page.title }}</h1>
@ -16,6 +16,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="menu"> <div id="menu">
{%- include logo.html -%} {%- include logo.html -%}
</div> </div>

View File

@ -11,6 +11,12 @@ Jekyll::Hooks.register :site, :post_read do |site|
.flatten .flatten
site.data['wiki_pages'] = wiki_pages site.data['wiki_pages'] = wiki_pages
wiki_pages_hash = wiki_pages.map { |page| [page.id, page] }.to_h
wiki_redirects = site.documents
.select { |doc| doc.data['layout'] == 'redirect' }
wiki_redirects.each { |page| page.data['redirect_target'] = wiki_pages_hash["/#{page.data['redirect'] || site.data['i18n'][site.config['lang']]['home']}"] }
site.data['wiki_redirects'] = wiki_redirects
wiki_tags = wiki_pages wiki_tags = wiki_pages
.map { |page| page.data['tags'] } .map { |page| page.data['tags'] }
.flatten .flatten