different titles nao

git-svn-id: http://yolanda.mister-muffin.de/svn@275 7eef14d0-6ed0-489d-bf55-20463b2d70db

trunk/style/structure/fake6.css

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

trunk/xsl/xhtml/header.xsl

@@ -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>
 

trunk/xsl/xhtml/loginbox.xsl

@@ -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>

trunk/xsl/xhtml/xhtml-body.xsl

@@ -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>

trunk/xsl/xhtml/xhtml-head.xsl

@@ -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"
+            rel="search"
-                        type="text/css"
+            type="application/opensearchdescription+xml"
-                        href="/style/embedded.css"
+        >
-                    />
+            <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:value-of select="//page/results/@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>
                     </title>
+
+            </xsl:when>
+
+        </xsl:choose>
+
     </head>
 
 </xsl:template>