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

---
 Builder/IISMainHandler/build.txt     |  2 +-
 templates/Modern/Conversation.xslt   | 50 +---------------------------
 templates/Modern/elems/MyHeader.xslt | 15 +++++++--
 3 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index f2b2a17..cfa11c7 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1686
\ No newline at end of file
+1688
\ No newline at end of file
diff --git a/templates/Modern/Conversation.xslt b/templates/Modern/Conversation.xslt
index a70ebfc..cd787a2 100644
--- a/templates/Modern/Conversation.xslt
+++ b/templates/Modern/Conversation.xslt
@@ -3,12 +3,10 @@
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\PMInfo.xslt"/>
 	<xsl:template name="specificTitle">
-		<xsl:value-of select="conversationInfo/interlocutor/account/user/name"/>
+		<xsl:value-of select="conversation/interlocutor/account/user/name"/>
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<xsl:call-template name="conversationInfo"/>
-		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
@@ -42,52 +40,6 @@
 				</td>
 			</tr>
 		</table>
-		<br />
-		<xsl:call-template name="conversationInfo"/>
-	</xsl:template>
-
-	<xsl:template name="conversationInfo">
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders"> 
-						<tr class="darktable">
-							<td>
-								<table width="100%" cellpadding="0" cellspacing="0">
-									<tr class="darktable">
-										<td align="left" width="33%">
-											<font class="catandforum">
-												<a href="/My/Conversations/"><xsl:text>Приватные сообщения</xsl:text></a>
-												<xsl:text> &gt;&gt; </xsl:text>
-												<xsl:value-of select="conversation/interlocutor/account/user/name"/>
-											</font>
-										</td>
-										<td width="33%" align="right">
-											<table border="0" class="tablesurround">
-												<tr>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<img alt="*" src="/static/images/greyflat.gif" style="vertical-align: text-bottom" />
-															<xsl:text>Плоский</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<img src="/static/images/greythreaded.gif" border="0" style="vertical-align: text-bottom" alt="Дерево" />
-															<xsl:text>Дерево</xsl:text>
-														</a>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/elems/MyHeader.xslt b/templates/Modern/elems/MyHeader.xslt
index fb3a771..833f539 100644
--- a/templates/Modern/elems/MyHeader.xslt
+++ b/templates/Modern/elems/MyHeader.xslt
@@ -17,13 +17,13 @@
 					<xsl:choose>
 						<xsl:when test="session/sessionKey and (session/indicators/unreadPrivateMessages != '0')">
 							<b>
-								<xsl:text>Сообщения (</xsl:text>
+								<xsl:text>Инбокс (</xsl:text>
 								<xsl:value-of select="session/indicators/unreadPrivateMessages"/>
 								<xsl:text>)</xsl:text>
 							</b>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:text>Сообщения (?)</xsl:text>
+							<xsl:text>Инбокс</xsl:text>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:with-param>
@@ -31,6 +31,17 @@
 					<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>