diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-03-03 13:46:44 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-03-03 13:46:44 +0100 |
| commit | 2e02da046d3e56cdf4744f644af35ad07424f48b (patch) | |
| tree | f2dcf353aa2338eae1c2ff2c41af971c580c2762 /xslt/report-templates/Image_List.xsl | |
| parent | 3c13229d98167ae4ae0710d5eeef23fef5005bf0 (diff) | |
| download | tellico-2e02da046d3e56cdf4744f644af35ad07424f48b.tar.gz tellico-2e02da046d3e56cdf4744f644af35ad07424f48b.zip | |
Update to upstream version 1.3.6
Diffstat (limited to 'xslt/report-templates/Image_List.xsl')
| -rw-r--r-- | xslt/report-templates/Image_List.xsl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xslt/report-templates/Image_List.xsl b/xslt/report-templates/Image_List.xsl index 78c596f..f73ca24 100644 --- a/xslt/report-templates/Image_List.xsl +++ b/xslt/report-templates/Image_List.xsl @@ -141,7 +141,10 @@ <xsl:if test="$id"> <img class="float"> <xsl:attribute name="src"> - <xsl:value-of select="concat($imgdir, $id)"/> + <xsl:call-template name="image-link"> + <xsl:with-param name="image" select="key('imagesById', $id)"/> + <xsl:with-param name="dir" select="$imgdir"/> + </xsl:call-template> </xsl:attribute> <xsl:call-template name="image-size"> <xsl:with-param name="limit-width" select="$image-width"/> @@ -150,7 +153,7 @@ </xsl:call-template> </img> </xsl:if> - + <table> <thead> <tr> @@ -163,8 +166,9 @@ <tbody> <!-- don't repeat title --> <xsl:for-each select="$columns[. != 'title']"> - <!-- no other images allowed --> - <xsl:if test="$entry/../tc:fields/tc:field[@name = current()]/@type != 10"> + <!-- no other images or paragraphs allowed --> + <xsl:variable name="ftype" select="$entry/../tc:fields/tc:field[@name = current()]/@type"/> + <xsl:if test="$ftype != 10 and $ftype != 2"> <xsl:call-template name="field-output"> <xsl:with-param name="entry" select="$entry"/> <!-- can't use a key, the context is not the document --> |