lib/oldweb/_tail.rhtml in olddoc-1.1.2 vs lib/oldweb/_tail.rhtml in olddoc-1.2.0
- old
+ new
@@ -1,29 +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']
-git_doc = 'https://kernel.org/pub/software/scm/git/docs/'
-se_url = "#{git_doc}git-send-email.html"
-rp_url = "#{git_doc}git-request-pull.html"
-
-if public_email && ml_url %><hr /><p>
-We love to hear from you!<br />
-Email patches (using <a
-href="<%= se_url %>">git send-email</a>),
-pull requests (formatted using <a
-href="<%= rp_url %>">git request-pull</a>), questions, bug reports,
-suggestions, etc. to us publically at:<br /><a
-href="mailto:<%= public_email %>"><%= public_email %></a><br />
-Mail archives are available at: <a
-href="<%= ml_url %>"><%= ml_url %></a><br />
-Please send plain-text email only and do not waste bandwidth on HTML mail,
-HTML mail will not be read.<br />
-Quote as little as reasonable and do not <a
-href="http://catb.org/jargon/html/T/top-post.html">top post</a>.<br /><% end
-if nntp_url %>NNTP archives are available at: <a
-href="<%= nntp_url %>"><%= nntp_url %></a><% end
-if private_email %>
-For sensitive topics, email us privately at:
-<a
-href="mailto:<%= private_email %>"><%= private_email %></a><% end %>
+archive_urls = Array(@old_cfg['ml_url']).concat(Array(@old_cfg['nntp_url']))
+if url = archive_urls.shift %><hr /><pre>
+mail archives: <a
+href="<%= url %>"><%= url %></a><%
+ archive_urls.each do |u| %>
+ <a
+href="<%= u %>"><%= u %></a> <%
+ end # archive_urls.each
+ if private_email || public_email %>
+<%
+ 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
+ end
+end
+%></pre>