From 39ea444c9dc03f923f7a06fd037084746ddbe518 Mon Sep 17 00:00:00 2001
From: Chris McCormick <chris@mccormick.cx>
Date: Sat, 25 Oct 2014 17:43:30 +0800
Subject: [PATCH] Removed more tables where they aren't required. Improved
 table layout.

---
 web/ccan.css             |  5 ++
 web/staticall.php        |  4 +-
 web/staticmoduleinfo.php | 99 ++++++++++++++++------------------------
 web/staticupload.php     |  8 +---
 web/upload.php           |  2 +-
 5 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/web/ccan.css b/web/ccan.css
index 80bd6d8f..280f0449 100644
--- a/web/ccan.css
+++ b/web/ccan.css
@@ -82,6 +82,11 @@ ul.menu {
 
 table {
     background: none;
+    max-width: 850px;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 0px;
+    width: 100%;
 }
 
 table a {
diff --git a/web/staticall.php b/web/staticall.php
index 39b529ce..3e9d445a 100644
--- a/web/staticall.php
+++ b/web/staticall.php
@@ -19,7 +19,7 @@ download.
 Or you can just download the <a href="ccan.tar.bz2">tarball of everything including CCAN tools (<?=$tarballsize?>K)</a>.
 </p>
 
-<table align="center" width="80%" border="0" cellpadding="3" cellspacing="1">
+<table align="center" cellpadding="3" cellspacing="1">
 <th align="left">Name</th>
 <th align="left">Summary / Link to details</th>
 <th align="right">Download</th>
@@ -50,7 +50,7 @@ foreach ($modules as $module) {
 
 (This is contributed code which was dumped here: these gems may need some polishing.)
 
-<table align="center" width="80%" border="0" cellpadding="3" cellspacing="1">
+<table align="center" cellpadding="3" cellspacing="1">
 
 <?php
 $d = dir($argv[2]);
diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php
index 98edf9b5..8f736337 100644
--- a/web/staticmoduleinfo.php
+++ b/web/staticmoduleinfo.php
@@ -17,116 +17,95 @@ $licence=extract_field('licence',$module_path);
 $license=extract_field('license',$module_path);
 $url_prefix = getenv("URLPREFIX");
 ?>
-<div class='content'>
-<table align="center" width="70%" border="0" cellpadding="3" cellspacing="1">
-<tr align="center">
-<td>
-<a href="<?=$repo_base.$module?>">Browse Source</a>
-</td>
-<td>
-<a href="<?=$url_prefix?><?=$tar_dir?>/with-deps/<?=$module?>.tar.bz2">Download</a>
-<a href="<?=$url_prefix?><?=$tar_dir?>/<?=$module?>.tar.bz2">(without any required ccan dependencies)</a>
-</tr>
-</table>
+<div class='content moduleinfo'>
 
-<p>
-</p>
+<p><a href="<?=$repo_base.$module?>">Browse Source</a> <a href="<?=$url_prefix?><?=$tar_dir?>/with-deps/<?=$module?>.tar.bz2">Download</a> <a href="<?=$url_prefix?><?=$tar_dir?>/<?=$module?>.tar.bz2">(without any required ccan dependencies)</a></p>
 
-<table align="center" width="70%" border="0" cellpadding="8" cellspacing="1">
-<tr align="left">
-<td><h3>Module: </h3> <?=$module?> </td>
-</tr>
+<h3>Module:</h3>
+<p><?=$module?></p>
 
-<tr align="left">
-<td><h3>Summary: </h3> <?=$summary?></td>
-</tr>
+<h3>Summary:</h3>
+<p><?=$summary?></p>
 
 <?php
 if ($maintainer) {
 ?>
-<tr align="left"> 
-<td><h3>Maintainer: </h3> <?=$maintainer?></td>
-</tr>
+<h3>Maintainer:</h3>
+<p><?=$maintainer?></p>
 <?php
 }
 
 if ($author) {
 ?>
-<tr align="left"> 
-<td><h3>Author: </h3> <?=$author?></td>
-</tr>
+<h3>Author:</h3>
+<p><?=$author?></p>
 <?php
 }
 
 if ($dependencies) {
 ?>
-<tr align="left">
-<td><h3>Dependencies: </h3> <pre> <?php
+<h3>Dependencies:</h3>
+<ul class='dependencies'>
+<?php
 	foreach (preg_split("/\s+/", $dependencies) as $dep) {
-		echo '<a href="'.substr($dep, 5).'.html">'.$dep.'</a> ';
+		if ($dep) {
+			echo '<li><a href="'.substr($dep, 5).'.html">'.$dep.'</a></li>';
+		}
         }
-?></pre></td>
-</tr>
+?>
+</ul>
+
 <?php 
 }
 
 if ($extdepends) {
 ?>
-<tr align="left">
-<td><h3>External dependencies: </h3> <?php
+<h3>External dependencies:</h3>
+<ul class='external-dependencies'>
+<?php
 	foreach (split("\n", $extdepends) as $dep) {
 		$fields=preg_split("/\s+/", $dep);
-		echo $fields[0].' ';
+		echo "<li>" . $fields[0].' ';
 		if (count($fields) > 1)
 			echo '(version '.$fields[1].') ';
-		echo '<br>';
+		echo '</li>';
         }
-?></td>
-</tr>
+?>
+</ul>
 <?php 
 }
 ?>
-<tr align="left">
-<td><h3>Description: </h3> <?=$description;?> </td>
-</tr>
+
+<h3>Description:</h3>
+<p><?=$description;?></p>
 
 <?php 
 if ($see_also) {
 ?>
-<tr align="left">
-<td><h3>See Also: </h3> <pre> <?php
+<h3>See Also:</h3>
+<ul class='see-also'>
+<?php
 	foreach (preg_split("/[\s,]+/", trim($see_also)) as $see) {
-		echo '<a href="'.substr($see, 5).'.html">'.$see.'</a> ';
+		echo '<li><a href="'.substr($see, 5).'.html">'.$see.'</a></li>';
         }
-?></pre></td>
-</tr>
-<?php
-}
-
-if ($example) {
 ?>
-<tr align="left"> 
-<td><h3>Example: </h3> <pre><?=$example?></pre></td>
-</tr>
+</ul>
 <?php
 }
 
-if ($licence) {
+if ($example) {
 ?>
-<tr align="left"> 
-<td><h3>License: </h3> <?=$licence?></td>
-</tr>
+<h3>Example:</h3>
+<pre class="lang-c prettyprint prettyprinted"><?=$example?></pre>
 <?php
 }
 
 if ($license) {
 ?>
-<tr align="left"> 
-<td><h3>License: </h3> <?=$license?></td>
-</tr>
+<h3>License:</h3>
+<p><?=$license?></p>
 <?php
 }
 ?>
-</table>
 </div>
 </body></html>
diff --git a/web/staticupload.php b/web/staticupload.php
index d692bf53..19dbedec 100644
--- a/web/staticupload.php
+++ b/web/staticupload.php
@@ -8,9 +8,6 @@ include('static-configuration');
 <div class='content'>
 <h3 align="center"> Upload Code</h3>
 
-<table width="70%" align="center">
-<tr>
-<td>
 <p>
 Got C code sitting around which might help someone?  Put it to work
 by uploading here; .tar.gz, .zip or even single C files.
@@ -20,11 +17,8 @@ by uploading here; .tar.gz, .zip or even single C files.
 main repository.  Otherwise, it'll go into our "junkcode" area where
 people can browse and download it.
 </p>
-</td>
-</tr>
-</table>
 
-<table width="70%" align="center">
+<table align="center">
 <tr>
 <p>
 <form enctype="multipart/form-data" action="<?=$uploadscript?>" method="POST">
diff --git a/web/upload.php b/web/upload.php
index 2972180d..fbbaf14e 100644
--- a/web/upload.php
+++ b/web/upload.php
@@ -17,7 +17,7 @@ main repository.  Otherwise, it'll go into our "junkcode" area where
 people can browse and download it.
 </p>
 
-<table width="80%" align="center">
+<table align="center">
 <tr>
 <th>
 <p>
-- 
2.39.2