Merge infrastructure part of the new www design.

Submitted by:	Emily Boyd (emilyboyd at emilyboyd dot com)
Sponsored by:	Google Summer of Code 2005

share/mk/doc.xml.mk

@@ -1,5 +1,5 @@
 # doc.xml.mk
-# $FreeBSD: www/share/mk/doc.xml.mk,v 1.2 2005/09/18 06:25:01 hrs Exp $
+# $FreeBSD: www/share/mk/doc.xml.mk,v 1.3 2005/09/19 07:00:44 hrs Exp $
 
 XML_CATALOG_FILES=	file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
 			file://${DOC_PREFIX}/share/sgml/catalog.xml \
@@ -11,7 +11,7 @@ XML_CATALOG_FILES=	file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
 # Variables used in DEPENDSET
 
 _DEPENDSET.all=	wwwstd transtable mirrors usergroups \
-		news press navigation advisories notices
+		news press events navigation advisories notices
 
 # DEPENDSET: wwwstd  .........................................................
 _DEPENDSET.wwwstd=	${XML_INCLUDES}
@@ -120,6 +120,40 @@ XML_NEWS_INCLUDES=	${WEB_PREFIX}/${WWW_LANGCODE}/news/includes.xsl
 XML_NEWS_PRESS_MASTER=	${WEB_PREFIX}/en/news/press.xml
 XML_NEWS_PRESS=		${WEB_PREFIX}/${WWW_LANGCODE}/news/press.xml
 
+# DEPENDSET: events  ..........................................................
+_DEPENDSET.events=	${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
+			${XML_EVENTS_CURDATE} ${XML_INCLUDES}
+_PARAMS.events=		--param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
+			--param events.xml "'${XML_EVENTS_EVENTS}'" \
+			--param curdate.xml "'${XML_EVENTS_CURDATE}'"
+XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/en/events/events.xml
+.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/events/events.xml)
+XML_EVENTS_EVENTS=	${WEB_PREFIX}/${WWW_LANGCODE}/events/events.xml
+.else
+XML_EVENTS_EVENTS=	${XML_EVENTS_EVENTS_MASTER}
+.endif
+XML_EVENTS_CURDATE=	${WEB_PREFIX}/en/events/curdate.xml
+
+DATE?=	/bin/date
+TR?=	/usr/bin/tr
+
+${XML_EVENTS_CURDATE}:
+	@${ECHO} "Generating ${.TARGET}"
+	@${ECHO_CMD} '<?xml version="1.0"?>'     > ${.TARGET}
+	@${ECHO_CMD} '<curdate>'                >> ${.TARGET}
+	@${ECHO_CMD} -n '  <year>'              >> ${.TARGET}
+	@${DATE} +%Y | ${TR} -d "\n"            >> ${.TARGET}
+	@${ECHO_CMD} '</year>'                  >> ${.TARGET}
+	@${ECHO_CMD} -n '  <month>'             >> ${.TARGET}
+	@${DATE} +%m | ${TR} -d "\n"            >> ${.TARGET}
+	@${ECHO_CMD} '</month>'                 >> ${.TARGET}
+	@${ECHO_CMD} -n '  <day>'               >> ${.TARGET}
+	@${DATE} +%d | ${TR} -d "\n"            >> ${.TARGET}
+	@${ECHO_CMD} '</day>'                   >> ${.TARGET}
+	@${ECHO_CMD} '</curdate>'               >> ${.TARGET}
+
+CLEANFILES+=	${XML_EVENTS_CURDATE}
+
 # DEPENDSET: navigation  .....................................................
 _DEPENDSET.navigation=	${XML_NAVIGATION} ${XML_INCLUDES}
 _PARAMS.navigation=	--param navigation.xml "'${XML_NAVIGATION}'"

share/mk/web.site.mk

@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $FreeBSD: www/share/mk/web.site.mk,v 1.67 2005/08/30 11:50:05 pav Exp $
+# $FreeBSD: www/share/mk/web.site.mk,v 1.68 2005/09/18 04:33:46 hrs Exp $
 
 #
 # Build and install a web site.
@@ -151,7 +151,19 @@ WWW_LANGCODE:=			${.CURDIR:S,^${_WEB_PREFIX}/,,:C,^([^/]+)/.*,\1,}
 .endif # !defined(WITHOUT_DOC)
 
 SGML_INCLUDES=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.navabout.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.navcommunity.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.navdevelopers.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.navdocs.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.navdownload.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/${WWW_LANGCODE}/includes.navsupport.sgml
 SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.header.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.navabout.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.navcommunity.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.navdevelopers.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.navdocs.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.navdownload.sgml
+SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.navsupport.sgml
 SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.misc.sgml
 SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.release.sgml
 SGML_INCLUDES+=	${WEB_PREFIX}/share/sgml/includes.sgml

share/sgml/templates.usergroups.xsl

@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 
-<!-- $FreeBSD: www/share/sgml/templates.usergroups.xsl,v 1.1 2005/07/16 09:58:17 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.usergroups.xsl,v 1.2 2005/09/18 06:25:01 hrs Exp $ -->
 
 <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:import href="includes.xsl" />
+  <xsl:variable name="section" select="'community'"/>
 
   <xsl:output method="xml"
     doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
@@ -24,7 +25,15 @@
       <xsl:copy-of select="$header1"/>
 
       <body xsl:use-attribute-sets="att.body">
-        <xsl:copy-of select="$header2"/>
+        <div id="containerwrap">
+          <div id="container">
+	    <xsl:copy-of select="$header2"/>
+
+	    <div id="content">
+      	      <xsl:copy-of select="$sidenav"/>
+
+      	      <div id="contentwrap">
+		<xsl:copy-of select="$header3"/>
 
 	<xsl:call-template name="html-usergroups-list-header" />
 
@@ -37,7 +46,15 @@
           <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
           <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
 	</xsl:call-template>
-	<xsl:copy-of select="$footer"/>
+
+	      </div> <!-- contentwrap -->
+	      <br class="clearboth" />
+	    </div> <!-- content -->
+
+	    <xsl:copy-of select="$footer"/>
+
+	  </div> <!-- container -->
+	</div> <!-- containerwrap -->
       </body>
     </html>
   </xsl:template>