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

search results now use css-property "display:inline-block"

Browse source 
added (non-functional) button for "advanced" search


git-svn-id: http://yolanda.mister-muffin.de/svn@200 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2007-12-16 06:06:59 +00:00
parent ee111baa67
commit 666fa10be9
5 changed files with 79 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@
<!-- front page --> <!-- front page -->
<string id="button_find">Find</string> <string id="button_find">Find</string>
<string id="button_lucky">Instant Access</string> <string id="button_lucky">Instant Access</string>
<string id="button_advanced">Avanced Search</string>
<string id="query_latestadditions">latest additions</string> <string id="query_latestadditions">latest additions</string>
<string id="query_mostdownloads">most downloads</string> <string id="query_mostdownloads">most downloads</string>
@ -53,6 +54,7 @@
<string id="error_insert_username">Please insert a username.</string> <string id="error_insert_username">Please insert a username.</string>
<string id="error_insert_password">Please insert a password.</string> <string id="error_insert_password">Please insert a password.</string>
<string id="error_repeat_password">Please repeat your password.</string> <string id="error_repeat_password">Please repeat your password.</string>
<string id="information_no_results">There are no results satisfying your query.</string>
<string id=""></string> <string id=""></string>
<!-- information --> <!-- information -->
@ -67,7 +69,10 @@
<!-- warnings --> <!-- warnings -->
<!-- results page--> <!-- results page-->
<string id="results_for_query">results for query</string> <string id="results_heading_1">results</string>
<string id="results_heading_2">to</string>
<string id="results_heading_3">out of</string>
<string id="results_heading_4">for</string>
<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>

24
trunk/style/default.css
View file

@ -115,6 +115,30 @@ div
{ {
margin: 0.75em; margin: 0.75em;
vertical-align: middle; vertical-align: middle;
overflow: visible;
}
div.page-number
{
display: inline-block;
font-size: 40px;
height: 32px;
width: 32px;
overflow: visible;
}
div.result
{
display: inline-block;
margin: 0.75em;
width: 160px;
overflow: visible;
}
div.result img
{
border-color: black;
border-width: 1px;
} }
div.search div.search

2
trunk/xsl/xhtml.xsl
View file

@ -272,7 +272,7 @@
</xsl:attribute> </xsl:attribute>
<fieldset> <fieldset>
<xsl:value-of select="$locale_strings[@id='search']" />: <xsl:value-of select="$locale_strings[@id='search']" />:
<input type="text" name="query" size="20"> <input type="text" name="query" size="15">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:if test="//results/@argument='query'"> <xsl:if test="//results/@argument='query'">
<xsl:value-of select="//results/@value" /> <xsl:value-of select="//results/@value" />

7
trunk/xsl/xhtml/frontpage.xsl
View file

@ -22,12 +22,17 @@
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_find']" /> <xsl:value-of select="$locale_strings[@id='button_find']" />
</xsl:attribute> </xsl:attribute>
</input>&#160; </input>
<input type="submit" name="lucky"> <input type="submit" name="lucky">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_lucky']" /> <xsl:value-of select="$locale_strings[@id='button_lucky']" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input type="submit" name="advanced">
<xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_advanced']" />
</xsl:attribute>
</input>
</fieldset> </fieldset>
</form> </form>
</div> </div>

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

@ -10,7 +10,7 @@
<xsl:template name="innerresults"> <xsl:template name="innerresults">
<xsl:for-each select="//results/result"> <xsl:for-each select="//results/result">
<div> <div class="result">
<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" />
@ -30,6 +30,8 @@
<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>
<br />
<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" />
@ -41,48 +43,10 @@
(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />) (<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</a>
<br />
<xsl:choose>
<xsl:when test="@status=0">
processing, please wait....
</xsl:when>
<xsl:when test="@status=2">
invalid audio and/or video stream
</xsl:when>
<xsl:when test="@status=3">
file not found - contact the admin
</xsl:when>
<xsl:when test="@status=4">
file is not a video
</xsl:when>
<xsl:when test="@status=5">
same video was already uploaded
</xsl:when>
</xsl:choose>
<br />
<xsl:value-of select="@viewcount" />
<xsl:value-of select="$locale_strings[@id='viewcount']" />
<xsl:if test="@edit='true'">
<a>
<xsl:attribute name="href">
<xsl:choose>
<xsl:when test="not(@status=1)">
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(rdf:RDF/cc:Work/dc:identifier, 'action=edit')" />
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />edit
</a>
</xsl:if>
</div> </div>
</xsl:for-each> </xsl:for-each>
</xsl:template> </xsl:template>
<xsl:template name="results">
<div> <div>
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@value!=''"> <xsl:when test="//results/@value!=''">
@ -178,16 +142,43 @@
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</div> </div>
<xsl:template name="results">
<div> <div>
<xsl:value-of select="//results/@resultcount" />&#160; <span class="heading">
<xsl:value-of select="$locale_strings[@id='results_on']" />&#160; <xsl:value-of select="$locale_strings[@id='results_heading_1']" />&#160;
<xsl:value-of select="//results/@lastpage" />&#160; <xsl:value-of select="//results/@pagesize * (//results/@currentpage - 1) + 1" />&#160;
<xsl:value-of select="$locale_strings[@id='pages']" /> <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']" />&#160;
"<xsl:value-of select="//results/@value" />"
</span>
</div> </div>
<xsl:call-template name="innerresults"/> <xsl:call-template name="innerresults"/>
<xsl:call-template name="pagination-arrows"/>
<xsl:call-template name="pagination-numbers"/> <xsl:if test="//results/@lastpage &gt; 1">
<xsl:call-template name="pagination-arrows"/>
</xsl:if>
</xsl:template>
<xsl:template name="results-ordering">
<!--
this is deprecated - dont use it.
-->
<div> <div>
<form method="get"> <form method="get">
@ -335,6 +326,11 @@
</xsl:if> </xsl:if>
<img src="./images/tango/go-previous.png" /> <img src="./images/tango/go-previous.png" />
</a> </a>
<div class="page-number">
<xsl:value-of select="//results/@currentpage" />
</div>
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" /> <xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
@ -360,46 +356,4 @@
</div> </div>
</xsl:template> </xsl:template>
<xsl:template name="pagination-numbers">
<!--
this template is currently unused,
it will probably be removed soon.
-->
<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&amp;orderby=', //results/@orderby, '&amp;sort=', //results/@sort, '&amp;pagesize=', //results/@pagesize)" />
<xsl:if test="//results/@currentpage > 2">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 2)" />
</xsl:attribute>
<xsl:value-of select="//results/@currentpage - 2" />
</a>
</xsl:if>
<xsl:if test="//results/@currentpage > 1">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
</xsl:attribute>
<xsl:value-of select="//results/@currentpage - 1" />
</a>
</xsl:if>
<xsl:value-of select="//results/@currentpage" />
<xsl:variable name="temp" select="//results/@lastpage - //results/@currentpage" />
<xsl:if test="$temp > 0">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
</xsl:attribute>
<xsl:value-of select="//results/@currentpage + 1" />
</a>
</xsl:if>
<xsl:if test="$temp > 1">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 2)" />
</xsl:attribute>
<xsl:value-of select="//results/@currentpage + 2" />
</a>
</xsl:if>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>