diff options
95 files changed, 573 insertions, 765 deletions
diff --git a/de_DE.ISO8859-1/htdocs/community.xsl b/de_DE.ISO8859-1/htdocs/community.xsl index af04051c43..c1164410be 100644 --- a/de_DE.ISO8859-1/htdocs/community.xsl +++ b/de_DE.ISO8859-1/htdocs/community.xsl @@ -2,7 +2,6 @@ <!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 "Die FreeBSD-Gemeinde"> -<!ENTITY email "freebsd-www"> <!ENTITY % navinclude.community "INCLUDE"> ]> @@ -10,28 +9,23 @@ <!-- $FreeBSDde: de-www/community.xsl,v 1.7 2011/08/01 09:27:32 jkois Exp $ --> <!-- basiert auf: 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 --> - - <div id="CONTENTWRAP"> - &header3; + <xsl:template name="process.sidewrap"> + &nav.community; + </xsl:template> + <xsl:template name="process.contentwrap"> <p>&os; wird von einer aktiven Gemeinschaft unterstützt.</p> @@ -136,6 +130,5 @@ </script> </div> <!-- Latest Videos --> - </div> <!-- CONTENTWRAP --> </xsl:template> </xsl:stylesheet> diff --git a/de_DE.ISO8859-1/htdocs/index.xsl b/de_DE.ISO8859-1/htdocs/index.xsl index 9ea8ce9850..3e0c455273 100644 --- a/de_DE.ISO8859-1/htdocs/index.xsl +++ b/de_DE.ISO8859-1/htdocs/index.xsl @@ -9,7 +9,10 @@ basiert auf: 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"/> @@ -26,6 +29,8 @@ <xsl:param name="events.xml" select="'none'"/> <xsl:param name="html.header.script.google" select="'IGNORE'"/> + <xsl:variable name="title">&title;</xsl:variable> + <xsl:template name="process.content"> <div id="FRONTCONTAINER"> <div id="FRONTMAIN"> diff --git a/el_GR.ISO8859-7/share/sgml/header.l10n.ent b/el_GR.ISO8859-7/share/sgml/header.l10n.ent index 86c7f602c1..3346308ee9 100644 --- a/el_GR.ISO8859-7/share/sgml/header.l10n.ent +++ b/el_GR.ISO8859-7/share/sgml/header.l10n.ent @@ -97,8 +97,6 @@ </div> <!-- HEADERCONTAINER --> '> -<!ENTITY header3 '<h1>&title;</h1>'> - <!-- macro for webbuild paper --> <!ENTITY webbuild ' <p>���� �� ������� ���������� �� ����������� ���������� ������������� diff --git a/en_US.ISO8859-1/htdocs/community.xsl b/en_US.ISO8859-1/htdocs/community.xsl index 4fadd129c7..4eb9b0de28 100644 --- a/en_US.ISO8859-1/htdocs/community.xsl +++ b/en_US.ISO8859-1/htdocs/community.xsl @@ -2,37 +2,29 @@ <!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 Community"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.community "INCLUDE"> ]> <!-- $FreeBSD$ --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> - <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/> +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml"> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> + <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:output method="xml" encoding="&xml.encoding;" - doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"/> + <xsl:variable name="title">&title;</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 --> - - <div id="CONTENTWRAP"> - &header3; + <xsl:template name="process.sidewrap"> + &nav.community; + </xsl:template> + <xsl:template name="process.contentwrap"> <p>&os; is well supported by its active community.</p> @@ -136,7 +128,5 @@ GSearch.setOnLoadCallback(LoadVideoBar); </script> </div> <!-- Latest Videos --> - </div> <!-- CONTENTWRAP --> - <br class="clearboth" /> </xsl:template> </xsl:stylesheet> diff --git a/en_US.ISO8859-1/htdocs/events/rss.xsl b/en_US.ISO8859-1/htdocs/events/rss.xsl index 58dca1a32e..83c7ef7316 100644 --- a/en_US.ISO8859-1/htdocs/events/rss.xsl +++ b/en_US.ISO8859-1/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$ --> @@ -43,10 +39,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/en_US.ISO8859-1/htdocs/gnome/index.xsl b/en_US.ISO8859-1/htdocs/gnome/index.xsl index 9a8c661609..f4e7f2b304 100644 --- a/en_US.ISO8859-1/htdocs/gnome/index.xsl +++ b/en_US.ISO8859-1/htdocs/gnome/index.xsl @@ -3,7 +3,6 @@ "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [ <!ENTITY base ".."> <!ENTITY title "The FreeBSD GNOME Project"> -<!ENTITY % navinclude.gnome "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -15,9 +14,11 @@ <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:template name="process.content"> <div id="SIDEWRAP"> - &nav; + &nav.gnome; </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> @@ -86,7 +87,7 @@ </div> <!-- rightnav --> </div> <!-- rightwrap --> - &header3; + <h1>&title;</h1> <h2>What is GNOME?</h2> diff --git a/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl b/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl index 540d7eeef5..1222efadae 100644 --- a/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl +++ b/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl @@ -4,23 +4,26 @@ <!ENTITY base ".."> <!ENTITY title "FreeBSD GNOME News Flash"> <!ENTITY rsslink "&base;/gnome/rss.xml"> -<!ENTITY rsstitle "&title;"> -<!ENTITY email "freebsd-gnome"> -<!ENTITY % navinclude.gnome "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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="title">&title;</xsl:variable> + + <xsl:variable name="rsstitle">&title;</xsl:variable> + + <xsl:variable name="rsslink">&rsslink;</xsl:variable> + <xsl:template name="process.content"> <div id="SIDEWRAP"> - &nav; + &nav.gnome; <div id="FEEDLINKS"> <ul> <li> @@ -39,7 +42,7 @@ </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> - &header3; + <h1>&title;</h1> <img src="&base;/gifs/news.jpg" align="right" border="0" width="193" height="144" alt="FreeBSD GNOME News"/> diff --git a/en_US.ISO8859-1/htdocs/gnome/rss.xsl b/en_US.ISO8859-1/htdocs/gnome/rss.xsl index cc7973314d..419213ee99 100644 --- a/en_US.ISO8859-1/htdocs/gnome/rss.xsl +++ b/en_US.ISO8859-1/htdocs/gnome/rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "FreeBSD GNOME Project News System"> -]> + "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> diff --git a/en_US.ISO8859-1/htdocs/gnome/rss2.xsl b/en_US.ISO8859-1/htdocs/gnome/rss2.xsl index e0eaffb282..5aef5db4ac 100644 --- a/en_US.ISO8859-1/htdocs/gnome/rss2.xsl +++ b/en_US.ISO8859-1/htdocs/gnome/rss2.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "FreeBSD GNOME Project News System"> -]> + "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> @@ -15,11 +12,6 @@ <xsl:output method="xml" indent="yes"/> - - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:variable name="title">FreeBSD GNOME Project News</xsl:variable> <xsl:variable name="link">http://www.FreeBSD.org/gnome/</xsl:variable> diff --git a/en_US.ISO8859-1/htdocs/index.xsl b/en_US.ISO8859-1/htdocs/index.xsl index 5ff8e97759..b91dcd1712 100644 --- a/en_US.ISO8859-1/htdocs/index.xsl +++ b/en_US.ISO8859-1/htdocs/index.xsl @@ -6,7 +6,10 @@ <!-- $FreeBSD$ --> -<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"/> @@ -23,6 +26,8 @@ <xsl:param name="events.xml" select="'none'"/> <xsl:param name="html.header.script.google" select="'IGNORE'"/> + <xsl:variable name="title">&title;</xsl:variable> + <xsl:template name="process.content"> <div id="FRONTCONTAINER"> <div id="FRONTMAIN"> diff --git a/en_US.ISO8859-1/htdocs/java/java-rss.xsl b/en_US.ISO8859-1/htdocs/java/java-rss.xsl index 8c75bb3290..e1ddec6822 100644 --- a/en_US.ISO8859-1/htdocs/java/java-rss.xsl +++ b/en_US.ISO8859-1/htdocs/java/java-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!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$ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" @@ -14,10 +11,6 @@ <xsl:output method="xml" indent="yes"/> - <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/en_US.ISO8859-1/htdocs/java/newsflash.xsl b/en_US.ISO8859-1/htdocs/java/newsflash.xsl index 189e57d171..9a1c5f0242 100644 --- a/en_US.ISO8859-1/htdocs/java/newsflash.xsl +++ b/en_US.ISO8859-1/htdocs/java/newsflash.xsl @@ -3,24 +3,28 @@ "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 title "FreeBSD &java; Project News Flash"> <!ENTITY rsstitle "FreeBSD Java Project News"> -<!ENTITY email "freebsd-java"> -<!ENTITY % navinclude.developers "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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="title">&title;</xsl:variable> + + <xsl:variable name="rsstitle">&title;</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> @@ -33,7 +37,7 @@ </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> - &header3; + <h1>&title;</h1> <img src="&base;/gifs/news.jpg" align="right" border="0" width="193" height="144" alt="FreeBSD Java News"/> diff --git a/en_US.ISO8859-1/htdocs/news/status/report.xsl b/en_US.ISO8859-1/htdocs/news/status/report.xsl index a91279a7e4..56ce32e89d 100644 --- a/en_US.ISO8859-1/htdocs/news/status/report.xsl +++ b/en_US.ISO8859-1/htdocs/news/status/report.xsl @@ -1,34 +1,26 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "FreeBSD Quarterly Status Report"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.about "INCLUDE"> ]> <!-- $FreeBSD$ --> <!-- Standard header material --> -<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="ucletters" - select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/> - <xsl:variable name="lcletters" - select="'abcdefghijklmnopqrstuvwxyz'"/> - - <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.about; + </xsl:template> + <xsl:template name="process.contentwrap"> <!-- Process all the <sections>, in order --> <xsl:apply-templates select="report/section"/> @@ -40,7 +32,7 @@ <xsl:variable name="cat-short" select="name"/> <ul> <xsl:for-each select="//project[@cat=$cat-short and @summary]"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $uppercase)"/> <li><a><xsl:attribute name="href">#<xsl:value-of select="translate(title, ' ', '-')"/></xsl:attribute><xsl:value-of select="title"/></a> @@ -48,7 +40,7 @@ </xsl:for-each> <xsl:for-each select="//project[@cat=$cat-short and not(@summary)]"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $uppercase)"/> <li><a><xsl:attribute name="href">#<xsl:value-of select="translate(title, ' ', '-')"/></xsl:attribute><xsl:value-of select="title"/></a> @@ -58,7 +50,7 @@ </xsl:for-each> <ul> <xsl:for-each select="//project[not(@cat)]"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $uppercase)"/> <li><a><xsl:attribute name="href">#<xsl:value-of select="translate(title, ' ', '-')"/></xsl:attribute><xsl:value-of select="title"/></a> @@ -70,14 +62,11 @@ <!-- Process each project, sorted --> <xsl:apply-templates select="report/project"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $uppercase)"/> </xsl:apply-templates> <!-- Standard footer --> <a href="../news.html">News Home</a> | <a href="status.html">Status Home</a> - </div> <!-- contentwrap --> - - <br class="clearboth" /> </xsl:template> <!-- Everything that follows are templates for the rest of the content --> diff --git a/en_US.ISO8859-1/htdocs/search/index-site.xsl b/en_US.ISO8859-1/htdocs/search/index-site.xsl index 1ec9e6323d..f586205ddd 100644 --- a/en_US.ISO8859-1/htdocs/search/index-site.xsl +++ b/en_US.ISO8859-1/htdocs/search/index-site.xsl @@ -6,12 +6,17 @@ <!-- $FreeBSD$ --> -<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:variable name="title">&title;</xsl:variable> + <xsl:template name="process.contentwrap"> <h1>Site Map</h1> diff --git a/en_US.ISO8859-1/htdocs/security/errata-rss.xsl b/en_US.ISO8859-1/htdocs/security/errata-rss.xsl index 06db69c796..819bfbcd61 100644 --- a/en_US.ISO8859-1/htdocs/security/errata-rss.xsl +++ b/en_US.ISO8859-1/htdocs/security/errata-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!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$ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" @@ -14,10 +11,6 @@ <xsl:output method="xml" indent="yes"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:call-template name="rss-errata-notices"> <xsl:with-param name="notices.xml" select="$notices.xml" /> diff --git a/en_US.ISO8859-1/htdocs/security/mkindex.xsl b/en_US.ISO8859-1/htdocs/security/mkindex.xsl index 36d2f45de0..af7dbf8e9b 100644 --- a/en_US.ISO8859-1/htdocs/security/mkindex.xsl +++ b/en_US.ISO8859-1/htdocs/security/mkindex.xsl @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!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$ --> diff --git a/en_US.ISO8859-1/htdocs/security/security-rdf.xsl b/en_US.ISO8859-1/htdocs/security/security-rdf.xsl index 7cb9332805..cdb9944b5c 100644 --- a/en_US.ISO8859-1/htdocs/security/security-rdf.xsl +++ b/en_US.ISO8859-1/htdocs/security/security-rdf.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!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$ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> diff --git a/en_US.ISO8859-1/htdocs/security/security-rss.xsl b/en_US.ISO8859-1/htdocs/security/security-rss.xsl index f84a2235de..1a967f7cd4 100644 --- a/en_US.ISO8859-1/htdocs/security/security-rss.xsl +++ b/en_US.ISO8859-1/htdocs/security/security-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!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$ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" @@ -14,10 +11,6 @@ <xsl:output method="xml" indent="yes"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:call-template name="rss-security-advisories"> <xsl:with-param name="advisories.xml" select="$advisories.xml" /> diff --git a/es_ES.ISO8859-1/htdocs/index.xsl b/es_ES.ISO8859-1/htdocs/index.xsl index 14f4b5d4b8..53602d081e 100644 --- a/es_ES.ISO8859-1/htdocs/index.xsl +++ b/es_ES.ISO8859-1/htdocs/index.xsl @@ -7,12 +7,13 @@ <!-- The FreeBSD Spanish Documentation Project Original Revision: r1.163 --> -<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"/> - <xsl:variable name="date" select="'$FreeBSD$'"/> - <!-- these params should be externally bound. The values here are not used actually --> <xsl:param name="advisories.xml" select="'none'"/> @@ -25,6 +26,10 @@ <xsl:param name="events.xml-master" select="'none'"/> <xsl:param name="events.xml" select="'none'"/> + <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/> + + <xsl:variable name="title">&title;</xsl:variable> + <xsl:template name="process.content"> <div id="FRONTCONTAINER"> <div id="FRONTMAIN"> diff --git a/es_ES.ISO8859-1/htdocs/search/index-site.xsl b/es_ES.ISO8859-1/htdocs/search/index-site.xsl index 02b77c894b..6ad5bd95ac 100644 --- a/es_ES.ISO8859-1/htdocs/search/index-site.xsl +++ b/es_ES.ISO8859-1/htdocs/search/index-site.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "Mapa de sitio e �ndice de http://www.FreeBSD.org"> +<!ENTITY title "Mapa del sitio"> ]> <!-- $FreeBSD$ --> @@ -9,18 +9,21 @@ <!-- The FreeBSD Spanish Documentation Project Original Revision: r1.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:variable name="lowercase" select="'a�bcde�fghi�jklmn�o�pqrstu�vwxyz'"/> <xsl:variable name="uppercase" select="'A�BCDE�FGHI�JKLMN�O�PQRSTU�VWXYZ'"/> + <xsl:variable name="title">&title;</xsl:variable> + <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/> <xsl:template name="process.contentwrap"> - <h1>Mapa del sitio</h1> - <xsl:call-template name="html-sitemap"/> <h2>Metap�ginas</h2> diff --git a/fr_FR.ISO8859-1/htdocs/auditors.sgml b/fr_FR.ISO8859-1/htdocs/auditors.sgml index ae0f84a4a7..6d80dacd21 100644 --- a/fr_FR.ISO8859-1/htdocs/auditors.sgml +++ b/fr_FR.ISO8859-1/htdocs/auditors.sgml @@ -26,8 +26,6 @@ <h1>Informations G�n�rales</h1> - <em>&date; </em> - <h2>Introduction</h2> <p>A la lumi�re de notre r�cent (et toujours actuel) souci de la s�curit�, diff --git a/fr_FR.ISO8859-1/htdocs/gnome/index.xsl b/fr_FR.ISO8859-1/htdocs/gnome/index.xsl index 568680551f..25a8958a76 100644 --- a/fr_FR.ISO8859-1/htdocs/gnome/index.xsl +++ b/fr_FR.ISO8859-1/htdocs/gnome/index.xsl @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!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 "Projet GNOME pour FreeBSD"> -<!ENTITY % navinclude.gnome "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -22,12 +20,13 @@ <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" select="'$FreeBSD$'"/> - <xsl:variable name="title" select="''"/> + <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/> + + <xsl:variable name="title">&title;</xsl:variable> <xsl:template names="process.content"> <div id="SIDEWRAP"> - &nav; + &nav.gnome; </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> @@ -96,7 +95,7 @@ </div> <!-- rightnav --> </div> <!-- rightwrap --> - &header3; + <h1>&title;</h1> <h2>Qu'est-ce que GNOME ?</h2> diff --git a/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl b/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl index ad627de9f5..d867abc350 100644 --- a/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl +++ b/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "Nouvelles sur le projet GNOME pour FreeBSD"> -<!ENTITY email "freebsd-gnome"> -<!ENTITY % navinclude.developers "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -16,24 +13,20 @@ Version francaise : Stephane Legrand <stephane@freebsd-fr.org> --> -<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:template names="process.content"> - <div id="SIDEWRAP"> - &nav; - </div> <!-- SIDEWRAP --> - - <div id="CONTENTWRAP"> - &header3; + <xsl:template name="process.sidewrap"> + &nav.developers; + </xsl:template> + <xsl:template names="process.contentwrap"> <img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193" height="144" alt="FreeBSD GNOME News"/> @@ -42,8 +35,6 @@ <xsl:for-each select="/news"> <xsl:call-templates name="html-news-list-homelink" /> </xsl:for-each> - - </div> <!-- contentwrap --> </xsl:template> <!-- Everything that follows are templates for the rest of the content --> @@ -78,6 +69,4 @@ </li> </xsl:template> - - <xsl:template match="date"/> <!-- Deliberately left blank --> </xsl:stylesheet> diff --git a/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl b/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl index 1c123af47d..286a154586 100644 --- a/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl +++ b/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "Syst�me de nouvelles du Projet GNOME pour FreeBSD"> -]> + "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> <!-- @@ -19,7 +16,7 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/> - <xsl:variable name="date" select="'$FreeBSD$'"/> + <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/> <xsl:output type="xml" /> diff --git a/fr_FR.ISO8859-1/htdocs/index.xsl b/fr_FR.ISO8859-1/htdocs/index.xsl index 436d618809..62c4d88100 100644 --- a/fr_FR.ISO8859-1/htdocs/index.xsl +++ b/fr_FR.ISO8859-1/htdocs/index.xsl @@ -13,12 +13,13 @@ Mise a jour: Marc Fonvieille <blackend@FreeBSD.org> --> -<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"/> - <xsl:variable name="date" select="''"/> - <!-- these params should be externally bound. The values here are not used actually --> <xsl:param name="advisories.xml" select="'none'"/> @@ -32,6 +33,10 @@ <xsl:param name="events.xml" select="'none'"/> <xsl:param name="curdate.xml" select="'none'"/> + <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/> + + <xsl:variable name="title">&title;</xsl:variable> + <xsl:template names="process.content"> <div id="FRONTCONTAINER"> <div id="FRONTMAIN"> diff --git a/fr_FR.ISO8859-1/htdocs/news/status/report.xsl b/fr_FR.ISO8859-1/htdocs/news/status/report.xsl index 67a2848436..6ee96233d3 100644 --- a/fr_FR.ISO8859-1/htdocs/news/status/report.xsl +++ b/fr_FR.ISO8859-1/htdocs/news/status/report.xsl @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "FreeBSD Rapport de Statut"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.about "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -17,28 +14,20 @@ --> <!-- Standard header material --> -<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:variable name="ucletters" - select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/> - <xsl:variable name="lcletters" - select="'abcdefghijklmnopqrstuvwxyz'"/> - - <xsl:template names="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.about; + </xsl:template> + <xsl:template names="process.contentwrap"> <!-- Process all the <sections>, in order --> <xsl:apply-templates select="/report/section"/> @@ -50,7 +39,7 @@ <xsl:variable name="cat-short" select="name"/> <ul> <xsl:for-each select="//project[@cat=$cat-short]"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $uppercase)"/> <li><a><xsl:attribute name="href">#<xsl:value-of select="translate(title, ' ', '-')"/></xsl:attribute><xsl:value-of select="title"/></a> @@ -60,7 +49,7 @@ </xsl:for-each> <ul> <xsl:for-each select="//project[not(@cat)]"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $ucppercase)"/> <li><a><xsl:attribute name="href">#<xsl:value-of select="translate(title, ' ', '-')"/></xsl:attribute><xsl:value-of select="title"/></a> @@ -72,12 +61,11 @@ <!-- Process each project, sorted --> <xsl:apply-templates select="/report/project"> - <xsl:sort select="translate(title, $lcletters, $ucletters)"/> + <xsl:sort select="translate(title, $lowercase, $uppercase)"/> </xsl:apply-templates> <!-- Standard footer --> <a href="../news.html">News Home</a> | <a href="status.html">Status Home</a> - </div> <!-- contentwrap --> </xsl:template> <!-- Everything that follows are templates for the rest of the content --> diff --git a/fr_FR.ISO8859-1/htdocs/search/index-site.xsl b/fr_FR.ISO8859-1/htdocs/search/index-site.xsl index 614bcb3b60..c99205f6f1 100644 --- a/fr_FR.ISO8859-1/htdocs/search/index-site.xsl +++ b/fr_FR.ISO8859-1/htdocs/search/index-site.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 "Plan du site et index de http://www.FreeBSD.org"> +<!ENTITY title "Plan du site"> ]> <!-- $FreeBSD$ --> @@ -15,18 +15,21 @@ Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net> --> -<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:variable name="lowercase" select="'a�bc�de���fghi�jklmno�pqrstu��vwxyz'"/> <xsl:variable name="uppercase" select="'A�BC�DE���FGHI�JKLMNO�PQRSTU��VWXYZ'"/> + <xsl:variable name="title">&title;</xsl:variable> + <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/> <xsl:template name="process.contentwrap"> - <h1>Plan du site</h1> - <xsl:call-template name="html-sitemap"/> <h2>Meta pages d'accueil</h2> diff --git a/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl b/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl index acc38a6bd7..a438daa67c 100644 --- a/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl +++ b/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!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$ --> @@ -17,7 +14,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/> - <xsl:variable name="date" select="'$FreeBSD$'"/> + <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/> <xsl:output type="xml" encoding="iso-8859-1" omit-xml-declaration="yes" /> diff --git a/hu_HU.ISO8859-2/htdocs/community.xsl b/hu_HU.ISO8859-2/htdocs/community.xsl index 4c569fa355..0de232aeff 100644 --- a/hu_HU.ISO8859-2/htdocs/community.xsl +++ b/hu_HU.ISO8859-2/htdocs/community.xsl @@ -2,8 +2,6 @@ <!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 "A &os; közösség"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.community "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -14,28 +12,25 @@ %SRCID% 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>A &os; mögött egy aktív fejlesztõi közösség áll.</p> @@ -143,6 +138,5 @@ GSearch.setOnLoadCallback(LoadVideoBar); </script> </div> <!-- latest-videos --> - </div> <!-- CONTENTWRAP --> </xsl:template> </xsl:stylesheet> diff --git a/hu_HU.ISO8859-2/htdocs/events/rss.xsl b/hu_HU.ISO8859-2/htdocs/events/rss.xsl index 0bcb5f79fa..2c61cfc55d 100644 --- a/hu_HU.ISO8859-2/htdocs/events/rss.xsl +++ b/hu_HU.ISO8859-2/htdocs/events/rss.xsl @@ -2,8 +2,6 @@ <!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 "&os; központú rendezvények"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.about "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -49,10 +47,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/hu_HU.ISO8859-2/htdocs/index.xsl b/hu_HU.ISO8859-2/htdocs/index.xsl index 902c0df977..178db0efc8 100644 --- a/hu_HU.ISO8859-2/htdocs/index.xsl +++ b/hu_HU.ISO8859-2/htdocs/index.xsl @@ -12,7 +12,10 @@ %SRCID% 1.169 --> -<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"/> @@ -28,6 +31,10 @@ <xsl:param name="events.xml-master" select="'none'"/> <xsl:param name="events.xml" select="'none'"/> + <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/hu_HU.ISO8859-2/htdocs/search/index-site.xsl b/hu_HU.ISO8859-2/htdocs/search/index-site.xsl index 89dabe6230..0dbf33464e 100644 --- a/hu_HU.ISO8859-2/htdocs/search/index-site.xsl +++ b/hu_HU.ISO8859-2/htdocs/search/index-site.xsl @@ -1,24 +1,26 @@ <?xml version="1.0" encoding="ISO-8859-2"?> <!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 "A http://www.FreeBSD.org oldaltérképe - és indexe"> +<!ENTITY title "Oldalt�rk�p"> ]> <!-- $FreeBSD$ --> -<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:variable name="lowercase" select="'a�bcde�fghi�jklmno���pqrstu���vwxyz'"/> <xsl:variable name="uppercase" select="'A�BCDE�FGHI�JKLMNO���PQRSTU���VWXYZ'"/> + <xsl:variable name="title">&title;</xsl:variable> + <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/> <xsl:template name="process.contentwrap"> - <h1>Oldaltérkép</h1> - <xsl:call-template name="html-sitemap"/> <h2>Metaoldalak</h2> diff --git a/hu_HU.ISO8859-2/htdocs/security/errata-rss.xsl b/hu_HU.ISO8859-2/htdocs/security/errata-rss.xsl index c4520ba1a6..a712a3e599 100644 --- a/hu_HU.ISO8859-2/htdocs/security/errata-rss.xsl +++ b/hu_HU.ISO8859-2/htdocs/security/errata-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-2"?> <!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 Hungarian Documentation Project @@ -20,10 +17,6 @@ <xsl:output method="xml" indent="yes"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:call-template name="rss-errata-notices"> <xsl:with-param name="notices.xml" select="$notices.xml" /> diff --git a/hu_HU.ISO8859-2/htdocs/security/mkindex.xsl b/hu_HU.ISO8859-2/htdocs/security/mkindex.xsl index 67865d90cb..b82b37d536 100644 --- a/hu_HU.ISO8859-2/htdocs/security/mkindex.xsl +++ b/hu_HU.ISO8859-2/htdocs/security/mkindex.xsl @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!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$ --> diff --git a/hu_HU.ISO8859-2/htdocs/security/security-rdf.xsl b/hu_HU.ISO8859-2/htdocs/security/security-rdf.xsl index 04bd0a56b1..ef83c9a27a 100644 --- a/hu_HU.ISO8859-2/htdocs/security/security-rdf.xsl +++ b/hu_HU.ISO8859-2/htdocs/security/security-rdf.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-2"?> <!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 Hungarian Documentation Project diff --git a/hu_HU.ISO8859-2/htdocs/security/security-rss.xsl b/hu_HU.ISO8859-2/htdocs/security/security-rss.xsl index 817c08e8e0..5b4d8dfcd7 100644 --- a/hu_HU.ISO8859-2/htdocs/security/security-rss.xsl +++ b/hu_HU.ISO8859-2/htdocs/security/security-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="iso-8859-2"?> <!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 Hungarian Documentation Project @@ -20,10 +17,6 @@ <xsl:output method="xml" indent="yes"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:call-template name="rss-security-advisories"> <xsl:with-param name="advisories.xml" select="$advisories.xml" /> diff --git a/hu_HU.ISO8859-2/share/sgml/libcommon.xsl b/hu_HU.ISO8859-2/share/sgml/libcommon.xsl index 358588b2ab..d757147b51 100644 --- a/hu_HU.ISO8859-2/share/sgml/libcommon.xsl +++ b/hu_HU.ISO8859-2/share/sgml/libcommon.xsl @@ -9,7 +9,10 @@ %SRCID% 1.31 --> -<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:param name="param-l10n-date-format-YMD" diff --git a/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl b/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl index 0db0b6ff96..b0a81f47f1 100644 --- a/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl +++ b/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl @@ -21,11 +21,6 @@ <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" /> - <xsl:variable name="date"> - <xsl:value-of xmlns:cvs="http://www.FreeBSD.org/XML/CVS" - select="normalize-space(//cvs:keyword[@name='freebsd'])"/> - </xsl:variable> - <!-- templates available: diff --git a/hu_HU.ISO8859-2/share/sgml/templates.events.xsl b/hu_HU.ISO8859-2/share/sgml/templates.events.xsl index 3337a3b34a..b32b52ce34 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.events.xsl +++ b/hu_HU.ISO8859-2/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 "&os; témájú rendezvények"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "&base;/events/rss.xml"> <!ENTITY rsstitle "Közelgõ &os; témájú rendezvények"> -<!ENTITY % navinclude.community "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -44,10 +41,9 @@ --> <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"/> @@ -71,6 +67,12 @@ <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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="/events/event[ @@ -94,7 +96,7 @@ <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&chd=t:<xsl:value-of select="$chart-country-counts"/>&chld=<xsl:value-of select="$chart-countries"/></xsl:variable> <div id="SIDEWRAP"> - &nav; + &nav.community; <div id="FEEDLINKS"> <ul> <li> @@ -107,7 +109,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/hu_HU.ISO8859-2/share/sgml/templates.news-rdf.xsl b/hu_HU.ISO8859-2/share/sgml/templates.news-rdf.xsl index e29eed5d44..f3148ed315 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.news-rdf.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.news-rdf.xsl @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!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 "RDF &os; hírek"> -<!ENTITY email "freebsd-www"> -]> + "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> @@ -20,10 +17,6 @@ <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <!-- Generate the main body of the RDF file --> <xsl:template match="news"> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/hu_HU.ISO8859-2/share/sgml/templates.news-rss.xsl b/hu_HU.ISO8859-2/share/sgml/templates.news-rss.xsl index baa33ed15e..0a6b412d2c 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.news-rss.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.news-rss.xsl @@ -23,10 +23,6 @@ <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <!-- Generate the main body of the RDF file --> <xsl:template match="news"> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> diff --git a/hu_HU.ISO8859-2/share/sgml/templates.newsflash.xsl b/hu_HU.ISO8859-2/share/sgml/templates.newsflash.xsl index 81d7250223..b163bce02b 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.newsflash.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.newsflash.xsl @@ -2,11 +2,8 @@ <!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 "&os; hírek"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "rss.xml"> <!ENTITY rsstitle "&title;"> -<!ENTITY % navinclude.about "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -17,17 +14,25 @@ %SRCID% 1.4 --> -<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:param name="news.project.xml-master" select="'none'" /> <xsl:param name="news.project.xml" select="'none'" /> + <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.about; <div id="FEEDLINKS"> <ul> <li> @@ -45,7 +50,7 @@ </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> - &header3; + <h1>&title;</h1> <xsl:for-each select="/news"> <xsl:call-template name="html-news-list-newsflash-preface" /> diff --git a/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl b/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl index 393d5740df..9b16835d39 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl @@ -2,8 +2,6 @@ <!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 "&os; hírek"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.about "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -14,12 +12,15 @@ %SRCID% 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> @@ -28,15 +29,11 @@ <xsl:copy-of select="." /> </xsl:template> - <xsl:template names="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"> <img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193" height="144" alt="&os; hírek"/> @@ -60,7 +57,6 @@ <a href="&enbase;/news/1996/index.html">1996</a></p> <a href="&base;/news/news.html">Hírek fõoldal</a> - </div> <!-- CONTENTWRAP --> </xsl:template> <xsl:template match="month"> diff --git a/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl b/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl index f650c1b717..d1aac0624f 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl @@ -2,8 +2,6 @@ <!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 "&os; a sajtóban"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.about "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -14,25 +12,24 @@ %SRCID% 1.7 --> -<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: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>A korábbi évek sajtókiadványai @@ -50,7 +47,6 @@ <a href="&enbase;/news/1998/press.html">1998-1996</a></p> <a href="&base;/news/news.html">Hírek fõoldal</a> - </div> <!-- CONTENTWRAP --> </xsl:template> <xsl:template match="month"> diff --git a/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl b/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl index 0115384677..083e8ff84c 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.pastevents.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 "Korábbi rendezvények"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "&base;/events/rss.xml"> <!ENTITY rsstitle "Közelgõ rendezvények"> -<!ENTITY % navinclude.community "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -44,10 +41,9 @@ --> <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"/> @@ -70,6 +66,12 @@ <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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="/events/event[ @@ -93,7 +95,7 @@ <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&chd=t:<xsl:value-of select="$chart-country-counts"/>&chld=<xsl:value-of select="$chart-countries"/></xsl:variable> <div id="SIDEWRAP"> - &nav; + &nav.community; <div id="FEEDLINKS"> <ul> <li> @@ -106,7 +108,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/hu_HU.ISO8859-2/share/sgml/templates.press-rss.xsl b/hu_HU.ISO8859-2/share/sgml/templates.press-rss.xsl index a3fdb44741..b5eb8a2f84 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.press-rss.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.press-rss.xsl @@ -49,10 +49,6 @@ <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <!-- Generate the main body of the RSS file --> <xsl:template match="press"> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> diff --git a/hu_HU.ISO8859-2/share/sgml/templates.press.xsl b/hu_HU.ISO8859-2/share/sgml/templates.press.xsl index 1a13a6fd61..87b937ca2a 100644 --- a/hu_HU.ISO8859-2/share/sgml/templates.press.xsl +++ b/hu_HU.ISO8859-2/share/sgml/templates.press.xsl @@ -2,11 +2,8 @@ <!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 "&os; a sajtóban"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "press-rss.xml"> <!ENTITY rsstitle "&title;"> -<!ENTITY % navinclude.about "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -17,8 +14,9 @@ %SRCID% 1.5 --> -<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"/> @@ -26,9 +24,15 @@ <xsl:param name="news.press.xml-master" select="'none'" /> <xsl:param name="news.press.xml" select="'none'" /> + <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.about; <div id="FEEDLINKS"> <ul> <li> @@ -42,7 +46,7 @@ <div id="CONTENTWRAP"> - &header3; + <h1>&title;</h1> <xsl:for-each select="/press"> <xsl:call-template name="html-news-list-press-preface" /> diff --git a/it_IT.ISO8859-15/htdocs/index.xsl b/it_IT.ISO8859-15/htdocs/index.xsl index 99ec4e0cd7..27153cf92d 100644 --- a/it_IT.ISO8859-15/htdocs/index.xsl +++ b/it_IT.ISO8859-15/htdocs/index.xsl @@ -11,10 +11,17 @@ Original revision: 1.138 --> -<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"/> + <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/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&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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"/>&chd=t:<xsl:value-of select="$chart-country-counts"/>&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&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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> diff --git a/nl_NL.ISO8859-1/htdocs/community.xsl b/nl_NL.ISO8859-1/htdocs/community.xsl index be307cf9b7..f3ce05406d 100644 --- a/nl_NL.ISO8859-1/htdocs/community.xsl +++ b/nl_NL.ISO8859-1/htdocs/community.xsl @@ -2,8 +2,6 @@ <!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 "&os; Gemeenschap"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.community "INCLUDE"> ]> <!-- $FreeBSD$ Vertaald door: Rene Ladan @@ -11,28 +9,25 @@ %SRCID% 38826 --> -<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; wordt goed ondersteund door haar actieve gemeenschap.</p> <p>Er zijn meer dan honderd <a @@ -133,6 +128,5 @@ GSearch.setOnLoadCallback(LoadVideoBar); </script> </div> <!-- Latest Videos --> - </div> <!-- CONTENTWRAP --> </xsl:template> </xsl:stylesheet> diff --git a/nl_NL.ISO8859-1/htdocs/index.xsl b/nl_NL.ISO8859-1/htdocs/index.xsl index c66eff5f3e..b493efefb5 100644 --- a/nl_NL.ISO8859-1/htdocs/index.xsl +++ b/nl_NL.ISO8859-1/htdocs/index.xsl @@ -10,7 +10,10 @@ <!-- $FreeBSD$ --> -<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"/> diff --git a/nl_NL.ISO8859-1/share/sgml/libcommon.xsl b/nl_NL.ISO8859-1/share/sgml/libcommon.xsl index f070806bd1..282dfec00f 100644 --- a/nl_NL.ISO8859-1/share/sgml/libcommon.xsl +++ b/nl_NL.ISO8859-1/share/sgml/libcommon.xsl @@ -5,7 +5,10 @@ %SOURCE% share/sgml/libcommon.xsl %SRCID% 38826 --> -<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:param name="param-l10n-date-format-YMD" diff --git a/ru_RU.KOI8-R/htdocs/community.xsl b/ru_RU.KOI8-R/htdocs/community.xsl index 378fae210f..d5fadb15fe 100644 --- a/ru_RU.KOI8-R/htdocs/community.xsl +++ b/ru_RU.KOI8-R/htdocs/community.xsl @@ -2,8 +2,6 @@ <!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"> ]> <!-- @@ -14,28 +12,25 @@ 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> @@ -139,6 +134,5 @@ GSearch.setOnLoadCallback(LoadVideoBar); </script> </div> <!-- Latest Videos --> - </div> <!-- CONTENTWRAP --> </xsl:template> </xsl:stylesheet> diff --git a/ru_RU.KOI8-R/htdocs/community/social.xsl b/ru_RU.KOI8-R/htdocs/community/social.xsl index 4021a47715..635178302e 100644 --- a/ru_RU.KOI8-R/htdocs/community/social.xsl +++ b/ru_RU.KOI8-R/htdocs/community/social.xsl @@ -2,8 +2,6 @@ <!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"> ]> <!-- @@ -14,23 +12,20 @@ Original revision: 1.6 --> -<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: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> <ul> @@ -64,7 +59,5 @@ �� <a href="http://twitter.com">Twitter</a>.</li> </ul> - - </div> <!-- CONTENTWRAP --> </xsl:template> </xsl:stylesheet> diff --git a/ru_RU.KOI8-R/htdocs/events/rss.xsl b/ru_RU.KOI8-R/htdocs/events/rss.xsl index 5cad126934..d60cd35df7 100644 --- a/ru_RU.KOI8-R/htdocs/events/rss.xsl +++ b/ru_RU.KOI8-R/htdocs/events/rss.xsl @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="KOI8-R" ?> <!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 % navinclude.about "INCLUDE"> -]> + "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- The FreeBSD Russian Documentation Project @@ -49,10 +45,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/ru_RU.KOI8-R/htdocs/gnome/index.xsl b/ru_RU.KOI8-R/htdocs/gnome/index.xsl index 973dd84a21..369d669a10 100644 --- a/ru_RU.KOI8-R/htdocs/gnome/index.xsl +++ b/ru_RU.KOI8-R/htdocs/gnome/index.xsl @@ -11,6 +11,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf1="http://my.netscape.com/rdf/simple/0.9/" + xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="rdf rdf1" version="1.0"> <xsl:import href="../includes.xsl"/> diff --git a/ru_RU.KOI8-R/htdocs/gnome/newsflash.xsl b/ru_RU.KOI8-R/htdocs/gnome/newsflash.xsl index 107aeb6ddc..aa355dc7f7 100644 --- a/ru_RU.KOI8-R/htdocs/gnome/newsflash.xsl +++ b/ru_RU.KOI8-R/htdocs/gnome/newsflash.xsl @@ -9,8 +9,9 @@ Original revision: 1.3 --> -<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="../includes.xsl"/> <xsl:import href="includes.xsl"/> @@ -19,9 +20,6 @@ <xsl:variable name="base" select="'../..'"/> <xsl:variable name="title" select="'��������� ������� FreeBSD GNOME'"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> <xsl:template name="process.content"> <div id="contentwrap"> diff --git a/ru_RU.KOI8-R/htdocs/index.xsl b/ru_RU.KOI8-R/htdocs/index.xsl index c6913e35a5..bbab0485ce 100644 --- a/ru_RU.KOI8-R/htdocs/index.xsl +++ b/ru_RU.KOI8-R/htdocs/index.xsl @@ -13,7 +13,10 @@ Original revision: 1.176 --> -<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"/> @@ -29,6 +32,10 @@ <xsl:param name="events.xml-master" select="'none'"/> <xsl:param name="events.xml" select="'none'"/> + <xsl:variable name="svnKeyword">$FreeBSD$</xsl:variable> + + <xsl:variable name="title">&title;</xsl:variable> + <xsl:template names="process.content"> <div id="FRONTCONTAINER"> <div id="FRONTMAIN"> diff --git a/ru_RU.KOI8-R/htdocs/search/index-site.xsl b/ru_RU.KOI8-R/htdocs/search/index-site.xsl index 6cf6e52fc6..819e882138 100644 --- a/ru_RU.KOI8-R/htdocs/search/index-site.xsl +++ b/ru_RU.KOI8-R/htdocs/search/index-site.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="koi8-r"?> <!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$ --> @@ -14,15 +14,18 @@ Original revision: 1.25 --> -<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/ru_RU.KOI8-R/htdocs/security/errata-rss.xsl b/ru_RU.KOI8-R/htdocs/security/errata-rss.xsl index e6dfb54839..8122e0ad83 100644 --- a/ru_RU.KOI8-R/htdocs/security/errata-rss.xsl +++ b/ru_RU.KOI8-R/htdocs/security/errata-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="koi8-r"?> <!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"> <!-- The FreeBSD Russian Documentation Project @@ -21,10 +18,6 @@ <xsl:output method="xml" indent="yes"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:call-template name="rss-errata-notices"> <xsl:with-param name="notices.xml" select="$notices.xml" /> diff --git a/ru_RU.KOI8-R/htdocs/security/security-rdf.xsl b/ru_RU.KOI8-R/htdocs/security/security-rdf.xsl index cbc1470d7c..5c3f806391 100644 --- a/ru_RU.KOI8-R/htdocs/security/security-rdf.xsl +++ b/ru_RU.KOI8-R/htdocs/security/security-rdf.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="koi8-r"?> <!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"> <!-- The FreeBSD Russian Documentation Project diff --git a/ru_RU.KOI8-R/htdocs/security/security-rss.xsl b/ru_RU.KOI8-R/htdocs/security/security-rss.xsl index 82dbba08da..6ab4ff4f39 100644 --- a/ru_RU.KOI8-R/htdocs/security/security-rss.xsl +++ b/ru_RU.KOI8-R/htdocs/security/security-rss.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="koi8-r"?> <!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"> <!-- The FreeBSD Russian Documentation Project @@ -21,10 +18,6 @@ <xsl:output method="xml" indent="yes"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <xsl:template match="/"> <xsl:call-template name="rss-security-advisories"> <xsl:with-param name="advisories.xml" select="$advisories.xml" /> diff --git a/ru_RU.KOI8-R/share/sgml/libcommon.xsl b/ru_RU.KOI8-R/share/sgml/libcommon.xsl index 9a5b61a445..683ca5d5d9 100644 --- a/ru_RU.KOI8-R/share/sgml/libcommon.xsl +++ b/ru_RU.KOI8-R/share/sgml/libcommon.xsl @@ -3,7 +3,10 @@ "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> -<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:template name="html-news-list-newsflash-preface"> diff --git a/ru_RU.KOI8-R/share/sgml/templates.events.xsl b/ru_RU.KOI8-R/share/sgml/templates.events.xsl index 6c5073ead5..0e149aabb8 100644 --- a/ru_RU.KOI8-R/share/sgml/templates.events.xsl +++ b/ru_RU.KOI8-R/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 "&base;/events/rss.xml"> <!ENTITY rsstitle "����������� ������� FreeBSD"> -<!ENTITY % navinclude.community "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- @@ -44,18 +41,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> @@ -75,6 +67,12 @@ <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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="/events/event[ @@ -98,7 +96,7 @@ <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&chd=t:<xsl:value-of select="$chart-country-counts"/>&chld=<xsl:value-of select="$chart-countries"/></xsl:variable> <div id="SIDEWRAP"> - &nav; + &nav.community; <div id="FEEDLINKS"> <ul> <li> @@ -111,7 +109,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/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl b/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl index 976eb46310..0f7c825a0e 100644 --- a/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl +++ b/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl @@ -1,19 +1,17 @@ <?xml version="1.0" encoding="koi8-r"?> <!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 base "../.."> <!ENTITY title "������ �������������"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.community "INCLUDE"> ]> <!-- The FreeBSD Russian Documentation Project --> <!-- $FreeBSDru: frdp/www/ru/share/sgml/templates.usergroups.xsl,v 1.2 2005/11/03 18:27:42 gad Exp $ --> <!-- $FreeBSD$ --> -<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/share/sgml/templates.usergroups.xsl"/> <xsl:template name="html-usergroups-list-header"> diff --git a/share/sgml/header.ent b/share/sgml/header.ent index e6df018089..b7382e7e3a 100644 --- a/share/sgml/header.ent +++ b/share/sgml/header.ent @@ -15,43 +15,13 @@ All rights reserved.</span>'> <!ENTITY email 'freebsd-questions'> <!ENTITY author '<a href="&base;/index.html">home</a> | <a href="&base;/mailto.html">contact</a> | <a href="&base;/copyright/index.html">legal</a> | ©right;'> -<!ENTITY date ''> <!ENTITY home '<a href="&base;/index.html"><img src"&enbase;/gifs/home.gif" alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'> <!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20060509'> <!ENTITY stylesheetlarge '&enbase;/layout/css/fixed_large.css'> -<!ENTITY nav ''> <!-- Standard headers and footers --> -<!ENTITY header1.meta ' - <meta http-equiv="Content-Type" content="text/html; charset=&xml.encoding;" /> - <meta name="MSSmartTagsPreventParsing" content="TRUE" /> -'> - -<!ENTITY header1.link ' - <link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon" /> - <link rel="icon" href="&enbase;/favicon.ico" type="image/x-icon" /> -<!-- - FOR TRANSLATORS: - - Do not translate the "Normal Text" and "Large Text" attributes in the - following two lines. They are not literal texts but JavaScript - parameters. Changing them will result in rendering errors. ---> - <link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text" /> - <link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text" />'> - - -<!ENTITY % header.rss "IGNORE"> -<![%header.rss;[ -<!ENTITY header1.rsslink ' - <link rel="alternate" type="application/rss+xml" - title="&rsstitle;" href="&rsslink;" /> -'> -]]> -<!ENTITY header1.rsslink ''> - <![%html.header.script.google;[ <!ENTITY header1.googlejs '<script xmlns="http://www.w3.org/1999/xhtml" type="text/javascript" src="&enbase;/layout/js/google.js"></script>'> ]]> @@ -74,13 +44,14 @@ <!ENTITY header2.word.contact 'Contact'> <!ENTITY header2.searchinputs ' - <div xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve"> + <div xmlns="http://www.w3.org/1999/xhtml"> <input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /> <input id="WORDS" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="&header2.word.search;" /><![CDATA[ ]]> + <span> </span> <input id="SUBMIT" name="submit" type="submit" value="&header2.word.search;" /> </div> '> @@ -220,23 +191,6 @@ </div> <!-- HEADERCONTAINER --> '> -<!ENTITY header3 '<h1>&title;</h1>'> - -<!ENTITY header ' -&header1; -<body> - <div id="CONTAINERWRAP"> - <div id="CONTAINER"> - &header2; - - <div id="CONTENT"> - <div id="SIDEWRAP"> - &nav; - </div> <!-- SIDEWRAP --> - - <div id="CONTENTWRAP"> - &header3;'> - <!ENTITY lastmod 'Last modified: '> <!-- macro for webbuild paper --> diff --git a/share/sgml/libcommon.xsl b/share/sgml/libcommon.xsl index 52272134ed..357aba231b 100644 --- a/share/sgml/libcommon.xsl +++ b/share/sgml/libcommon.xsl @@ -7,11 +7,21 @@ version="1.0" xmlns:cvs="http://www.FreeBSD.org/XML/CVS" xmlns:date="http://exslt.org/dates-and-times" - extension-element-prefixes="date" + xmlns:str="http://exslt.org/strings" + extension-element-prefixes="date str" + xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="date cvs"> <xsl:import href="./transtable-common.xsl" /> + <xsl:variable name="svnKeyword"> + <xsl:value-of select="//cvs:keyword[1]"/> + </xsl:variable> + + <xsl:variable name="date"> + <xsl:value-of select="str:split($svnKeyword, ' ')[4]"/> + </xsl:variable> + <!-- default format for date string --> <xsl:param name="param-l10n-date-format-YMD" select="'%Y-%M-%D'" /> diff --git a/share/sgml/templates.entries.xsl b/share/sgml/templates.entries.xsl index e2f8c31864..ad8640020f 100644 --- a/share/sgml/templates.entries.xsl +++ b/share/sgml/templates.entries.xsl @@ -2,41 +2,32 @@ <!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 "Commercial Vendors"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.support "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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/share/sgml/libcommon.xsl"/> <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/> <xsl:param name="basename" select="'none'" /> <xsl:param name="sort" select="'none'" /> - <xsl:variable name="uc" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/> - <xsl:variable name="lc" select="'abcdefghijklmnopqrstuvwxyz'"/> + <xsl:variable name="title">&title;</xsl:variable> - <xsl:template name="process.content"> - <div id="SIDEWRAP"> - &nav; - </div> <!-- SIDEWRAP --> - - <div id="contentwrap"> - &header3; + <xsl:template name="process.sidewrap"> + &nav.support; + </xsl:template> + <xsl:template name="process.contentwrap"> <xsl:for-each select="/entries"> <xsl:call-template name="html-commercial-preface" /> <xsl:call-template name="html-commercial-listing" /> </xsl:for-each> - - </div> <!-- contentwrap --> - - <br class="clearboth" /> </xsl:template> <xsl:template name="html-commercial-preface"> @@ -100,7 +91,7 @@ <xsl:otherwise> <dl> <xsl:for-each select="/entries/entry"> - <xsl:sort select="translate(name, $uc, $lc)" order="ascending"/> + <xsl:sort select="translate(name, $uppercase, $lowercase)" order="ascending"/> <dt><xsl:element name="a"> <xsl:attribute name="name"> diff --git a/share/sgml/templates.events.xsl b/share/sgml/templates.events.xsl index 929c406a90..c9130c7b4a 100644 --- a/share/sgml/templates.events.xsl +++ b/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 Events"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "&base;/events/rss.xml"> <!ENTITY rsstitle "Upcoming FreeBSD Events"> -<!ENTITY % navinclude.community "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -38,10 +35,9 @@ --> <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"/> @@ -65,6 +61,12 @@ <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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="event[ @@ -88,7 +90,7 @@ <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&chd=t:<xsl:value-of select="$chart-country-counts"/>&chld=<xsl:value-of select="$chart-countries"/></xsl:variable> <div id="SIDEWRAP"> - &nav; + &nav.community; <div id="FEEDLINKS"> <ul> <li> @@ -101,7 +103,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/share/sgml/templates.news-rdf.xsl b/share/sgml/templates.news-rdf.xsl index 418d0e6670..ba592329cd 100644 --- a/share/sgml/templates.news-rdf.xsl +++ b/share/sgml/templates.news-rdf.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!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 RDF"> -<!ENTITY email "freebsd-www"> -]> + "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> @@ -14,10 +11,6 @@ <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <!-- Generate the main body of the RDF file --> <xsl:template match="news"> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/share/sgml/templates.news-rss.xsl b/share/sgml/templates.news-rss.xsl index ac39d24b63..07703fa9e5 100644 --- a/share/sgml/templates.news-rss.xsl +++ b/share/sgml/templates.news-rss.xsl @@ -17,10 +17,6 @@ <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <!-- Generate the main body of the RDF file --> <xsl:template match="news"> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> diff --git a/share/sgml/templates.newsflash.xsl b/share/sgml/templates.newsflash.xsl index bc2283cfd4..2df0cdfe3b 100644 --- a/share/sgml/templates.newsflash.xsl +++ b/share/sgml/templates.newsflash.xsl @@ -2,26 +2,31 @@ <!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 rsslink "rss.xml"> <!ENTITY rsstitle "&title;"> -<!ENTITY % navinclude.about "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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:param name="news.project.xml-master" select="'none'" /> <xsl:param name="news.project.xml" select="'none'" /> + <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.about; <div id="FEEDLINKS"> <ul> <li> @@ -39,7 +44,7 @@ </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> - &header3; + <h1>&title;</h1> <xsl:for-each select="/news"> <xsl:call-template name="html-news-list-newsflash-preface" /> diff --git a/share/sgml/templates.oldnewsflash.xsl b/share/sgml/templates.oldnewsflash.xsl index 3eeb7140d2..616e188428 100644 --- a/share/sgml/templates.oldnewsflash.xsl +++ b/share/sgml/templates.oldnewsflash.xsl @@ -2,14 +2,13 @@ <!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$ --> -<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"/> @@ -17,20 +16,18 @@ <xsl:variable name="year"> <xsl:value-of select="descendant::year/name"/> </xsl:variable> + + <xsl:variable name="title">&title;</xsl:variable> <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"> <!-- Notice how entity references in SGML become variable references in the stylesheet, and that the syntax for referring to variables inside an attribute is "{$variable}". @@ -64,8 +61,6 @@ <a href="../1996/index.html">1996</a></p> <a href="&base;/news/news.html">News Home</a> - </div> <!-- CONTENTWRAP --> - <br class="clearboth" /> </xsl:template> <!-- Everything that follows are templates for the rest of the content --> diff --git a/share/sgml/templates.oldpress.xsl b/share/sgml/templates.oldpress.xsl index 9bbd4de6eb..664b1d59a6 100644 --- a/share/sgml/templates.oldpress.xsl +++ b/share/sgml/templates.oldpress.xsl @@ -2,31 +2,28 @@ <!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 in the Press"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.about "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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: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.content"> <xsl:apply-templates select="//month"/> <p>Other press publications: @@ -44,8 +41,6 @@ <a href="../1998/press.html">1998-1996</a></p> <a href="&base;/news/news.html">News Home</a> - </div> <!-- CONTENTWRAP --> - <br class="clearboth" /> </xsl:template> <!-- Everything that follows are templates for the rest of the content --> diff --git a/share/sgml/templates.pastevents.xsl b/share/sgml/templates.pastevents.xsl index 894027c9c2..741b36b104 100644 --- a/share/sgml/templates.pastevents.xsl +++ b/share/sgml/templates.pastevents.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 Past Events"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "&base;/events/rss.xml"> <!ENTITY rsstitle "Upcoming FreeBSD Events"> -<!ENTITY % navinclude.community "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> @@ -38,10 +35,9 @@ --> <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"/> @@ -64,6 +60,12 @@ <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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"> @@ -88,7 +90,7 @@ <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&chd=t:<xsl:value-of select="$chart-country-counts"/>&chld=<xsl:value-of select="$chart-countries"/></xsl:variable> <div id="SIDEWRAP"> - &nav; + &nav.community; <div id="FEEDLINKS"> <ul> <li> @@ -101,7 +103,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/share/sgml/templates.press-rss.xsl b/share/sgml/templates.press-rss.xsl index 3cb9e7cb8a..582e3d4f7c 100644 --- a/share/sgml/templates.press-rss.xsl +++ b/share/sgml/templates.press-rss.xsl @@ -43,10 +43,6 @@ <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/> - <xsl:variable name="date"> - <xsl:value-of select="//cvs:keyword[@name='freebsd']"/> - </xsl:variable> - <!-- Generate the main body of the RSS file --> <xsl:template match="press"> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> diff --git a/share/sgml/templates.press.xsl b/share/sgml/templates.press.xsl index 0fa3d93665..44e0577e70 100644 --- a/share/sgml/templates.press.xsl +++ b/share/sgml/templates.press.xsl @@ -2,17 +2,15 @@ <!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 in the Press"> -<!ENTITY email "freebsd-www"> <!ENTITY rsslink "press-rss.xml"> <!ENTITY rsstitle "&title;"> -<!ENTITY % navinclude.about "INCLUDE"> -<!ENTITY % header.rss "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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"/> @@ -20,9 +18,15 @@ <xsl:param name="news.press.xml-master" select="'none'" /> <xsl:param name="news.press.xml" select="'none'" /> + <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.about; <div id="FEEDLINKS"> <ul> <li> @@ -36,7 +40,7 @@ <div id="CONTENTWRAP"> - &header3; + <h1>&title;</h1> <xsl:for-each select="/press"> <xsl:call-template name="html-news-list-press-preface" /> diff --git a/share/sgml/templates.usergroups.xsl b/share/sgml/templates.usergroups.xsl index 6ab2f693ba..25fd944c39 100644 --- a/share/sgml/templates.usergroups.xsl +++ b/share/sgml/templates.usergroups.xsl @@ -2,15 +2,14 @@ <!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 "User Groups"> -<!ENTITY email "freebsd-www"> -<!ENTITY % navinclude.community "INCLUDE"> ]> <!-- $FreeBSD$ --> -<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"/> @@ -19,14 +18,13 @@ <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&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() = @@ -61,9 +59,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 --> - - <br class="clearboth" /> </xsl:template> </xsl:stylesheet> diff --git a/share/sgml/xhtml.xsl b/share/sgml/xhtml.xsl index 0e710a3edb..5f5dcc7b86 100644 --- a/share/sgml/xhtml.xsl +++ b/share/sgml/xhtml.xsl @@ -3,12 +3,19 @@ "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> -<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:cvs="http://www.FreeBSD.org/XML/CVS" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:str="http://exslt.org/strings" + xmlns="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="cvs xhtml" extension-element-prefixes="str"> + <xsl:variable name="rsslink" select="''"/> + + <xsl:variable name="rsstitle" select="''"/> + <xsl:variable name="svnKeyword"> <xsl:value-of select="//cvs:keyword[1]"/> </xsl:variable> @@ -44,7 +51,8 @@ parameters. Changing them will result in rendering errors. --> <link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css" title="Normal Text" /> <link rel="alternate stylesheet" media="screen" href="&stylesheetlarge;" type="text/css" title="Large Text" /> - &header1.rsslink; + <xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:link"/> + <xsl:call-template name="process.rss.link"/> <script type="text/javascript" src="&enbase;/layout/js/styleswitcher.js"></script> &header1.googlejs; </head> @@ -99,41 +107,52 @@ parameters. Changing them will result in rendering errors. </html> </xsl:template> + <xsl:template name="process.rss.link"> + <xsl:if test="$rsslink != ''"> + <link rel="alternate" type="application/rss+xml" + title="{$rsstitle}" href="{$rsslink}" /> + </xsl:if> + </xsl:template> + + <xsl:template name="process.sidewrap"> + <xsl:choose xmlns:xhtml="http://www.w3.org/1999/xhtml"> + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.about'"> + &nav.about; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.community'"> + &nav.community; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.developers'"> + &nav.developers; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.docs'"> + &nav.docs; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.download'"> + &nav.download; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.gnome'"> + &nav.gnome; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.ports'"> + &nav.ports; + </xsl:when> + + <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.support'"> + &nav.support; + </xsl:when> + </xsl:choose> + </xsl:template> + <xsl:template name="process.content"> <div id="SIDEWRAP"> - <xsl:choose xmlns:xhtml="http://www.w3.org/1999/xhtml"> - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.about'"> - &nav.about; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.community'"> - &nav.community; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.developers'"> - &nav.developers; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.docs'"> - &nav.docs; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.download'"> - &nav.download; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.gnome'"> - &nav.gnome; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.ports'"> - &nav.ports; - </xsl:when> - - <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.support'"> - &nav.support; - </xsl:when> - </xsl:choose> + <xsl:call-template name="process.sidewrap"/> </div> <!-- SIDEWRAP --> <div id="CONTENTWRAP"> diff --git a/zh_CN.GB2312/htdocs/index.xsl b/zh_CN.GB2312/htdocs/index.xsl index b9e398d9e0..7bec5ac5bb 100644 --- a/zh_CN.GB2312/htdocs/index.xsl +++ b/zh_CN.GB2312/htdocs/index.xsl @@ -8,7 +8,10 @@ <!-- Original revision: 1.160 --> <!-- $FreeBSD$ --> -<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-master" select="'none'"/> <xsl:param name="events.xml" select="'none'"/> + <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/zh_CN.GB2312/htdocs/security/mkindex.xsl b/zh_CN.GB2312/htdocs/security/mkindex.xsl index 6be1deac2f..3c3aaa1929 100644 --- a/zh_CN.GB2312/htdocs/security/mkindex.xsl +++ b/zh_CN.GB2312/htdocs/security/mkindex.xsl @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="gb2312" ?> <!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.4 --> @@ -11,7 +8,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/> - <xsl:variable name="date" select="'$FreeBSD$'"/> + <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/> <xsl:output type="xml" encoding="&xml.encoding;" omit-xml-declaration="yes" /> diff --git a/zh_CN.GB2312/share/sgml/libcommon.xsl b/zh_CN.GB2312/share/sgml/libcommon.xsl index 4282230aa1..d9b8183bd9 100644 --- a/zh_CN.GB2312/share/sgml/libcommon.xsl +++ b/zh_CN.GB2312/share/sgml/libcommon.xsl @@ -4,7 +4,10 @@ <!-- $FreeBSD$ --> <!-- Original Revision: 1.7 --> -<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"/> <!-- Language-specific definitions should be put below this line --> diff --git a/zh_TW.Big5/htdocs/index.xsl b/zh_TW.Big5/htdocs/index.xsl index 39e517cd37..35764987e8 100644 --- a/zh_TW.Big5/htdocs/index.xsl +++ b/zh_TW.Big5/htdocs/index.xsl @@ -8,7 +8,10 @@ <!-- Original revision: 1.158 --> <!-- $FreeBSD$ --> -<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-master" select="'none'"/> <xsl:param name="events.xml" select="'none'"/> + <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/zh_TW.Big5/share/sgml/libcommon.xsl b/zh_TW.Big5/share/sgml/libcommon.xsl index 535c044f9b..0ec4623794 100644 --- a/zh_TW.Big5/share/sgml/libcommon.xsl +++ b/zh_TW.Big5/share/sgml/libcommon.xsl @@ -3,7 +3,10 @@ "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd"> <!-- $FreeBSD$ --> -<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"/> <!-- Language-specific definitions should be put below this line --> |