9 files changed, 13 insertions, 11 deletions

diff --git a/resources/jade/finals/ham/cw-decoder.jade b/resources/pug/finals/ham/cw-decoder.pug
index bc8636b..b4285eb 100644
--- a/resources/jade/finals/ham/cw-decoder.jade
+++ b/resources/pug/finals/ham/cw-decoder.pug
@@ -1,4 +1,4 @@
-extends layout-ham.jade
+extends /layout-ham.pug
 
 block prepend menu
 	- var page = 'cw-decoder'
@@ -10,7 +10,7 @@ block subtitleDate
 	| January 2017
 
 block subtitle-right
-	+githubLink('camilstaps/CWDecoder')
+	+githubIconLink('camilstaps/CWDecoder')
 
 block page
 	h4 Introduction
diff --git a/resources/jade/finals/ham/index.jade b/resources/pug/finals/ham/index.pug
index c4cdc31..8cdae2f 100644
--- a/resources/jade/finals/ham/index.jade
+++ b/resources/pug/finals/ham/index.pug
@@ -1,4 +1,4 @@
-extends layout-ham.jade
+extends /layout-ham.pug
 
 block prepend menu
 	- var page = 'home'
diff --git a/resources/jade/finals/index.jade b/resources/pug/finals/index.pug
index 36c8a5e..454834f 100644
--- a/resources/jade/finals/index.jade
+++ b/resources/pug/finals/index.pug
@@ -1,4 +1,4 @@
-extends layout.jade
+extends /layout.pug
 
 block content
 	img#profile(alt="Camil Staps", style="float:left;", src="/assets/img/profile-300x300.png", width="170")
diff --git a/resources/jade/include/foot.jade b/resources/pug/include/foot.pug
index e69de29..e69de29 100644
--- a/resources/jade/include/foot.jade
+++ b/resources/pug/include/foot.pug
diff --git a/resources/jade/include/head.jade b/resources/pug/include/head.pug
index 7099c24..7099c24 100644
--- a/resources/jade/include/head.jade
+++ b/resources/pug/include/head.pug
diff --git a/resources/jade/include/layout-ham.jade b/resources/pug/include/layout-ham.pug
index 09bb3b7..ab080cf 100644
--- a/resources/jade/include/layout-ham.jade
+++ b/resources/pug/include/layout-ham.pug
@@ -1,4 +1,4 @@
-extends layout-sidebar.jade
+extends layout-sidebar.pug
 
 block title
 	| PD7LOL
diff --git a/resources/jade/include/layout-sidebar.jade b/resources/pug/include/layout-sidebar.pug
index 6e4610b..bdbec70 100644
--- a/resources/jade/include/layout-sidebar.jade
+++ b/resources/pug/include/layout-sidebar.pug
@@ -1,4 +1,4 @@
-extends layout.jade
+extends layout.pug
 
 block append titleContainer
 	|  – 
@@ -22,9 +22,6 @@ block content
 					block subtitleDate
 		div.col-lg-2.col-md-2.text-right
 			block subtitle-right
-				mixin githubLink(repo)
-					a(href='https://github.com/' + repo, target='_blank', title='Source on GitHub')
-						img(src='/assets/img/github.png', alt='GitHub')
 
 		div.col-lg-9.col-md-8.text-justify
 			block page
diff --git a/resources/jade/include/layout.jade b/resources/pug/include/layout.pug
index 685be88..6a89533 100644
--- a/resources/jade/include/layout.jade
+++ b/resources/pug/include/layout.pug
@@ -1,7 +1,9 @@
+include /mixins.pug
+
 doctype html
 html(lang="en")
 	head
-		include ./head.jade
+		include head.pug
 
 	body
 		.container
@@ -20,6 +22,6 @@ html(lang="en")
 					| Copyright © Camil Staps #{date.getFullYear()}  •  
 					= "Last updated " + date.toDateString()
 
-		include ./foot.jade
+		include foot.pug
 
 		block js
diff --git a/resources/pug/include/mixins.pug b/resources/pug/include/mixins.pug
new file mode 100644
index 0000000..14c78f3
--- /dev/null
+++ b/resources/pug/include/mixins.pug
@@ -0,0 +1,3 @@
+mixin githubIconLink(repo)
+	a(href='https://github.com/' + repo, target='_blank', title='Source on GitHub')
+		img(src='/assets/img/github.png', alt='GitHub')