Re: GCJ redesign (was: java/status.html updates)

[Gerald Pfeifer <pfeifer at dbai dot tuwien dot ac dot at>]

On Wed, 30 Oct 2002, Per Bothner wrote:
>>   http://www.dbai.tuwien.ac.at/~pfeifer/tmp/gcj/
> That's nice - except the link to the GCC Home page is gone.

Well spotted, thanks.  This is fixed in the version of the patch to
style.html that I am committing now (which also tries to improve layout
a bit further).

Gerald

Remove the definition of <GCJNAV> and instead make the GCJ navigation
an optional part of the main navigation which is enabled for all pages
called java/[^/]*.html.

Index: style.mhtml
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/style.mhtml,v
retrieving revision 1.37
diff -u -3 -p -r1.37 style.mhtml
--- style.mhtml	30 Oct 2002 22:49:29 -0000	1.37
+++ style.mhtml	31 Oct 2002 14:12:17 -0000
@@ -4,6 +4,9 @@
 <if <match <get-var env::PREPROCESS_FILE> "install/.*">
   <unset-var XHTML>
 >
+<if <match <get-var env::PREPROCESS_FILE> "java/[^/]*.html">
+  <set-var navigation>
+>

 <if <var-exists XHTML>
  <group
@@ -104,6 +107,30 @@
   <td valign="top">                                       <!-- left frame -->
   <table border="0" cellspacing="0" cellpadding="2" width="1%">

+  <if <match <get-var env::PREPROCESS_FILE> "java/[^/]*.html">
+   <group
+    <tr><td><table cellspacing="0" width="100%">
+    <tr bgcolor="#B0D0FF"><td>
+    <img src="gcj.jpg" alt="GCJ" width="136" height="98" />
+    </td></tr>
+    <tr bgcolor="#E0F0FF"><td>
+    <p>
+    <a href="index.html">GCJ Home</a><br />
+    <a href="../">GCC Home</a><br />
+    <a href="status.html">Status</a><br />
+    <a href="faq.html">FAQ</a><br />
+    <a href="docs.html">Documentation</a><br />
+    <a href="build-snapshot.html">Build</a><br />
+    <a href="test.html">Testing</a><br />
+    <a href="contrib.html">Contributing</a><br />
+    <a href="done.html">Done with Gcj</a><br />
+    <a href="thanks.html">Thanks</a>
+    </p>
+    </td></tr>
+    </table></td></tr>
+   >
+  >
+
   <tr><td><table cellspacing="0" width="100%">
   <tr bgcolor="#FFEE99"><td>
   <b>About GCC</b>
@@ -254,62 +281,3 @@ permitted in any medium, provided this n
 </verbatim>
 </define-container>

-;;; Navigation bar for gcj pages.
-<define-container GCJNAV>
-<verbatim>
-<table border="0">
-<tr><td valign="top">
-
-<table border="0">
-<tr><td>
-<img src="gcj.jpg" alt="gcj logo" width="136" height="98" />
-</td></tr>
-<tr>
-<td>
-<br />
-<table border="0"><tr><td width="10"></td><td>
-<a href="../">GCC</a><br />
-<a href="index.html">GCJ Home</a><br />
-<a href="faq.html">FAQ</a><br />
-<a href="docs.html">Documentation</a><br />
-<a href="build-snapshot.html">Build</a><br />
-<a href="test.html">Testing</a><br />
-<a href="contrib.html">Contributing</a><br />
-<a href="done.html">Done with Gcj</a><br />
-<a href="../bugs.html">Bugs</a><br />
-<a href="thanks.html">Thanks</a><br />
-<br /><br /><br />
-<a href="http://sources.redhat.com/mauve/";>The Mauve Project</a><br />
-</td></tr></table>
-<br /><br /><br />
-<table border="0"><tr><td width="10"></td><td>
-<form method="get" action="http://gcc.gnu.org/cgi-bin/ml-request";>
-<small>
-Get our announcements:<br />
-</small>
-<input type="hidden" name="digest" value="off" />
-<input type="hidden" name="operation" value="subscribe" />
-<input type="hidden" name="listname" value="java-announce" />
-<input type="text" name="username" value="your e-mail-address" size="20" />
-<br />
-<input type="submit" name="submit" value="Subscribe!" />
-</form>
-</td></tr></table>
-
-</td></tr></table>
-
-</td>
-
-<td width="2" bgcolor="black">i</td>
-<td width="6"></td>
-<td>
-
-</verbatim>
-
-%body
-
-<verbatim>
-</td></tr>
-</table>
-</verbatim>
-</define-container>