made newsletter subscription, adapted index, added it on mews/newsletter

svn path=/trunk/; revision=19475

index.en.xhtml

@@ -50,27 +50,7 @@
 	    <strong><receive-newsletter />:</strong>
 	  </p>
 
-	  <form id="formnl" name="formnl" method="post" action="http://mail.fsfeurope.org/mailman/subscribe/newsletter-en">
-	    <p>
-	      <select id="language" name="language" onchange="var form = document.getElementById('formnl'); var sel=document.getElementById('language'); form.action='http://mail.fsfeurope.org/mailman/subscribe/newsletter-'+sel.options[sel.options.selectedIndex].value">
-		<option value="en" selected="selected">English</option>
-		<option value="el">Ελληνικά</option>	
-		<option value="es">Español</option>
-		<option value="de">Deutsch</option>
-		<option value="fr">Français</option>
-		<option value="it">Italiano</option>
-		<option value="nl">Nederlands</option>
-		<option value="pt">Português</option>
-		<option value="ru">Русский</option>
-		<option value="sv">Svenska</option>
-	      </select>
-	      
-	      <input id="email" name="email" type="email" placeholder="email address" />
-	      
-	      <subscribe-button />
-	      
-	    </p>
-	  </form>
+	  <subscribe-nl/>
 
 	  <ul>
 	  

index.xsl

@@ -7,6 +7,7 @@
   <xsl:import href="tools/xsltsl/date-time.xsl" />
   <xsl:import href="tools/xsltsl/tagging.xsl" />
   <xsl:import href="tools/xsltsl/translations.xsl" />
+  <xsl:import href="tools/xsltsl/static-elements.xsl" />
   <xsl:output method="xml" encoding="UTF-8" indent="yes" />
   
   <!-- 
@@ -110,17 +111,8 @@
     </xsl:call-template>
   </xsl:template>
   
-  <!--generate subscribe button in correct language-->
-  <xsl:template match="subscribe-button">
-    <xsl:element name="input">
-      <xsl:attribute name="id">submit</xsl:attribute>
-      <xsl:attribute name="type">submit</xsl:attribute>
-      <xsl:attribute name="value">
-	    <xsl:call-template name="gettext">
-          <xsl:with-param name="id" select="'subscribe'" />
-        </xsl:call-template>
-      </xsl:attribute>
-    </xsl:element>
+  <xsl:template match="subscribe-nl">
+    <xsl:call-template name="subscribe-nl" />
   </xsl:template>
   
   <!-- Do not copy <set> or <text> to output at all -->

news/newsletter.en.xhtml

@@ -11,7 +11,14 @@
       In addition to our <a href="news.html">regular news stories</a>, each
       month FSFE issues a newsletter that summarises its
       most important activities.
+      
     </p>
+    
+    <p>
+      <receive-newsletter />
+    </p>
+    
+    <subscribe-nl />
 
   </body>
 

news/newsletter.xsl

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
+  
+  <xsl:import href="../tools/xsltsl/translations.xsl" />
+  <xsl:import href="../tools/xsltsl/static-elements.xsl" />
+  
   <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
 
   <xsl:template match="/">
@@ -41,5 +44,16 @@
 
   <xsl:template match="set | tags"/>
   
+  <!--translated sentence "receive-newsletter"-->
+  <xsl:template match="receive-newsletter">
+    <xsl:call-template name="gettext">
+      <xsl:with-param name="id" select="'receive-newsletter'" />
+    </xsl:call-template>
+  </xsl:template>
+  
+  <xsl:template match="subscribe-nl">
+    <xsl:call-template name="subscribe-nl" />
+  </xsl:template>
+  
 </xsl:stylesheet>