[PATCH] tail: support multiple URLs for archives

[PATCH] tail: support multiple URLs for archives

[Eric Wong]

The more archives, the better.
---
 lib/oldweb/_tail.rhtml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/oldweb/_tail.rhtml b/lib/oldweb/_tail.rhtml
index 0879572..fda210d 100644
--- a/lib/oldweb/_tail.rhtml
+++ b/lib/oldweb/_tail.rhtml
@@ -1,21 +1,23 @@
 <%
 public_email = @old_cfg['public_email']
 private_email = @old_cfg['private_email']
-ml_url = @old_cfg['ml_url']
-nntp_url = @old_cfg['nntp_url']
-
-if public_email && ml_url %><hr /><pre>
+archive_urls = Array(@old_cfg['ml_url']).concat(Array(@old_cfg['nntp_url']))
+if url = archive_urls.shift %><hr /><pre>
 mail archives: <a
-href="<%= ml_url %>"><%= ml_url %></a> mailto:<a
-href="mailto:<%= public_email %>"><%=
-public_email
-%></a>
-<% end
-if nntp_url %>NNTP archives: <a
-href="<%= nntp_url %>"><%= nntp_url %></a>
+href="<%= url %>"><%= url %></a><%
+  archive_urls.each do |u| %>
+	<a
+href="<%= u %>"><%= u %></a> <%
+  end # archive_urls.each
+  if private_email || public_email %>
 <%
-end
-if private_email
-%>private mail: <a
+    if public_email %>public: <a
+href="mailto:<%= public_email %>"><%= public_email %></a><%
+    end
+    if private_email || public_email %> / <% end
+    if private_email %>private: <a
 href="mailto:<%= private_email %>"><%= private_email %></a><%
-end %></pre>
+    end
+  end
+end
+%></pre>
-- 
EW

[PATCH 2/1] tail: fix divider when private email does not exist

[Eric Wong]

Not all projects have both email addresses.
---
 lib/oldweb/_tail.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/oldweb/_tail.rhtml b/lib/oldweb/_tail.rhtml
index fda210d..f56bf2c 100644
--- a/lib/oldweb/_tail.rhtml
+++ b/lib/oldweb/_tail.rhtml
@@ -14,7 +14,7 @@ href="<%= u %>"><%= u %></a> <%
     if public_email %>public: <a
 href="mailto:<%= public_email %>"><%= public_email %></a><%
     end
-    if private_email || public_email %> / <% end
+    if private_email && public_email %> / <% end
     if private_email %>private: <a
 href="mailto:<%= private_email %>"><%= private_email %></a><%
     end
-- 
EW