Merge branch 'master' of https://github.com/Drassil/git-wiki-theme

5 files changed, 98 insertions, 120 deletions

diff --git a/assets/404.html b/assets/404.html
new file mode 100644
index 0000000..7f4c12b
--- /dev/null
+++ b/assets/404.html
@@ -0,0 +1,7 @@
+---
+layout: git-wiki-404
+permalink: /404.html
+is_wiki_page: false
+---
+
+<!--- this file is needed for automatic creation of non existent pages --->
diff --git a/assets/blog/index.html b/assets/blog/index.html
new file mode 100644
index 0000000..1e17dc4
--- /dev/null
+++ b/assets/blog/index.html
@@ -0,0 +1,6 @@
+---
+is_wiki_page: false
+permalink: /blog/index.html
+---
+
+<!--- this file is needed for automatic creation of blog page --->
diff --git a/assets/js/searchdata.js b/assets/js/searchdata.js
new file mode 100644
index 0000000..7c46fed
--- /dev/null
+++ b/assets/js/searchdata.js
@@ -0,0 +1,44 @@
+---
+layout: null
+is_wiki_page: false
+---
+{% if site.search_engine == "js" %}
+var jsondata=[
+  {% for post in site.posts %}
+    {
+      "title"    : "{{ post.title | escape }}",
+      "category" : "{{ post.category }}",
+      "tags"     : "{{ post.tags | join: ', ' }}",
+      "url"      : "{{ site.baseurl }}{{ post.url }}",
+      "date"     : "{{ post.date }}",
+      "content"  : "{{ post.content | strip_html | strip_newlines | remove: '"' }}"
+    } {% unless forloop.last %},{% endunless %}
+  {% endfor %}
+  ,
+  {% for page in site.html_pages %}
+   {
+     {% assign title = page.title | default: page.name %}
+     {% if title != nil %}
+        "title"    : "{{ title | escape }}",
+        "category" : "{{ page.category }}",
+        "tags"     : "{{ page.tags | join: ', ' }}",
+        "url"      : "{{ site.baseurl }}{{ page.url }}",
+        "date"     : "{{ page.date }}",
+        "content"  : "{{ page.content | strip_html | strip_newlines | remove: '"' }}"
+     {% endif %}
+   } {% unless forloop.last %},{% endunless %}
+  {% endfor %}
+];
+
+var sjs = SimpleJekyllSearch({
+    searchInput: document.getElementById('search-input'),
+    resultsContainer: document.getElementById('results-container'),
+    json: jsondata,
+    searchResultTemplate: '<li><a href="{url}" title="{desc}">{title}</a></li>',
+    noResultsText: 'No results found',
+    limit: 10,
+    fuzzy: false,
+    exclude: []
+  })
+{% endif %}
+
diff --git a/assets/js/toc.js b/assets/js/toc.js
deleted file mode 100644
index bf8fbec..0000000
--- a/assets/js/toc.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// https://github.com/ghiculescu/jekyll-table-of-contents
-(function ($) {
-  $.fn.toc = function (options) {
-    var element = $(this);
-
-    setTimeout(function () {
-      var defaults = {
-          noBackToTopLinks: false,
-          title: '<i>Jump to...</i>',
-          minimumHeaders: 3,
-          headers: 'h1, h2, h3, h4, h5, h6',
-          listType: 'ol', // values: [ol|ul]
-          showEffect: 'show', // values: [show|slideDown|fadeIn|none]
-          showSpeed: 'slow', // set to 0 to deactivate effect
-          classes: {
-            list: '',
-            item: ''
-          }
-        },
-        settings = $.extend(defaults, options);
-
-      function fixedEncodeURIComponent(str) {
-        return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
-          return '%' + c.charCodeAt(0).toString(16);
-        });
-      }
-
-      function createLink(header) {
-        var innerText = (header.textContent === undefined) ? header.innerText : header.textContent;
-        return "<a href='#" + fixedEncodeURIComponent(header.id) + "'>" + innerText + "</a>";
-      }
-
-      var headers = $(settings.headers).filter(function () {
-          // get all headers with an ID
-          var previousSiblingName = element.prev().attr("name");
-          if (!this.id && previousSiblingName) {
-            this.id = element.attr("id", previousSiblingName.replace(/\./g, "-"));
-          }
-
-          // Yehonal
-          if (!this.id) {
-            this.id = element.text().replace(/\W/g, '_');
-          }
-
-          return this.id;
-        });
-      if (!headers.length || headers.length < settings.minimumHeaders || !element.length) {
-        element.hide();
-        return;
-      }
-
-      if (0 === settings.showSpeed) {
-        settings.showEffect = 'none';
-      }
-
-      var get_level = function (ele) {
-        return parseInt(ele.nodeName.replace("H", ""), 10);
-      };
-      var highest_level = headers.map(function (_, ele) {
-        return get_level(ele);
-      }).get().sort()[0];
-      var return_to_top = '<i class="icon-arrow-up back-to-top"> </i>';
-
-      var level = get_level(headers[0]),
-        this_level,
-        html = settings.title + " <" + settings.listType + " class=\"" + settings.classes.list + "\">";
-      headers.on('click', function () {
-          if (!settings.noBackToTopLinks) {
-            window.location.hash = this.id;
-          }
-        })
-        .addClass('clickable-header')
-        .each(function (_, header) {
-          this_level = get_level(header);
-          if (!settings.noBackToTopLinks && this_level === highest_level) {
-            $(header).addClass('top-level-header').after(return_to_top);
-          }
-          if (this_level === level) // same level as before; same indenting
-            html += "<li class=\"" + settings.classes.item + "\">" + createLink(header);
-          else if (this_level <= level) { // higher level than before; end parent ol
-            for (var i = this_level; i < level; i++) {
-              html += "</li></" + settings.listType + ">"
-            }
-            html += "<li class=\"" + settings.classes.item + "\">" + createLink(header);
-          } else if (this_level > level) { // lower level than before; expand the previous to contain a ol
-            for (i = this_level; i > level; i--) {
-              html += "<" + settings.listType + " class=\"" + settings.classes.list + "\">" +
-                "<li class=\"" + settings.classes.item + "\">"
-            }
-            html += createLink(header);
-          }
-          level = this_level; // update for the next one
-        });
-      html += "</" + settings.listType + ">";
-      if (!settings.noBackToTopLinks) {
-        $(document).on('click', '.back-to-top', function () {
-          $(window).scrollTop(0);
-          window.location.hash = '';
-        });
-      }
-
-      var render = {
-        show: function () {
-          element.hide().html(html).show(settings.showSpeed);
-        },
-        slideDown: function () {
-          element.hide().html(html).slideDown(settings.showSpeed);
-        },
-        fadeIn: function () {
-          element.hide().html(html).fadeIn(settings.showSpeed);
-        },
-        none: function () {
-          element.html(html).show();
-        }
-      };
-
-      render[settings.showEffect]();
-    }, 0);
-  }
-})(jQuery);
diff --git a/assets/sitemap_full.xml b/assets/sitemap_full.xml
new file mode 100644
index 0000000..8db8225
--- /dev/null
+++ b/assets/sitemap_full.xml
@@ -0,0 +1,41 @@
+---
+layout: none
+sitemap: false
+is_wiki_page: false
+permalink: /sitemap_full.xml
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+{% if site.search_engine == "js_rss" %}
+	<title>{{ site.name | xml_escape }}</title>
+	<description>{{ site.description | xml_escape }}</description>
+	<link>{{ site.url }}</link>
+	<atom:link href="{{ site.url }}/search.xml" rel="self" type="application/rss+xml" />
+	{% for post in site.posts %}
+		{% if post.published != false %}
+		<item>
+			<title>{{ post.title | xml_escape }}</title>
+			<description>{{ post.content | xml_escape }}</description>
+			<pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+			<link>{{site.url}}{{ post.url | relative_url }}</link>
+			<guid isPermaLink="true">{{site.url}}{{ post.url | relative_url }}</guid>
+		</item>
+		{% endif %}
+	{% endfor %}
+	{% for post in site.pages %}
+		{% if post.layout != "null" %}
+			{% if post.sitemap != false %}
+			<item>
+				<title>{{ post.title | xml_escape }}</title>
+				<description>{{ post.content | xml_escape }}</description>
+				<pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+				<link>{{site.url}}{{ post.url | relative_url }}</link>
+				<guid isPermaLink="true">{{site.url}}{{ post.url | relative_url }}</guid>
+			</item>
+			{% endif %}
+		{% endif %}
+	{% endfor %}
+{% endif %}
+</channel>
+</rss>