From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-5791-garchives=archives.gentoo.org@gentoo.org>)
	id 1IdWg0-0000yT-5d
	for garchives@archives.gentoo.org; Thu, 04 Oct 2007 19:48:05 +0000
Received: from robin.gentoo.org (localhost [127.0.0.1])
	by robin.gentoo.org (8.14.1/8.14.0) with SMTP id l94Jcnsu004478;
	Thu, 4 Oct 2007 19:38:49 GMT
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by robin.gentoo.org (8.14.1/8.14.0) with ESMTP id l94JcmYh004473
	for <gentoo-commits@lists.gentoo.org>; Thu, 4 Oct 2007 19:38:48 GMT
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id D4D10650C4
	for <gentoo-commits@lists.gentoo.org>; Thu,  4 Oct 2007 19:38:47 +0000 (UTC)
Received: from neysx by stork.gentoo.org with local (Exim 4.60)
	(envelope-from <neysx@gentoo.org>)
	id 1IdWWz-0007b6-6a
	for gentoo-commits@lists.gentoo.org; Thu, 04 Oct 2007 19:38:45 +0000
From: "Xavier Neys (neysx)" <neysx@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, neysx@gentoo.org
Subject: [gentoo-commits] gentoo commit in xml/htdocs/xsl: guide.xsl
X-VCS-Repository: gentoo
X-VCS-Files: guide.xsl
X-VCS-Directories: xml/htdocs/xsl
X-VCS-Committer: neysx
X-VCS-Committer-Name: Xavier Neys
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <E1IdWWz-0007b6-6a@stork.gentoo.org>
Sender: Xavier Neys <neysx@stork.gentoo.org>
Date: Thu, 04 Oct 2007 19:38:45 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@gentoo.org
X-Archives-Salt: e51c88ff-897c-4bc5-a620-70e342800b1b
X-Archives-Hash: f82e4098a425d77cbae61a77886e42ef

neysx       07/10/04 19:38:45

  Modified:             guide.xsl
  Log:
  Added shortcut for gentoo devs in <mail>: <mail>nick</mail> is enough
  Commented out link to p.g.o until further notice

Revision  Changes    Path
1.220                xml/htdocs/xsl/guide.xsl

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/guide.xsl?rev=1.220&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/guide.xsl?rev=1.220&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/guide.xsl?r1=1.219&r2=1.220

Index: guide.xsl
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/guide.xsl,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- guide.xsl	14 Sep 2007 08:39:08 -0000	1.219
+++ guide.xsl	4 Oct 2007 19:38:44 -0000	1.220
@@ -39,16 +39,19 @@
 <!-- Where is this xsl being run? -->
 <xsl:param name="httphost">www</xsl:param>
 
-<!-- Get the list of retired devs from the roll-call -->
-<xsl:variable name="RETIRED-DEVS" xmlns="">
- <retired>
-  <xsl:for-each select="document('/proj/en/devrel/roll-call/userinfo.xml')/userlist/user[translate(status,'TIRED','tired')='retired']">
+<!-- Get the list of devs from the roll-call -->
+<xsl:variable name="ALL-DEVS" xmlns="">
+ <devs>
+  <xsl:for-each select="document('/proj/en/devrel/roll-call/userinfo.xml')/userlist/user">
     <user username="{@username}">
+     <xsl:if test="translate(status,'TIRED','tired')='retired'">
+      <xsl:attribute name="retired"/>
+     </xsl:if>
      <xsl:copy-of select="realname"/>
-     <xsl:copy-of select="email[substring-after(text(),'@')!='gentoo.org']"/>
+     <xsl:copy-of select="email"/>
     </user>
   </xsl:for-each>
- </retired>
+ </devs>
 </xsl:variable>
 
 <!-- img tag -->
@@ -157,7 +160,7 @@
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/www-gentoo-org.xml" title="Gentoo Website"/>
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/forums-gentoo-org.xml" title="Gentoo Forums"/>
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/bugs-gentoo-org.xml" title="Gentoo Bugzilla"/>
-  <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/packages-gentoo-org.xml" title="Gentoo Packages"/>
+<!--  <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/packages-gentoo-org.xml" title="Gentoo Packages"/> -->
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/archives-gentoo-org.xml" title="Gentoo List Archives"/>
   
   <xsl:if test="//glsaindex or //glsa-latest">
@@ -289,7 +292,7 @@
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/www-gentoo-org.xml" title="Gentoo Website"/>
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/forums-gentoo-org.xml" title="Gentoo Forums"/>
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/bugs-gentoo-org.xml" title="Gentoo Bugzilla"/>
-  <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/packages-gentoo-org.xml" title="Gentoo Packages"/>
+<!--  <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/packages-gentoo-org.xml" title="Gentoo Packages"/> -->
   <link rel="search" type="application/opensearchdescription+xml" href="http://www.gentoo.org/search/archives-gentoo-org.xml" title="Gentoo List Archives"/>
   
   <xsl:if test="/mainpage/newsitems">
@@ -544,8 +547,10 @@
                       </xsl:if> 
                     <xsl:text>Name and Logo Guidelines</xsl:text></a>
                     <br/>
+<!--
                     <a class="altlink" href="http://packages.gentoo.org/">Online Package Database</a>
                     <br/>
+-->
                     <a class="altlink" href="{concat($www,'/security/en/index.xml')}">Security Announcements</a>
                     <br/>
                     <a class="altlink" href="{concat($www,'/proj/en/devrel/staffing-needs/')}">Staffing&#xA0;Needs</a>
@@ -672,63 +677,121 @@
     <xsl:otherwise>/main/en/contact.xml</xsl:otherwise>
    </xsl:choose>
   </xsl:variable>
-Copyright 2001-<xsl:value-of select="substring(func:today(),1,4)"/> Gentoo Foundation, Inc.  Questions, Comments? <a class="highlight" href="{concat($www, $contact)}">Contact us</a>.
+Copyright 2001-<xsl:value-of select="substring(func:today(),1,4)"/> Gentoo Foundation, Inc. Questions, Comments? <a class="highlight" href="{concat($www, $contact)}">Contact us</a>.
 </xsl:template>
 
 <!-- Mail template -->
 <xsl:template match="mail">
-<a>
- <xsl:attribute name="href">
+<xsl:if test="string-length(@link)>0 or string-length(.)>0">
+ <xsl:variable name="gnick">
+  <xsl:choose>
+   <xsl:when test="string-length(@link)=0 and not(contains(text(),'@'))">
+     <!-- <mail>nick</mail> -->
+     <xsl:value-of select="."/>
+   </xsl:when>
+   <xsl:when test="string-length(@link)=0 and contains(text(),'@gentoo.org')">
+     <!-- <mail>nick@gentoo.org</mail> -->
+     <xsl:value-of select="substring-before(., '@')"/>
+   </xsl:when>
+   <xsl:when test="string-length(@link)>0 and not(contains(@link,'@'))">
+     <!-- <mail link="nick">blah blah</mail> -->
+     <xsl:value-of select="@link"/>
+   </xsl:when>
+   <xsl:when test="contains(@link,'@gentoo.org')">
+     <!-- <mail link="nick@gentoo.org">blah blah</mail> -->
+     <xsl:value-of select="substring-before(@link, '@gentoo.org')"/>
+   </xsl:when>
+  </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="gmail">
+  <xsl:if test="string-length($gnick)>0">
    <xsl:choose>
-    <xsl:when test="@link">
-      <xsl:value-of select="concat('mailto:', @link)"/>
+    <xsl:when test="exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick and @retired]">
+     <xsl:value-of select="exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/email[substring-after(text(),'@')!='gentoo.org'][1]"/>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:value-of select="concat('mailto:', .)"/>
+     <xsl:value-of select="exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/email[substring-after(text(),'@')='gentoo.org'][1]"/>
     </xsl:otherwise>
    </xsl:choose>
- </xsl:attribute>
- <xsl:value-of select="."/>
-</a>
+  </xsl:if>
+ </xsl:variable>
 
-</xsl:template>
+ <xsl:variable name="gname">
+  <xsl:if test="string-length($gnick)>0">
+   <xsl:choose>
+    <xsl:when test="exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/realname/@fullname">
+     <xsl:value-of select="exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/realname/@fullname"/>
+    </xsl:when>
+    <xsl:when test="exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/realname[firstname or familyname]">
+     <xsl:value-of select="concat(exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/realname/firstname,' ',exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick]/realname/familyname)"/>
+    </xsl:when>
+   </xsl:choose>
+  </xsl:if>
+ </xsl:variable>
 
-<!-- Mail inside <author>...</author> -->
-<xsl:template match="/*[1]/author/mail">
-  <xsl:variable name="nick" select="substring-before(@link,'@gentoo.org')"/>
+ <xsl:variable name="href">
   <xsl:choose>
-    <xsl:when test="substring-after(@link,'@')='gentoo.org' and exslt:node-set($RETIRED-DEVS)/retired/user[@username=$nick]">
-      <!-- @gentoo.org address of a retired dev, use another email from roll-call, or no email at all -->
-      <xsl:choose>
-        <xsl:when test="exslt:node-set($RETIRED-DEVS)/retired/user[@username=$nick]/email">
-          <b><a class="altlink" href="mailto:{exslt:node-set($RETIRED-DEVS)/retired/user[@username=$nick]/email[1]}"><xsl:value-of select="."/></a></b>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="."/>
-        </xsl:otherwise>
-      </xsl:choose>
+  <xsl:when test="string-length($gname)>0 and string-length($gmail)=0 and exslt:node-set($ALL-DEVS)/devs/user[@username=$gnick and @retired]"/>
+    <xsl:when test="string-length($gmail)>0">
+      <xsl:value-of select="concat('mailto:', $gmail)"/>
+    </xsl:when>
+    <xsl:when test="string-length(@link)>0">
+      <xsl:value-of select="concat('mailto:', @link)"/>
+    </xsl:when>
+    <xsl:when test="string-length(.)>0">
+      <xsl:value-of select="concat('mailto:', .)"/>
+    </xsl:when>
+  </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="content">
+   <xsl:choose>
+    <xsl:when test="string-length(@link)>0 and string-length(.)>0">
+     <xsl:value-of select="."/>
+    </xsl:when>
+    <xsl:when test="string-length($gname)>0">
+     <xsl:value-of select="$gname"/>
+    </xsl:when>
+    <xsl:when test="string-length($gnick)>0">
+     <xsl:value-of select="$gnick"/>
     </xsl:when>
     <xsl:otherwise>
-      <b><a class="altlink" href="mailto:{@link}"><xsl:value-of select="."/></a></b>
+     <xsl:value-of select="."/>
     </xsl:otherwise>
-  </xsl:choose>
+   </xsl:choose>
+ </xsl:variable>
 
+ <xsl:choose>
+  <xsl:when test="string-length($href)>0">
+   <a href="{$href}">
+     <xsl:choose>
+      <xsl:when test="name(..)='author'">
+       <xsl:attribute name="class">altlink</xsl:attribute>
+       <b><xsl:value-of select="$content"/></b>
+      </xsl:when>
+      <xsl:otherwise>
+       <xsl:value-of select="$content"/>
+      </xsl:otherwise>
+     </xsl:choose>
+   </a>
+  </xsl:when>
+  <xsl:otherwise><xsl:value-of select="$content"/></xsl:otherwise>
+ </xsl:choose>
+
+</xsl:if>
 </xsl:template>
 
 <!-- Author -->
 <xsl:template match="author">
-<xsl:apply-templates/>
+  <xsl:apply-templates/>
   <xsl:if test="@title">
-    <xsl:if test="$style != 'printable'">
-      <br/>
-    </xsl:if>
-    <xsl:if test="$style = 'printable'">&#160;</xsl:if>
+    <xsl:if test="$style != 'printable'"><br/></xsl:if>
+    <xsl:if test="$style  = 'printable'">&#160;</xsl:if>
     <i><xsl:value-of select="@title"/></i>
   </xsl:if>
   <br/>
-  <xsl:if test="$style != 'printable' and position()!=last()">
-    <br/>
-  </xsl:if>
+  <xsl:if test="$style != 'printable' and position() != last()"><br/></xsl:if>
 </xsl:template>
 
 <!-- FAQ Index & Chapter -->
@@ -1614,6 +1677,18 @@
 
 <xsl:template name="rhcol">
 <!-- Right-hand column with date/authors/ads -->
+
+  <xsl:variable name="images">
+    <!-- Source images from www.gentoo.org when on another server to
+         prevent missing images after an update -->
+    <xsl:choose>
+      <xsl:when test="$httphost != 'www'">http://www.gentoo.org/</xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$ROOT"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <table border="0" cellspacing="4px" cellpadding="4px">
     <!-- Add a "printer-friendly" button when link attribute exists -->
     <xsl:if test="/book or /guide">
@@ -1746,7 +1821,7 @@
     <tr lang="en">
     <td align="center" class="topsep">
             <a href="http://www.vr.org">
-	    <img src="{concat($ROOT,'images/vr-ad.png')}" width="125" height="144" alt="Gentoo Centric Hosting: vr.org" border="0"/>
+	    <img src="{concat($images,'images/vr-ad.png')}" width="125" height="144" alt="Gentoo Centric Hosting: vr.org" border="0"/>
         </a>
 	    <p class="alttext">
 	      <a href="http://www.vr.org/">VR Hosted</a>
@@ -1756,7 +1831,7 @@
     <tr lang="en">
       <td align="center" class="topsep">
       <a href="http://www.tek.net" target="_top">
-        <img src="{concat($ROOT,'images/tek-gentoo.gif')}" width="125" height="125" alt="Tek Alchemy" border="0"/>
+        <img src="{concat($images,'images/tek-gentoo.gif')}" width="125" height="125" alt="Tek Alchemy" border="0"/>
       </a>
       <p class="alttext">
 	  <a href="http://www.tek.net/">Tek Alchemy</a>
@@ -1766,7 +1841,7 @@
     <tr lang="en">
     <td align="center" class="topsep">
       <a href="http://www.sevenl.net" target="_top">
-        <img src="{concat($ROOT,'images/sponsors/sevenl.gif')}" width="125" height="144" alt="SevenL.net" border="0"/>
+        <img src="{concat($images,'images/sponsors/sevenl.gif')}" width="125" height="144" alt="SevenL.net" border="0"/>
       </a>
       <p class="alttext">
 	  <a href="http://www.sevenl.net/">SevenL.net</a>
@@ -1776,7 +1851,7 @@
     <tr lang="en">
     <td align="center" class="topsep">
         <a href="http://www.gni.com" target="_top">
-          <img src="{concat($ROOT,'images/gni_logo.png')}" width="125" alt="Global Netoptex Inc." border="0"/>
+          <img src="{concat($images,'images/gni_logo.png')}" width="125" alt="Global Netoptex Inc." border="0"/>
       </a>
       <p class="alttext">
 	  <a href="http://www.gni.com">Global Netoptex Inc.</a>



-- 
gentoo-commits@gentoo.org mailing list