aboutsummaryrefslogtreecommitdiffstats
path: root/bn_django/templates
diff options
context:
space:
mode:
Diffstat (limited to 'bn_django/templates')
-rw-r--r--bn_django/templates/about.html1
-rw-r--r--bn_django/templates/base.html8
-rw-r--r--bn_django/templates/comment_list2
-rw-r--r--bn_django/templates/frontpage.html2
4 files changed, 9 insertions, 4 deletions
diff --git a/bn_django/templates/about.html b/bn_django/templates/about.html
index 16ebf99..1fcd7aa 100644
--- a/bn_django/templates/about.html
+++ b/bn_django/templates/about.html
@@ -20,6 +20,7 @@ This website is the web presence of Bryan Newbold. It serves as a:
<dt /><a href="/knowledge/">brain dump</a>
<dd /> so I won't forget
<dt /><a href="/photos/">photo gallery</a>
+ <dt /><a href="/journal/">journal</a>
<dt /><a href="http://planet.bnewbold.net/">rss aggregator</a>
<dt /><a href="http://git.bnewbold.net/">browsable code repository</a>
<dd /> so people (including myself!) don't have to rewrite
diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html
index 6ccdc7f..d67b18f 100644
--- a/bn_django/templates/base.html
+++ b/bn_django/templates/base.html
@@ -22,15 +22,17 @@
<link rel="alternate stylesheet" type="text/css"
href="/static/style/flexy-nuts-serif.css" title="flexy-nuts-serif" />
{% endblock %}
-{% block externaljs %} {% endblock %}
+{% block externaljs %} {% endblock %} {% block otherhead %} {% endblock %}
<title>{% block windowtitle %}bnewbold.net{% endblock %}</title>
</head>
<body>
<div id="top_bar">
<div id="top_bar_content">
- <span class="righty"><a href="/knowledge/">knowledge</a>&nbsp;
+ <span class="righty">
+ <a href="/journal/">journal</a>&nbsp;
<a href="/photos/">photos</a>&nbsp;
- <a href="/code/">code</a></span>
+ <a href="/code/">code</a>&nbsp;
+ <a href="/knowledge/">knowledge</a></span>
<span class="lefty"><a href="/">bnewbold.net</a></span>
</div>
</div>
diff --git a/bn_django/templates/comment_list b/bn_django/templates/comment_list
index 0629541..d00dc6a 100644
--- a/bn_django/templates/comment_list
+++ b/bn_django/templates/comment_list
@@ -16,7 +16,7 @@
<span class="comment_headline">{{ c.headline|escape|wordwrap:80 }}</span>
<br />
{% endif %}
- <span class="comment_content">{{ c.comment|escape|wordwrap:80 }}</span>
+ <span class="comment_content">{{ c.comment|escape|linebreaks|wordwrap:80 }}</span>
</td></tr>
{% endfor %}
{% for c in free_comments %}
diff --git a/bn_django/templates/frontpage.html b/bn_django/templates/frontpage.html
index a8c0e40..a23b8ee 100644
--- a/bn_django/templates/frontpage.html
+++ b/bn_django/templates/frontpage.html
@@ -15,6 +15,8 @@
<br />
Other sites: <br />
&nbsp; - <a href="http://web.mit.edu/bnewbold/www"> athena locker</a><br />
+ &nbsp; - <a href="http://planet.bnewbold.net"> planet</a><br />
+ &nbsp; - <a href="http://equator.memeschemes.com"> equator</a><br />
{% endblock %}
{% block content %}