# 
# 
# patch "common.py"
#  from [d928e7fccebbbedf45b5502510d28e0d393f5cce]
#    to [e6891581f51135943b6ebf9a1578ecfa86f678f0]
# 
# patch "fileinbranch.psp"
#  from [ecbb0d37fbf851b77f73e80a891bda273ea5e0cc]
#    to [b5303538fa3fc8a567d758d257de52f79004414f]
# 
# patch "headofbranch.psp"
#  from [0ed723e4c169ad83b1eab28a9679934ca03d0c90]
#    to [5949f4c3976c2860d25028f005f6f5e19a4995d3]
# 
# patch "index.psp"
#  from [129467f8ab1f55a203b97ffe8d8348e3e10cc2ab]
#    to [43de300221be3969e8017655a613f196e9633466]
# 
# patch "revision.psp"
#  from [906a621b7b7fcde8da4c6a06814aca7139e236da]
#    to [26173c719074ab6e123ad9cb7e3ed841fa4b886d]
# 
# patch "tags.psp"
#  from [b048d6098ec2fa6b362f65545f1733b5f8f6570c]
#    to [ebf8689665678fbcb9a90537d5f1fae8c2da73b8]
# 
# patch "tarofbranch.psp"
#  from [9308da5d0f102c73c421197586d4cdb711a13485]
#    to [a213fcbd0ade73bb588d5d4b37bc9174b24299a4]
# 
# patch "viewmtn.css"
#  from [95eb449ad29196711324096437bdfaba0cdff47b]
#    to [6ba0f07423cb4d0c041d2d41daaa63ff6f92be73]
# 
============================================================
--- common.py	d928e7fccebbbedf45b5502510d28e0d393f5cce
+++ common.py	e6891581f51135943b6ebf9a1578ecfa86f678f0
@@ -60,6 +60,8 @@
 		else: rv +=  "head of " + hq(link_to)
 		rv += '</a>'
 		return rv
+	elif link_type == "manifest":
+		return '[' + hq(link_to[:8]) + '..]'
 	else:
 		rv = '<span style="color:red;">Unknown link type: %s</span>' % (hq(link_type))
 		return rv
============================================================
--- fileinbranch.psp	ecbb0d37fbf851b77f73e80a891bda273ea5e0cc
+++ fileinbranch.psp	b5303538fa3fc8a567d758d257de52f79004414f
@@ -65,7 +65,7 @@
 links to download "<%=hq(path)%>" from that revision.
 </p>
 
-<table>
+<table class="pretty">
 <tr><th>Head revision</th><th>View file</th></tr>
 <%
 	for id in file_version.keys():
============================================================
--- headofbranch.psp	0ed723e4c169ad83b1eab28a9679934ca03d0c90
+++ headofbranch.psp	5949f4c3976c2860d25028f005f6f5e19a4995d3
@@ -43,7 +43,7 @@
 The following head IDs are available. Please select one to view.
 </p>
 
-<table>
+<table class="pretty">
 <tr><th>Head revision</th></tr>
 <%
 	for id in heads:
============================================================
--- index.psp	129467f8ab1f55a203b97ffe8d8348e3e10cc2ab
+++ index.psp	43de300221be3969e8017655a613f196e9633466
@@ -37,7 +37,7 @@
 href="tags.psp">tagged revisions</a> could be helpful if you are looking
 for a particular revision.  </p>
 
-<table>
+<table class="pretty">
 <tr><th>Branch</th></tr>
 <%
 	branches.sort()
============================================================
--- revision.psp	906a621b7b7fcde8da4c6a06814aca7139e236da
+++ revision.psp	26173c719074ab6e123ad9cb7e3ed841fa4b886d
@@ -15,7 +15,7 @@
 #
 
 def prettify(s):
-	return ' '.join(map(lambda x: x[0].upper() + x[1:], s.replace("_", " ").split(" ")))
+	return '&nbsp;'.join(map(lambda x: hq(x[0].upper() + x[1:]), s.replace("_", " ").split(" ")))
 
 psp.set_error_page("error.psp")
 
@@ -47,7 +47,7 @@
 
 <h2>Certificates</h2>
 
-<table>
+<table class="pretty">
 <%
 certs = mt.certs(id)
 for cert in certs:
@@ -55,14 +55,14 @@
 	name, value = cert["Name"][0], hq(cert["Value"])
 	if name == "branch":
 		value = link("branch", value)
-	req.write('<tr><th valign="top">%s</th><td valign="top">%s</td></tr>' % (hq(prettify(name)), value))
+	req.write('<tr><th valign="top">%s</th><td valign="top">%s</td></tr>' % (prettify(name), value))
 
 %>
 </table>
 
 <h2>Revision details</h2>
 
-<table>
+<table class="pretty">
 <%
 revision = mt.revision(id)
 old_revision = None
@@ -79,51 +79,37 @@
 				value += 'Patch file %s from %s to %s (%s) <br />' % (hq(fname), link("file", [from_id, fname]), link("file", [to_id, fname]), link("diff", [old_revision, id, fname]))
 		elif type == "old_revision":
 			old_revision, old_manifest = stanza[0][1], stanza[1][1]
-			value += 'Old revision is: %s (%s)<br />Old manifest: %s<br />' % (link("revision", old_revision), link("diff", [old_revision, id]), hq(old_manifest))
+			value += 'Old revision is: %s (%s)<br />Old manifest: %s<br />' % (link("revision", old_revision), link("diff", [old_revision, id]), link("manifest", old_manifest))
 		elif type == "new_manifest":
 			new_manifest = stanza[0][1]
-			value += 'New manifest is: %s<br />' % (hq(old_manifest))
+			value += 'New manifest is: %s<br />' % (link("manifest", old_manifest))
 		elif type == "add_file":
 			new_file = stanza[0][1]
 			value += "Add file: %s <br />" % (hq(new_file))
 		elif type == "delete_file":
 			delete_file = stanza[0][1]
 			value += "Delete file: %s <br />" % (hq(delete_file))
-	req.write('<tr><th valign="top">%s</th><td valign="top">%s</td></tr>' % (hq(prettify(key)), value))
+	req.write('<tr><th valign="top">%s</th><td valign="top">%s</td></tr>' % (prettify(key), value))
 
 %>
 </table>
 
-<h2>Ancestry Graph</h2>
-
+<div style="float: right;">
+<img usemap="#ancestry" src="<%= ancestry_graph['image_uri'] %>" alt="Ancestry of <%= hq(id) %>" style="border-width: 1px; border-color: black; border-style: solid;" /><br />
 <%
 increment = 5
-if ancestry_limit > 0:
-	zoom_out = ancestry_limit + increment
-	zoom_in = ancestry_limit - increment
-	if zoom_in <= 0: zoom_in = 1
+zoom_out = ancestry_limit + increment
+zoom_in = ancestry_limit - increment
+if zoom_in <= 0: zoom_in = 1
 %>
-<p>
-The following graph shows the ancestry relationship between revisions
-in the last <%=ancestry_limit%> Monotone log entries. The graph can 
-be modified to
-<a href="<%="revision.psp?id=%s&amp;ancestry_limit=%d" % (urllib.quote(id), zoom_in)%>">show fewer entries</a>, 
-<a href="<%="revision.psp?id=%s&amp;ancestry_limit=%d" % (urllib.quote(id), zoom_out)%>">show more entries</a>, or 
-<a href="<%="revision.psp?id=%s&amp;ancestry_limit=0" % (urllib.quote(id))%>">show all revisions</a>.
-</p>
+<small>
+last <%=ancestry_limit%> log entries (
+<a href="<%="revision.psp?id=%s&amp;ancestry_limit=%d" % (urllib.quote(id), zoom_in)%>">fewer</a>, 
+<a href="<%="revision.psp?id=%s&amp;ancestry_limit=%d" % (urllib.quote(id), zoom_out)%>">more</a>, or 
+<a href="<%="revision.psp?id=%s&amp;ancestry_limit=0" % (urllib.quote(id))%>">all</a>)
+</small>
+</div>
 
-<%
-else:
-%>
-<p>
-The following graph shows all ancestor revisions of this revision.
-</p>
-<%
-
-%>
-
-<img usemap="#ancestry" src="<%= ancestry_graph['image_uri'] %>" alt="Ancestry of <%= hq(id) %>" style="border-width: 1px; border-color: black; border-style: solid;" />
-
 <h2>Manifest</h2>
 
 <%
@@ -141,21 +127,26 @@
 All <%=len(manifest)%> files in this manifest can be downloaded together in a <%=link("tar", manifest_id, "tar archive")%>.
 </p>
 
-<table>
-<tr><th>Filename</th></tr>
 <%
-	for id, filename in manifest:
-%>
-<tr>
-	<td valign="top"><%=link("file", [id, filename], filename)%></td>
-</tr>
-<%
+	# display the manifest broken into some columns.
+	n_columns = 3
+	offset = 0
+	req.write('<table class="pretty"><tr>')
+	for i in range(n_columns):
+		size = len(manifest) / n_columns;
+		spillage = len(manifest) % n_columns;
+		if spillage > 0 and i < spillage: size += 1
+		req.write('<td>\n')
+		for id, filename in manifest[offset:offset+size]:
+			req.write('%s<br />\n' % (link("file", [id, filename], filename)))
+		req.write('</td>\n')
+		offset += size
+	req.write('</tr></table>')
 
 %>
 
-</table>
+<%
 
-<%
 req.write(footer(info))
 
 %>
============================================================
--- tags.psp	b048d6098ec2fa6b362f65545f1733b5f8f6570c
+++ tags.psp	ebf8689665678fbcb9a90537d5f1fae8c2da73b8
@@ -35,7 +35,7 @@
 To view a particular tag, select it from the list below.
 </p>
 
-<table>
+<table class="pretty">
 <tr><th>Tag</th><th>Signed by</th></tr>
 <%
 	tags.sort(lambda x,y: cmp(x[0], y[0]))
============================================================
--- tarofbranch.psp	9308da5d0f102c73c421197586d4cdb711a13485
+++ tarofbranch.psp	a213fcbd0ade73bb588d5d4b37bc9174b24299a4
@@ -41,7 +41,7 @@
 each revision.
 </p>
 
-<table>
+<table class="pretty">
 <tr><th>Head revision</th><th>Tar file</th></tr>
 <%
 	for id in heads:
============================================================
--- viewmtn.css	95eb449ad29196711324096437bdfaba0cdff47b
+++ viewmtn.css	6ba0f07423cb4d0c041d2d41daaa63ff6f92be73
@@ -1,9 +1,8 @@
 
 BODY {
 	background-color: white;
 	font-family: "Trebuchet MS", Verdana, Sans-Serif; 
 	font-size : 100%;
-	text-align: justify;
 }
 
 DIV#menuBar {
@@ -24,6 +23,7 @@
 }
 
 DIV#footer {
+	clear: both;
 	border-top-width: 1px;
 	border-top-style: solid;
 	border-top-color: black;
@@ -31,15 +31,14 @@
 	text-align: right;
 }
 
-TABLE {
-	position: relative;
+TABLE.pretty {
 	border-width: 1px;
 	border-style: solid;
 	border-color: black;
 	font-size: 80%;
 }
 
-TH {
+TABLE.pretty TH {
 	background-color: black;
 	color: white;
 }