adding source and print-ready fields, add test item

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

contribute/promoitems/info-ANEXAMPLE.en.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<infoset>
+  <info id="UNIQUEID (e.g. nocloud)">
+    <name>HEADLINE OF THIS ITEM</name>
+    <description>
+      DESCRIPTION TEXT
+    </description>
+    <!-- Labels (label="xyz") should be translated to your language! -->
+    <!-- Leave a tag like <printready> blank or erase it if you don't want to appear it -->
+    <type label="Type">TYPE OF ITEM (e.g. Leaflet)</type>
+    <size label="Size">SIZE OF ITEM (e.g. 85mm x 55mm)</size>
+    <languages label="Available languages (to download)">
+      <a href="LINK1">LANGUAGE1</a>, <a href="LINK2">LANGUAGE2</a>
+    </languages>
+    <printed label="Printed versions (to order)">
+      <a href="LINK1">LANGUAGE1</a>, <a href="LINK2">LANGUAGE2</a>
+    </printed>
+    <source label="Available source files (to download)">AVAILABLE SOURCE FILES (SVG)</source> 
+    <printready label="Print-ready files (to download)">AVAILABLE PRINT-READY FILES</printready>
+    <license label="License">LICENSE OF ITEM</license>
+  </info>
+
+</infoset>

contribute/promoitems/info-fellowship-leaflet.de.xml

@@ -7,7 +7,7 @@
     </description>
     <type label="Typ">Flugblatt</type>
     <size label="Größe">A5 (14,8 × 21cm)</size>
-    <formats label="Verfügbare Formate (zum Herunterladen)"></formats>
+    <source label="Verfügbare Quelldateien (zum Herunterladen)"></source> 
     <languages label="Verfügbare Sprachen (zum Herunterladen)">
       <a href="http://download.fsfe.org/advocacy/leaflets/fellowship-leaflet-nyr2.1.en.pdf" title="What can I do">Englisch</a>, <a href="http://download.fsfe.org/advocacy/leaflets/fellowship-leaflet-nyr2.1.de.pdf" title="Was kann ich tun">Deutsch</a>
     </languages>

contribute/promoitems/info-fellowship-leaflet.en.xml

@@ -7,7 +7,7 @@
     </description>
     <type label="Type">Leaflet</type>
     <size label="Size">A5 (14,8 × 21cm)</size>
-    <formats label="Available formats (to download)"></formats>
+    <source label="Available source files (to download)"></source> 
     <languages label="Available languages (to download)">
       <a href="http://download.fsfe.org/advocacy/leaflets/fellowship-leaflet-nyr2.1.en.pdf" title="What can I do">English</a>, <a href="http://download.fsfe.org/advocacy/leaflets/fellowship-leaflet-nyr2.1.de.pdf" title="Was kann ich tun">German</a>
     </languages>

contribute/promoitems/info-fsfe-folder.en.xml

@@ -8,7 +8,7 @@
     </description>
     <type label="Type">Folder</type>
     <size label="Size">A5 (14,8 × 21cm) / A4 (21 × 29,7cm)</size>
-    <formats label="Available formats (to download)"></formats>
+    <source label="Available source files (to download)"></source> 
     <languages label="Available languages (to download)"><a href="/about/printable/folder.en.F.pdf">English</a>, <a href="/about/printable/folder.de.F.pdf">German</a></languages>
     <printed label="Printed versions (to order)"><span style="color:red">Unfortunately, FSFE folders in A5 are out of stock at the moment</span></printed>
     <license label="License"></license>

contribute/promoitems/info-nocloud.de.xml

@@ -6,8 +6,8 @@
       Ein Aufkleber, um User über ihre Online-Realität aufzuklären: "There is no cloud just other people's computers"
     </description>
     <type label="Typ">Aufkleber</type>
-    <size>85mm x 55mm</size>
-    <formats label="Verfügbare Formate (zum Herunterladen)"></formats>
+    <size label="Größe">85mm x 55mm</size>
+    <source label="Verfügbare Quelldateien (zum Herunterladen)"></source> 
     <languages label="Verfügbare Sprachen (zum Herunterladen)">
       <a href="http://download.fsfe.org/advocacy/stickers/thereisnocloud/thereisnocloud-final-85mm.png">Englisch</a>
     </languages>

contribute/promoitems/info-nocloud.en.xml

@@ -7,7 +7,7 @@
     </description>
     <type label="Type">Sticker</type>
     <size label="Size">85mm x 55mm</size>
-    <formats label="Available formats (to download)"></formats>
+    <source label="Available source files (to download)"></source> 
     <languages label="Available languages (to download)">
       <a href="http://download.fsfe.org/advocacy/stickers/thereisnocloud/thereisnocloud-final-85mm.png">English</a>
     </languages>

contribute/promoitems/info-testitem.en.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<infoset>
+  <info id="testitem">
+    <name>Testitem for new spreadtheword page</name>
+    <description>
+      This is just a testitem to see if every field is working.
+    </description>
+    <!-- Labels (label="xyz") should be translated to your language! -->
+    <!-- Leave a tag like <printready> blank or erase it if you don't want to appear it -->
+    <type label="Type">Sticker</type>
+    <size label="Size">42 m²</size>
+    <languages label="Available languages (to download)">
+      <a href="http://fsfe.org">Language 1</a>, <a href="http://test.fsfe.org">Language 2</a>, <a href="http://fsfe.org">Language 3</a>
+    </languages>
+    <printed label="Printed versions (to order)">
+      <a href="http://fsfe.org">Language 1</a>, <a href="http://test.fsfe.org">Language 2</a>
+    </printed>
+    <source label="Available source files (to download)"><a href="http://fsfe.org">English (SVG)</a></source> 
+    <printready label="Print-ready files (to download)"><a href="http://fsfe.org">English (PDF)</a></printready>
+    <license label="License">CC BY-SA 3.0 (by Captain Designaah)</license>
+  </info>
+
+</infoset>

contribute/promoitems/item.en.xml

@@ -4,14 +4,21 @@
 
 <itemset>
 
+  <!-- Test -->
+  <item type="test" id="testitem" order="1">
+ 	<image
+    imglarge="http://fsfe.org"
+    imgsmall="/graphics/megaphone.png"/>
+  </item>
+
   <!-- FSFE and Fellowship -->
-  <item type="fsfe" id="fellowship-leaflet" order="2">
+  <item type="fsfe" id="fellowship-leaflet" order="1">
  	<image
     imglarge="http://download.fsfe.org/advocacy/leaflets/fellowship-leaflet-nyr2.1.en.pdf"
     imgsmall="/contribute/promopics/fellowship-leaflet-thumb.png"/>
   </item>
 
-  <item type="fsfe" id="fsfe-folder" order="1">
+  <item type="fsfe" id="fsfe-folder" order="2">
  	<image
     imglarge="/about/printable/folder.en.F.pdf"
     imgsmall="/contribute/promopics/folder-fsfe-en1_thumb.png"/>

contribute/spreadtheword.en.xhtml

@@ -38,6 +38,10 @@
 		<h2 id="id-available-promotion-material">Available promotion material</h2>
 
 <!-- START ITEMIZE TESTING -->
+    
+    <h3 id="testing" class="left break">Silly tests</h3>
+		
+		<dynamic-content type="test"/>
 
 		<h3 id="fsfe-and-fellowship-material" class="left break">About FSFE and the Fellowship</h3>
 		

contribute/spreadtheword.xsl

@@ -77,17 +77,6 @@
             <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/size" />
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-
-          <!-- Available formats to download -->
-          <xsl:if test="/buildinfo/document/set/info[@id=$id]/formats != ''">
-            <xsl:element name="strong">
-              <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/formats/@label" />
-              <xsl:text>: </xsl:text>
-            </xsl:element>
-            <xsl:element name="br"></xsl:element>
-            <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/formats" />
-            <xsl:element name="br"></xsl:element>
-          </xsl:if>
           
           <!-- Available languages to download -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/languages != ''">
@@ -111,6 +100,28 @@
             <xsl:element name="br"></xsl:element>
           </xsl:if>
           
+          <!-- Available source files to download -->
+          <xsl:if test="/buildinfo/document/set/info[@id=$id]/source != ''">
+            <xsl:element name="strong">
+              <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/source/@label" />
+              <xsl:text>: </xsl:text>
+            </xsl:element>
+            <xsl:element name="br"></xsl:element>
+            <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/source" />
+            <xsl:element name="br"></xsl:element>
+          </xsl:if>
+          
+          <!-- Available print ready files to download -->
+          <xsl:if test="/buildinfo/document/set/info[@id=$id]/printready != ''">
+            <xsl:element name="strong">
+              <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/printready/@label" />
+              <xsl:text>: </xsl:text>
+            </xsl:element>
+            <xsl:element name="br"></xsl:element>
+            <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/printready" />
+            <xsl:element name="br"></xsl:element>
+          </xsl:if>
+          
           <!-- License -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/license != ''">
             <xsl:element name="strong">