Fixes number of deprecated warnings

polderknowledge · Nov 6, 2016 · 99c6201 · 99c6201
1 parent 2941d91
commit 99c6201
Show file tree

Hide file tree

Showing 8 changed files with 370 additions and 24 deletions.
diff --git a/asset/img/logo.svg b/asset/img/logo.svg
diff --git a/theme/404.html b/theme/404.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "main.html" %}
 
 {% block content %}
 

diff --git a/theme/breadcrumbs.html b/theme/breadcrumbs.html
@@ -1,13 +1,13 @@
 <ol class="breadcrumb" role="navigation" aria-label="breadcrumbs navigation">
-  <li><a href="{{ homepage_url }}">{{ site_name }}</a> &raquo;</li>
-  {% if current_page %}
-    {% for doc in current_page.ancestors %}
+  <li><a href="{{ nav.homepage_url }}">{{ config.site_name }}</a> &raquo;</li>
+  {% if page %}
+    {% for doc in page.ancestors %}
       {% if doc.link %}
         <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
       {% else %}
         <li>{{ doc.title }} &raquo;</li>
       {% endif %}
     {% endfor %}
   {% endif %}
-  {% if current_page %}<li class="active">{{ current_page.title }}</li>{% endif %}
+  {% if page %}<li class="active">{{ page.title }}</li>{% endif %}
 </ol>
diff --git a/theme/content.html b/theme/content.html
@@ -1,25 +1,25 @@
-{% if meta.source %}
+{% if page.meta.source %}
 <div class="source-links">
-{% for filename in meta.source %}
+{% for filename in page.meta.source %}
     <span class="label label-primary">{{ filename }}</span>
 {% endfor %}
 </div>
 {% endif %}
 
 {% include "breadcrumbs.html" %}
 
-{{ content }}
+{{ page.content }}
 
 <hr />
 
-{% if include_next_prev %}
+{% if page.next_page or page.previous_page %}
 <nav>
   <ul class="pager hidden-print">
-    <li class="previous{% if not previous_page %} disabled{% endif %}">
-      <a rel="prev" {% if previous_page %}href="{{ previous_page.url }}"{% endif %}><i class="fa fa-arrow-left"></i> Previous</a>
+    <li class="previous{% if not page.previous_page %} disabled{% endif %}">
+      <a rel="prev" {% if page.previous_page %}href="{{ page.previous_page.url }}"{% endif %}><i class="fa fa-arrow-left"></i> Previous</a>
     </li>
-    <li class="next{% if not next_page %} disabled {% endif %}">
-      <a rel="next" {% if next_page %}href="{{ next_page.url }}"{% endif %}>Next <i class="fa fa-arrow-right"></i></a>
+    <li class="next{% if not page.next_page %} disabled {% endif %}">
+      <a rel="next" {% if page.next_page %}href="{{ page.next_page.url }}"{% endif %}>Next <i class="fa fa-arrow-right"></i></a>
     </li>
   </ul>
 </nav>

diff --git a/theme/dropdown.html b/theme/dropdown.html
@@ -1,7 +1,7 @@
 <div class="zf-components">
   <div class="zf-components-grid">
     <div class="zf-logo">
-      <a href="http://framework.zend.com" data-toggle="tooltip" data-placement="bottom" title="Go to the ZF homepage"><img src="{{ base_url }}/img/zf-logo-mark.svg" alt="Zend Framework" width="250" /></a>
+      <a href="http://polderknowledge.com" data-toggle="tooltip" data-placement="bottom" title="Go to the Polder Knowledge homepage"><img src="{{ base_url }}/img/logo.svg" alt="Polder Knowledge" width="250" /></a>
     </div>
 
     <div class="component-list"></div>

diff --git a/theme/base.html → theme/main.html b/theme/base.html → theme/main.html
@@ -5,9 +5,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">{% if page_description %}
-    <meta name="description" content="{{ page_description }}">{% endif %} {% if site_author %}
-    <meta name="author" content="{{ site_author }}">{% endif %} {% if canonical_url %}
-    <link rel="canonical" href="{{ canonical_url }}">{% endif %}
+    <meta name="description" content="{{ page_description }}">{% endif %} {% if config.site_author %}
+    <meta name="author" content="{{ config.site_author }}">{% endif %} {% if page.canonical_url %}
+    <link rel="canonical" href="{{ page.canonical_url }}">{% endif %}
     <link rel="shortcut icon" href="{{ base_url }}/img/favicon.ico">
 
     <title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
@@ -39,7 +39,7 @@
     {% endif %}
 </head>
 
-<body{% if current_page and current_page.is_homepage %} class="homepage" {% endif %}>
+<body{% if page and page.is_homepage %} class="homepage" {% endif %}>
 
     {% include "nav.html" %}
 
@@ -95,7 +95,7 @@ <h4 class="modal-title" id="exampleModalLabel">Search</h4>
 </body>
 
 </html>
-{% if current_page and current_page.is_homepage %}
+{% if page and page.is_homepage %}
 <!--
 MkDocs version : {{ mkdocs_version }}
 Build Date UTC : {{ build_date_utc }}

diff --git a/theme/nav.html b/theme/nav.html
@@ -15,8 +15,8 @@
 
             <!-- Main title -->
             <span class="navbar-brand">
-              <a class="logo-link" href="http://polderknowledge.com" data-toggle="tooltip" data-placement="bottom" title="Polder Knowledge"><img src="{{ base_url }}/img/logo.png" height="28" alt="Polder Knowledge" /></a>
-              <a href="{{ homepage_url }}">{{ site_name }}</a>
+              <a class="logo-link" href="http://polderknowledge.com" data-toggle="tooltip" data-placement="bottom" title="Polder Knowledge"><img src="{{ base_url }}/img/logo.svg" height="28" alt="Polder Knowledge" /></a>
+              <a href="{{ nav.homepage_url }}">{{ config.site_name }}</a>
             </span>
         </div>
 

diff --git a/theme/toc.html b/theme/toc.html
@@ -1,6 +1,6 @@
 <div class="bs-sidebar hidden-print affix well" role="complementary">
     <ul class="nav bs-sidenav">
-    {% for toc_item in toc %}
+    {% for toc_item in page.toc %}
         <li class="main {% if toc_item.active %}active{% endif %}"><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li>
         {% for toc_item in toc_item.children %}
             <li><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li>
@@ -11,10 +11,10 @@
     {% if include_next_prev %}
     <ul class="pager hidden-print">
       <li class="previous{% if not previous_page %} disabled{% endif %}">
-        <a rel="prev" {% if previous_page %}href="{{ previous_page.url }}"{% endif %}><i class="fa fa-arrow-left"></i> Previous</a>
+        <a rel="prev" {% if page.previous_page %}href="{{ previous_page.url }}"{% endif %}><i class="fa fa-arrow-left"></i> Previous</a>
       </li>
       <li class="next{% if not next_page %} disabled {% endif %}">
-        <a rel="next" {% if next_page %}href="{{ next_page.url }}"{% endif %}>Next <i class="fa fa-arrow-right"></i></a>
+        <a rel="next" {% if page.next_page %}href="{{ next_page.url }}"{% endif %}>Next <i class="fa fa-arrow-right"></i></a>
       </li>
     </ul>
     {% endif %}