From 5b713232ec5493ac95beafc5ecb07b727be502a9 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 26 Sep 2010 10:58:23 +0000
Subject: [PATCH] Logout link improved

---
 Builder/IISMainHandler/build.txt     |  2 +-
 templates/Modern/elems/Header.xslt   |  7 ++++++-
 templates/Modern/elems/MyHeader.xslt | 14 ++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 64ef4cb..1291917 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1690
\ No newline at end of file
+1694
\ No newline at end of file
diff --git a/templates/Modern/elems/Header.xslt b/templates/Modern/elems/Header.xslt
index 6efa24e..dbb26af 100644
--- a/templates/Modern/elems/Header.xslt
+++ b/templates/Modern/elems/Header.xslt
@@ -16,6 +16,7 @@
 		<xsl:param name="text"/>
 		<xsl:param name="isDisabled"/>
 		<xsl:param name="postfix"/>
+		<xsl:param name="skipDatePostfix"/>
 		<a target="_top">
 			<xsl:choose>
 				<xsl:when test="$isDisabled='true'">
@@ -25,7 +26,11 @@
 					<xsl:if test="starts-with(/root/currentUrl, $url)">
 						<xsl:attribute name="class">selected</xsl:attribute>
 					</xsl:if>
-					<xsl:attribute name="href"><xsl:value-of select="$url"/><xsl:value-of select="$postfix"/>?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+					<xsl:attribute name="href">
+						<xsl:value-of select="$url"/>
+						<xsl:value-of select="$postfix"/>
+						<xsl:if test="not($skipDatePostfix='true')">?<xsl:value-of select="current/date/ticks"/></xsl:if>
+					</xsl:attribute>
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:value-of select="$text"/>
diff --git a/templates/Modern/elems/MyHeader.xslt b/templates/Modern/elems/MyHeader.xslt
index bdc19be..8b33ba9 100644
--- a/templates/Modern/elems/MyHeader.xslt
+++ b/templates/Modern/elems/MyHeader.xslt
@@ -66,12 +66,14 @@
 				</xsl:with-param>
 			</xsl:call-template>
 			<xsl:text>&#160;&#160;&#160;</xsl:text>
-			<a target="_top">
-				<xsl:if test="session/sessionKey">
-					<xsl:attribute name="href">/do/Logout/?sessionKey=<xsl:value-of select="session/sessionKey"/></xsl:attribute>
-				</xsl:if>
-				<xsl:text>Выход</xsl:text>
-			</a>
+			<xsl:call-template name="headerLink">
+				<xsl:with-param name="url">/do/Logout/?sessionKey=<xsl:value-of select="session/sessionKey"/></xsl:with-param>
+				<xsl:with-param name="text">Выход</xsl:with-param>
+				<xsl:with-param name="isDisabled">
+					<xsl:if test="not(session/sessionKey)">true</xsl:if>
+				</xsl:with-param>
+				<xsl:with-param name="skipDatePostfix">true</xsl:with-param>
+			</xsl:call-template>
 			<xsl:if test="starts-with(/root/currentUrl, '/My/Conversations/')">
 				<xsl:call-template name="conversationsHeader"/>
 			</xsl:if>