Browse Source

improve xsl, better css

svn path=/branches/test/; revision=31122
pull/8/head
Max Mehl 5 years ago
parent
commit
7aa0a42c6d
6 changed files with 83 additions and 80 deletions
  1. +6
    -1
      contribute/promoitems/archive.en.xml
  2. +27
    -0
      contribute/promoitems/info-testitem-archive.en.xml
  3. +0
    -1
      contribute/promoitems/info-testitem.en.xml
  4. +4
    -4
      contribute/promoitems/item.en.xml
  5. +43
    -50
      contribute/promotion-materials-archive.en.xhtml
  6. +3
    -24
      contribute/promotion-materials-archive.xsl

+ 6
- 1
contribute/promoitems/archive.en.xml View File

@ -5,7 +5,12 @@
<itemset>
<!-- Test -->
<item type="test" id="testitem" year="2042" order="1">
<item type="test" id="testitem-archive" year="2042" order="1">
<image
imgsmall="/graphics/trusted-computing-vid.png"/>
</item>
<item type="test" id="testitem" year="2042" order="2">
<image
imgsmall="/graphics/megaphone.png"/>
</item>


+ 27
- 0
contribute/promoitems/info-testitem-archive.en.xml View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8" ?>
<infoset>
<info id="testitem-archive">
<!-- Leave a tag like <printready> blank or erase it if you don't
want to appear it -->
<!-- Translations for "Type", "Size" etc. can be found in
/tools/texts-**.xml -->
<name>Archived test item</name>
<description>
This is a test item which should only appear in the promo-archive.
</description>
<type>Poster</type>
<size>2mm x 2mm</size>
<languages>
<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>
<a href="http://fsfe.org">Language 1</a>, <a href="http://test.fsfe.org">Language 2</a>
</printed>
<context><a href="/">Nothing</a></context>
<source><a href="http://fsfe.org">English (SVG)</a></source>
<printready><a href="http://fsfe.org">English (PDF)</a></printready>
<license>CC BY-SA 3.0</license>
<author>Chief Inkscape</author>
</info>
</infoset>

+ 0
- 1
contribute/promoitems/info-testitem.en.xml View File

@ -22,7 +22,6 @@
<printready><a href="http://fsfe.org">English (PDF)</a></printready>
<license>CC BY-SA 3.0</license>
<author>Captain Designaah</author>
<year>2042</year>
</info>
</infoset>

+ 4
- 4
contribute/promoitems/item.en.xml View File

@ -5,24 +5,24 @@
<itemset>
<!-- Test -->
<item type="test" id="testitem" order="1">
<item type="test" id="testitem" year="2042" order="1">
<image
imgsmall="/graphics/megaphone.png"/>
</item>
<!-- FSFE and Fellowship -->
<item type="fsfe" id="fellowship-leaflet" order="1">
<item type="fsfe" id="fellowship-leaflet" year="2008" order="1">
<image
imgsmall="/contribute/promopics/fellowship-leaflet-thumb.png"/>
</item>
<item type="fsfe" id="fsfe-folder" order="2">
<item type="fsfe" id="fsfe-folder" year="2005" order="2">
<image
imgsmall="/contribute/promopics/folder-fsfe-en1_thumb.png"/>
</item>
<!-- Free Software and users freedom -->
<item type="fsfreedom" id="nocloud-sticker" order="1">
<item type="fsfreedom" id="nocloud-sticker" year="2015" order="1">
<image
imgsmall="/contribute/promopics/thereisnocloud_thumb.png"/>
</item>


+ 43
- 50
contribute/promotion-materials-archive.en.xhtml View File

@ -1,70 +1,63 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html>
<head>
<title>Promotion Material Archive - FSFE</title>
<meta content="FSFE's Promotion Material Archive" name="description" />
<meta content="FSFE Graphics Buttons Logo Promotion Sticker Poster Leaflets Flyer Campaigns Free Your Android I cannot read your documents Fellowship Plussy Gnu" name="keywords" />
<style type="text/css">
div.two-column {
float: left;
width: 40%;
}
h1, h2, h3 {
clear: both;
}
div#toc {
border: solid 1px;
margin: .5em;
background: rgb(240,240,240);
}
</style>
<head>
<title>Promotion Material Archive - FSFE</title>
<meta content="FSFE's Promotion Material Archive" name="description" />
<meta content="FSFE Graphics Buttons Logo Promotion Sticker Poster Leaflets Flyer Campaigns Free Your Android I cannot read your documents Fellowship Plussy Gnu" name="keywords" />
</head>
<style type="text/css">
div.two-column {
float: left;
width: 40%;
}
h1, h2, h3 {
clear: both;
}
div#toc {
border: solid 1px;
margin: .5em;
background: rgb(240,240,240);
}
div#toc ul {
margin-top: 10px;
}
</style>
</head>
<body>
<p id="category"><a href="/contribute/spreadtheword">Spread the word!</a></p>
<h1 id="promoarchive">Promotion Material Archive</h1>
<body>
<p id="category"><a href="/contribute/spreadtheword">Spread the word!</a></p>
<h1>Promotion Material Archive</h1>
<div id="introduction">
<p>On this page you find promotion material which we don't offer in a printed version anymore. However you can of course use linked files to spread the information material online or print it yourself for your event.</p>
</div>
</div>
<p>The archive is ordered chronologically to maintain a better overview. However the table below orders all our archived promotion material by category. Click on one item to be forwarded directly to the full description and download links.</p>
<h2>Table of all promotion material</h2>
<h2 id="short">List of all promotion materials</h2>
<toc />
<h2>Archived promotion material ordered by year</h2>
<h3 class="left break">2042</h3>
<dynamic-content year="2042"/>
<h2 id="full">Archived promotion material ordered by year</h2>
<h3 class="left break">2015</h3>
<dynamic-content year="2015"/>
<h3 class="left break">2014</h3>
<dynamic-content year="2014"/>
<h3 class="left break">2008</h3>
<dynamic-content year="2008"/>
<h3 class="left break">2005</h3>
<dynamic-content year="2005"/>
<h3 class="left break">2042</h3>
<dynamic-content year="2042"/>
<h3 class="left break">2015</h3>
<dynamic-content year="2015"/>
<h3 class="left break">2014</h3>
<dynamic-content year="2014"/>
</body>
<h3 class="left break">2008</h3>
<dynamic-content year="2008"/>
<h3 class="left break">2005</h3>
<dynamic-content year="2005"/>
</body>
<timestamp></timestamp>
</html>


+ 3
- 24
contribute/promotion-materials-archive.xsl View File

@ -4,6 +4,7 @@
<xsl:import href="../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<!-- Automatically created list of content -->
<xsl:template match="toc">
<xsl:element name="div">
<xsl:attribute name="id">toc</xsl:attribute>
@ -11,6 +12,8 @@
<xsl:for-each select="/buildinfo/document/set/item">
<xsl:sort select="@type" order="ascending" />
<!-- Load variables id, #link, type and year -->
<xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
<xsl:variable name="link" select="concat('#', $id)"/>
<xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
@ -31,15 +34,10 @@
<xsl:text>)</xsl:text>
</xsl:element> <!-- /a -->
</xsl:element> <!-- /li -->
</xsl:for-each>
</xsl:element> <!-- /ul -->
</xsl:element> <!-- /div -->
</xsl:template>
<!-- Fill dynamic content -->
@ -128,25 +126,6 @@
<xsl:element name="br"></xsl:element>
</xsl:if>
<!-- Printed version -->
<xsl:if test="/buildinfo/document/set/info[@id=$id]/printed != ''">
<xsl:element name="span">
<!--<xsl:attribute name="style">font-size:0.8em</xsl:attribute>-->
<xsl:element name="abbr"> <!-- mouseover info text -->
<xsl:attribute name="title">
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'stw-printed-tooltip'" /></xsl:call-template>
</xsl:attribute>
<xsl:element name="strong"> <!-- Field name -->
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'stw-printed'" /></xsl:call-template>
</xsl:element> <!-- /strong -->
</xsl:element> <!-- /abbr -->
<xsl:text>: </xsl:text>
<xsl:element name="br"></xsl:element>
<xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/printed" /> <!-- Dynamic value of the field -->
</xsl:element> <!-- /span -->
<xsl:element name="br"></xsl:element>
</xsl:if>
<!-- Languages -->
<xsl:if test="/buildinfo/document/set/info[@id=$id]/languages != ''">
<xsl:element name="span">


Loading…
Cancel
Save