[Debian-live-changes] r1230 - dists/trunk/live-webbuilder

Fri May 4 14:16:14 UTC 2007

Author: daniel
Date: 2007-05-04 14:16:14 +0000 (Fri, 04 May 2007)
New Revision: 1230

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


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

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

Deleted: dists/trunk/live-webbuilder/htmlblock
===================================================================

--- dists/trunk/live-webbuilder/htmlblock	2007-05-04 14:14:55 UTC (rev 1229)
+++ dists/trunk/live-webbuilder/htmlblock	2007-05-04 14:16:14 UTC (rev 1230)
@@ -1,51 +0,0 @@
-<BR><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 SIZE=40 NAME=www_reply_to_email></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 SIZE=150 NAME=www_packages></TD></TR>
-</TABLE>
-<BR>
-<INPUT type=submit value="Submit">
-</FORM>
-</BODY>
-</HTML>

Deleted: dists/trunk/live-webbuilder/htmlheader
===================================================================
--- dists/trunk/live-webbuilder/htmlheader	2007-05-04 14:14:55 UTC (rev 1229)
+++ dists/trunk/live-webbuilder/htmlheader	2007-05-04 14:16:14 UTC (rev 1230)
@@ -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>

Modified: dists/trunk/live-webbuilder/live-webbuilder.sh
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:14:55 UTC (rev 1229)
+++ dists/trunk/live-webbuilder/live-webbuilder.sh	2007-05-04 14:16:14 UTC (rev 1230)
@@ -20,7 +20,7 @@
 echo ""
 
 # Start sending HTML
-cat htmlheader
+cat header.html
 
 ##########################################
 # Collet the parms
@@ -30,7 +30,7 @@
 if [ -z "$QUERY_STRING" ]; then
 	# Generate the form since it looks like
 	# no parameters were detected being passed.
-	cat htmlblock
+	cat form.html
 else
 	# Ok we made it here so we have parameters
 	# sent to the script.


