[Debian-live-changes] r1233 - in dists/trunk/live-webbuilder: . html

Daniel Baumann daniel at alioth.debian.org
Fri May 4 14:28:35 UTC 2007


Author: daniel
Date: 2007-05-04 14:28:35 +0000 (Fri, 04 May 2007)
New Revision: 1233

Added:
   dists/trunk/live-webbuilder/html/build.html
   dists/trunk/live-webbuilder/html/form.html
   dists/trunk/live-webbuilder/html/header.html
Removed:
   dists/trunk/live-webbuilder/form.html
   dists/trunk/live-webbuilder/header.html
   dists/trunk/live-webbuilder/htmlbuild
Modified:
   dists/trunk/live-webbuilder/live-webbuilder.sh
Log:


Deleted: dists/trunk/live-webbuilder/form.html
===================================================================
--- dists/trunk/live-webbuilder/form.html	2007-05-04 14:26:28 UTC (rev 1232)
+++ dists/trunk/live-webbuilder/form.html	2007-05-04 14:28:35 UTC (rev 1233)
@@ -1,82 +0,0 @@
-<h2>Please submit your parameters (email is required) to generate you live cd.</h2>
-
-<br />
-<br />
-
-<form method="get" action="/cgi-bin/live-webbuilder.sh">
-
-<table>
-	<tr>
-		<td>* Email Address: </td>
-		<td><input name="www_reply_to_email" size="40" /></td>
-	</tr>
-	<tr>
-		<td> --packages-lists: </td>
-		<td>
-			<select name="www_packages_lists" size="1" >
-				<option value="gnome" SELECTED>gnome</option>
-				<option value="gnome-core">gnome-core</option>
-				<option value="gnome-full">gnome-full</option>
-				<option value="gnome-junior">gnome-junior</option>
-				<option value="gnustep">gnustep</option>
-				<option value="kde">kde</option>
-				<option value="kde-core">kde-core</option>
-				<option value="kde-extra">kde-extra</option>
-				<option value="kde-full">kde-full</option>
-				<option value="kde-junior">kde-junior</option>
-				<option value="mini">mini</option>
-				<option value="minimal">minimal</option>
-				<option value="rescue">rescue</option>
-				<option value="standard">standard</option>
-				<option value="standard-x11">standard-x11</option>
-				<option value="xfce">xfce</option>
-				<option value="xfce-junior">xfce-junior</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td> --distribution: </td>
-		<td>
-			<select name="www_distribution" size="1">
-				<option value="etch" SELECTED>etch</option>
-				<option value="lenny">lenny</option>
-				<option value="sid">sid</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td> --binary-image: </td>
-		<td>
-			<select name="www_binary_image" size="1">
-				<option value="hdd">hdd</option>
-				<option value="iso" SELECTED>iso</option>
-				<option value="hdd">usb</option>
-				<option value="hdd">net</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td> --filesystem: </td>
-		<td>
-			<select name="www_filesystem" size="1">
-				<option value="ext2">ext2</option>
-				<option value="plain">plain</option>
-				<option value="squashfs" SELECTED>squashfs</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td> --packages: </td>
-		<td>
-			<input name="www_packages" size="150" />
-		</td>
-	</tr>
-</table>
-
-<br />
-
-<input type="submit" value="Submit" />
-</form>
-
-</body>
-</html>

Deleted: dists/trunk/live-webbuilder/header.html
===================================================================
--- dists/trunk/live-webbuilder/header.html	2007-05-04 14:26:28 UTC (rev 1232)
+++ dists/trunk/live-webbuilder/header.html	2007-05-04 14:28:35 UTC (rev 1233)
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-	<head>
-		<title>Debian Live Webbuilder ${VERSION}</title>
-		<link rel="icon" href="http://debian-live.alioth.debian.org/favicon.ico" type="image/ico">
-		<link rel="stylesheet" type="text/css" href="http://debian-live.alioth.debian.org/images/style.css" />
-		<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
-		<meta name="keywords" content="Debian, Live, Project">
-		<meta name="description" content="The Debian Live Project">
-	</head>
-<body>
-
-<div id="header">
-	<div id="debianlogo"><img src="http://debian-live.alioth.debian.org/images/debian.png" alt="Debian logo" width="56" height="70"></div>
-	<div id="headertitle"><a href="http://debian-live.alioth.debian.org/" title="http://debian-live.alioth.debian.org/">Debian Live</a></div>
-	<div id="headersubtitle">Live Debian systems!</div>
-</div>
-
-<div id="maincontent" style="margin: 0 0 0 0;">
-	<h1>This is the webbuild interface ${VERSION} of the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
-</div>

Copied: dists/trunk/live-webbuilder/html/build.html (from rev 1228, dists/trunk/live-webbuilder/htmlbuild)

Copied: dists/trunk/live-webbuilder/html/form.html (from rev 1231, dists/trunk/live-webbuilder/form.html)

Copied: dists/trunk/live-webbuilder/html/header.html (from rev 1230, dists/trunk/live-webbuilder/header.html)

Deleted: dists/trunk/live-webbuilder/htmlbuild
===================================================================
--- dists/trunk/live-webbuilder/htmlbuild	2007-05-04 14:26:28 UTC (rev 1232)
+++ dists/trunk/live-webbuilder/htmlbuild	2007-05-04 14:28:35 UTC (rev 1233)
@@ -1,11 +0,0 @@
-<BR><H2>Your build id is ${WWW_BUILD_ID}. We shall begin the build attempt shortly. You will be notified when the attempt has completed.</H2>
-The parameters you submitted are:
-<BR>Email - ${WWW_REPLY_TO_EMAIL}
-<BR>--packages-lists ${WWW_PACKAGES_LISTS}
-<BR>--distibution ${WWW_DISTRIBUTION}
-<BR>--binary-image ${WWW_BINARY_IMAGE}
-<BR>--filesystem: ${WWW_FILESYSTEM}
-<BR>--packages ${WWW_PACKAGES}
-<BR><H2>Thank you for your submission. </H2>
-</BODY>
-</HTML>

Modified: dists/trunk/live-webbuilder/live-webbuilder.sh
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:26:28 UTC (rev 1232)
+++ dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:28:35 UTC (rev 1233)
@@ -14,13 +14,14 @@
 VERSION="0.2.3"
 WWW_WORK_PATH="/tmp/"
 WWW_MIRROR_BUILD="http://localhost/debian"
+HTML="/usr/share/live-webbuilder/html"
 
 # Send the HTTP headers
 echo "Content-type: text/html"
 echo ""
 
 # Start sending HTML
-cat header.html
+cat "${HTML}"/header.html
 
 ##########################################
 # Collet the parms
@@ -30,7 +31,7 @@
 if [ -z "$QUERY_STRING" ]; then
 	# Generate the form since it looks like
 	# no parameters were detected being passed.
-	cat form.html
+	cat "${HTML}"/form.html
 else
 	# Ok we made it here so we have parameters
 	# sent to the script.
@@ -60,7 +61,7 @@
 	##########################################
 	# Start sending HTML
 	##########################################
-	cat htmlbuild
+	cat "${HTML}"/build.html
 
 	##########################################
 	# Set the variables to pass to the cron job




More information about the Debian-live-changes mailing list