Update templates to Go HTML

www/.layout.gohtml

@@ -76,7 +76,7 @@
 				<ul>
 					<li>&#0187; <a href="/">Homepage</a> (<a href="/blog.rss">RSS</a>)</li>
 					<li>&#0187; <a href="/about">About Me</a></li>
-					<li>&#0187; <a href="/photos/albums">Photo Albums</a></li>
+					<!-- <li>&#0187; <a href="/photos/albums">Photo Albums</a></li> -->
 					<li>&#0187; <a href="/wiki/Main-Page">Wiki</a></li>
 					<li>&#0187; <a href="/guestbook">Guestbook</a></li>
 					<li>&#0187; <a href="/contact">Contact Me</a></li>

www/contact/index.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Contact Me{{ end }}
-{% block title %}Contact Me{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Contact Me</h1>
 
@@ -44,8 +43,8 @@ Things that you <strong>SHOULD NOT</strong> use this form for:
 
 For anything else:<p>
 
-<form name="contact" action="{{ url_for('contact.send') }}" method="POST">
+<form name="contact" action="/contact" method="POST">
-	<input type="hidden" name="token" value="{{ csrf_token() }}">
+	<input type="hidden" name="token" value="{{ .CSRF }}">
 
 	<strong>Your name:</strong><br>
 	<small>(so I know who you are)</small><br>
@@ -72,4 +71,4 @@ For anything else:<p>
 	</div>
 </form>
 
-{% endblock %}
+{{ end }}

www/designs/index.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Web Design{{ end }}
-{% block title %}Web Design{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Web Design</h1>
 
@@ -126,4 +125,4 @@ website, in chronological order.<p>
 	</div>
 </div>
 
-{% endblock %}
+{{ end }}

www/download.gohtml

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+
 {% block title %}Download Manager{% endblock %}
 {% block content %}
 

www/errorgen.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Error Message Generator{{ end }}
-{% block title %}Error Message Generator{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Error Message Generator</h1>
 
@@ -189,4 +188,4 @@
 </tr>
 </table>
 
-{% endblock %}
+{{ end }}

www/firered.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Sequence Breaking Pokemon FireRed{{ end }}
-{% block title %}Sequence Breaking Pokemon FireRed{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Sequence Breaking Pokemon FireRed</h1>
 
@@ -8,28 +7,6 @@ This is the story of my quest to <a href="http://tvtropes.org/pmwiki/pmwiki.php/
 Break</a> Pokemon FireRed Version. I decided a good place to begin my quest would be Fuchsia City instead of
 Palette Town. This is what happened...
 
-{% set pages = {
-	"1": "Getting to Fuchsia City",
-	"2": "Level Grinding on Silence Bridge",
-	"3": "On the Road to Cerulean City",
-	"4": "Breaking Mt. Moon"
-} %}
-<ul>
-{% for i in pages|sort %}
-	{% set link = pages[i] %}
-
-	<li>
-		{% if i == page %}
-			<strong>Part {{ i }} - {{ link }}</strong>
-		{% else %}
-			<a href="/firered{% if i != '1' %}/{{ i }}{% endif %}">Part {{ i }} - {{ link }}</a>
-		{% endif %}
-	</li>
-{% endfor %}
-	<li><a href="/firered/full">All on one page</a></li>
-</ul>
-
-{% if page == "1" or page == "full" %}
 	<h2>The Original Idea</h2>
 
 	In the zoo in Fuchsia City in front of the
@@ -179,12 +156,10 @@ Palette Town. This is what happened...
 		<em>Charmander is evolving!</em>
 	</div>
 
-	{% if page == "1" %}
-		<p>&gt; Continue to <a href="/firered/2">Part 2 - {{ pages["2"] }}</a>
-	{% endif %}
-{% endif %}
 
-{% if page == "2" or page == "full" %}
+
+
+
 	<h1>Level Grinding on Silence Bridge</h1>
 
 	After battling my way through the Bikers and Bird Catchers, I finally
@@ -321,12 +296,11 @@ Palette Town. This is what happened...
 		<em>North to Cerulean City, south to Vermilion City.</em>
 	</div>
 
-	{% if page == "2" %}
-		<p>&gt; Continue to <a href="/firered/3">Part 3 - {{ pages["3"] }}</a>
-	{% endif %}
-{% endif %}
 
-{% if page == "3" or page == "full" %}
+
+
+
+
 	<h1>On the Road to Cerulean City</h1>
 
 	<div class="center">
@@ -453,12 +427,11 @@ Palette Town. This is what happened...
 		<em>My gym badges so far. I never got the 1<sup>st</sup> badge.</em>
 	</div>
 
-	{% if page == "3" %}
-		<p>&gt; Continue to <a href="/firered/4">Part 4 - {{ pages["4"] }}</a>
-	{% endif %}
-{% endif %}
 
-{% if page == "4" or page == "full" %}
+
+
+
+
 	<h1>Breaking Mt. Moon</h1>
 
 	<div class="center">
@@ -594,12 +567,8 @@ Palette Town. This is what happened...
 
 	So this is where my quest comes to an end. If anybody has any new
 	ideas, feel free to leave me a comment about them. :)
-{% endif %}
 
 <p>
-{{ include_page("comment.partial_index",
+{{ RenderComments "Sequence Breaking Pokémon FireRed" "article-firered" }}
-	thread="article-firered",
-	subject="Sequence Breaking FireRed Version",
-) | safe }}
 
-{% endblock %}
+{{ end }}

www/flash/aichaos-warners.gohtml

@@ -0,0 +1,21 @@
+{{ define "title" }}AiChaos Warners - Flash Animations{{ end }}
+{{ define "content" }}
+
+<h1>AiChaos Warners</h1>
+
+<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
+
+<div id="swfObject"></div>
+<br><br>
+
+<script>
+	swfobject.embedSWF("/creativity/flash/warners.swf", "swfObject",
+		550, 400,
+		"10.0.0"
+	);
+</script>
+
+
+&#0171; <a href="/flash">More Flash Animations</a>
+
+{{ end }}

www/flash/aichaos-warners.html

@@ -1,15 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}AiChaos Warners - Flash Animations{% endblock %}
-{% block content %}
-
-<h1>AiChaos Warners</h1>
-
-{% set swf_path="/creativity/flash/warners.swf" %}
-{% set swf_width=550 %}
-{% set swf_height=400 %}
-{% include "flash/flash-common.html" %}
-
-
-&#0171; <a href="/flash">More Flash Animations</a>
-
-{% endblock %}

www/flash/flash-common.html

@@ -1,12 +0,0 @@
-<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
-
-<div id="swfObject"></div>
-<br><br>
-
-<script>
-	swfobject.embedSWF("{{ swf_path }}", "swfObject",
-		{{ swf_width }}, {{ swf_height }},
-		"10.0.0"
-	);
-</script>
-

www/flash/index.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Flash Animations{{ end }}
-{% block title %}Flash Animations{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Flash Animations</h1>
 
@@ -34,4 +33,4 @@ their main problem was AIM's warning system. Almost anybody could warn the bot p
 attack). This is a short Flash animation I put up to give the warners a piece of
 my mind.
 
-{% endblock %}
+{{ end }}

www/flash/kanian-azulian-war.gohtml

@@ -0,0 +1,20 @@
+{{ define "title" }}Kanian/Azulian War - Flash Animations{{ end }}
+{{ define "content" }}
+
+<h1>Kanian/Azulian War</h1>
+
+<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
+
+<div id="swfObject"></div>
+<br><br>
+
+<script>
+	swfobject.embedSWF("/creativity/flash/KanianAzuWar.swf", "swfObject",
+		550, 400,
+		"10.0.0"
+	);
+</script>
+
+&#0171; <a href="/flash">More Flash Animations</a>
+
+{{ end }}

www/flash/kanian-azulian-war.html

@@ -1,14 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}Kanian/Azulian War - Flash Animations{% endblock %}
-{% block content %}
-
-<h1>Kanian/Azulian War</h1>
-
-{% set swf_path="/creativity/flash/KanianAzuWar.swf" %}
-{% set swf_width=550 %}
-{% set swf_height=400 %}
-{% include "flash/flash-common.html" %}
-
-&#0171; <a href="/flash">More Flash Animations</a>
-
-{% endblock %}

www/flash/pwnizard-i-choose-you.gohtml

@@ -0,0 +1,20 @@
+{{ define "title" }}Pwnizard, I Choose You! - Flash Animations{{ end }}
+{{ define "content" }}
+
+<h1>Pwnizard, I Choose You!</h1>
+
+<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
+
+<div id="swfObject"></div>
+<br><br>
+
+<script>
+	swfobject.embedSWF("/creativity/flash/pwnizard.swf", "swfObject",
+		550, 400,
+		"10.0.0"
+	);
+</script>
+
+&#0171; <a href="/flash">More Flash Animations</a>
+
+{{ end }}

www/flash/pwnizard-i-choose-you.html

@@ -1,14 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}Pwnizard, I Choose You! - Flash Animations{% endblock %}
-{% block content %}
-
-<h1>Pwnizard, I Choose You!</h1>
-
-{% set swf_path="/creativity/flash/pwnizard.swf" %}
-{% set swf_width=480 %}
-{% set swf_height=320 %}
-{% include "flash/flash-common.html" %}
-
-&#0171; <a href="/flash">More Flash Animations</a>
-
-{% endblock %}

www/fonts.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}TrueType Fonts{{ end }}
-{% block title %}TrueType Fonts{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>TrueType Fonts</h1>
 
@@ -48,4 +47,4 @@ letters than are in the English alphabet and I did that on purpose.<p>
 
 &#0164; <a href="/download?project=TTF&file=Lorelei.zip">Download Lorelei.ttf</a> (ZIP; 7.66 KB)
 
-{% endblock %}
+{{ end }}

www/google-ads.inc.html

@@ -1,33 +0,0 @@
-{# Google ads for Kirsle.net #}
-
-{% macro nav_ads() %}
-	<div style="text-align: center">
-		<script type="text/javascript"><!--
-			google_ad_client = "ca-pub-0838718168234603";
-			/* Kirsle.net Nav */
-			google_ad_slot = "1728209841";
-			google_ad_width = 120;
-			google_ad_height = 240;
-			//-->
-		</script>
-		<script type="text/javascript"
-			src="//pagead2.googlesyndication.com/pagead/show_ads.js">
-		</script>
-	</div>
-{% endmacro %}
-
-{% macro leaderboard() %}
-	<div style="text-align: center" class="google-leaderboard">
-		<script type="text/javascript"><!--
-			google_ad_client = "ca-pub-0838718168234603";
-			/* Kirsle.net Leaderboard */
-			google_ad_slot = "9251476641";
-			google_ad_width = 728;
-			google_ad_height = 90;
-			//-->
-		</script>
-		<script type="text/javascript"
-			src="//pagead2.googlesyndication.com/pagead/show_ads.js">
-		</script>
-	</div>
-{% endmacro %}

www/guestbook.gohtml

@@ -0,0 +1,8 @@
+{{ define "title" }}My Guestbook{{ end }}
+{{ define "content" }}
+
+<h1>My Guestbook</h1>
+
+{{ RenderComments "Guestbook" "guestbook" }}
+
+{{ end }}

www/guestbook.html

@@ -1,13 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}My Guestbook{% endblock %}
-{% block content %}
-
-<h1>My Guestbook</h1>
-
-{{ include_page("comment.partial_index",
-	thread="guestbook",
-	subject="My Guestbook",
-	header=False,
-) | safe }}
-
-{% endblock %}

www/javascript.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Creative JavaScripts{{ end }}
-{% block title %}Creative JavaScripts{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Creative JavaScripts</h1>
 
@@ -31,7 +30,7 @@ programming and attention to detail.<p>
 &#0164; <a href="creativity/javascript/jsrpg.html" onClick="return openWin(this)">
 	View this script in action</a><p>
 
-{% endblock %}
+{{ end }}
 {% block scripts %}
 <script type="text/javascript">
 function openWin(obj) {
@@ -39,4 +38,4 @@ function openWin(obj) {
 	return false;
 }
 </script>
-{% endblock %}
+{% endblock %}

www/msdos.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}MS-DOS{{ end }}
-{% block title %}MS-DOS{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>MS-DOS &amp; Software</h1>
 
@@ -54,10 +53,6 @@ with VirtualBox's emulated hardware. Drivers include:
 
 For tips, tricks, or to leave comments, see the relevant blog post "<a href="/blog/kirsle/ms-dos-and-windows-3-1">MS-DOS and Windows 3.1</a>". The comments on that blog post are shared to this page as well (so comments on either page show up in both places).<p>
 
-{{ include_page("comment.partial_index",
+{{ RenderComments "MS-DOS" "post-42" }}
-	thread="blog-42",
-	subject="MS-DOS",
-	header=False,
-) | safe }}
 
-{% endblock %}
+{{ end }}

www/pccc.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Perl CyanChat Client{{ end }}
-{% block title %}Perl CyanChat Client{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Perl CyanChat Client</h1>
 
@@ -351,4 +350,4 @@
 </tr>
 </table>
 
-{% endblock %}
+{{ end }}

www/raspberrypi.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Raspberry Pi{{ end }}
-{% block title %}Raspberry Pi{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Raspberry Pi</h1>
 
@@ -83,4 +82,4 @@ started one, shut it down and restart it.
 	subject="Raspberry Pi",
 ) | safe }}
 
-{% endblock %}
+{{ end }}

www/rendering.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}3D Renderings{{ end }}
-{% block title %}3D Renderings{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>3D Renderings</h1>
 
@@ -125,4 +124,4 @@ modeled more or less in AutoCAD 2006 and rendered in 3DS Max 8.<p>
 	</tr>
 </table>
 
-{% endblock %}
+{{ end }}

www/rivescript.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}RiveScript{{ end }}
-{% block title %}RiveScript{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>RiveScript</h1>
 
@@ -177,4 +176,4 @@ What is its name?
 	could utilize, or provide the source code to allow it to be directly compiled in with other
 	programs.
 
-{% endblock %}
+{{ end }}

www/solar/ui.css

@@ -91,13 +91,16 @@ input[type="email"],
 textarea,
 input[type="file"],
 select { /* To hell with IE */
-	background-color: #000000 !important;
+	background-color: #000 !important;
-	border: 1px solid #999;
+	border: 1px solid #999 !important;
 	font-family: Verdana,Arial,Helvetica,sans-serif !important;
 	font-size: small !important;
 	color: #FFF !important;
 	margin: 2px 0px;
-	max-width: 400px;
+	max-width: 600px;
+}
+input:focus, textarea:focus, select:focus {
+	border: 1px solid #09F !important;
 }
 acronym,abbr {
 	border-bottom: 1px dotted #BEBEBE;
@@ -117,6 +120,10 @@ acronym,abbr {
 }
 
 /* Bootstrap CSS overrides */
+a.btn {
+	text-decoration: none;
+	color: white;
+}
 p {
 	margin: 10px 0px;
 }
@@ -130,6 +137,10 @@ li > ul, li > ol {
 blockquote {
 	margin: 20px 0px;
 }
+.card {
+	background-color: transparent;
+	border: 1px dashed #006699;
+}
 
 /* Our own custom nav button for Bootstrap */
 .mobile-nav {
@@ -234,120 +245,17 @@ table.table td {
 	float: left
 }
 
-/**********
- * Photos *
- **********/
-
-/* Photo Upload page */
-.photo-upload-dropbox {
-    border: 2px dashed #0099FF;
-    padding: 40px;
-}
-.photo-upload-dropbox.active {
-    border: 4px dashed #FF99FF;
-}
-.upload-trough {
-    position: relative;
-    border: 1px solid #000000;
-    width: 100%;
-    height: 28px;
-}
-.upload-progress-bar {
-    position: relative;
-    width: 0%;
-    height: 100%;
-    background-color: #FF9900;
-}
-
-/* Photo Grids: see http://ansciath.tumblr.com/post/7347495869/css-aspect-ratio */
-ul.photo-grid {
-	list-style: none;
-	display: inline;
-	margin: 0;
-	padding: 0;
-	position: relative;
-}
-
-ul.photo-grid li {
-	position: relative;
-	/*float: left;*/
-	display: inline-block;
-	width: 260px;
-	height: 260px;
-	margin-left: 20px;
-	margin-top: 20px;
-}
-
-ul.photo-grid li .dummy {
-	padding-top: 100%;
-}
-
-.photo-grid-item {
-	cursor: pointer;
-	overflow: hidden; /* Crop off long names, etc. */
-
-	/* We use absolute positioning to detach this element from the flow, */
-	/* allowing the .dummy to dictate the height of the square. */
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-}
-
-.photo-grid-item img {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-}
-
-.photo-grid-item .name {
-	position: absolute;
-	top: 4px;
-	left: 4px;
-	right: 4px;
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-	color: #FFFFFF;
-	text-align: left;
-	text-shadow: 1px 1px 0px #000000,
-				-1px -1px 0px #000000,
-				 1px -1px 0px #000000,
-				-1px 1px 0px #000000;
-}
-
-.photo-description {
-	display: block;
-	border: 1px solid #FF99FF;
-	box-shadow: 0px 0px 4px #0099FF;
-	padding: 10px;
-	margin: 20px 0px;
-	background-color: #000000;
-	width: 790px;
-}
-
-/*ul#arrange-photos {
-	list-style-type: none;
-	margin: 0px;
-	padding: 0px;
-}
-ul#arrange-photos li {
-	cursor: pointer;
-	margin: 20px;
-	padding: 1px;
-	float: left;
-	width: 150px;
-}*/
-
 /********
  * Blog *
  *******/
 
+.blog-title {
+	display: block;
+	padding-bottom: 0;
+}
+
 /* Blog titles when shown on index view */
-a.blog-title-index:link, a.blog-title-index:visited {
+a.blog-title:link, a.blog-title:visited {
 	font-family: "Trebuchet MS",Verdana,Arial,sans-serif;
 	font-size: 32pt;
 	font-weight: bold;
@@ -356,59 +264,47 @@ a.blog-title-index:link, a.blog-title-index:visited {
 	-moz-text-shadow: 0px 0px 10px #0099FF;
 	-webkit-text-shadow: 0px 0px 10px #0099FF
 }
-a.blog-title-index:hover, a.blog-title-index:active {
+a.blog-title:hover, a.blog-title:active {
 	text-decoration: underline;
 	text-shadow: 0px 0px 10px #FF99FF;
 	-moz-text-shadow: 0px 0px 10px #FF99FF;
 	-webkit-text-shadow: 0px 0px 10px #FF99FF
 }
 
-/* Poster's avatar box */
+.blog-meta .blog-private,
-.blog-author, .comment-author {
+.blog-meta .blog-unlisted,
-	float: right;
+.blog-meta .blog-draft,
-	background-color: #444444;
+.blog-meta .blog-sticky {
-	border: 1px solid #CCCCCC;
-	padding: 2px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px; /* 96 avatar width + 4px padding */
-	text-align: center;
-	font-weight: bold
-}
-.blog-author a, .comment-author a {
-	text-decoration: none;
-}
-div.siikir-avatar {
-	width: 96px;
-	margin: auto;
-}
-
-.blog-entry-private, .blog-entry-draft, .blog-entry-sticky {
 	font-weight: bold;
 	font-style: normal;
 }
 
-.blog-entry-private {
+.blog-meta .blog-private,
+.blog-meta .blog-unlisted {
 	color: #FF9900;
 }
 
-.blog-entry-draft {
+.blog-meta .blog-draft {
 	color: #00FFFF;
 }
 
-.blog-entry-sticky {
+.blog-meta .blog-sticky {
 	color: #FF99FF;
 }
 
 /* Timestamp and author line below blog titles */
-.blog-timestamp {
+.blog-meta, .comment-meta {
 	font-size: smaller;
 	font-style: italic;
-	padding-left: 30px;
+	margin-top: 1rem;
-	padding-top: 5px;
+	margin-bottom: 2rem;
-	padding-bottom: 10px
+}
+.comment-meta {
+	margin-top: 0;
+	margin-bottom: 1rem;
 }
 
+/* TODO */
 ul.blog-categories {
 	list-style: none;
 	display: inline;
@@ -425,40 +321,6 @@ ul.blog-categories li:last-child:after {
 	content: "";
 }
 
-/* Blog comment wrapper */
-.comment {
-	border: 1px dashed #006699;
-	padding: 5px
-}
-.comment-editable {
-	color: #FF9900;
-}
-
-/* Wiki */
-a.wiki-broken {
-	color: #FF9900;
-}
-
-/********************
- * Visitor Tracking *
- ********************/
-
-.visitor-graph {
-	height: 16px;
-	width: 100%;
-	border: 1px outset;
-}
-.visitor-graph.unique {
-	background-color: #0099FF;
-	background-image: url("/static/images/blue-clearlooks.png");
-	border-color: #0099FF;
-}
-.visitor-graph.hits {
-	background-color: #FF99FF;
-	background-image: url("/static/images/pink-clearlooks.png");
-	border-color: #FF99FF;
-}
-
 /*******************************************************************************
  * Supernova Website Design Classes - Copyright 2009 Casey Kirsle - Kirsle.com *
  ******************************************************************************/
@@ -481,13 +343,6 @@ a.wiki-broken {
 	height: auto;
 }
 
-/* Hide the uber wide leaderboard Google ad on mobile */
-@media (max-width: 940px) {
-	.google-leaderboard {
-		display: none;
-	}
-}
-
 /*************
  * Eye Candy *
  ************/

www/start.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}Start Page{{ end }}
-{% block title %}Start Page{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Start Page</h1>
 
@@ -20,7 +19,7 @@
 
 <em>David is the best.</em>
 
-{% endblock %}
+{{ end }}
 {% block scripts %}
 <script>
 	$(document).ready(function() {

www/tkcalc.gohtml

@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
+{{ define "title" }}TkCalc{{ end }}
-{% block title %}TkCalc{% endblock %}
+{{ define "content" }}
-{% block content %}
 
 <h1>Tk Calculator</h1>
 
@@ -151,4 +150,4 @@
 </tr>
 </table>
 
-{% endblock %}
+{{ end }}