diff --git a/content_muflax/index.mkd b/content_muflax/index.mkd
index a70b2b3..a1e26f4 100644
--- a/content_muflax/index.mkd
+++ b/content_muflax/index.mkd
@@ -19,24 +19,61 @@ There is also [Twitter][].
# Sites
-<%= site_link :blog %>
+
-<%= site_link :daily %>
+<%= render "list-site",
+ :domain => "blog",
+ :desc => "A Blog" %>
-<%= site_link :letsread %>
+<%= render "list-site",
+ :domain => "daily",
+ :desc => "Daily[^daily] Practice" %>
-<%= site_link :sutra %>
+<%= render "list-site",
+ :domain => "letsread",
+ :desc => "Reading Is Radical" %>
-<%= site_link :gospel %>
+<%= render "list-site",
+ :domain => "sutra",
+ :desc => "Bloggin' The Sutras" %>
+
+<%= render "list-site",
+ :domain => "gospel",
+ :desc => "(a work in progress)" %>
+
+
+
+[^daily]: On average.
# Topics
-<%= topic_link "Antinatalism", "muflax:morality/antinatalism" %>
+
-<%= topic_link "Crackpottery", "blog:crackpottery/crackpot-beliefs-the-theory" %>
+<%= render "list-topic",
+ :topic => "Antinatalism",
+ :link => "muflax:morality/antinatalism",
+ :desc => "Being Born Sucks" %>
-<%= topic_link "Dark Stance", "muflax:morality/stances" %>
+<%= render "list-topic",
+ :topic => "Crackpottery",
+ :link => "blog:crackpottery/crackpot-beliefs-the-theory",
+ :desc => "Warranted Crackpot Belief" %>
-<%= topic_link "Experiments", "blog:experiments" %>
+<%= render "list-topic",
+ :topic => "Dark Stance",
+ :link => "muflax:morality/stances",
+ :desc => "Transform Nothing, Seek No Gain" %>
-<%= topic_link "Meta-Ethics", "blog:morality" %>
+<%= render "list-topic",
+ :topic => "Experiments",
+ :link => "blog:experiments",
+ :desc => "Trying Cool Stuff" %>
+
+<%= render "list-topic",
+ :topic => "Meta-Ethics",
+ :link => "blog:morality",
+ :desc => "Solving Morality" %>
+
+
+
+
diff --git a/layouts/list-site.erb b/layouts/list-site.erb
new file mode 100644
index 0000000..baea804
--- /dev/null
+++ b/layouts/list-site.erb
@@ -0,0 +1,13 @@
+
+
+
+ <%= @site.site_yaml["sites"][@domain]["title"] %>
+
+
+
+
+ <%= @desc %>
+
+
+
+
diff --git a/layouts/list-topic.erb b/layouts/list-topic.erb
new file mode 100644
index 0000000..5902837
--- /dev/null
+++ b/layouts/list-topic.erb
@@ -0,0 +1,13 @@
+
+
+
+ <%= @topic %>
+
+
+
+
+ <%= @desc %>
+
+
+
+
diff --git a/lib/links.rb b/lib/links.rb
index 91bab9f..c5788d8 100644
--- a/lib/links.rb
+++ b/lib/links.rb
@@ -1,3 +1,5 @@
+# translates various link formats / demands into urls
+
def local_link url
if m = url.match(/^(?\w+):(?.+)$/)
"#{site_url m[:site]}/#{m[:page]}"
@@ -10,21 +12,6 @@ def site_url site
"http://#{site == "muflax" ? "" : "#{site}."}muflax.com"
end
-def site_link site
- site = site.to_s
-
- url = site_url site
- title = @site.site_yaml["sites"][site]["title"]
-
- "#{url} - #{title}"
-end
-
-def topic_link topic, target
- url = local_link target
-
- "#{url} - #{topic}"
-end
-
class Nanoc::Site
def moved_pages
moved = []
diff --git a/sites.yaml b/sites.yaml
index ac19ef7..c63c4f3 100644
--- a/sites.yaml
+++ b/sites.yaml
@@ -3,7 +3,7 @@ sites:
title: lies and wonderland
disqus_site: muflax
blog:
- title: muflax\' mindstream
+ title: muflax' mindstream
disqus_site: muflaxblog
sutra:
title: Blogchen
@@ -12,7 +12,7 @@ sites:
title: muflax becomes a saint
disqus_site: dailymuflax
letsread:
- title: Let\'s Read
+ title: Let's Read
disqus_site: muflaxread
gospel:
- title: Unchanging Gospel
\ No newline at end of file
+ title: The Unchanging Gospel
\ No newline at end of file