Extract redirection features for old URLs from 'default' into a new 'redirect' layout

2025-02-02 02:49:14 +01:00 · 2015-03-17 17:46:34 +01:00 · 2015-03-17 17:46:34 +01:00 · c8424e50c7
commit c8424e50c7
parent 0fb8e2c2cf
13 changed files with 31 additions and 30 deletions
--- a/_includes/header.html
+++ b/_includes/header.html
@ -5,10 +5,6 @@
    <meta charset="UTF-8">
    <title>{{ site.name }} - {% if page.title | size > 0 %}{{ page.title }}{% else %}{{ site.description }}{% endif %}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-	{% if page.redirect %}
-    <meta name="robots" content="noindex,follow">
-	<meta http-equiv="refresh" content="0; url={{ page.redirect }}" />
-	{% else %}
    <meta name="author" content="Thomas Jensen" />
    <meta name="robots" content="index,follow" />
 	{% if page.sedesc %}
@ -38,12 +34,10 @@
    <link href="{{ site.baseurl }}/css/bootstrap.min.css" rel="stylesheet">
    <link href="{{ site.baseurl }}/css/theme.css" rel="stylesheet">
    <link href="{{ site.baseurl }}/css/boxes.css" rel="stylesheet">
-	{% endif %}
 </head>

 <body>

-{% if page.redirect %}{% else %}
 <div class="container-fluid">
    <div class="row-fluid">
        <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
@ -60,7 +54,7 @@
                <ul class="nav navbar-nav">
                    <li class="active"><a href="{{ site.baseurl }}/about.html">About</a></li>
                    <li class="active"><a href="{{ site.baseurl }}/examples.html">Examples</a></li>
-                    <li class="active"><a href="{{ site.baseurl }}/docs/index.html">Documentation</a></li>
+                    <li class="active"><a href="{{ site.baseurl }}/docs/">Documentation</a></li>
                    <li class="active"><a href="{{ site.baseurl }}/contributing.html">Contributing</a></li>
 					<li class="active"><a href="{{ site.baseurl }}/download.html"><b>Download</b></a></li>
                    <li class="active visible-xs-block"><a href="{{ site.baseurl }}/links.html">Links</a></li>
@ -72,4 +66,3 @@
        </div>
    </div>
 </div>
-{% endif %}
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -1,15 +1,4 @@
 {% include header.html %}
-{% if page.redirect %}
-<div>
-This page has moved to <A HREF="{{ page.redirect }}">{{ page.redirect }}</A>.
-
-<P>Please update your bookmarks.
-</div>
-
-</body>
-</html>
-{% else %}
-
 <div class="container container-left">
    <div class="row">
        <div class="col-md-3 hidden-xs">
@ -22,4 +11,3 @@ This page has moved to <A HREF="{{ page.redirect }}">{{ page.redirect }}</A>.
 </div>

 {% include footer.html %}
-{% endif %}
--- a/_layouts/redirect.html
+++ b/_layouts/redirect.html
@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>{{ site.name }} - Moved content</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="robots" content="noindex,follow">
+    <meta http-equiv="refresh" content="0; url={{ page.redirect }}" />
+</head>
+
+<body>
+
+<div>
+<p>This page has moved to <A HREF="{{ page.redirect }}">{{ page.redirect }}</A>.</p>
+<p>Please update your bookmarks.</p>
+</div>
+
+</body>
+</html>
--- a/boxes.shtml
+++ b/boxes.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: /
 ---
--- a/docs/config-complete_exp.shtml
+++ b/docs/config-complete_exp.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: config-complete_exp.html
 ---
--- a/docs/config-general.shtml
+++ b/docs/config-general.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: config-general.html
 ---
--- a/docs/config-step.shtml
+++ b/docs/config-step.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: config-step.html
 ---
--- a/docs/config-syntax.shtml
+++ b/docs/config-syntax.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: config-syntax.html
 ---
--- a/docs/faq.shtml
+++ b/docs/faq.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: faq.html
 ---
--- a/docs/filters.shtml
+++ b/docs/filters.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: filters.html
 ---
--- a/docs/index.shtml
+++ b/docs/index.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: index.html
 ---
--- a/docs/install.shtml
+++ b/docs/install.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: install.html
 ---
--- a/docs/legal.shtml
+++ b/docs/legal.shtml
@ -1,4 +1,4 @@
 ---
-layout: default
+layout: redirect
 redirect: legal.html
 ---