index tweaks

etherdump/commands/index.py

@@ -55,30 +55,31 @@ def url_base (url):
 def main (args):
     p = ArgumentParser("Convert dumped files to a document via a template.")
 
-    p.add_argument("input", nargs="+", help="filenames")
+    p.add_argument("input", nargs="+", help="filenames (uses .meta.json files)")
     p.add_argument("--templatepath", default=None, help="path to find templates, default: built-in")
     p.add_argument("--template", default="index.html", help="template name, built-ins include index.html, rss.xml; default: index.html")
-    p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: .etherdump/settings.json")
+    p.add_argument("--padinfo", default=".etherdump/settings.json", help="settings, default: ./.etherdump/settings.json")
     # p.add_argument("--zerorevs", default=False, action="store_true", help="include pads with zero revisions, default: False (i.e. pads with no revisions are skipped)")
 
-    p.add_argument("--skip", default=None, type=int, help="skip this many items, default: None")
-    p.add_argument("--order", default="lastedited", help="order, possible values: padid, pad (no group name), lastedited (number of) authors, revisions, default: lastedited")
+    p.add_argument("--order", default="padid", help="order, possible values: padid, pad (no group name), lastedited, (number of) authors, revisions, default: padid")
     p.add_argument("--reverse", default=False, action="store_true", help="reverse order, default: False (reverse chrono)")
     p.add_argument("--limit", type=int, default=0, help="limit to number of items, default: 0 (no limit)")
+    p.add_argument("--skip", default=None, type=int, help="skip this many items, default: None")
 
-    p.add_argument("--title", default="etherdump", help="title for document or rss feed channel title, default: etherdump")
-    p.add_argument("--description", default="", help="channel description, default: empty")
-    p.add_argument("--language", default="en-US", help="rss: feed language, default: en-US")
-    p.add_argument("--updatePeriod", default="daily", help="rss: updatePeriod, possible values: hourly, daily, weekly, monthly, yearly; default: daily")
-    p.add_argument("--updateFrequency", default=1, type=int, help="rss: update frequency within the update period (where 2 would mean twice per period); default: 1")
-    p.add_argument("--siteurl", default=None, help="rss: to use as channel's site link, default: the etherpad url")
-    p.add_argument("--feedurl", default="feed.xml", help="rss: to use as feeds own (self) link, default: feed.xml")
-    p.add_argument("--generator", default="https://gitlab.com/activearchives/etherdump", help="generator, default: https://gitlab.com/activearchives/etherdump")
-
-    p.add_argument("--content", default=False, action="store_true", help="rss: include content, default: False")
-    p.add_argument("--link", default="diffhtml,html,text", help="version to use as link, can be comma-delim list, use first avail, default: diffhtml,html,text")
+    p.add_argument("--content", default=False, action="store_true", help="rss: include (full) content tag, default: False")
+    p.add_argument("--link", default="diffhtml,html,text", help="link variable will be to this version, can be comma-delim list, use first avail, default: diffhtml,html,text")
     p.add_argument("--linkbase", default=None, help="base url to use for links, default: try to use the feedurl")
 
+    pg = p.add_argument_group('template variables')
+    pg.add_argument("--feedurl", default="feed.xml", help="rss: to use as feeds own (self) link, default: feed.xml")
+    pg.add_argument("--siteurl", default=None, help="rss: to use as channel's site link, default: the etherpad url")
+    pg.add_argument("--title", default="etherdump", help="title for document or rss feed channel title, default: etherdump")
+    pg.add_argument("--description", default="", help="rss: channel description, default: empty")
+    pg.add_argument("--language", default="en-US", help="rss: feed language, default: en-US")
+    pg.add_argument("--updatePeriod", default="daily", help="rss: updatePeriod, possible values: hourly, daily, weekly, monthly, yearly; default: daily")
+    pg.add_argument("--updateFrequency", default=1, type=int, help="rss: update frequency within the update period (where 2 would mean twice per period); default: 1")
+    pg.add_argument("--generator", default="https://gitlab.com/activearchives/etherdump", help="generator, default: https://gitlab.com/activearchives/etherdump")
+
     args = p.parse_args(args)
 
     tmpath = args.templatepath

etherdump/data/templates/index.html

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
-<html>
+<html lang="{{language}}">
 <head>
 	<meta charset="utf-8" />
-	<title>etherdump</title>
+	<title>{{title}}</title>
 	<link rel="stylesheet" type="text/css" href="{%block css %}styles.css{%endblock%}">
+	<link rel="alternate" type="application/rss+xml" href="recentchanges.rss">
 	{% block scripts %}
 	<script src="jquery-latest.js"></script>
 	<script src="jquery.tablesorter.min.js"></script>
@@ -88,7 +89,7 @@ $(document).ready(function()
 {% for pad in pads %}
 <tr>
 	<td class="name">
-		{{ pad.padid }}
+		<a href="{{pad.link}}">{{ pad.padid }}</a>
 	</td>
 	<td class="versions"> 
 		{% for v in pad.versions %}<a href="{{v.url}}">{{v.type}}</a> {% endfor %}