From b4db789fc4b3199696e5a7dad755456dc5750c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info>
Date: Wed, 9 Mar 2016 00:43:06 +0100
Subject: [PATCH] Fix lead images
- This commit finishes feature parity with master
- except thumbnails
---
sitegin/nunjucks.js | 7 +++++++
sitegin/urls.js | 2 +-
theme/templates/partials/list.html.nunj | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/sitegin/nunjucks.js b/sitegin/nunjucks.js
index ee354284..aa87c041 100644
--- a/sitegin/nunjucks.js
+++ b/sitegin/nunjucks.js
@@ -38,6 +38,13 @@ env.addFilter('inspect', function(obj) {
return util.inspect(obj);
});
+env.addFilter('relURL', function(filename, dir){
+ if(filename.substr(0,1) == '/' || filename.match('://')) return filename;
+ if(dir.substr(0,1) !== '/') dir = '/' + dir;
+ if(filename.match(/\/$/)) return dir+filename;
+ return dir+'/'+filename;
+})
+
module.exports = function(data, type) {
return new Promise(function(resolve, reject) {
env.getTemplate(type+'.html.nunj', true, function(err, tmpl) {
diff --git a/sitegin/urls.js b/sitegin/urls.js
index d8c0f62b..11693250 100644
--- a/sitegin/urls.js
+++ b/sitegin/urls.js
@@ -6,7 +6,7 @@ module.exports = function(obj) {
return new Promise(function(resolve, reject) {
obj.pages.forEach(function(page) {
var file = page.file;
- file = file.replace(/\\.md$/,'');
+ file = file.replace(/\.md$/,'');
file = file.replace(/^articles/,'clanek');
page.file = file;
})
diff --git a/theme/templates/partials/list.html.nunj b/theme/templates/partials/list.html.nunj
index fa30d58f..c40b1a05 100644
--- a/theme/templates/partials/list.html.nunj
+++ b/theme/templates/partials/list.html.nunj
@@ -8,7 +8,7 @@
<div class="block article" style="">
<a href="{{ config.baseurl }}/{{ page.file }}">
<div style="height:120px;
- {% if page.metadata.image %}background-image: url('{{ page.file }}/{{ page.metadata.image }}'){% endif %}
+ {% if page.metadata.image %}background-image: url('{{ config.baseurl }}{{ page.metadata.image | relURL(page.file) }}'){% endif %}
" class="leadimage light-blue darken-2"></div>
</a>
<div class="head-title">
--
GitLab