From a69c97ce4f648b10297fa0759064ef56e95dd4f7 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 5 Sep 2010 15:00:00 +0000
Subject: [PATCH] Slight refactoring of header panels

---
 templates/Full/Conversation.xslt          | 2 --
 templates/Full/Conversations.xslt         | 2 --
 templates/Full/Login.xslt                 | 2 --
 templates/Full/MigrateAccount.xslt        | 2 --
 templates/Full/PMReply.xslt               | 2 --
 templates/Full/PMSend.xslt                | 2 --
 templates/Full/RegisterByInvite.xslt      | 2 --
 templates/Full/Settings.xslt              | 2 --
 templates/Full/UserInfo.xslt              | 2 --
 templates/Full/UserList.xslt              | 2 --
 templates/Full/UserPollsParticipated.xslt | 2 --
 templates/Full/UserPosts.xslt             | 2 --
 templates/Full/UserReplies.xslt           | 2 --
 templates/Full/elems/Header.xslt          | 8 ++++++++
 14 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/templates/Full/Conversation.xslt b/templates/Full/Conversation.xslt
index 52aa870..da942f1 100644
--- a/templates/Full/Conversation.xslt
+++ b/templates/Full/Conversation.xslt
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:import href="elems\PMInfo.xslt"/>
 	<xsl:template name="specificTitle">
 		<xsl:value-of select="conversationInfo/interlocutor/account/user/name"/>
 	</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<xsl:call-template name="conversationInfo"/>
 		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
diff --git a/templates/Full/Conversations.xslt b/templates/Full/Conversations.xslt
index f2e5b37..181c6d5 100644
--- a/templates/Full/Conversations.xslt
+++ b/templates/Full/Conversations.xslt
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:import href="elems\ConversationInfo.xslt"/>
 	<xsl:template name="specificTitle">Личные сообщения</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/Login.xslt b/templates/Full/Login.xslt
index 77b1f1d..e325f4a 100644
--- a/templates/Full/Login.xslt
+++ b/templates/Full/Login.xslt
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:template name="specificTitle">Вход</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/MigrateAccount.xslt b/templates/Full/MigrateAccount.xslt
index 24aa539..6fab565 100644
--- a/templates/Full/MigrateAccount.xslt
+++ b/templates/Full/MigrateAccount.xslt
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:template name="specificTitle">Миграция</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/PMReply.xslt b/templates/Full/PMReply.xslt
index 9fe842f..27f7446 100644
--- a/templates/Full/PMReply.xslt
+++ b/templates/Full/PMReply.xslt
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:import href="elems\TextEditor.xslt"/>
 	<xsl:template name="specificTitle">
 		<xsl:text>Ответ на личное сообщение - </xsl:text>
 		<xsl:value-of select="message/interlocutor/account/user/name"/>
 	</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/PMSend.xslt b/templates/Full/PMSend.xslt
index a33f5f1..dc1075d 100644
--- a/templates/Full/PMSend.xslt
+++ b/templates/Full/PMSend.xslt
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:import href="elems\TextEditor.xslt"/>
 	<xsl:template name="specificTitle">Новое личное сообщение</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/RegisterByInvite.xslt b/templates/Full/RegisterByInvite.xslt
index 2815b75..70db86b 100644
--- a/templates/Full/RegisterByInvite.xslt
+++ b/templates/Full/RegisterByInvite.xslt
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:template name="specificTitle">Регистрация</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/Settings.xslt b/templates/Full/Settings.xslt
index fa7ea6e..71fdb85 100644
--- a/templates/Full/Settings.xslt
+++ b/templates/Full/Settings.xslt
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\MyHeader.xslt"/>
 	<xsl:template name="specificTitle">Настройки</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="myHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserInfo.xslt b/templates/Full/UserInfo.xslt
index 3131d33..5a3311e 100644
--- a/templates/Full/UserInfo.xslt
+++ b/templates/Full/UserInfo.xslt
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\UsersHeader.xslt"/>
 	<xsl:template name="specificTitle"><xsl:value-of select="user/name"/></xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="usersHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index 88af2e2..73eca2e 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\UsersHeader.xslt"/>
 	<xsl:template name="specificTitle">Пользователи</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="usersHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserPollsParticipated.xslt b/templates/Full/UserPollsParticipated.xslt
index 48fcb9a..b198804 100644
--- a/templates/Full/UserPollsParticipated.xslt
+++ b/templates/Full/UserPollsParticipated.xslt
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\UsersHeader.xslt"/>
 	<xsl:import href="elems\PollShortInfo.xslt"/>
 	<xsl:template name="specificTitle">Опросы</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="usersHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserPosts.xslt b/templates/Full/UserPosts.xslt
index 4b85b7d..b38bbf7 100644
--- a/templates/Full/UserPosts.xslt
+++ b/templates/Full/UserPosts.xslt
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\UsersHeader.xslt"/>
 	<xsl:import href="elems\PostInfo.xslt"/>
 	<xsl:template name="specificTitle">
 		<xsl:text>Сообщения - </xsl:text>
 		<xsl:value-of select="user/name"/>
 	</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="usersHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserReplies.xslt b/templates/Full/UserReplies.xslt
index e8865ce..1740721 100644
--- a/templates/Full/UserReplies.xslt
+++ b/templates/Full/UserReplies.xslt
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:import href="elems\UsersHeader.xslt"/>
 	<xsl:import href="elems\PostInfo.xslt"/>
 	<xsl:template name="specificTitle">
 		<xsl:text>Ответы - </xsl:text>
 		<xsl:value-of select="user/name"/>
 	</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="usersHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt
index 4216b0f..ca3d365 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+	<xsl:import href="MyHeader.xslt"/>
+	<xsl:import href="UsersHeader.xslt"/>
 
 	<xsl:template name="headerLink">
 		<xsl:param name="url"/>
@@ -68,6 +70,12 @@
 				</td>
 			</tr>
 		</table>
+		<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>
 		<center>&#160;&#160;</center>
 	</xsl:template>
 </xsl:stylesheet>