From 2cd047fabba55b0b13c315d3edc9f55e36713ee4 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Sun, 9 Aug 2015 14:22:34 +0300
Subject: [PATCH] fix bug with error on 404 redirection fix warnings

---
 404.html                    | 6 +++---
 _includes/ssl-redirect.html | 6 ------
 _layouts/default.html       | 1 -
 feed-short.xml              | 1 -
 feed.xml                    | 1 -
 index.html                  | 4 ++--
 ru/feed-short.xml           | 1 -
 ru/feed.xml                 | 1 -
 8 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 _includes/ssl-redirect.html

diff --git a/404.html b/404.html
index 159bc3c..69ab815 100644
--- a/404.html
+++ b/404.html
@@ -29,12 +29,12 @@
 
 <!-- redirection to russian page -->
 <script type="text/javascript">
-  var languageinfo=navigator.language? navigator.language : navigator.userLanguage
+  var languageinfo = navigator.language ? navigator.language : navigator.userLanguage
   function redirectpage(dest) {
     if (window.location.replace) window.location.replace(dest)
-    else window.location=dest
+    else window.location = dest
   }
-  if (languageinfo.substr(0,2) == "ru") redirectpage("/ru/404")
+  if (languageinfo.substr(0,2) == "ru") redirectpage("/ru/404.html")
 </script>
 <!-- redirection to russian page -->
 
diff --git a/_includes/ssl-redirect.html b/_includes/ssl-redirect.html
deleted file mode 100644
index 38a2a73..0000000
--- a/_includes/ssl-redirect.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type="text/javascript">
-  var host = "arcanis.name";
-  if ((host == window.location.host) && (window.location.protocol != "https:"))
-    window.location.protocol = "https";
-</script>
-
diff --git a/_layouts/default.html b/_layouts/default.html
index 4f0c3de..59c629b 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -26,7 +26,6 @@
         document.createElement('figcaption');
       </script>
     <![endif]-->
-    {% include ssl-redirect.html %}
     {% include google_analytics.html %}
     {% if page.share == true %}
       {% include header_sharethis.html %}
diff --git a/feed-short.xml b/feed-short.xml
index e4c3f7e..9e1a628 100644
--- a/feed-short.xml
+++ b/feed-short.xml
@@ -1,5 +1,4 @@
 ---
-layout: none
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
diff --git a/feed.xml b/feed.xml
index 3a6e1c0..716e902 100644
--- a/feed.xml
+++ b/feed.xml
@@ -1,5 +1,4 @@
 ---
-layout: none
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
diff --git a/index.html b/index.html
index d3a51d7..6c09c3c 100644
--- a/index.html
+++ b/index.html
@@ -32,10 +32,10 @@ title: arcanis' homepage
   <script type="text/javascript">
     function redirectpage(dest) {
       if (window.location.replace) window.location.replace(dest)
-      else window.location=dest
+      else window.location = dest
     }
     if (document.referrer != "{{ site.url }}/ru/") {
-      var languageinfo=navigator.language? navigator.language : navigator.userLanguage
+      var languageinfo = navigator.language ? navigator.language : navigator.userLanguage
       if (languageinfo.substr(0,2) == "ru") redirectpage("/ru/")
     }
   </script>
diff --git a/ru/feed-short.xml b/ru/feed-short.xml
index 595b5e2..42b5f4c 100644
--- a/ru/feed-short.xml
+++ b/ru/feed-short.xml
@@ -1,5 +1,4 @@
 ---
-layout: none
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
diff --git a/ru/feed.xml b/ru/feed.xml
index 1e6cfff..fbd2b58 100644
--- a/ru/feed.xml
+++ b/ru/feed.xml
@@ -1,5 +1,4 @@
 ---
-layout: none
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">