[Debian-live-changes] r1872 - in dists/trunk/live-webhelper: scripts templates

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-29 17:02:13 +0000 (Tue, 29 May 2007)
New Revision: 1872

Modified:
   dists/trunk/live-webhelper/scripts/cgi
   dists/trunk/live-webhelper/templates/form.html
Log:


Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-05-29 16:27:27 UTC (rev 1871)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-05-29 17:02:13 UTC (rev 1872)
@@ -44,7 +44,9 @@
 if [ -z "${QUERY_STRING}" ]
 then
 	# Sending html form
-	cat "${TEMPLATES}"/form.html
+	sed -i	-e "s/VERSION/${VERSION}/" \
+		-e "s/DATE/`date +%Y%m%d-%H:%M`/" \
+	"${TEMPLATES}"/form.html
 else
 	# Converting spaces:	sed "s/+/ /g"
 	# Converting '@':	sed "s/%40/@/g"

Modified: dists/trunk/live-webhelper/templates/form.html
===================================================================
--- dists/trunk/live-webhelper/templates/form.html	2007-05-29 16:27:27 UTC (rev 1871)
+++ dists/trunk/live-webhelper/templates/form.html	2007-05-29 17:02:13 UTC (rev 1872)
@@ -109,19 +109,19 @@
 	<table>
 		<tr>
 			<td><label for="Iso_Application">--iso-application:</label> </td>
-			<td><input accesskey="i" id="Iso_Application" name="iso_application" maxlength="128" size="50" type="text" value="Debian Live" readonly/></td>
+			<td><input accesskey="i" id="Iso_Application" name="iso_application" maxlength="128" size="50" type="text" value="Debian Live" /></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Preparer">--iso-preparer:</label> </td>
-			<td><input accesskey="i" id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-helper \${VERSION}; http://packages.qa.debian.org/live-helper" readonly/></td>
+			<td><input accesskey="i" id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-helper VERSION; http://packages.qa.debian.org/live-helper" readonly/></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Publisher">--iso-publisher:</label> </td>
-			<td><input accesskey="i" id="Iso_Publisher" name="iso_publisher" maxlength="128" size="50" type="text" value="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org" readonly/></td>
+			<td><input accesskey="i" id="Iso_Publisher" name="iso_publisher" maxlength="128" size="50" type="text" value="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org" /></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Volume">--iso-volume:</label> </td>
-			<td><input accesskey="i" id="Iso_Volume" name="iso_volume" maxlength="128" size="50" type="text" value="Debian Live \`date +%Y%m%d-%H:%M\`" readonly/></td>
+			<td><input accesskey="i" id="Iso_Volume" name="iso_volume" maxlength="128" size="50" type="text" value="Debian Live DATE" readonly/></td>
 		</tr>
 	</table>
 </div>