From: <dco...@us...> - 2009-04-16 15:54:13
|
Revision: 3039 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=3039&view=rev Author: dcorpataux Date: 2009-04-16 15:54:06 +0000 (Thu, 16 Apr 2009) Log Message: ----------- Search resultst PDF export layout Modified Paths: -------------- sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-fop.xsl sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-pdf-fop.xsl Modified: sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-fop.xsl =================================================================== --- sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-fop.xsl 2009-04-16 15:47:32 UTC (rev 3038) +++ sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-fop.xsl 2009-04-16 15:54:06 UTC (rev 3039) @@ -21,16 +21,16 @@ <xsl:for-each select="$res/*"> <xsl:if test="geonet:info/id != ''"> - <fo:table-row> - <fo:table-cell> - + <fo:table-row border-bottom="1pt solid gray"> + <fo:table-cell padding-bottom="10pt" padding-top="10pt"> + <xsl:variable name="source" select="string(geonet:info/source)"/> <xsl:variable name="groupLogoUuid" select="string(geonet:info/groupLogoUuid)"/> <xsl:variable name="groupWebsite" select="string(geonet:info/groupWebsite)"/> - - - - + + + + <fo:block font-weight="bold" font-size="14pt" border-top="2pt solid black"> <xsl:choose> @@ -48,7 +48,7 @@ url('<xsl:value-of select="concat('http://', $server/host,':', $server/port, $gui/url, '/images/logos/', $groupLogoUuid , '.png')" />')" </xsl:attribute> - </fo:external-graphic> + </fo:external-graphic> </xsl:when> <xsl:when test="/root/gui/sources/record[string(siteid)=$source]"> <fo:external-graphic content-width="35pt"> @@ -67,19 +67,18 @@ </fo:external-graphic> </xsl:otherwise> </xsl:choose> - + <xsl:value-of select="dc:title" /> </fo:block> - <fo:block text-align="left"> - <xsl:value-of select="$gui/strings/abstract" /> + <fo:block text-align="left" padding-bottom="3pt"> + <fo:inline font-weight="bold"><xsl:value-of select="$gui/strings/abstract" /></fo:inline> : <xsl:value-of select="dct:abstract" /> </fo:block> <!-- keywords --> <xsl:if test="dc:subject"> - <fo:block text-align="left" - font-style="italic"> - <xsl:value-of select="$gui/strings/keywords" /> + <fo:block text-align="left" padding-bottom="3pt"> + <fo:inline font-weight="bold"><xsl:value-of select="$gui/strings/keywords" /></fo:inline> : <xsl:for-each select="dc:subject"> <xsl:if test="position() > 1"> @@ -91,8 +90,7 @@ </xsl:if> <fo:block text-align="left"> - |<fo:basic-link text-decoration="underline" - color="blue"> + |<fo:basic-link text-decoration="underline" color="blue"> <xsl:attribute name="external-destination"> url('<xsl:value-of @@ -118,16 +116,17 @@ column-width="proportional-column-width(1)" /> <fo:table-body> <fo:table-row> - <fo:table-cell display-align="left" background-color="#064377"> - <fo:block text-align="left"> - <!-- FIXME --> - <fo:external-graphic> + <fo:table-cell display-align="left" background-color="#97d1d3"> + <fo:block text-align="left" background-image="url('')"> + <!-- FIXME: put the geocat header background as block bg --> + <fo:external-graphic content-height="50pt"> <xsl:attribute name="src"> url('<xsl:value-of - select="concat('http://', //server/host,':', //server/port, /root/gui/url,'/images/header-background.jpg')" />')" + select="concat('http://', //server/host,':', //server/port, /root/gui/url,'/images/header-logo.jpg')" />')" </xsl:attribute> </fo:external-graphic> </fo:block> +<!-- </fo:table-cell><fo:table-cell display-align="right" background-color="#064377"> <fo:block text-align="right"> <fo:external-graphic> @@ -137,6 +136,7 @@ </xsl:attribute> </fo:external-graphic> </fo:block> +--> </fo:table-cell> </fo:table-row> </fo:table-body> Modified: sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-pdf-fop.xsl =================================================================== --- sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-pdf-fop.xsl 2009-04-16 15:47:32 UTC (rev 3038) +++ sandbox/geocat.ch/trunk/web/geonetwork/xsl/csw-pdf-fop.xsl 2009-04-16 15:54:06 UTC (rev 3039) @@ -30,11 +30,11 @@ <fo:page-sequence master-reference="simpleA4" initial-page-number="1"> - <xsl:variable name="df">yyyy-MM-dd'T'HH:mm:ss</xsl:variable> - + <xsl:variable name="df">dd-MM-yyyy</xsl:variable> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end"> - GeoNetwork opensource - <xsl:value-of select="date:format-date(date:date-time(),$df)"/> - + <xsl:value-of select="date:format-date(date:date-time(),$df)"/> - <fo:page-number /> / <fo:page-number-citation ref-id="terminator" /> @@ -57,7 +57,7 @@ <fo:table-row height="10mm"> <fo:table-cell display-align="center"> - <fo:block text-align="center"> + <fo:block text-align="right"> <xsl:value-of select="/root/gui/strings/resultsMatching" /> <xsl:value-of This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |