From 3a04ed33ecbae4ab4248af2c3bb35970168a18c1 Mon Sep 17 00:00:00 2001
From: Petr Baudis <petr.baudis@novartis.com>
Date: Mon, 28 Jul 2008 21:01:31 +0200
Subject: [PATCH] cgi/: Overhaul project forms

The project registration/edit forms now use a wannabe-pretty table
layout.
---
 cgi/editproj.cgi | 29 ++++++++++++++++++-----------
 cgi/regproj.cgi  | 26 +++++++++++++++-----------
 html/girocco.css |  7 +++++++
 3 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/cgi/editproj.cgi b/cgi/editproj.cgi
index feaaaa5..1431bf2 100755
--- a/cgi/editproj.cgi
+++ b/cgi/editproj.cgi
@@ -64,21 +64,23 @@ EOT
 }
 print <<EOT;
 <form method="post">
-<p>Project name: <a href="$Girocco::Config::gitweburl/$h{name}.git">$h{name}</a>.git <input type="hidden" name="name" value="$h{name}" /></p>
-<p><strong>Admin password:</strong> <input type="password" name="cpwd" /> <sup><a href="pwproj.cgi?name=$name">(forgot password?)</a></sup></p>
-<p>New admin password (twice): <input type="password" name="pwd" /> <input type="password" name="pwd2" /><br />
-   <em>(leave empty to keep it at the current value)</em></p>
-<p>E-mail contact: <input type="text" name="email" value="$h{email}" /></p>
-<p>Description: <input type="text" name="desc" value="$h{desc}" /></p>
-<p>Homepage URL: <input type="text" name="hp" value="$h{hp}" /></p>
-<p>README (HTML, lt 8kb): <textarea name="README" rows="5" cols="80">$h{README}</textarea></p>
+<table class="form">
+<tr><td class="formlabel">Project name:</td><td><a href="$Girocco::Config::gitweburl/$h{name}.git">$h{name}</a>.git
+	<input type="hidden" name="name" value="$h{name}" /></td></tr>
+<tr><td class="formlabel"><strong>Admin password:</strong></td><td>
+	<input type="password" name="cpwd" /> <sup><a href="pwproj.cgi?name=$name">(forgot password?)</a></sup></td></tr>
+<tr><td class="formlabel">New admin password (twice):<br />
+	<em>(leave empty to keep it the same)</em></td><td>
+	<input type="password" name="pwd" /><br /><input type="password" name="pwd2" /><br />
+	</td></tr>
+<tr><td class="formlabel">E-mail contact:</td><td><input type="text" name="email" value="$h{email}" /></td></tr>
 EOT
 
 if ($proj->{mirror}) {
-	print "<p>Repository URL: <input type=\"text\" name=\"url\" value=\"$h{url}\" /></p>\n";
+	print "<tr><td class=\"formlabel\">Repository URL:</td><td><input type=\"text\" name=\"url\" value=\"$h{url}\" /></td></tr>\n";
 } else {
 	print <<EOT;
-<p>Users:</p>
+<tr><td class="formlabel">Users:</td><td>
 <ul>
 EOT
 	$Girocco::Config::manage_users and print "<p>Only <a href=\"reguser.cgi\">registered users</a> can push.</p>";
@@ -93,10 +95,15 @@ EOT
 	print <<EOT;
 <li>Add user: <input type="text" name="user" /></li>
 </ul>
+</td></tr>
 EOT
 }
 
 print <<EOT;
-<p><input type="submit" name="y0" value="Update" /></p>
+<tr><td class="formlabel">Homepage URL:</td><td><input type="text" name="hp" value="$h{hp}" /></td></tr>
+<tr><td class="formlabel">Description:</td><td><input type="text" name="desc" value="$h{desc}" size="80" /></td></tr>
+<tr><td class="formlabel">README (HTML, lt 8kb):</td><td><textarea name="README" rows="5" cols="80">$h{README}</textarea></td></tr>
+<tr><td></td><td><input type="submit" name="y0" value="Update" /></td></tr>
+</table>
 </form>
 EOT
diff --git a/cgi/regproj.cgi b/cgi/regproj.cgi
index b640706..7cd7c2e 100755
--- a/cgi/regproj.cgi
+++ b/cgi/regproj.cgi
@@ -148,26 +148,30 @@ my $modechooser;
 my $mirrorentry = 'Repository URL: <input type="text" name="url" />';
 if ($me and $pe) {
 	$modechooser = <<EOT;
-<p>Hosting mode:</p><ul>
+<tr><td class="formlabel">Hosting mode:</td><td><ul>
 <li><input type="radio" name="mode" value="mirror" />Mirror mode. $mirrorentry</li>
-<li><input type="radio" name="mode" value="push" />Push mode.</li></ul>
+<li><input type="radio" name="mode" value="push" />Push mode.</li>
+</ul></td></tr>
 EOT
 } else {
 	$modechooser = '<input type="hidden" name="mode" value="'.($me ? $me->{name} : $pe->{name}).'">';
-	$me and $modechooser .= "<p>$mirrorentry</p>";
+	$mirrorentry =~ s#: #:</td><td>#;
+	$me and $modechooser .= "<tr><td class=\"formlabel\">$mirrorentry</td></tr>";
 }
 
 print <<EOT;
 $Girocco::Config::legalese
 <form method="post">
-<p>Project name: <input type="text" name="name" value="$name" />.git</p>
-<p>Admin password (twice): <input type="password" name="pwd" /> <input type="password" name="pwd2" /></p>
-<p>E-mail contact: <input type="text" name="email" /></p>
+<table class="form">
+<tr><td class="formlabel">Project name:</td><td><input type="text" name="name" value="$name" />.git</td></tr>
+<tr><td class="formlabel">Admin password (twice):</td><td><input type="password" name="pwd" /><br /><input type="password" name="pwd2" /></td></tr>
+<tr><td class="formlabel">E-mail contact:</td><td><input type="text" name="email" /></td></tr>
 $modechooser
-<p>Description: <input type="text" name="desc" /></p>
-<p>Homepage URL: <input type="text" name="hp" /></p>
-<p>README (HTML, lt 8kb): <textarea name="README" rows="5" cols="80"></textarea></p>
-<p style="display:none">Anti-captcha (leave empty!): <input type="text" name="mail" /></p>
-<p><input type="submit" name="y0" value="Register" /></p>
+<tr><td class="formlabel">Homepage URL:</td><td><input type="text" name="hp" /></td></tr>
+<tr><td class="formlabel">Short description:</td><td><input type="text" name="desc" size="80" /></td></tr>
+<tr><td class="formlabel">README (HTML, lt 8kb):</td><td><textarea name="README" rows="5" cols="80"></textarea></td></tr>
+<tr style="display:none"><td>Anti-captcha (leave empty!):</td><td><input type="text" name="mail" /></td></tr>
+<tr><td></td><td><input type="submit" name="y0" value="Register" /></td></tr>
+</table>
 </form>
 EOT
diff --git a/html/girocco.css b/html/girocco.css
index b5c5f1f..5bf0bed 100644
--- a/html/girocco.css
+++ b/html/girocco.css
@@ -1 +1,8 @@
 /* Girocco CSS */
+
+.formlabel {
+	margin-right: 0.5em;
+	padding-top: 0.2em;
+	text-align: right;
+	background-color: #d9d8d1;
+}
-- 
2.11.4.GIT