From a19428fa729620b98f7f8ecb9f02f2083b0b8e53 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 7 Sep 2010 22:36:46 -0700
Subject: [PATCH] webapps.mason: fix templates for boilerplate wrapping

---
 extra/webapps/mason/download-package.xml | 46 +++++++++++-------------
 extra/webapps/mason/download-release.xml | 24 +++++--------
 2 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/extra/webapps/mason/download-package.xml b/extra/webapps/mason/download-package.xml
index d2cfab6590..9d18b6ed7c 100644
--- a/extra/webapps/mason/download-package.xml
+++ b/extra/webapps/mason/download-package.xml
@@ -5,39 +5,33 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <link rel="stylesheet" href="http://factorcode.org/css/master.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-    <title>Factor binary package for <t:label t:name="platform" /></title>
-  </head>
-  <body>
-    <div><img src="http://factorcode.org/graphics/logo.png" alt="Logo" /></div>
+	<t:title>Factor binary package for <t:label t:name="platform" /></t:title>
 
-    <h1>Factor binary package for <t:label t:name="platform" /></h1>
+	<div><img src="http://factorcode.org/graphics/logo.png" alt="Logo" /></div>
 
-    <p>Requirements:</p>
-    <t:xml t:name="requirements" />
+	<h1>Factor binary package for <t:label t:name="platform" /></h1>
 
-    <h2>Download <t:xml t:name="package" /></h2>
+	<p>Requirements:</p>
+	<t:xml t:name="requirements" />
 
-    <p>This package was built from GIT ID <t:xml t:name="git-id" />.</p>
+	<h2>Download <t:xml t:name="package" /></h2>
 
-    <p>Once you download Factor, you can <a href="http://concatenative.org/wiki/view/Factor/Learning">start learning</a> the language!</p>
+	<p>This package was built from GIT ID <t:xml t:name="git-id" />.</p>
 
-    <h1>Build machine information</h1>
+	<p>Once you download Factor, you can <a href="http://concatenative.org/wiki/view/Factor/Learning">start learning</a> the language!</p>
 
-    <table border="1">
-      <tr><td>Host name:</td><td><t:xml t:name="host-name" /></td></tr>
-      <tr><td>Last heartbeat:</td><td><t:label t:name="current-timestamp" /></td></tr>
-      <tr><td>Current status:</td><td><t:xml t:name="status" /></td></tr>
-      <tr><td>Last build:</td><td><t:xml t:name="last-build" /></td></tr>
-      <tr><td>Last clean build:</td><td><t:xml t:name="last-clean-build" /></td></tr>
-      <tr><td>Binaries:</td><td><t:xml t:name="binaries" /></td></tr>
-      <tr><td>Clean images:</td><td><t:xml t:name="clean-images" /></td></tr>
-    </table>
+	<h1>Build machine information</h1>
 
-    <p><t:xml t:name="last-report" /></p>
-  </body>
-</html>
+	<table border="1">
+		<tr><td>Host name:</td><td><t:xml t:name="host-name" /></td></tr>
+		<tr><td>Last heartbeat:</td><td><t:label t:name="current-timestamp" /></td></tr>
+		<tr><td>Current status:</td><td><t:xml t:name="status" /></td></tr>
+		<tr><td>Last build:</td><td><t:xml t:name="last-build" /></td></tr>
+		<tr><td>Last clean build:</td><td><t:xml t:name="last-clean-build" /></td></tr>
+		<tr><td>Binaries:</td><td><t:xml t:name="binaries" /></td></tr>
+		<tr><td>Clean images:</td><td><t:xml t:name="clean-images" /></td></tr>
+	</table>
+
+	<p><t:xml t:name="last-report" /></p>
 
 </t:chloe>
diff --git a/extra/webapps/mason/download-release.xml b/extra/webapps/mason/download-release.xml
index 286a9308b6..ffb485e173 100644
--- a/extra/webapps/mason/download-release.xml
+++ b/extra/webapps/mason/download-release.xml
@@ -5,25 +5,19 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <link rel="stylesheet" href="http://factorcode.org/css/master.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-    <title>Factor binary package for <t:label t:name="platform" /></title>
-  </head>
-  <body>
-    <div><img src="http://factorcode.org/graphics/logo.png" alt="Logo" /></div>
+	<t:title>Factor binary package for <t:label t:name="platform" /></t:title>
 
-    <h1>Factor binary package for <t:label t:name="platform" /></h1>
+	<div><img src="http://factorcode.org/graphics/logo.png" alt="Logo" /></div>
 
-    <p>Requirements:</p>
-    <t:xml t:name="requirements" />
+	<h1>Factor binary package for <t:label t:name="platform" /></h1>
 
-    <h2>Download <t:xml t:name="release" /></h2>
+	<p>Requirements:</p>
+	<t:xml t:name="requirements" />
 
-    <p>This release was built from GIT ID <t:xml t:name="git-id" />.</p>
+	<h2>Download <t:xml t:name="release" /></h2>
 
-    <p>Once you download Factor, you can <a href="http://concatenative.org/wiki/view/Factor/Learning">start learning</a> the language!</p>
-  </body>
-</html>
+	<p>This release was built from GIT ID <t:xml t:name="git-id" />.</p>
+
+	<p>Once you download Factor, you can <a href="http://concatenative.org/wiki/view/Factor/Learning">start learning</a> the language!</p>
 
 </t:chloe>

Host name:
Last heartbeat:
Current status:
Last build:
Last clean build:
Binaries:
Clean images: