Add more useful 404 page

jamulussoftware · Dec 4, 2020 · 5021fe4 · 5021fe4
1 parent 3e06ffe
commit 5021fe4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/404.html b/404.html
@@ -2,29 +2,34 @@
 permalink: /404.html
 lang: en
 category: "hidden"
+hidelang: yes
 ---
 <!DOCTYPE html>
 <!--[if IE 9]> <html class="ie9"> <![endif]-->
-<html lang="{{ site.active_lang }}">
+<html lang="en">
 
 <head>
   <title>404 Not found - Jamulus</title>
   {% include headtags.html %}
 </head>
 
 <body class="thissiteisgone">
-  <header class="fx-row fx-row-between-xs fx-text-center">
-    <div class="fx-col fx-text-center">
-        <img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}" />
+  {% include header.html %}
+  <div class="fx-row fx-row-center-xs">
+    {% include general/nav.html %}
+    <div id="maincontainer" class="fx-col-100-xs fx-col-50-m">
+      <noscript class="red"><strong>{{ site.data.general.tNoJSEnabled }}</strong></noscript>
+      <main>
+        <div class="fx-col-center-xs fx-txt-center">
+          <div class="red doubletextsize">&#x274C; <strong>404</strong></div>
+          <h1 class="red">There's nothing here</h1>
+          <p>Jamu... What? We couldn't find this page! Maybe this site was moved or deleted. Did you check if there was a typo?</p>
+          <p>You might find the content on the</p>
+          <p><a href="/wiki" class="button red-bg">Wiki overview page</a></p>
+        </div>
+      </main>
     </div>
-  </header>
-  <main class="fx-row-center-xs">
-    <div class="fx-col-center-xs fx-txt-center">
-      <h1 class="red">404. There's nothing here</h1>
-      <p>Jamu... What? We couldn't find this page... Maybe this site was moved or deleted. Did you check if there was a typo?</p>
-      <p><a href="#" class="button red-bg" onclick="history.go(-1);return false;">Try going back</a></p>
-    </div>
-  </main>
+  </div>
   {% include footer.html %}
 </body>
 

diff --git a/_includes/general/nav.html b/_includes/general/nav.html
@@ -1,5 +1,5 @@
 <aside id="gnav" class="fx-col-100-xs fx-col-25-m">
-  {% include langselect.html %}
+  {% if page.hidelang %}{% else %}{% include langselect.html %}{% endif %}
   <nav id="mnv">
     <ul>
       {% if site.data.navigation.nav[0] %}

diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,8 @@
+<header class="fx-row fx-row-between-xs fx-text-center">
+  <div class="fx-col fx-text-center"><a href="/{% if site.active_lang != site.default_lang %}{{ site.active_lang }}/{% endif %}">
+      <img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}" /></a>
+  </div>
+  <div class="fx-col-center-xs fx-txt-right hide-on-dt">
+    <a href="#mnv" onclick="showNav();return false;">{% include general/navbtn.html %}</a>
+  </div>
+</header>
diff --git a/_layouts/wiki.html b/_layouts/wiki.html
@@ -10,14 +10,7 @@
 </head>
 
 <body class="wikisite">
-  <header class="fx-row fx-row-between-xs fx-text-center">
-    <div class="fx-col fx-text-center"><a href="/{% if site.active_lang != site.default_lang %}{{ site.active_lang }}/{% endif %}">
-        <img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}" /></a>
-    </div>
-    <div class="fx-col-center-xs fx-txt-right hide-on-dt">
-      <a href="#mnv" onclick="showNav();return false;">{% include general/navbtn.html %}</a>
-    </div>
-  </header>
+  {% include header.html %}
   <div class="fx-row fx-row-center-xs">
     {% include general/nav.html %}
     <div id="maincontainer" class="fx-col-100-xs fx-col-50-m">