conflict solved ?
git-svn-id: http://yolanda.mister-muffin.de/svn@56 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
parent
cdcbf45b18
commit
f3fb99d68a
3 changed files with 13 additions and 8 deletions
|
@ -33,10 +33,13 @@
|
||||||
<str id="query_bestrated">best rated</str>
|
<str id="query_bestrated">best rated</str>
|
||||||
|
|
||||||
<!-- results page-->
|
<!-- results page-->
|
||||||
<str id="results_for_query">results for</str>
|
<str id="results_for_query">results for query</str>
|
||||||
|
|
||||||
<!-- search bar-->
|
<!-- search bar-->
|
||||||
<str id="search">search: </str>
|
<str id="search">search</str>
|
||||||
|
|
||||||
|
<!-- -->
|
||||||
|
<str id=""></str>
|
||||||
|
|
||||||
<!-- dublin core entities -->
|
<!-- dublin core entities -->
|
||||||
<str id="DC.title">title</str>
|
<str id="DC.title">title</str>
|
||||||
|
|
|
@ -3,9 +3,14 @@
|
||||||
|
|
||||||
<strings>
|
<strings>
|
||||||
|
|
||||||
|
<!-- visible -->
|
||||||
<str id="site_name">GNUtube</str>
|
<str id="site_name">GNUtube</str>
|
||||||
<str id="site_motto">WebTV free as in Speech</str>
|
<str id="site_motto">WebTV free as in Speech</str>
|
||||||
|
|
||||||
|
<!-- invisible -->
|
||||||
|
<str id="registerpage">search.pl?query=</str>
|
||||||
|
<str id="resultspage">search.pl?query=</str>
|
||||||
|
|
||||||
</strings>
|
</strings>
|
||||||
|
|
||||||
</xsl:stylesheet>
|
</xsl:stylesheet>
|
||||||
|
|
|
@ -20,8 +20,6 @@
|
||||||
<xsl:variable name="site_strings" select="document('../site/gnutube.xml')//strings" />
|
<xsl:variable name="site_strings" select="document('../site/gnutube.xml')//strings" />
|
||||||
<xsl:variable name="locale_strings" select="document(concat('../locale/',/page/@locale,'.xml'))//strings" />
|
<xsl:variable name="locale_strings" select="document(concat('../locale/',/page/@locale,'.xml'))//strings" />
|
||||||
|
|
||||||
<xsl:variable name="resultspage">search.pl?query=</xsl:variable>
|
|
||||||
|
|
||||||
<xsl:template match="/">
|
<xsl:template match="/">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
|
||||||
|
@ -119,7 +117,7 @@
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<form method="get" enctype="text/plain">
|
<form method="get" enctype="text/plain">
|
||||||
<xsl:attribute name="action">
|
<xsl:attribute name="action">
|
||||||
<xsl:value-of select="$resultspage" />
|
<xsl:value-of select="$site_strings/str[@id='resultspage']" />
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<input type="text" name="query" size="40" /><br />
|
<input type="text" name="query" size="40" /><br />
|
||||||
|
@ -159,7 +157,7 @@
|
||||||
<xsl:value-of select="$resultspage" />
|
<xsl:value-of select="$resultspage" />
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<xsl:value-of select="$locale_strings/str[@id='search']" />
|
<xsl:value-of select="$locale_strings/str[@id='search']" />:
|
||||||
<input type="text" name="query" size="auto" />
|
<input type="text" name="query" size="auto" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
|
@ -200,9 +198,8 @@
|
||||||
<xsl:template match="results">
|
<xsl:template match="results">
|
||||||
<xsl:call-template name="searchbar"/>
|
<xsl:call-template name="searchbar"/>
|
||||||
<div>
|
<div>
|
||||||
THE SEARCH FOR
|
<xsl:value-of select="$locale_strings/str[@id='results_for_query']" />:
|
||||||
"<xsl:value-of select="@query" />"
|
"<xsl:value-of select="@query" />"
|
||||||
BROUGHT US TEH FOLLOWING <del>OBJECTIONS</del><ins>OBJECTS</ins>.
|
|
||||||
</div>
|
</div>
|
||||||
<table class="results">
|
<table class="results">
|
||||||
<xsl:for-each select="result">
|
<xsl:for-each select="result">
|
||||||
|
|
Loading…
Reference in a new issue