jekyll-kde-theme 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd797dcc14ab827652d59e997d6c4ca1231c21530e426fb1547ecfd165096812
-  data.tar.gz: 88a0991e7ce7f4ec4f7ae18c0be99679154390c7bfd7271f4f686bec1396a018
+  metadata.gz: 3786a6d801cda90a75672d21b27b79b2f67404c14fb98e2d6912b194e8bdc5e5
+  data.tar.gz: ac04c611ace78f5d141830b824e21e42fa98b34b245556861b48ab8d9df2ba5d
 SHA512:
-  metadata.gz: d59aac94dae4301360ca3e0cabbd73e3f58bc1040be2f041ac076b41d68aed69378d0ba4f4962e9a8bab40121611636b242c85b7733658156597fb208802a131
-  data.tar.gz: e06c3adc843a30a58d1c132755d3a2efc327f1708560092abdcf66975623ed973aea8cee87c5a672ec2d28fe2109b31f78b6b87c82ce3bc12a46d51d1178ae80
+  metadata.gz: 5409c724ed22e4bf6a97f000756260b6fe31d6d630186a998a9013ae62d9ba53912be6031a257a270b42da05da873191bd895a7ef10bd8c3873544e55824f5a2
+  data.tar.gz: 315d989261ae5a36fc24e99f20b31370ef15235e094b4c1f03174920575ee0096172a66bd384980985cf1f719172fe3526fe9c81e82a7a2dca4466b30ea43588

data/_includes/blog.html

@@ -16,15 +16,28 @@
             <span>&laquo; {% if site.prev %}{{site.prev}}{% else %}Prev{% endif %}</span>
             {% endif %}
 
-            {% for page in (1..paginator.total_pages) %}
-                {% if page == paginator.page %}
-                    <span class="ml-1 mr-1">{{ page }}</span>
-                {% elsif page == 1 %}
-                    <a class="ml-1 mr-1" href="/">{{ page }}</a>
-                {% else %}
-                    <a class="ml-1 mr-1" href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
-                {% endif %}
-            {% endfor %}
+            {% if paginator.total_pages > 20 %}
+                {% for page in (1..paginator.total_pages) %}
+                    {% assign relative_to_current = paginator.page | minus: page | replace: '-', '' | divided_by: 1 %}
+                    {% if page == paginator.page %}
+                        <span class="ml-1 mr-1">{{ page }}</span>
+                    {% elsif relative_to_current < 5 and page == 1 %}
+                        <a class="ml-1 mr-1" href="{{ '/' | relative_url }}">{{ page }}</a>
+                    {% elsif relative_to_current < 5 %}
+                        <a class="ml-1 mr-1" href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
+                    {% endif %}
+                {% endfor %}
+            {% else %}
+                {% for page in (1..paginator.total_pages) %}
+                    {% if page == paginator.page %}
+                        <span class="ml-1 mr-1">{{ page }}</span>
+                    {% elsif page == 1 %}
+                        <a class="ml-1 mr-1" href="{{ '/' | relative_url }}">{{ page }}</a>
+                    {% else %}
+                        <a class="ml-1 mr-1" href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
 
             {% if paginator.next_page %}
                 <a class="ml-1 mr-1" href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">{% if site.next %}{{site.next}}{% else %}Next{% endif %} &raquo;</a>

data/_includes/footer.html

@@ -90,3 +90,24 @@
 
 <!-- Standard JS Files, bootstrap Async -->
 <script src="https://cdn.kde.org/aether-devel/bootstrap.js"></script>
+
+{% if site.matomo %}
+
+
+<!-- Matomo -->
+<script type="text/javascript">
+  var _paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://stats.kde.org/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+      _paq.push(['setSiteId', '{{ site.matomo }}']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript>
+<!-- End Matomo Code -->
+{% endif %}

data/_includes/head.html

@@ -8,22 +8,22 @@
     {% if page.summary %}
     <meta name="description" content="{{ page.summary | escape }}">
     {% endif %}
-    {%if page.tags %}
+    {% if page.tags %}
     <meta name="keywords" content="{{ page.tags | join: ', ' | escape }}"/>
-    {%endif %}
+    {% endif %}
 
     <!-- Icons -->
-    <link href="/assets/aether/media/192x192.png" rel="icon" sizes="192x192" />
-    <link href="/assets/aether/media/180x180.png" rel="apple-touch-icon" sizes="180x180" />
-    <link href="/assets/aether/media/128x128.svg" rel="icon" sizes="128x128" />
-    <link href="/assets/aether/media/64x64.svg" rel="icon" sizes="64x64" />
-    <link href="/assets/aether/media/32x32.svg" rel="icon" sizes="32x32" />
-    <link href="/assets/aether/media/24x24.svg" rel="icon" sizes="24x24" />
-    <link href="/assets/aether/media/16x16.svg" rel="icon" sizes="16x16" />
+    <link href="{{ '/assets/aether/media/192x192.png' | relative_url }}" rel="icon" sizes="192x192" />
+    <link href="{{ '/assets/aether/media/180x180.png' | relative_url }}" rel="apple-touch-icon" sizes="180x180" />
+    <link href="{{ '/assets/aether/media/128x128.svg' | relative_url }}" rel="icon" sizes="128x128" />
+    <link href="{{ '/assets/aether/media/64x64.svg' | relative_url }}" rel="icon" sizes="64x64" />
+    <link href="{{ '/assets/aether/media/32x32.svg' | relative_url }}" rel="icon" sizes="32x32" />
+    <link href="{{ '/assets/aether/media/24x24.svg' | relative_url }}" rel="icon" sizes="24x24" />
+    <link href="{{ '/assets/aether/media/16x16.svg' | relative_url }}" rel="icon" sizes="16x16" />
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="https://cdn.kde.org/aether/css/bootstrap.min.css">
 
-    <link rel="stylesheet" href="/css/main.css">
+    <link rel="stylesheet" href="{{ '/css/main.css' | relative_url }}">
 </head>
 

data/_includes/header.html

@@ -1,7 +1,7 @@
 <header class="header clearfix">
     <nav id="kHeaderNav" class="navbar navbar-expand-lg container-fluid">
-        <a class="navbar-brand {% if page.url == '/' %}navbar-brand-active{% endif %}" href="/index.html" id="KontactGlobalLogo">
-            <img src="{% if site.app_icon %}{{ site.app_icon }}{% else %}/assets/img/app_icon.png{% endif %}">
+        <a class="navbar-brand {% if page.url == '/' %}navbar-brand-active{% endif %}" href="{{ '/index.html' | relative_url }}" id="KontactGlobalLogo">
+            <img src="{% if site.app_icon %}{{ site.app_icon | relative_url }}{% else %}{{ '/assets/img/app_icon.png' | relative_url }}{% endif %}">
         </a>
         <button class="navbar-toggler" type="button" data-toggle="collapse"
                 data-target="#kMainNavbar" aria-controls="kMainNavbar"
@@ -18,7 +18,7 @@
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item">
                     <a class="nav-link {% if page.url == '/' %}active{% endif %}"
-                       href="/" aria-haspopup="true" aria-expanded="false">{{ site.title }}</a>
+                       href="{{ '/' | relative_url }}" aria-haspopup="true" aria-expanded="false">{{ site.title }}</a>
                 </li>
 
                 {% if site.navigation.top %}
@@ -28,7 +28,18 @@
                 {% endif %}
 
                 {% for nav in sorted %}
-                  {% if nav.title and (nav.title != "Changelog" or (site.changelogs | size) != 0) %}
+                  {% if nav.subnav %}
+                  <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" id="navbar{{nav.title|slugify}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        {{ nav.title }}
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbar{{nav.title|slugify}}">
+                        {% for subnav in nav.subnav %}
+                            <a class="dropdown-item" href="{{ subnav.url }}">{{ subnav.title }}</a>
+                        {% endfor %}
+                    </div>
+                  </li>
+                  {% elsif nav.title and (nav.title != "Changelog" or (site.changelogs | size) != 0) %}
                   <li class="nav-item">
                       <a class="nav-link {% if page.url == nav.url %}active{% endif %}" href="{{ nav.url }}">{{ nav.title }}</a>
                   </li>

data/_layouts/post.html

@@ -3,5 +3,6 @@ layout: default
 ---
 
 <main class="container">
-{{ content }}
-</div>
+    <h1>{{ page.title }}</h1>
+    {{ content }}
+</main>

data/_sass/base.scss

@@ -567,3 +567,4 @@ main.navfix {
         diplay: block;
     }
 }
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-kde-theme
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Carl Schwan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Jekyll theme for KDE websites