merge together difference between test and trunk

svn path=/branches/test/; revision=29255

build/xslt/fsfe_body.xsl

@@ -20,9 +20,6 @@
 
       <xsl:call-template name="fsfe_pageclass" />
 
-      <!-- For pages used on external web servers, use absolute URLs -->
-      <xsl:variable name="urlprefix"><xsl:if test="/buildinfo/document/@external">https://fsfe.org</xsl:if></xsl:variable>
-
       <!-- First of all, a comment to make clear this is generated -->
       <xsl:comment>This file was generated by an XSLT script. Please do not edit.</xsl:comment>
       

index.xsl

@@ -109,7 +109,7 @@
     <div  id="campaigns-boxes" class="cycle-slideshow"  data-cycle-pause-on-hover="true" data-cycle-speed="500"  data-cycle-timeout="9000" data-cycle-slides="a"  data-cycle-fx="scrollHorz" data-cycle-swipe="true">
       <div class="cycle-pager"/>
       
-      <xsl:for-each select="/buildinfo/textsetbackup/campaigns/campaign[@id='zacchiroli']">
+      <xsl:for-each select="/buildinfo/textsetbackup/campaigns/campaign[@id='zacchiroli' or @id='becomefellow']">
         <xsl:choose>
           <xsl:when test="count(/buildinfo/textset/campaigns/campaign[@id = current()/@id]) > 0">
             <xsl:apply-templates select="/buildinfo/textset/campaigns/campaign[@id = current()/@id]" mode="slideshow" />

news/news.xsl

@@ -47,13 +47,13 @@
 
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
+    <xsl:text>&#160;</xsl:text>
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
-      <xsl:text>[</xsl:text>
+      <xsl:attribute name="class">learn-more</xsl:attribute>
         <xsl:value-of select="/buildinfo/document/text[@id='more']" />
-      <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
 </xsl:stylesheet>

news/newsletter.xsl

@@ -23,7 +23,7 @@
         <xsl:value-of select="body"/>
         <xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>
         <xsl:if test="$link!=''">
-          [<a href="{link}"><xsl:value-of select="/buildinfo/document/text[@id='more']"/>]</a>
+          &#160;<a href="{link}" class="learn-more"><xsl:value-of select="/buildinfo/document/text[@id='more']"/></a>
         </xsl:if>
       </p>
     </xsl:for-each>