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#header
{
clear: both;
clear: right;
display: block;
height: 3em;
}

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

@ -9,7 +9,15 @@
<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:when test="string-length(//@username)=0">
@ -80,6 +88,35 @@
</a>
</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:choose>

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

@ -53,38 +53,6 @@
</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:choose>

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

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

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

@ -15,33 +15,53 @@
content="application/xhtml+xml;charset=utf-8"
/>
<xsl:choose>
<xsl:when test="not(//@embed)">
<link
rel="shortcut icon"
type="image/x-icon"
href="/images/favicon.ico"
/>
<link
rel="stylesheet"
type="text/css"
media="screen"
href="/style/default.css"
/>
</xsl:when>
<xsl:when test="//@embed='video'">
<link
rel="stylesheet"
type="text/css"
href="/style/embedded.css"
/>
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:attribute>
</link>
<xsl:choose>
<xsl:when test="//frontpage">
<title>
<xsl:value-of select="$site_strings[@id='site_name']" />
-
<xsl:value-of select="$site_strings[@id='site_motto']" />
</title>
</xsl:when>
</xsl:choose>
<xsl:when test="//page/video">
<xsl:if test="boolean(//results)">
<title>
<xsl:value-of select="$site_strings[@id='site_name']" />
-
<xsl:value-of select="//page/video/rdf:RDF/cc:Work/dc:title" />
</title>
</xsl:when>
<xsl:when test="//page//results">
<link
rel="alternate"
@ -77,44 +97,17 @@
</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:attribute>
</link>
<title>
<xsl:choose>
<xsl:when test="boolean(//frontpage)">
<xsl:value-of select="$site_strings[@id='site_name']" />
-
<xsl:value-of select="$site_strings[@id='site_motto']" />
</xsl:when>
<xsl:when test="boolean(//resultspage)">
<xsl:value-of select="$site_strings[@id='site_name']" />
-
<xsl:value-of select="$locale_strings[@id='results_for_query']" />
"<xsl:value-of select="//resultspage/@query" />"
</xsl:when>
<xsl:otherwise>
<!--
this seems to be fail
should be fixed somehow
-->
<xsl:value-of select="$site_strings[@id='site_name']" />
-
<xsl:value-of select="$site_strings[@id='site_motto']" />
</xsl:otherwise>
</xsl:choose>
"<xsl:value-of select="//page/results/@query" />"
</title>
</xsl:when>
</xsl:choose>
</head>
</xsl:template>