PERFORCE change 155403 for review
Gabor Pali
pgj at FreeBSD.org
Sun Dec 28 20:38:52 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=155403
Change 155403 by pgj at kolbasz on 2008/12/29 04:38:32
IFC
Affected files ...
.. //depot/projects/docproj_hu/www/en/community.xsl#4 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#32 integrate
.. //depot/projects/docproj_hu/www/share/sgml/release.ent#8 integrate
.. //depot/projects/docproj_hu/www/share/sgml/templates.events.xsl#5 integrate
.. //depot/projects/docproj_hu/www/share/sgml/templates.pastevents.xsl#3 integrate
.. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#4 integrate
Differences ...
==== //depot/projects/docproj_hu/www/en/community.xsl#4 (text+ko) ====
@@ -6,7 +6,7 @@
<!ENTITY % navinclude.community "INCLUDE">
]>
-<!-- $FreeBSD: www/en/community.xsl,v 1.5 2008/06/23 07:50:03 murray Exp $ -->
+<!-- $FreeBSD: www/en/community.xsl,v 1.6 2008/12/28 10:20:54 murray Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -83,6 +83,63 @@
<a href="&base;/events/events.html">events
page</a>.</p>
+<!-- The Latest Videos section is placed inside an invisible block, which
+ is only made visible if the browser supports Javascript. -->
+
+ <div id="latest-videos" style="display:none;">
+ <h3>Latest Videos</h3>
+
+<!-- See http://www.google.com/uds/solutions/wizards/videobar.html -->
+ <div id="videoBar-bar">
+ <span style="color:#676767;font-size:11px;margin:10px;padding:4px;">Loading...</span>
+ </div>
+
+ <script src="http://www.google.com/uds/api?file=uds.js&v=1.0&source=uds-vbw"
+ type="text/javascript"></script>
+ <style type="text/css">
+ @import url("http://www.google.com/uds/css/gsearch.css");
+ </style>
+ <!-- Video Bar Code and Stylesheet -->
+ <script type="text/javascript">
+ window._uds_vbw_donotrepair = true;
+ </script>
+ <script src="http://www.google.com/uds/solutions/videobar/gsvideobar.js?mode=new"
+ type="text/javascript"></script>
+ <style type="text/css">
+ @import url("http://www.google.com/uds/solutions/videobar/gsvideobar.css");
+ </style>
+
+ <style type="text/css">
+ .playerInnerBox_gsvb .player_gsvb {
+ width : 320px;
+ height : 260px;
+ }
+ </style>
+ <script type="text/javascript">
+ document.getElementById('latest-videos').style.display = 'block';
+
+ function LoadVideoBar() {
+
+ var videoBar;
+ var options = {
+ largeResultSet : !true,
+ horizontal : true,
+ autoExecuteList : {
+ cycleTime : GSvideoBar.CYCLE_TIME_MEDIUM,
+ cycleMode : GSvideoBar.CYCLE_MODE_LINEAR,
+ executeList : ["ytchannel:bsdconferences"]
+ }
+ }
+
+ videoBar = new GSvideoBar(document.getElementById("videoBar-bar"),
+ GSvideoBar.PLAYER_ROOT_FLOATING,
+ options);
+ }
+ // arrange for this function to be called during body.onload
+ // event processing
+ GSearch.setOnLoadCallback(LoadVideoBar);
+ </script>
+ </div> <!-- Latest Videos -->
</div> <!-- CONTENTWRAP -->
<br class="clearboth" />
</div> <!-- CONTENT -->
==== //depot/projects/docproj_hu/www/share/sgml/news.xml#32 (text+ko) ====
@@ -25,7 +25,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/news.xml,v 1.214 2008/12/13 19:09:59 danger Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.216 2008/12/25 15:44:12 blackend Exp $
</cvs:keyword>
</cvs:keywords>
@@ -36,6 +36,20 @@
<name>12</name>
<day>
+ <name>25</name>
+
+ <event>
+ <title>FreeBSD 7.1-RC2 Available</title>
+
+ <p>The second and last release candidate of &os; 7.1 is now
+ <a href="http://lists.freebsd.org/pipermail/freebsd-stable/2008-December/047203.html">available</a>. ISO images for Tier-1 architectures are now
+ available on most of the <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
+ <day>
<name>9</name>
<event>
==== //depot/projects/docproj_hu/www/share/sgml/release.ent#8 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.28 2008/12/09 17:53:27 blackend Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.29 2008/12/25 14:21:35 blackend Exp $ -->
<!-- XXX rel.current and u.rel.* should be available in doc/ -->
<!-- The currently released versions of FreeBSD. This value is used to
@@ -31,7 +31,7 @@
<!ENTITY beta.testing "INCLUDE">
<!ENTITY % beta.testing "INCLUDE">
<!ENTITY betarel.current '7.1'>
-<!ENTITY betarel.vers 'RC1'>
+<!ENTITY betarel.vers 'RC2'>
<!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
<!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
==== //depot/projects/docproj_hu/www/share/sgml/templates.events.xsl#5 (text+ko) ====
@@ -9,7 +9,7 @@
<!ENTITY % header.rss "INCLUDE">
]>
-<!-- $FreeBSD: www/share/sgml/templates.events.xsl,v 1.11 2008/06/29 19:25:35 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.events.xsl,v 1.12 2008/12/28 10:59:06 murray Exp $ -->
<!-- Copyright (c) 2003 Simon L. Nielsen <simon at FreeBSD.org>
Copyright (c) 2008 Murray M Stokely <murray at FreeBSD.org>
@@ -301,12 +301,26 @@
<!-- Template: event -->
<xsl:template match="event">
+ <xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable>
+ <xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
+ <xsl:variable name="name" select="name" />
+ <xsl:variable name="lcname" select="translate($name, $upper, $lower)" />
+
+<!-- Note that only MeetBSD and NYCBSDCon have a significant number of
+ videos on YouTube so we hard code them for now. When we have a
+ better track record of getting videos from our conferences posted
+ to YouTube then we can implement a more generic solution here,
+ but for now we don't want to add the link to youtube when we know
+ in most cases there is no content there. -->
+
<li>
<xsl:call-template name="eventbody"/>
<p>Social links: <a rel="nofollow">
<xsl:attribute name="href">http://www.flickr.com/search/?w=all&q=<xsl:value-of select="name" />&m=text</xsl:attribute>
Flickr</a>, <a rel="nofollow">
- <xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog Search</a>.</p>
+ <xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog Search</a><xsl:if test="contains($lcname, 'meetbsd') or contains($lcname, 'nycbsdcon')">,
+ <a rel="nofollow">
+ <xsl:attribute name="href">http://www.youtube.com/results?search_query=bsdconferences+<xsl:value-of select="name" /></xsl:attribute>YouTube</a></xsl:if>.</p>
</li>
</xsl:template>
==== //depot/projects/docproj_hu/www/share/sgml/templates.pastevents.xsl#3 (text+ko) ====
@@ -9,7 +9,7 @@
<!ENTITY % header.rss "INCLUDE">
]>
-<!-- $FreeBSD: www/share/sgml/templates.pastevents.xsl,v 1.3 2008/12/15 02:50:38 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.pastevents.xsl,v 1.4 2008/12/28 10:59:06 murray Exp $ -->
<!-- Copyright (c) 2003 Simon L. Nielsen <simon at FreeBSD.org>
Copyright (c) 2008 Murray M Stokely <murray at FreeBSD.org>
@@ -254,12 +254,19 @@
<!-- Template: event -->
<xsl:template match="event">
+ <xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable>
+ <xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
+ <xsl:variable name="name" select="name" />
+ <xsl:variable name="lcname" select="translate($name, $upper, $lower)" />
+
<li>
<xsl:call-template name="eventbody"/>
<p>Social links: <a rel="nofollow">
<xsl:attribute name="href">http://www.flickr.com/search/?w=all&q=<xsl:value-of select="name" />&m=text</xsl:attribute>
Flickr</a>, <a rel="nofollow">
- <xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog Search</a>.</p>
+ <xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog Search</a><xsl:if test="contains($lcname, 'meetbsd') or contains($lcname, 'nycbsdcon')">,
+ <a rel="nofollow">
+ <xsl:attribute name="href">http://www.youtube.com/results?search_query=bsdconferences+<xsl:value-of select="name" /></xsl:attribute>YouTube</a></xsl:if>.</p>
</li>
</xsl:template>
==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#4 (text+ko) ====
@@ -5,7 +5,7 @@
<usergroups>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/usergroups.xml,v 1.71 2008/08/26 08:14:05 jkois Exp $
+ $FreeBSD: www/share/sgml/usergroups.xml,v 1.75 2008/12/27 04:29:01 murray Exp $
</cvs:keyword>
</cvs:keywords>
@@ -225,18 +225,18 @@
</entry>
<entry id="uugrn">
- <name>Unix Users Group Rhein-Neckar eV (UUGRN eV)</name>
+ <name>Unix Users Group Rhein-Neckar e.V. (UUGRN e.V.)</name>
<url>http://www.uugrn.org/</url>
- <description>The Unix Users Group Rhein-Neckar eV (UUGRN eV)
+ <description>The Unix Users Group Rhein-Neckar e.V. (UUGRN e.V.)
provides a regional forum for users of all Unix flavors, with
a stress on Linux and BSD. <a
- href="http://wiki.uugrn.org/wiki/UUGRN:Stammtisch">Meetings</a>
- are held on the second Thursday of each month at the
- "Vereinsgaststatte ESC-Blauweiss Mannheim" in Mannheim. The
- <a href="http://wiki.uugrn.org/wiki/UUGRN:FIXME_Treffen">FIXME
- meeting</a> happens every fourth Friday of each month in
+ href="http://stammtisch.uugrn.org/">Meetings</a>
+ are held on the third Monday of each month at the
+ "Tomate" in B6,12 68159 Mannheim. The
+ <a href="http://fixme.uugrn.org/">FIXME
+ meeting</a> happens every first Friday of each month in
"Forum41" in Schwetzingen. Located in Germany,
- Rhine-Neckar-Region.
+ <a href="http://wiki.rhein-neckar.de/">Rhine-Neckar-Region</a>.
</description>
</entry>
@@ -973,17 +973,6 @@
<continent name="South America">
<country code="AR" name="Argentina">
-
- <entry id="bsdargentina">
- <name>BSD Argentina</name>
- <url>http://www.bsdargentina.com.ar</url>
- <description>We have the goal of promoting BSD systems in server,
- office and home environments. BSD Argentina serves as a base
- for Argentine users of FreeBSD, PC-BSD, NetBSD, OpenBSD and
- other BSD variations. Join us!
- </description>
- </entry>
-
<entry id="beersd-argentina">
<name>bug.dc.uba.ar</name>
<url>http://bug.dc.uba.ar</url>
@@ -1036,6 +1025,21 @@
</description>
</entry>
</country>
+
+ <country code="CL" name="Chile">
+ <entry id="bsdcl">
+ <name>BSD Chile</name>
+ <url>http://www.bsd.cl</url>
+
+ <description>The BSD Chile User Group (bsd.cl) maintains mirrors,
+ documents, and mailing lists for the Chilean BSD community. The
+ group also provides infrastructure for BSD events in Chile and
+ can be reached on the IRC server irc.bsd.cl #BSD in addition to
+ the <a href="http://www.bsd.cl">www.bsd.cl</a> web site.
+ </description>
+
+ </entry>
+ </country>
</continent>
<continent name="Asia">
@@ -1187,5 +1191,16 @@
</description>
</entry>
</country>
+
+ <country code="TR" name="Turkey">
+ <entry id="enderunix">
+ <name>EnderUNIX (Turkish *BSD team)</name>
+ <url>http://www.enderunix.org/?lng=en</url>
+ <description>EnderUNIX is a Turkish BSD user group that provides
+ documentation, tips, mailing lists, and mirrors for BSD operating
+ systems.</description>
+ </entry>
+ </country>
+
</continent>
</usergroups>
More information about the p4-projects
mailing list