@@ -453,12 +427,11 @@ Palette Town. This is what happened...
My gym badges so far. I never got the 1st badge.
- {% if page == "3" %}
-
@@ -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 %}
-{{ include_page("comment.partial_index",
- thread="article-firered",
- subject="Sequence Breaking FireRed Version",
-) | safe }}
+{{ RenderComments "Sequence Breaking Pokémon FireRed" "article-firered" }}
-{% endblock %}
\ No newline at end of file
+{{ end }}
diff --git a/www/flash/aichaos-warners.gohtml b/www/flash/aichaos-warners.gohtml
new file mode 100644
index 0000000..59919b7
--- /dev/null
+++ b/www/flash/aichaos-warners.gohtml
@@ -0,0 +1,21 @@
+{{ define "title" }}AiChaos Warners - Flash Animations{{ end }}
+{{ define "content" }}
+
+
AiChaos Warners
+
+
+
+
+
+
+
+
+
+«
More Flash Animations
+
+{{ end }}
diff --git a/www/flash/aichaos-warners.html b/www/flash/aichaos-warners.html
deleted file mode 100644
index 0eecfa5..0000000
--- a/www/flash/aichaos-warners.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}AiChaos Warners - Flash Animations{% endblock %}
-{% block content %}
-
-
AiChaos Warners
-
-{% set swf_path="/creativity/flash/warners.swf" %}
-{% set swf_width=550 %}
-{% set swf_height=400 %}
-{% include "flash/flash-common.html" %}
-
-
-«
More Flash Animations
-
-{% endblock %}
diff --git a/www/flash/flash-common.html b/www/flash/flash-common.html
deleted file mode 100644
index 635be86..0000000
--- a/www/flash/flash-common.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
diff --git a/www/flash/index.html b/www/flash/index.gohtml
similarity index 94%
rename from www/flash/index.html
rename to www/flash/index.gohtml
index 475d936..f0eb2c1 100644
--- a/www/flash/index.html
+++ b/www/flash/index.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}Flash Animations{% endblock %}
-{% block content %}
+{{ define "title" }}Flash Animations{{ end }}
+{{ define "content" }}
Flash Animations
@@ -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 %}
\ No newline at end of file
+{{ end }}
diff --git a/www/flash/kanian-azulian-war.gohtml b/www/flash/kanian-azulian-war.gohtml
new file mode 100644
index 0000000..8dfde45
--- /dev/null
+++ b/www/flash/kanian-azulian-war.gohtml
@@ -0,0 +1,20 @@
+{{ define "title" }}Kanian/Azulian War - Flash Animations{{ end }}
+{{ define "content" }}
+
+
Kanian/Azulian War
+
+
+
+
+
+
+
+
+«
More Flash Animations
+
+{{ end }}
diff --git a/www/flash/kanian-azulian-war.html b/www/flash/kanian-azulian-war.html
deleted file mode 100644
index 73bda4b..0000000
--- a/www/flash/kanian-azulian-war.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}Kanian/Azulian War - Flash Animations{% endblock %}
-{% block content %}
-
-
Kanian/Azulian War
-
-{% set swf_path="/creativity/flash/KanianAzuWar.swf" %}
-{% set swf_width=550 %}
-{% set swf_height=400 %}
-{% include "flash/flash-common.html" %}
-
-«
More Flash Animations
-
-{% endblock %}
diff --git a/www/flash/pwnizard-i-choose-you.gohtml b/www/flash/pwnizard-i-choose-you.gohtml
new file mode 100644
index 0000000..6dadea3
--- /dev/null
+++ b/www/flash/pwnizard-i-choose-you.gohtml
@@ -0,0 +1,20 @@
+{{ define "title" }}Pwnizard, I Choose You! - Flash Animations{{ end }}
+{{ define "content" }}
+
+
Pwnizard, I Choose You!
+
+
+
+
+
+
+
+
+«
More Flash Animations
+
+{{ end }}
diff --git a/www/flash/pwnizard-i-choose-you.html b/www/flash/pwnizard-i-choose-you.html
deleted file mode 100644
index 6c65cd6..0000000
--- a/www/flash/pwnizard-i-choose-you.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}Pwnizard, I Choose You! - Flash Animations{% endblock %}
-{% block content %}
-
-
Pwnizard, I Choose You!
-
-{% set swf_path="/creativity/flash/pwnizard.swf" %}
-{% set swf_width=480 %}
-{% set swf_height=320 %}
-{% include "flash/flash-common.html" %}
-
-«
More Flash Animations
-
-{% endblock %}
diff --git a/www/fonts.html b/www/fonts.gohtml
similarity index 94%
rename from www/fonts.html
rename to www/fonts.gohtml
index 254c551..d96df90 100644
--- a/www/fonts.html
+++ b/www/fonts.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}TrueType Fonts{% endblock %}
-{% block content %}
+{{ define "title" }}TrueType Fonts{{ end }}
+{{ define "content" }}
TrueType Fonts
@@ -48,4 +47,4 @@ letters than are in the English alphabet and I did that on purpose.
¤ Download Lorelei.ttf (ZIP; 7.66 KB)
-{% endblock %}
\ No newline at end of file
+{{ end }}
diff --git a/www/google-ads.inc.html b/www/google-ads.inc.html
deleted file mode 100644
index 73c7390..0000000
--- a/www/google-ads.inc.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{# Google ads for Kirsle.net #}
-
-{% macro nav_ads() %}
-
-
-
-
-{% endmacro %}
-
-{% macro leaderboard() %}
-
-
-
-
-{% endmacro %}
diff --git a/www/guestbook.gohtml b/www/guestbook.gohtml
new file mode 100644
index 0000000..50ed42e
--- /dev/null
+++ b/www/guestbook.gohtml
@@ -0,0 +1,8 @@
+{{ define "title" }}My Guestbook{{ end }}
+{{ define "content" }}
+
+
My Guestbook
+
+{{ RenderComments "Guestbook" "guestbook" }}
+
+{{ end }}
diff --git a/www/guestbook.html b/www/guestbook.html
deleted file mode 100644
index 9a098d2..0000000
--- a/www/guestbook.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}My Guestbook{% endblock %}
-{% block content %}
-
-
My Guestbook
-
-{{ include_page("comment.partial_index",
- thread="guestbook",
- subject="My Guestbook",
- header=False,
-) | safe }}
-
-{% endblock %}
\ No newline at end of file
diff --git a/www/javascript.html b/www/javascript.gohtml
similarity index 93%
rename from www/javascript.html
rename to www/javascript.gohtml
index 801d190..dd46ce1 100644
--- a/www/javascript.html
+++ b/www/javascript.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}Creative JavaScripts{% endblock %}
-{% block content %}
+{{ define "title" }}Creative JavaScripts{{ end }}
+{{ define "content" }}
Creative JavaScripts
@@ -31,7 +30,7 @@ programming and attention to detail.
¤
View this script in action
-{% endblock %}
+{{ end }}
{% block scripts %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/www/msdos.html b/www/msdos.gohtml
similarity index 91%
rename from www/msdos.html
rename to www/msdos.gohtml
index 79edfc3..2946e18 100644
--- a/www/msdos.html
+++ b/www/msdos.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}MS-DOS{% endblock %}
-{% block content %}
+{{ define "title" }}MS-DOS{{ end }}
+{{ define "content" }}
MS-DOS & Software
@@ -54,10 +53,6 @@ with VirtualBox's emulated hardware. Drivers include:
For tips, tricks, or to leave comments, see the relevant blog post "
MS-DOS and Windows 3.1". The comments on that blog post are shared to this page as well (so comments on either page show up in both places).
-{{ include_page("comment.partial_index",
- thread="blog-42",
- subject="MS-DOS",
- header=False,
-) | safe }}
+{{ RenderComments "MS-DOS" "post-42" }}
-{% endblock %}
+{{ end }}
diff --git a/www/pccc.html b/www/pccc.gohtml
similarity index 98%
rename from www/pccc.html
rename to www/pccc.gohtml
index 7d74f5d..4734399 100644
--- a/www/pccc.html
+++ b/www/pccc.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}Perl CyanChat Client{% endblock %}
-{% block content %}
+{{ define "title" }}Perl CyanChat Client{{ end }}
+{{ define "content" }}
Perl CyanChat Client
@@ -351,4 +350,4 @@
-{% endblock %}
+{{ end }}
diff --git a/www/raspberrypi.html b/www/raspberrypi.gohtml
similarity index 95%
rename from www/raspberrypi.html
rename to www/raspberrypi.gohtml
index a1d06b4..f6a674b 100644
--- a/www/raspberrypi.html
+++ b/www/raspberrypi.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}Raspberry Pi{% endblock %}
-{% block content %}
+{{ define "title" }}Raspberry Pi{{ end }}
+{{ define "content" }}
Raspberry Pi
@@ -83,4 +82,4 @@ started one, shut it down and restart it.
subject="Raspberry Pi",
) | safe }}
-{% endblock %}
\ No newline at end of file
+{{ end }}
diff --git a/www/rendering.html b/www/rendering.gohtml
similarity index 97%
rename from www/rendering.html
rename to www/rendering.gohtml
index f7033f9..6021746 100644
--- a/www/rendering.html
+++ b/www/rendering.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}3D Renderings{% endblock %}
-{% block content %}
+{{ define "title" }}3D Renderings{{ end }}
+{{ define "content" }}
3D Renderings
@@ -125,4 +124,4 @@ modeled more or less in AutoCAD 2006 and rendered in 3DS Max 8.
-{% endblock %}
+{{ end }}
diff --git a/www/rivescript.html b/www/rivescript.gohtml
similarity index 98%
rename from www/rivescript.html
rename to www/rivescript.gohtml
index 7eedaec..4824a7f 100644
--- a/www/rivescript.html
+++ b/www/rivescript.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}RiveScript{% endblock %}
-{% block content %}
+{{ define "title" }}RiveScript{{ end }}
+{{ define "content" }}
RiveScript
@@ -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 }}
diff --git a/www/solar/ui.css b/www/solar/ui.css
index 56f46bb..a20ea7c 100644
--- a/www/solar/ui.css
+++ b/www/solar/ui.css
@@ -91,13 +91,16 @@ input[type="email"],
textarea,
input[type="file"],
select { /* To hell with IE */
- background-color: #000000 !important;
- border: 1px solid #999;
+ background-color: #000 !important;
+ 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-author, .comment-author {
- float: right;
- background-color: #444444;
- 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 {
+.blog-meta .blog-private,
+.blog-meta .blog-unlisted,
+.blog-meta .blog-draft,
+.blog-meta .blog-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;
- padding-top: 5px;
- padding-bottom: 10px
+ margin-top: 1rem;
+ margin-bottom: 2rem;
+}
+.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 *
************/
diff --git a/www/start.html b/www/start.gohtml
similarity index 91%
rename from www/start.html
rename to www/start.gohtml
index b6254e1..24af955 100644
--- a/www/start.html
+++ b/www/start.gohtml
@@ -1,6 +1,5 @@
-{% extends "layout.html" %}
-{% block title %}Start Page{% endblock %}
-{% block content %}
+{{ define "title" }}Start Page{{ end }}
+{{ define "content" }}
Start Page
@@ -20,7 +19,7 @@
David is the best.
-{% endblock %}
+{{ end }}
{% block scripts %}