From 34ca199fe333bfc8b134ee28838ff0556b082adf Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 26 Sep 2010 10:40:01 +0000
Subject: [PATCH] Conversation header improved

---
 Builder/IISMainHandler/build.txt              |  2 +-
 .../Modern/elems/ConversationsHeader.xslt     | 29 +++++++++++++++++++
 templates/Modern/elems/MyHeader.xslt          | 16 ++++------
 3 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 templates/Modern/elems/ConversationsHeader.xslt

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index cfa11c7..64ef4cb 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1688
\ No newline at end of file
+1690
\ No newline at end of file
diff --git a/templates/Modern/elems/ConversationsHeader.xslt b/templates/Modern/elems/ConversationsHeader.xslt
new file mode 100644
index 0000000..6274b5c
--- /dev/null
+++ b/templates/Modern/elems/ConversationsHeader.xslt
@@ -0,0 +1,29 @@
+<?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:template name="conversationsHeader">
+		<div class="header">
+			<xsl:call-template name="headerLink">
+				<xsl:with-param name="url">/My/Conversations/List/</xsl:with-param>
+				<xsl:with-param name="text">Список</xsl:with-param>
+			</xsl:call-template>
+			<xsl:text>&#160;&#160;&#160;</xsl:text>
+			<xsl:call-template name="headerLink">
+				<xsl:with-param name="url">/My/Conversations/NewPM/</xsl:with-param>
+				<xsl:with-param name="text">Новое (?)</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="conversation">
+				<xsl:text>&#160;&#160;&#160;</xsl:text>
+				<xsl:call-template name="headerLink">
+					<xsl:with-param name="url">
+						<xsl:text>/My/Conversations/Conversation/</xsl:text>
+						<xsl:value-of select="conversation/interlocutor/account/id"/>
+						<xsl:text>/</xsl:text>
+					</xsl:with-param>
+					<xsl:with-param name="text"><xsl:value-of select="conversation/interlocutor/account/user/name"/></xsl:with-param>
+				</xsl:call-template>
+			</xsl:if>
+		</div>
+	</xsl:template>
+</xsl:stylesheet>
+
diff --git a/templates/Modern/elems/MyHeader.xslt b/templates/Modern/elems/MyHeader.xslt
index 833f539..bdc19be 100644
--- a/templates/Modern/elems/MyHeader.xslt
+++ b/templates/Modern/elems/MyHeader.xslt
@@ -1,6 +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="ConversationsHeader.xslt"/>
+
 	<xsl:template name="myHeader">
 		<div class="header">
 			<xsl:call-template name="headerLink">
@@ -31,17 +33,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:if test="conversation">
-				<xsl:text> &#8594; </xsl:text>
-				<xsl:call-template name="headerLink">
-					<xsl:with-param name="url">
-						<xsl:text>/My/Conversations/Conversation/</xsl:text>
-						<xsl:value-of select="conversation/interlocutor/account/id"/>
-						<xsl:text>/</xsl:text>
-					</xsl:with-param>
-					<xsl:with-param name="text"><xsl:value-of select="conversation/interlocutor/account/user/name"/></xsl:with-param>
-				</xsl:call-template>
-			</xsl:if>
 			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Settings/</xsl:with-param>
@@ -81,6 +72,9 @@
 				</xsl:if>
 				<xsl:text>Выход</xsl:text>
 			</a>
+			<xsl:if test="starts-with(/root/currentUrl, '/My/Conversations/')">
+				<xsl:call-template name="conversationsHeader"/>
+			</xsl:if>
 		</div>
 	</xsl:template>
 </xsl:stylesheet>