- Add namespace to XHTML fragments generated by XSLT stylesheets

- Properly define titles, navigation bars and RSS links for generated pages
- Minor cleanup

Approved by:	doceng (implicit)

12 files changed, 79 insertions, 117 deletions

diff --git a/ja_JP.eucJP/htdocs/community.xsl b/ja_JP.eucJP/htdocs/community.xsl
index 73a12e331d..3d402d02fe 100644
--- a/ja_JP.eucJP/htdocs/community.xsl
+++ b/ja_JP.eucJP/htdocs/community.xsl
@@ -2,35 +2,30 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 	  "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD のコミュニティ">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 <!-- Original revision: 1.9 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:key name="last-year-event-by-country" match="event[number(enddate/year) = (number($curdate.year) - 1)]"
     use="location/country" />
 
   <xsl:key name="event-by-year" match="event" use="enddate/year" />
 
-  <xsl:template name="process.content">
-	      <div id="SIDEWRAP">
-		&nav;
-	      </div> <!-- SIDEWRAP -->
+  <xsl:variable name="title">&title;</xsl:variable>
 
-	      <div id="CONTENTWRAP">
-		&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.community;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 		<p>&os; には、開発を支える活発なコミュニティがあります。</p>
 
 		<p><a href="&base;/community/mailinglists.html"
@@ -140,6 +135,5 @@
 		    GSearch.setOnLoadCallback(LoadVideoBar);
 		  </script>
 		</div> <!-- Latest Videos -->
-	      </div> <!-- CONTENTWRAP -->
   </xsl:template>
 </xsl:stylesheet>
diff --git a/ja_JP.eucJP/htdocs/events/rss.xsl b/ja_JP.eucJP/htdocs/events/rss.xsl
index 49eaad7407..51723537b3 100644
--- a/ja_JP.eucJP/htdocs/events/rss.xsl
+++ b/ja_JP.eucJP/htdocs/events/rss.xsl
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "FreeBSD Events">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
@@ -45,10 +41,6 @@
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:output method="xml" indent="yes"/>
 
   <xsl:key name="event-by-month" match="event"
diff --git a/ja_JP.eucJP/htdocs/index.xsl b/ja_JP.eucJP/htdocs/index.xsl
index cf9de13768..fe1446f19f 100644
--- a/ja_JP.eucJP/htdocs/index.xsl
+++ b/ja_JP.eucJP/htdocs/index.xsl
@@ -7,7 +7,10 @@
 <!-- $FreeBSD$ -->
 <!-- Original revision: 1.178 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
@@ -24,6 +27,10 @@
   <xsl:param name="events.xml" select="'none'"/>
   <xsl:param name="html.header.script.google" select="'IGNORE'"/>
 
+  <xsl:variable name="svnKeyword">$FreeBSD$</xsl:variable>
+
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:template name="process.content">
 	    <div id="FRONTCONTAINER">
 	      <div id="FRONTMAIN">
diff --git a/ja_JP.eucJP/htdocs/java/java-rss.xsl b/ja_JP.eucJP/htdocs/java/java-rss.xsl
index dcfa5e8fc1..2d3a4ef4f6 100644
--- a/ja_JP.eucJP/htdocs/java/java-rss.xsl
+++ b/ja_JP.eucJP/htdocs/java/java-rss.xsl
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
@@ -16,10 +13,6 @@
 
   <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:template match="/">
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>
diff --git a/ja_JP.eucJP/htdocs/java/newsflash.xsl b/ja_JP.eucJP/htdocs/java/newsflash.xsl
index b67af8afa7..992bb2b8c1 100644
--- a/ja_JP.eucJP/htdocs/java/newsflash.xsl
+++ b/ja_JP.eucJP/htdocs/java/newsflash.xsl
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
 <!ENTITY rsslink "&base;/java/rss.xml">
 <!ENTITY title "FreeBSD &java; Project: Newsflash">
 <!ENTITY rsstitle "FreeBSD Java Project News">
-<!ENTITY email "freebsd-java">
-<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % header.rss "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -15,19 +11,22 @@
 <!-- Original revision: 1.2 -->
 
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS" exclude-result-prefixes="cvs">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
+  <xsl:variable name="title">&title;</xsl:variable>
+
+  <xsl:variable name="rsstitle">&rsstitle;</xsl:variable>
+
+  <xsl:variable name="rsslink">&rsslink;</xsl:variable>
 
   <xsl:template name="process.content">
               <div id="SIDEWRAP">
-                &nav;
+                &nav.developers;
                 <div id="FEEDLINKS">
                   <ul>
                     <li>
@@ -40,7 +39,7 @@
               </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
-		&header3;
+		<h1>&title;</h1>
 
 		<img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
 		  height="144" alt="FreeBSD Java News"/>
diff --git a/ja_JP.eucJP/htdocs/search/index-site.xsl b/ja_JP.eucJP/htdocs/search/index-site.xsl
index a50763d1c7..1e5f7fc9de 100644
--- a/ja_JP.eucJP/htdocs/search/index-site.xsl
+++ b/ja_JP.eucJP/htdocs/search/index-site.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="eucJP"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
                                 "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "http://www.FreeBSD.org のサイトマップおよび索引">
+<!ENTITY title "サイトマップ">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -9,15 +9,18 @@
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.29 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
   <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/>
 
-  <xsl:template name="process.contentwrap">
-    <h1>サイトマップ</h1>
+  <xsl:variable name="title">&title;</xsl:variable>
 
+  <xsl:template name="process.contentwrap">
     <xsl:call-template name="html-sitemap"/>
 
     <h2>各ホームページ</h2>
diff --git a/ja_JP.eucJP/htdocs/security/mkindex.xsl b/ja_JP.eucJP/htdocs/security/mkindex.xsl
index 6dee89966f..88fe22bd7d 100644
--- a/ja_JP.eucJP/htdocs/security/mkindex.xsl
+++ b/ja_JP.eucJP/htdocs/security/mkindex.xsl
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- Original revision: 1.7 -->
diff --git a/ja_JP.eucJP/share/sgml/libcommon.xsl b/ja_JP.eucJP/share/sgml/libcommon.xsl
index 8c5fadcc93..f3878ad710 100644
--- a/ja_JP.eucJP/share/sgml/libcommon.xsl
+++ b/ja_JP.eucJP/share/sgml/libcommon.xsl
@@ -5,7 +5,10 @@
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.34 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
 
   <!-- default format for date string -->
diff --git a/ja_JP.eucJP/share/sgml/templates.events.xsl b/ja_JP.eucJP/share/sgml/templates.events.xsl
index 77cd2b7a61..48df3a64fc 100644
--- a/ja_JP.eucJP/share/sgml/templates.events.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.events.xsl
@@ -2,11 +2,8 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD 関連イベント">
-<!ENTITY email "freebsd-www">
 <!ENTITY rsslink "&enbase;/events/rss.xml">
 <!ENTITY rsstitle "今後開催予定の FreeBSD 関連イベント">
-<!ENTITY % navinclude.community "INCLUDE">
-<!ENTITY % header.rss "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -40,18 +37,13 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   xmlns:date="http://exslt.org/dates-and-times"
-  extension-element-prefixes="date"
-  exclude-result-prefixes="cvs">
+  xmlns="http://www.w3.org/1999/xhtml"
+  extension-element-prefixes="date">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:param name="startyear">2007</xsl:param>
   <xsl:param name="pastyears">2003 2004 2005 2006</xsl:param>
 
@@ -71,6 +63,12 @@
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
+  <xsl:variable name="rsstitle">&rsstitle;</xsl:variable>
+
+  <xsl:variable name="rsslink">&rsslink;</xsl:variable>
+
   <xsl:template name="process.content">
   <xsl:variable name="chart-countries">
     <xsl:for-each select="/evetns/event[
@@ -94,7 +92,7 @@
   <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&amp;chd=t:<xsl:value-of select="$chart-country-counts"/>&amp;chld=<xsl:value-of select="$chart-countries"/></xsl:variable>
 
               <div id="SIDEWRAP">
-                &nav;
+                &nav.community;
                 <div id="FEEDLINKS">
                   <ul>
                     <li>
@@ -107,7 +105,7 @@
               </div> <!-- SIDEWRAP -->
 
 	      <div id="contentwrap">
-		&header3;
+		<h1>&title;</h1>
  	<!--
 	     Note the current date to have a reference, if the
 	     upcoming/past events are split incorrectly.
diff --git a/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl b/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
index 6dcb47578f..6fc6dd66a4 100644
--- a/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
@@ -2,41 +2,34 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:variable name="year">
     <xsl:value-of select="descendant::year/name"/>
   </xsl:variable>
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  
-  <xsl:output type="html" encoding="&xml.encoding;"/>
 
   <xsl:template match="p">
     <xsl:copy-of select="." />
   </xsl:template>
 
-  <xsl:template name="process.content">
-	<div id="SIDEWRAP">
-	  &nav;
-	</div> <!-- SIDEWRAP -->
-
-	<div id="CONTENTWRAP">
-
-	&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.about;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 	<xsl:apply-templates select="/news/descendant::month"/>
 	
 	<p>Other project news:
@@ -56,7 +49,6 @@
 	  <a href="../1996/index.html">1996</a></p>
 
 	<a href="&base;/news/news.html">News Home</a>
-	</div> <!-- CONTENTWRAP -->
   </xsl:template>
 
   <!-- Everything that follows are templates for the rest of the content -->
diff --git a/ja_JP.eucJP/share/sgml/templates.oldpress.xsl b/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
index 5b99658dca..732e928a80 100644
--- a/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
@@ -2,37 +2,30 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "ニュース記事">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:variable name="year">
     <xsl:value-of select="descendant::year/name"/>
   </xsl:variable>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-  
-  <xsl:template name="process.content">
-	<div id="SIDEWRAP">
-	  &nav;
-	</div> <!-- SIDEWRAP -->
-
-	<div id="CONTENTWRAP">
-
-	  &header3;
+  <xsl:template name="process.sidewrap">
+    &nav.about;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 	<xsl:apply-templates select="//month"/>
 	
 	<p>過去のニュース記事:
@@ -50,7 +43,6 @@
 	  <a href="&enbase;/news/1998/press.html">1998-1996</a></p>
 
 	<a href="&base;/news/news.html">ニュースページ</a>
-	</div> <!-- CONTENTWRAP -->
   </xsl:template>
 
   <!-- Everything that follows are templates for the rest of the content -->
diff --git a/ja_JP.eucJP/share/sgml/templates.usergroups.xsl b/ja_JP.eucJP/share/sgml/templates.usergroups.xsl
index f986dce355..f7f8224b4c 100644
--- a/ja_JP.eucJP/share/sgml/templates.usergroups.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.usergroups.xsl
@@ -2,37 +2,31 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
                                 "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "ユーザグループ">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  exclude-result-prefixes="cvs">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:key name="usergroup-by-country" match="entry"
     use="../@code" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />
 
-  <xsl:template name="process.content">
-	      <div id="SIDEWRAP">
-		&nav;
-	      </div> <!-- SIDEWRAP -->
+  <xsl:variable name="title">&title;</xsl:variable>
 
-	      <div id="CONTENTWRAP">
-		&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.community;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
   <xsl:variable name="chart-countries">
     <xsl:for-each select="//entry[
 	generate-id() =
@@ -67,7 +61,5 @@
           <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
           <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
 	</xsl:call-template>
-
-	      </div> <!-- CONTENTWRAP -->
   </xsl:template>
 </xsl:stylesheet>