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

conflict solved (i hope so)

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@199 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2007-12-15 22:00:14 +00:00
parent 226495b893
commit ee111baa67
3 changed files with 98 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
trunk/NEWS
View file

14
trunk/locale/en-us.xml
View file

@ -71,13 +71,23 @@
<string id="ordered_by">ordered by</string> <string id="ordered_by">ordered by</string>
<string id="ascending">ascending</string> <string id="ascending">ascending</string>
<string id="descending">descending</string> <string id="descending">descending</string>
<string id="videos_oldest">oldest first</string>
<string id="videos_newest">most recent first</string>
<string id="videos_downloaded_least">least downloaded first</string>
<string id="videos_downloaded_most">most downloaded first</string>
<string id="videos_viewed_least">least viewed first</string>
<string id="videos_viewed_most">most viewed first</string>
<string id="videos_shortest">shortest first</string>
<string id="videos_lengthest">lenghtest first</string>
<string id="videos_smallest">smallest first</string>
<string id="videos_biggest">biggest first</string>
<string id="results_on">results on</string> <string id="results_on">results on</string>
<string id="pages">pages</string> <string id="pages">pages</string>
<string id="relevance">relevance</string> <string id="relevance">relevance</string>
<string id="duration">duration</string> <string id="duration">duration</string>
<string id="filesize">filesize</string> <string id="filesize">filesize</string>
<string id="viewcount">viewcount</string> <string id="viewcount">views</string>
<string id="downloadcount">downloadcount</string> <string id="downloadcount">downloads</string>
<string id="timestamp">timestamp</string> <string id="timestamp">timestamp</string>
<!-- search bar--> <!-- search bar-->

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

@ -9,10 +9,8 @@
<xsl:template name="innerresults"> <xsl:template name="innerresults">
<table class="results">
<xsl:for-each select="//results/result"> <xsl:for-each select="//results/result">
<tr class="result"> <div>
<td>
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" /> <xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
@ -26,31 +24,25 @@
</xsl:attribute> </xsl:attribute>
</img> </img>
</a> </a>
</td> <br />
<td>
<div class="videotitle">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" /> <xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="rdf:RDF/cc:Work/dc:title" /> <xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
</a>
</div>
<br />
<xsl:value-of select="rdf:RDF/cc:Work/dc:description" />
<table class="videometadata">
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='duration']" />:
</td>
<td class="rightcell">
<xsl:variable name="minutes" select="floor(@duration div 60)" /> <xsl:variable name="minutes" select="floor(@duration div 60)" />
<xsl:variable name="hours" select="floor(@duration div 3600)" /> <xsl:variable name="hours" select="floor(@duration div 3600)" />
<xsl:variable name="seconds" select="@duration - $minutes*60 - $hours*3600" /> <xsl:variable name="seconds" select="@duration - $minutes*60 - $hours*3600" />
<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" /> <xsl:choose>
</td> <xsl:when test="$hours=0">
</tr> (<xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</table> </xsl:when>
<xsl:otherwise>
(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</xsl:otherwise>
</xsl:choose>
</a>
<br />
<xsl:choose> <xsl:choose>
<xsl:when test="@status=0"> <xsl:when test="@status=0">
processing, please wait.... processing, please wait....
@ -68,6 +60,9 @@
same video was already uploaded same video was already uploaded
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
<br />
<xsl:value-of select="@viewcount" />
<xsl:value-of select="$locale_strings[@id='viewcount']" />
<xsl:if test="@edit='true'"> <xsl:if test="@edit='true'">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
@ -83,10 +78,8 @@
<img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />edit <img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />edit
</a> </a>
</xsl:if> </xsl:if>
</td> </div>
</tr>
</xsl:for-each> </xsl:for-each>
</table>
</xsl:template> </xsl:template>
<xsl:template name="results"> <xsl:template name="results">
@ -134,50 +127,50 @@
<xsl:when test="//results/@orderby='timestamp'"> <xsl:when test="//results/@orderby='timestamp'">
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@sort='asc'"> <xsl:when test="//results/@sort='asc'">
the oldest videos <xsl:value-of select="$locale_strings[@id='videos_oldest']" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
the newest videos <xsl:value-of select="$locale_strings[@id='videos_newest']" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="//results/@orderby='downloadcount'"> <xsl:when test="//results/@orderby='downloadcount'">
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@sort='asc'"> <xsl:when test="//results/@sort='asc'">
the least downloaded videos <xsl:value-of select="$locale_strings[@id='videos_downloaded_least']" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
the most downloaded videos <xsl:value-of select="$locale_strings[@id='videos_downloaded_most']" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="//results/@orderby='viewcount'"> <xsl:when test="//results/@orderby='viewcount'">
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@sort='asc'"> <xsl:when test="//results/@sort='asc'">
the least viewed videos <xsl:value-of select="$locale_strings[@id='videos_viewed_least']" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
the most viewed videos <xsl:value-of select="$locale_strings[@id='videos_viewed_most']" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="//results/@orderby='duration'"> <xsl:when test="//results/@orderby='duration'">
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@sort='asc'"> <xsl:when test="//results/@sort='asc'">
the shortest videos <xsl:value-of select="$locale_strings[@id='videos_shortest']" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
the lengthest videos <xsl:value-of select="$locale_strings[@id='videos_lengthest']" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="//results/@orderby='filesize'"> <xsl:when test="//results/@orderby='filesize'">
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@sort='asc'"> <xsl:when test="//results/@sort='asc'">
the smallest videos <xsl:value-of select="$locale_strings[@id='videos_smallest']" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
the biggest videos <xsl:value-of select="$locale_strings[@id='videos_biggest']" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -186,10 +179,12 @@
</xsl:choose> </xsl:choose>
</div> </div>
<div> <div>
<xsl:value-of select="//results/@resultcount" /> results on <xsl:value-of select="//results/@lastpage" /> pages <xsl:value-of select="//results/@resultcount" />&#160;
<xsl:value-of select="$locale_strings[@id='results_on']" />&#160;
<xsl:value-of select="//results/@lastpage" />&#160;
<xsl:value-of select="$locale_strings[@id='pages']" />
</div> </div>
<xsl:call-template name="pagination-arrows"/>
<xsl:call-template name="innerresults"/> <xsl:call-template name="innerresults"/>
<xsl:call-template name="pagination-arrows"/> <xsl:call-template name="pagination-arrows"/>
<xsl:call-template name="pagination-numbers"/> <xsl:call-template name="pagination-numbers"/>