[SCM] live-helper branch, debian, updated. debian/2.0_a8-1-36-ga44b663
Daniel Baumann
daniel at debian.org
Fri Mar 12 15:25:13 UTC 2010
The following commit has been merged in the debian branch:
commit f80082c02c508f09a62f8638b2a80fa769a15021
Author: Richard Nelson <unixabg at gmail.com>
Date: Mon Mar 8 13:19:55 2010 -0600
Cleaning up cgi templates.
diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html
index 72e2a9b..c134d8b 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -1,14 +1,9 @@
<br />
-<h2>Your build 'BUILD' was recorded and will processed soon. Depending on the options you have selected, the build takes about between 5 and 20 minutes. You will be notified by email when the attempt has completed.</h2>
-
-<br />
+<h3>Your build 'BUILD' was recorded and will processed soon. Depending on the options you have selected, the build takes about between 5 and 20 minutes. You will be notified by email when the attempt has completed.</h3>
<h3>Your build will be available at: <a href="SERVER/BUILD/">SERVER/BUILD/</a>.</h3>
-<br />
-<br />
-
<fieldset>
<legend><b>Options</b></legend>
@@ -74,4 +69,4 @@
<br />
-<h2>Thank you for your submission.</h2>
+<h3>Thank you for your submission.</h3>
diff --git a/templates/cgi/debian-official/footer.html b/templates/cgi/debian-official/footer.html
index 880028b..6e2648a 100644
--- a/templates/cgi/debian-official/footer.html
+++ b/templates/cgi/debian-official/footer.html
@@ -1,6 +1,7 @@
<div id="footer">
- live-webhelper, version VERSION<br />
- Debian Live Project <a href="mailto:debian-live at lists.debian.org"><debian-live at lists.debian.org></a> — <a href="http://debian-live.alioth.debian.org/legal.html">Legal information</a><br />
+ <br />
+ <h2 id="subtitle">Debian Live Project <a href="mailto:debian-live at lists.debian.org"><debian-live at lists.debian.org></a> — <a href="http://live.debian.net/legal.html">Legal information</a></h2>
+ <br />
</div>
</body>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index 2a86d25..645756d 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -1,11 +1,7 @@
-<br />
-
-<h2>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h2>
-<br />
-<br />
+<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
-<form action="live-webhelper" method="get">
+<form action="live-helper" method="get">
<fieldset>
diff --git a/templates/cgi/debian-official/header.html b/templates/cgi/debian-official/header.html
index d52efa6..d90ddc9 100644
--- a/templates/cgi/debian-official/header.html
+++ b/templates/cgi/debian-official/header.html
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
- <title>Debian Live Webhelper</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" />
+ <title>Debian Live Helper</title>
+ <link rel="icon" href="http://live.debian.net/favicon.ico" type="image/ico">
+ <link rel="stylesheet" type="text/css" href="http://live.debian.net/stylesheet.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">
@@ -32,12 +32,7 @@
</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 webhelper of the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
+ <h1 id="title">live-helper web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
+ <h2 id="subtitle"><a href="http://live.debian.net/">Live Debian systems!</a></h2>
</div>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index 5a2c24d..f565b5c 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -1,14 +1,9 @@
<br />
-<h2>Your build 'BUILD' was recorded and will processed soon. Depending on the options you have selected, the build takes about between 5 and 20 minutes. You will be notified by email when the attempt has completed.</h2>
-
-<br />
+<h3>Your build 'BUILD' was recorded and will processed soon. Depending on the options you have selected, the build takes about between 5 and 20 minutes. You will be notified by email when the attempt has completed.</h3>
<h3>Your build will be available at: <a href="SERVER/BUILD/">SERVER/BUILD/</a>.</h3>
-<br />
-<br />
-
<fieldset>
<legend><b>Options</b></legend>
diff --git a/templates/cgi/debian-unofficial/footer.html b/templates/cgi/debian-unofficial/footer.html
index 880028b..6e2648a 100644
--- a/templates/cgi/debian-unofficial/footer.html
+++ b/templates/cgi/debian-unofficial/footer.html
@@ -1,6 +1,7 @@
<div id="footer">
- live-webhelper, version VERSION<br />
- Debian Live Project <a href="mailto:debian-live at lists.debian.org"><debian-live at lists.debian.org></a> — <a href="http://debian-live.alioth.debian.org/legal.html">Legal information</a><br />
+ <br />
+ <h2 id="subtitle">Debian Live Project <a href="mailto:debian-live at lists.debian.org"><debian-live at lists.debian.org></a> — <a href="http://live.debian.net/legal.html">Legal information</a></h2>
+ <br />
</div>
</body>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index c9dcb17..bbe0c82 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -1,11 +1,6 @@
-<br />
-
-<h2>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h2>
-
-<br />
-<br />
+<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
-<form action="live-webhelper" method="get">
+<form action="live-helper" method="get">
<fieldset>
diff --git a/templates/cgi/debian-unofficial/header.html b/templates/cgi/debian-unofficial/header.html
index d52efa6..d90ddc9 100644
--- a/templates/cgi/debian-unofficial/header.html
+++ b/templates/cgi/debian-unofficial/header.html
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
- <title>Debian Live Webhelper</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" />
+ <title>Debian Live Helper</title>
+ <link rel="icon" href="http://live.debian.net/favicon.ico" type="image/ico">
+ <link rel="stylesheet" type="text/css" href="http://live.debian.net/stylesheet.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">
@@ -32,12 +32,7 @@
</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 webhelper of the <a href="http://debian-live.alioth.debian.org/">Debian Live</a> project.</h1>
+ <h1 id="title">live-helper web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
+ <h2 id="subtitle"><a href="http://live.debian.net/">Live Debian systems!</a></h2>
</div>
--
live-helper
More information about the debian-live-changes
mailing list