From a3f66a062f7e2291671bfd294c33c074869709f8 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sun, 27 Jun 2004 19:18:00 +0000
Subject: [PATCH] Make the "right box" a bit less cluttered:

- Removing the announcement links for the 5.X and the 4.X releases.
- Point the title link for the 5.X release to the
  announcement, as it is already the case for the 4.X release.
- Only show the 5 first items from the project news and the press
  sections.

Reviewed by:	hrs
---
 en/index.xsl                 | 12 +++++-------
 share/sgml/includes.misc.xsl | 10 +++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/en/index.xsl b/en/index.xsl
index b9a6128706..7725893b52 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/index.xsl,v 1.103 2004/06/12 23:29:40 dwmalone Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.104 2004/06/27 06:22:31 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   
@@ -6,7 +6,7 @@
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.103 2004/06/12 23:29:40 dwmalone Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.104 2004/06/27 06:22:31 hrs Exp $'"/>
   <xsl:variable name="title" select="'The FreeBSD Project'"/>
 
   <!-- these params should be externally bound. The values
@@ -240,11 +240,10 @@
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
 			<td valign="top"><p>
-			      <a href="{$u.rel.early}">
+			      <a href="{$u.rel.announce}">
 			      <font size="+1" color="#990000"><b>New Technology Release:
 			    <xsl:value-of select="$rel.current"/></b></font></a><br/>
-			    <small>&#183; <a href="{$u.rel.announce}">Announcement</a><br/>
-			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
+			    <small>&#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
 			      &#183; <a href="{$u.rel.notes}">Release Notes</a><br/>
 			      &#183; <a href="{$u.rel.hardware}">Hardware Notes</a><br/>
 			      &#183; <a href="{$u.rel.installation}">Installation Notes</a><br/>
@@ -256,8 +255,7 @@
 			      <font size="+1" color="#990000"><b>Production Release:
 			    <xsl:value-of select="$rel2.current"/></b></font></a><br/>
 			
-			    <small>&#183; <a href="{$u.rel2.announce}">Announcement</a><br/>
-			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
+			    <small>&#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
 			      &#183; <a href="{$u.rel2.notes}">Release Notes</a><br/>
 			      &#183; <a href="{$u.rel2.hardware}">Hardware Notes</a><br/>
 			      &#183; <a href="{$u.rel2.installation}">Installation Notes</a><br/>
diff --git a/share/sgml/includes.misc.xsl b/share/sgml/includes.misc.xsl
index 0f7db4313a..b135deec7c 100644
--- a/share/sgml/includes.misc.xsl
+++ b/share/sgml/includes.misc.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.11 2004/06/27 06:22:31 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.12 2004/06/27 08:28:21 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
@@ -279,12 +279,12 @@
   </xsl:template>
 
   <!-- template: "html-index-news-project-items"
-       pulls in the 10 most recent project items -->
+       pulls in the 5 most recent project items -->
 
   <xsl:template name="html-index-news-project-items">
     <xsl:param name="news.project.xml" select="''" />
 
-    <xsl:for-each select="document($news.project.xml)/descendant::event[position() &lt;= 10]">
+    <xsl:for-each select="document($news.project.xml)/descendant::event[position() &lt;= 5]">
       <xsl:value-of select="$leadingmark" /><a>
 	<xsl:attribute name="href">
 	  news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
@@ -319,12 +319,12 @@
   </xsl:template>
 
   <!-- template: "html-index-news-press-items"
-       pulls in the 10 most recent press items -->
+       pulls in the 5 most recent press items -->
 
   <xsl:template name="html-index-news-press-items">
     <xsl:param name="news.press.xml" select="''" />
 
-    <xsl:for-each select="document($news.press.xml)/descendant::story[position() &lt; 10]">
+    <xsl:for-each select="document($news.press.xml)/descendant::story[position() &lt;= 5]">
       <xsl:value-of select="$leadingmark" /><a>
 	<xsl:attribute name="href">
 	  news/press.html#<xsl:call-template name="generate-story-anchor"/>