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

different titles nao

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@275 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2008-04-06 23:56:34 +00:00
parent a928c9f4ce
commit 23a16e7484
5 changed files with 134 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/style/structure/fake6.css
View file

@ -289,7 +289,7 @@ ul
ul#footer, ul#footer,
ul#header ul#header
{ {
clear: both; clear: right;
display: block; display: block;
height: 3em; height: 3em;
} }

39
trunk/xsl/xhtml/header.xsl
View file

@ -9,7 +9,15 @@
<xsl:template name="header"> <xsl:template name="header">
<ul id="header" role="navigation"> <!--
<img>
<xsl:attribute name="src">
<xsl:value-of select="$site_strings[@id='path_root']" />/images/logo-small.png
</xsl:attribute>
</img>
-->
<ul id="header" role="navigation" style="clear:right;">
<xsl:choose> <xsl:choose>
<xsl:when test="string-length(//@username)=0"> <xsl:when test="string-length(//@username)=0">
@ -80,6 +88,35 @@
</a> </a>
</li> </li>
<li id="upload">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='header_upload-video']" />
</a>
</li>
<!--
<li id="">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_settings']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='settings_details']" />
</a>
</li>
-->
<li id="logout">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_logout']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='logout']" />
</a>
</li>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>

32
trunk/xsl/xhtml/loginbox.xsl
View file

@ -53,38 +53,6 @@
</a> </a>
--> -->
<ul id="account-actions" role="navigation">
<li id="upload">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='header_upload-video']" />
</a>
</li>
<!--
<li id="">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_settings']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='settings_details']" />
</a>
</li>
-->
<li id="logout">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_logout']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='logout']" />
</a>
</li>
</ul>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>

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

@ -32,8 +32,11 @@
<xsl:call-template name="splashbox" /> <xsl:call-template name="splashbox" />
</xsl:when> </xsl:when>
<xsl:when test="//video"> <xsl:when test="//page/video">
<xsl:call-template name="searchbar" /> <xsl:call-template name="searchbar" />
<!--
<xsl:call-template name="tagbar" />
-->
<xsl:if test="//message"> <xsl:if test="//message">
<xsl:call-template name="message"/> <xsl:call-template name="message"/>
@ -42,7 +45,7 @@
<xsl:call-template name="video"/> <xsl:call-template name="video"/>
</xsl:when> </xsl:when>
<xsl:when test="//search"> <xsl:when test="//page//results">
<xsl:call-template name="searchbar" /> <xsl:call-template name="searchbar" />
<xsl:call-template name="results"/> <xsl:call-template name="results"/>
</xsl:when> </xsl:when>

187
trunk/xsl/xhtml/xhtml-head.xsl
View file

@ -9,113 +9,106 @@
<xsl:template name="xhtml-head"> <xsl:template name="xhtml-head">
<head> <head>
<meta <meta
http-equiv="Content-Type" http-equiv="Content-Type"
content="application/xhtml+xml;charset=utf-8" content="application/xhtml+xml;charset=utf-8"
/> />
<xsl:choose> <link
rel="shortcut icon"
type="image/x-icon"
href="/images/favicon.ico"
/>
<xsl:when test="not(//@embed)"> <link
<link rel="stylesheet"
rel="shortcut icon" type="text/css"
type="image/x-icon" media="screen"
href="/images/favicon.ico" href="/style/default.css"
/> />
<link
rel="stylesheet"
type="text/css"
media="screen"
href="/style/default.css"
/>
</xsl:when>
<xsl:when test="//@embed='video'"> <link
<link rel="search"
rel="stylesheet" type="application/opensearchdescription+xml"
type="text/css" >
href="/style/embedded.css" <xsl:attribute name="href">
/> <xsl:value-of select="$site_strings[@id='path_root']" />?xslt=opensearch
</xsl:when> </xsl:attribute>
<xsl:attribute name="title">
<xsl:value-of select="$site_strings[@id='site_name']" />
</xsl:attribute>
</link>
</xsl:choose> <xsl:choose>
<xsl:when test="//frontpage">
<xsl:if test="boolean(//results)"> <title>
<link
rel="alternate"
type="application/rss+xml"
>
<xsl:attribute name="title">
<xsl:value-of select="$locale_strings[@id='rss_title_results_this_page']" />
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_root']" />
<xsl:value-of select="$site_strings[@id='path_results']" />
<xsl:value-of select="//results/@query" />
&amp;pagesize=<xsl:value-of select="//results/@pagesize" />
&amp;page=<xsl:value-of select="//results/@page" />
&#38;xslt=rss
</xsl:attribute>
</link>
<link
rel="alternate"
type="application/rss+xml"
>
<xsl:attribute name="title">
<xsl:value-of select="$locale_strings[@id='rss_title_results_all_pages']" />
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_root']" />
<xsl:value-of select="$site_strings[@id='path_results']" />
<xsl:value-of select="//results/@query" />
&amp;pagesize=99999
&amp;page=1
&#38;xslt=rss
</xsl:attribute>
</link>
</xsl:if>
<link
rel="search"
type="application/opensearchdescription+xml"
>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_root']" />?xslt=opensearch
</xsl:attribute>
<xsl:attribute name="title">
<xsl:value-of select="$site_strings[@id='site_name']" /> <xsl:value-of select="$site_strings[@id='site_name']" />
</xsl:attribute> -
</link> <xsl:value-of select="$site_strings[@id='site_motto']" />
</title>
<title> </xsl:when>
<xsl:choose>
<xsl:when test="boolean(//frontpage)"> <xsl:when test="//page/video">
<xsl:value-of select="$site_strings[@id='site_name']" />
- <title>
<xsl:value-of select="$site_strings[@id='site_motto']" /> <xsl:value-of select="$site_strings[@id='site_name']" />
</xsl:when> -
<xsl:when test="boolean(//resultspage)"> <xsl:value-of select="//page/video/rdf:RDF/cc:Work/dc:title" />
</title>
</xsl:when>
<xsl:when test="//page//results">
<link
rel="alternate"
type="application/rss+xml"
>
<xsl:attribute name="title">
<xsl:value-of select="$locale_strings[@id='rss_title_results_this_page']" />
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_root']" />
<xsl:value-of select="$site_strings[@id='path_results']" />
<xsl:value-of select="//results/@query" />
&amp;pagesize=<xsl:value-of select="//results/@pagesize" />
&amp;page=<xsl:value-of select="//results/@page" />
&#38;xslt=rss
</xsl:attribute>
</link>
<link
rel="alternate"
type="application/rss+xml"
>
<xsl:attribute name="title">
<xsl:value-of select="$locale_strings[@id='rss_title_results_all_pages']" />
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_root']" />
<xsl:value-of select="$site_strings[@id='path_results']" />
<xsl:value-of select="//results/@query" />
&amp;pagesize=99999
&amp;page=1
&#38;xslt=rss
</xsl:attribute>
</link>
<title>
<xsl:value-of select="$site_strings[@id='site_name']" /> <xsl:value-of select="$site_strings[@id='site_name']" />
- -
<xsl:value-of select="$locale_strings[@id='results_for_query']" /> <xsl:value-of select="$locale_strings[@id='results_for_query']" />
"<xsl:value-of select="//resultspage/@query" />" "<xsl:value-of select="//page/results/@query" />"
</xsl:when> </title>
<xsl:otherwise>
<!-- </xsl:when>
this seems to be fail
should be fixed somehow </xsl:choose>
-->
<xsl:value-of select="$site_strings[@id='site_name']" /> </head>
-
<xsl:value-of select="$site_strings[@id='site_motto']" />
</xsl:otherwise>
</xsl:choose>
</title>
</head>
</xsl:template> </xsl:template>