From 1ba6268f175965fe12fb2731fda51e7e3b1e6e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info>
Date: Wed, 9 Mar 2016 18:27:31 +0100
Subject: [PATCH] =?UTF-8?q?Zm=C4=9Bny=20v=20pati=C4=8Dce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Zdroják tohoto článku je nynà pod datem změny
(6. 3. 2016 napsal Jan Novák ...)
- Přidány odkazy na webkameru a "Jakub Skořepa"
- Přidány odkazy na facebook a google+
- Odkazy vedoucĂ mimo hlavnĂ stránky se otevĂrajĂ v novĂ© záloĹľce
(jenom ty z patiÄŤky)
---
theme/templates/article.html.nunj | 11 +++++++----
theme/templates/partials/base.html.nunj | 17 ++++++++++-------
theme/templates/partials/svgs.html.nunj | 8 ++++++++
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/theme/templates/article.html.nunj b/theme/templates/article.html.nunj
index afca50de..bf6f74db 100644
--- a/theme/templates/article.html.nunj
+++ b/theme/templates/article.html.nunj
@@ -6,8 +6,8 @@
<div class="section container" id="content">
<div class="metadata">
<h2 id="title">{{ metadata.title }}</h2>
- <div class="author" style="color: #a2a2a2">
- {% if not metadata.nodate %}
+ {% if not metadata.nodate %}
+ <a class="author" style="color: #a2a2a2; display: block" class="black-text" target="_blank" href="https://git.ok1kvk.cz/ok1kvk.cz/content/tree/master/articles/{{file | replace("clanek/","")}}.md">
{% if metadata.date %}
<span style="color: #626262">{{ metadata.date.creation | date("D. M. YYYY") }}</span>
napsal
@@ -18,8 +18,8 @@
{% else %}
Článek nenà v gitu
{% endif %}
- {% endif %}
- </div>
+ </a>
+ {% endif %}
<div class="tags">
{% for tag in metadata.tags %}
{% if tag.url != "clanek" %}
@@ -35,3 +35,6 @@
</article>
</div>
{% endblock %}
+
+{% block footerlink %}
+{% endblock %}
diff --git a/theme/templates/partials/base.html.nunj b/theme/templates/partials/base.html.nunj
index 83d92a22..e65b5c20 100644
--- a/theme/templates/partials/base.html.nunj
+++ b/theme/templates/partials/base.html.nunj
@@ -148,15 +148,18 @@
<footer class="page-footer blue">
<div class="container s6">
- <a class="orange-text text-lighten-3" href="https://git.ok1kvk.cz/">Gitlab</a> |
- <a class="orange-text text-lighten-3" href="https://ok1kvk.cz/forum">FĂłrum</a> |
- <a class="orange-text text-lighten-3">Webkamera</a>
- {% if type=="article" %}
- | <a class="orange-text text-lighten-3" href="https://git.ok1kvk.cz/ok1kvk.cz/content/tree/master/articles/{{file | replace("clanek/","")}}.md">Zdroják tohoto článku</a>
- {% endif %}
+ <a class="orange-text text-lighten-3" target="_blank" href="https://git.ok1kvk.cz/">Gitlab</a> |
+ <a class="orange-text text-lighten-3" target="_blank" href="https://ok1kvk.cz/forum">FĂłrum</a> |
+ <a class="orange-text text-lighten-3" href="/clanek/webkamera/">Webkamera</a>
+ {% block footerlink %}
+ {% endblock %}
+ <div style="display:inline-block; height: 1em">
+ <a style="display: block; float: left; margin-top: -.5em" target="_blank" href="https://www.facebook.com/ok1kvk">{{ svgs.facebook("white",2,"em") }}</a>
+ <a style="display: block; float: left; margin-top: -.5em" target="_blank" href="https://plus.google.com/114799569777501028942">{{ svgs.gplus("white",2,"em") }}</a>
+ </div>
</div>
<div class="container s6">
- Stránky pro OK1KVK vytvořil <a class="orange-text text-lighten-3">Jakub Skořepa</a> 2015-2016
+ Stránky pro OK1KVK vytvořil <a class="orange-text text-lighten-3" target="_blank" href="https://blog.skorepa.info">Jakub Skořepa</a> 2015-2016
</div>
</footer>
diff --git a/theme/templates/partials/svgs.html.nunj b/theme/templates/partials/svgs.html.nunj
index d03b66ba..7a52254f 100644
--- a/theme/templates/partials/svgs.html.nunj
+++ b/theme/templates/partials/svgs.html.nunj
@@ -35,3 +35,11 @@
{% macro search(color, size=24, unit="px") %}
{{ symbol(color, size, unit, "M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z") }}
{% endmacro %}
+
+{% macro facebook(color, size=24, unit="px") %}
+ {{ symbol(color, size, unit, "M19,4V7H17A1,1 0 0,0 16,8V10H19V13H16V20H13V13H11V10H13V7.5C13,5.56 14.57,4 16.5,4M20,2H4A2,2 0 0,0 2,4V20A2,2 0 0,0 4,22H20A2,2 0 0,0 22,20V4C22,2.89 21.1,2 20,2Z") }}
+{% endmacro %}
+
+{% macro gplus(color, size=24, unit="px") %}
+ {{ symbol(color, size, unit, "M20,2A2,2 0 0,1 22,4V20A2,2 0 0,1 20,22H4A2,2 0 0,1 2,20V4C2,2.89 2.9,2 4,2H20M20,12H18V10H17V12H15V13H17V15H18V13H20V12M9,11.29V13H11.86C11.71,13.71 11,15.14 9,15.14C7.29,15.14 5.93,13.71 5.93,12C5.93,10.29 7.29,8.86 9,8.86C10,8.86 10.64,9.29 11,9.64L12.36,8.36C11.5,7.5 10.36,7 9,7C6.21,7 4,9.21 4,12C4,14.79 6.21,17 9,17C11.86,17 13.79,15 13.79,12.14C13.79,11.79 13.79,11.57 13.71,11.29H9Z") }}
+{% endmacro %}
--
GitLab