aaaah

4 files changed, 26 insertions, 24 deletions

diff --git a/tmpl/index.atom.erb b/tmpl/index.atom.erb
index cd70f7e..54e4b72 100644
--- a/tmpl/index.atom.erb
+++ b/tmpl/index.atom.erb
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
 	<title>AndrewDM.me <%= @title %></title>
@@ -9,19 +8,5 @@
 	<author><%= Person.new("Andrew Murrell").atom %></author>
 	<id><%= $url %></id>
 
-	<% @pages.sort_by{|p| p.updated}.reverse.each do |page| %>
-	<entry xmlns="http://www.w3.org/2005/Atom">
-		<link rel="alternate" type="text/html" href="<%= page.url %>"/>
-		<id><%= page.url %></id>
-		<updated><%= page.updated.rfc3339 %></updated>
-		<published><%= page.published.rfc3339 %></published>
-		<title><%= page.title %></title>
-		<author><%= page.author.atom %></author>
-<% if page.content %>
-		<content type="html"><%= html_escape(page.content) %></content>
-<% end %><% if page.rights %>
-		<rights type="html"><%= html_escape(page.rights) %></rights>
-<% end %>
-	</entry>
-	<% end %>
+	<% @pages.sort_by{|p| p.updated}.reverse.each do |page| %><%=@page.atom %><% end %>
 </feed>
diff --git a/tmpl/index.md.erb b/tmpl/index.md.erb
index a3ec547..680647d 100644
--- a/tmpl/index.md.erb
+++ b/tmpl/index.md.erb
@@ -1,12 +1,7 @@
 ---
-title: "<%= @title %>"
+title: "<%= atom_title %>"
 class: "index"
 ---
 
-<% @sections.keys.sort.each do |path| %>
-<% unless path.empty? %>## [<%= @sections[path]['head'] %>](<%= path %>)<% end %>
-
-<% @sections[path]['body'].sort_by{|a|a.published}.reverse.each do |a| %>
- * <span><a <% if a.is_a?(ExternPage) %>class="external" <% end %>href="<%= @url.route_to(a.url) %>" title="Published on <%= a.published.strftime('%Y-%m-%d') %><% if a.updated != a.published %> (updated on<%= a.updated.strftime('%Y-%m-%d') %>)<% end %>"><%= a.title %></a></span><span><% a.tags.each do |t| %><%= t.html %><% end %></span><% end %>
-
-<% end %>
+<% index_pages.sort_by{|a|a.atom_published}.reverse.each do |a| %>
+ * <span><a <% if a.is_a?(RemotePage) %>class="external" <% end %>href="<%= Config::get.url.route_to(a.url) %>" title="Published on <%= a.atom_published.strftime('%Y-%m-%d') %><% if a.atom_updated != a.atom_published %> (updated on<%= a.atom_updated.strftime('%Y-%m-%d') %>)<% end %>"><%= a.title %></a></span><span><% a.atom_categories.each do |t| %><%= t.html %><% end %></span><% end %>
diff --git a/tmpl/index.md.erb.bak b/tmpl/index.md.erb.bak
new file mode 100644
index 0000000..a3ec547
--- /dev/null
+++ b/tmpl/index.md.erb.bak
@@ -0,0 +1,12 @@
+---
+title: "<%= @title %>"
+class: "index"
+---
+
+<% @sections.keys.sort.each do |path| %>
+<% unless path.empty? %>## [<%= @sections[path]['head'] %>](<%= path %>)<% end %>
+
+<% @sections[path]['body'].sort_by{|a|a.published}.reverse.each do |a| %>
+ * <span><a <% if a.is_a?(ExternPage) %>class="external" <% end %>href="<%= @url.route_to(a.url) %>" title="Published on <%= a.published.strftime('%Y-%m-%d') %><% if a.updated != a.published %> (updated on<%= a.updated.strftime('%Y-%m-%d') %>)<% end %>"><%= a.title %></a></span><span><% a.tags.each do |t| %><%= t.html %><% end %></span><% end %>
+
+<% end %>
diff --git a/tmpl/page.atom.erb b/tmpl/page.atom.erb
new file mode 100644
index 0000000..ea37ea5
--- /dev/null
+++ b/tmpl/page.atom.erb
@@ -0,0 +1,10 @@
+<entry xmlns="http://www.w3.org/2005/Atom">
+	<link rel="alternate" type="text/html" href="<%= page.url %>"/>
+	<id><%= page.url %></id>
+	<updated><%= page.updated.rfc3339 %></updated>
+	<published><%= page.published.rfc3339 %></published>
+	<title><%= page.title %></title>
+	<author><%= page.author.atom %></author>
+	<% if page.content %><content type="html"><%= html_escape(page.content) %></content><% end %>
+	<% if page.rights %><rights type="html"><%= html_escape(page.rights) %></rights><% end %>
+</entry>