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 %> + + +[^daily]: On average. # Topics -<%= topic_link "Antinatalism", "muflax:morality/antinatalism" %> + + +
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