| 1 |
neysx 08/01/15 19:00:28 |
| 2 |
|
| 3 |
Modified: guide.xsl mail.xsl |
| 4 |
Log: |
| 5 |
Allow nicks in <poster> link in <mail> |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.225 xml/htdocs/xsl/guide.xsl |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/guide.xsl?rev=1.225&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/guide.xsl?rev=1.225&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/guide.xsl?r1=1.224&r2=1.225 |
| 13 |
|
| 14 |
Index: guide.xsl |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/guide.xsl,v |
| 17 |
retrieving revision 1.224 |
| 18 |
retrieving revision 1.225 |
| 19 |
diff -u -r1.224 -r1.225 |
| 20 |
--- guide.xsl 1 Jan 2008 21:29:24 -0000 1.224 |
| 21 |
+++ guide.xsl 15 Jan 2008 19:00:27 -0000 1.225 |
| 22 |
@@ -1853,7 +1853,12 @@ |
| 23 |
<br/> |
| 24 |
<font size="0.90em"> |
| 25 |
Posted on <xsl:copy-of select="func:format-date($thenews/date)"/> |
| 26 |
- by <xsl:value-of select="$thenews/poster"/> |
| 27 |
+ <xsl:variable name="poster"> |
| 28 |
+ <xsl:call-template name="smart-mail"> |
| 29 |
+ <xsl:with-param name="mail" select="$thenews/poster"/> |
| 30 |
+ </xsl:call-template> |
| 31 |
+ </xsl:variable> |
| 32 |
+ by <xsl:value-of select="$poster"/> |
| 33 |
</font> |
| 34 |
</p> |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.4 xml/htdocs/xsl/mail.xsl |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/mail.xsl?rev=1.4&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/mail.xsl?rev=1.4&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/mail.xsl?r1=1.3&r2=1.4 |
| 44 |
|
| 45 |
Index: mail.xsl |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/mail.xsl,v |
| 48 |
retrieving revision 1.3 |
| 49 |
retrieving revision 1.4 |
| 50 |
diff -u -r1.3 -r1.4 |
| 51 |
--- mail.xsl 29 Oct 2007 16:35:32 -0000 1.3 |
| 52 |
+++ mail.xsl 15 Jan 2008 19:00:27 -0000 1.4 |
| 53 |
@@ -65,7 +65,7 @@ |
| 54 |
</devs> |
| 55 |
</xsl:template> |
| 56 |
|
| 57 |
-<!-- Process mail tag, see if we have a Gentoo dev, add @gentoo.org is required |
| 58 |
+<!-- Process mail tag, see if we have a Gentoo dev, add @gentoo.org if required |
| 59 |
and pull name from roll-call if required |
| 60 |
Returns an xml element named mail with optional link attribute |
| 61 |
--> |
| 62 |
@@ -126,6 +126,9 @@ |
| 63 |
<xsl:when test="string-length($gmail)>0"> |
| 64 |
<xsl:value-of select="$gmail"/> |
| 65 |
</xsl:when> |
| 66 |
+ <xsl:when test="string-length($mail/@link)>0 and not(contains($mail/@link,'@'))"> |
| 67 |
+ <xsl:value-of select="concat($mail/@link, '@gentoo.org')"/> |
| 68 |
+ </xsl:when> |
| 69 |
<xsl:when test="string-length($mail/@link)>0"> |
| 70 |
<xsl:value-of select="$mail/@link"/> |
| 71 |
</xsl:when> |
| 72 |
@@ -146,11 +149,11 @@ |
| 73 |
<xsl:when test="string-length($gmail)>0 and string-length($mail/text())=0"> |
| 74 |
<xsl:value-of select="$gmail"/> |
| 75 |
</xsl:when> |
| 76 |
- <xsl:when test="string-length($mail/text())=0"> |
| 77 |
+ <xsl:when test="string-length($mail/text())=0 and string-length($mail/@link)>0"> |
| 78 |
<xsl:value-of select="$mail/@link"/> |
| 79 |
</xsl:when> |
| 80 |
<xsl:otherwise> |
| 81 |
- <xsl:value-of select="."/> |
| 82 |
+ <xsl:value-of select="$mail/text()"/> |
| 83 |
</xsl:otherwise> |
| 84 |
</xsl:choose> |
| 85 |
</xsl:variable> |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
-- |
| 90 |
gentoo-commits@l.g.o mailing list |
Archives