From 07c63236288272f2e010531f1957b22fe7ed4e72 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Fri, 24 Sep 2010 05:44:20 +0000
Subject: [PATCH] Headers panel improved

---
 Builder/IISMainHandler/build.txt        |  2 +-
 static/css/modern/global.css            |  3 +++
 templates/Modern/elems/ForumHeader.xslt |  6 ++---
 templates/Modern/elems/Header.xslt      | 30 ++++++++++++-------------
 templates/Modern/elems/UsersHeader.xslt |  6 ++---
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index f14fd46..1234088 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1560
\ No newline at end of file
+1562
\ No newline at end of file
diff --git a/static/css/modern/global.css b/static/css/modern/global.css
index 142d9ce..73eaa5b 100644
--- a/static/css/modern/global.css
+++ b/static/css/modern/global.css
@@ -119,3 +119,6 @@ BLOCKQUOTE BR {FONT-SIZE:1px}
 .header a.selected {
 	font-size:1.13em;
 }
+.header .header {
+	font-size:0.8em;
+}
diff --git a/templates/Modern/elems/ForumHeader.xslt b/templates/Modern/elems/ForumHeader.xslt
index e63066a..90da6a3 100644
--- a/templates/Modern/elems/ForumHeader.xslt
+++ b/templates/Modern/elems/ForumHeader.xslt
@@ -30,10 +30,10 @@
 				<xsl:text>&#160;&#160;&#160;</xsl:text>
 				<xsl:apply-templates select="currentLocation//board[not(name(../..)='board')]" mode="headerBoardLink"/>
 			</xsl:if>
+			<xsl:if test="currentLocation//board">
+				<xsl:call-template name="boardHeader"/>
+			</xsl:if>
 		</div>
-		<xsl:if test="currentLocation//board">
-			<xsl:call-template name="boardHeader"/>
-		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="board" mode="headerParentBoardLink">
diff --git a/templates/Modern/elems/Header.xslt b/templates/Modern/elems/Header.xslt
index 00f5e9a..d287d17 100644
--- a/templates/Modern/elems/Header.xslt
+++ b/templates/Modern/elems/Header.xslt
@@ -161,22 +161,22 @@
 				<xsl:with-param name="url">/Users/</xsl:with-param>
 				<xsl:with-param name="text">Пользователи</xsl:with-param>
 			</xsl:call-template>
+			<xsl:if test="starts-with(/root/currentUrl, '/Forum/')">
+				<xsl:call-template name="forumHeader"/>
+			</xsl:if>
+			<xsl:if test="starts-with(/root/currentUrl, '/Users/')">
+				<xsl:call-template name="usersHeader"/>
+			</xsl:if>
+			<xsl:if test="starts-with(/root/currentUrl, '/My/')">
+				<xsl:call-template name="myHeader"/>
+			</xsl:if>
+			<xsl:if test="starts-with(/root/currentUrl, '/Upload/')">
+				<xsl:call-template name="uploadHeader"/>
+			</xsl:if>
+			<xsl:if test="starts-with(/root/currentUrl, '/Polls/')">
+				<xsl:call-template name="pollsHeader"/>
+			</xsl:if>
 		</div>
-		<xsl:if test="starts-with(/root/currentUrl, '/Forum/')">
-			<xsl:call-template name="forumHeader"/>
-		</xsl:if>
-		<xsl:if test="starts-with(/root/currentUrl, '/Users/')">
-			<xsl:call-template name="usersHeader"/>
-		</xsl:if>
-		<xsl:if test="starts-with(/root/currentUrl, '/My/')">
-			<xsl:call-template name="myHeader"/>
-		</xsl:if>
-		<xsl:if test="starts-with(/root/currentUrl, '/Upload/')">
-			<xsl:call-template name="uploadHeader"/>
-		</xsl:if>
-		<xsl:if test="starts-with(/root/currentUrl, '/Polls/')">
-			<xsl:call-template name="pollsHeader"/>
-		</xsl:if>
 		<center>&#160;&#160;</center>
 	</xsl:template>
 </xsl:stylesheet>
diff --git a/templates/Modern/elems/UsersHeader.xslt b/templates/Modern/elems/UsersHeader.xslt
index ae97694..13a6cc4 100644
--- a/templates/Modern/elems/UsersHeader.xslt
+++ b/templates/Modern/elems/UsersHeader.xslt
@@ -25,10 +25,10 @@
 					<xsl:with-param name="text"><xsl:value-of select="user/name"/></xsl:with-param>
 				</xsl:call-template>
 			</xsl:if>
+			<xsl:if test="user">
+				<xsl:call-template name="userHeader"/>
+			</xsl:if>
 		</div>
-		<xsl:if test="user">
-			<xsl:call-template name="userHeader"/>
-		</xsl:if>
 	</xsl:template>
 </xsl:stylesheet>