josch/yolanda
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

some videos now on front page, fixed results template to allow several

Browse source 
<results /> on one page


git-svn-id: http://yolanda.mister-muffin.de/svn@317 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2008-04-25 11:42:50 +00:00
parent f15eaf0887
commit 84a9112e82
3 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
trunk/xsl/xhtml/results.xsl
View file

@ -9,35 +9,39 @@
<xsl:template name="results">
<h1>
<xsl:value-of select="$locale_strings[@id='results_heading_1']" />&#160;
<xsl:value-of select="//results/@pagesize * (//results/@currentpage - 1) + 1" />&#160;
<xsl:value-of select="$locale_strings[@id='results_heading_2']" />&#160;
<xsl:choose>
<xsl:when test="(//results/@pagesize * //results/@currentpage) &lt; //results/@resultcount">
<xsl:value-of select="//results/@pagesize * //results/@currentpage" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="//results/@resultcount" />
</xsl:otherwise>
</xsl:choose>&#160;
<xsl:value-of select="$locale_strings[@id='results_heading_3']" />&#160;
<xsl:value-of select="//results/@resultcount" />&#160;
<xsl:value-of select="$locale_strings[@id='results_heading_4']" />
</h1>
<xsl:for-each select="//page/results">
<xsl:call-template name="results-listing"/>
<h1>
<xsl:value-of select="$locale_strings[@id='results_heading_1']" />&#160;
<xsl:value-of select="//results/@pagesize * (//results/@currentpage - 1) + 1" />&#160;
<xsl:value-of select="$locale_strings[@id='results_heading_2']" />&#160;
<xsl:choose>
<xsl:when test="(//results/@pagesize * //results/@currentpage) &lt; //results/@resultcount">
<xsl:value-of select="//results/@pagesize * //results/@currentpage" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="//results/@resultcount" />
</xsl:otherwise>
</xsl:choose>&#160;
<xsl:value-of select="$locale_strings[@id='results_heading_3']" />&#160;
<xsl:value-of select="//results/@resultcount" />&#160;
<xsl:value-of select="$locale_strings[@id='results_heading_4']" />
</h1>
<xsl:if test="//results/@lastpage &gt; 1">
<xsl:call-template name="pagination-arrows"/>
</xsl:if>
<xsl:call-template name="results-listing"/>
<xsl:if test="//results/@lastpage &gt; 1">
<xsl:call-template name="pagination-arrows"/>
</xsl:if>
</xsl:for-each>
</xsl:template>
<xsl:template name="results-listing">
<div class="results">
<xsl:for-each select="//results/result">
<xsl:for-each select="result">
<div class="result">
<a>
<xsl:attribute name="href">

1
trunk/xsl/xhtml/upload.xsl
View file

@ -524,6 +524,7 @@
<xsl:if test="$start &lt;= $end">
<xsl:call-template name="for-loop">
<xsl:with-param name="start">
<xsl:value-of select="$start + 1"/>
</xsl:with-param>

16
trunk/xsl/xhtml/xhtml-body.xsl
View file

@ -19,14 +19,14 @@
<xsl:call-template name="header"/>
<xsl:call-template name="searchbar" />
<xsl:if test="string-length(//@username)=0">
<xsl:call-template name="loginbox" />
</xsl:if>
<xsl:choose>
<xsl:when test="//frontpage">
<xsl:call-template name="searchbar" />
<xsl:if test="string-length(//@username)=0">
<xsl:call-template name="loginbox" />
</xsl:if>
<xsl:call-template name="tagcloud" />
@ -35,10 +35,11 @@
</xsl:if>
<xsl:call-template name="splashbox" />
<xsl:call-template name="results"/>
</xsl:when>
<xsl:when test="//page/video">
<xsl:call-template name="searchbar" />
<!--
<xsl:call-template name="tagbar" />
-->
@ -51,7 +52,6 @@
</xsl:when>
<xsl:when test="//page//results">
<xsl:call-template name="searchbar" />
<xsl:call-template name="results"/>
</xsl:when>
</xsl:choose>