diff --git a/sitegin/nunjucks.js b/sitegin/nunjucks.js index ee35428460beb8ca971200dc68aee786e371a328..aa87c04145ec7fa8971ff4ebf5fdfde20ca9ca46 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 d8c0f62b757ba47655923e9688c544fb96b1a833..11693250eded17a113efbd10eb2be356fa135f42 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 fa30d58fc2556e70ff42490ba76005c8a620f4d1..c40b1a05aa822ae0f3e8f9318ed7f7bb190016c1 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">