From 0563dcd6084e376bd2c43aebb4d7be4dd6e84c5c Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sat, 10 Jul 2010 22:08:41 +0000
Subject: [PATCH] Fixed UX in pageOuter

---
 Builder/IISMainHandler/build.txt |  2 +-
 templates/Full/elems/Main.xslt   | 43 ++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 33343c8..ddc27b0 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-733
\ No newline at end of file
+739
\ No newline at end of file
diff --git a/templates/Full/elems/Main.xslt b/templates/Full/elems/Main.xslt
index f60063f..7df4470 100644
--- a/templates/Full/elems/Main.xslt
+++ b/templates/Full/elems/Main.xslt
@@ -94,14 +94,19 @@
 		<xsl:param name="baseLink"/>
 		<xsl:param name="selected">-1</xsl:param>
 		<xsl:if test="current() != '0'">
-			<xsl:text>|</xsl:text>
+			<xsl:text>&#8201;|&#8201;</xsl:text>
 		</xsl:if>
-		<a class="separate">
-			<xsl:if test="current() != $selected">
-				<xsl:attribute name="href"><xsl:value-of select="$baseLink"/><xsl:value-of select="current()"/></xsl:attribute>
-			</xsl:if>
-			<xsl:value-of select="current()"/>
-		</a>
+		<xsl:choose>
+			<xsl:when test="current() != $selected">
+				<a>
+					<xsl:attribute name="href"><xsl:value-of select="$baseLink"/><xsl:value-of select="current()"/></xsl:attribute>
+					<xsl:value-of select="current()"/>
+				</a>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="current()"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="pageOuter" mode="withoutCurrent">
@@ -114,6 +119,7 @@
 
 	<xsl:template match="pageOuter" mode="withCurrent">
 		<xsl:param name="baseLink"/>
+		<xsl:text> </xsl:text>
 		<xsl:apply-templates select="pages/page" mode="withoutCurrent">
 			<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 			<xsl:with-param name="selected">
@@ -127,16 +133,21 @@
 				</xsl:choose>
 			</xsl:with-param>
 		</xsl:apply-templates>
-		<xsl:text>|</xsl:text>
-		<a class="separate">
-			<xsl:if test="unlimited='false'">
-				<xsl:attribute name="href"><xsl:value-of select="$baseLink"/>all</xsl:attribute>
-			</xsl:if>
-			<xsl:text>все</xsl:text>
-		</a>
+		<xsl:text>&#8201;|&#8201;</xsl:text>
+		<xsl:choose>
+			<xsl:when test="unlimited='false'">
+				<a>
+					<xsl:attribute name="href"><xsl:value-of select="$baseLink"/>all</xsl:attribute>
+					<xsl:text>все</xsl:text>
+				</a>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:text>все</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:if test="next">
-			<xsl:text>|</xsl:text>
-			<a class="separate">
+			<xsl:text>&#8201;|&#8201;</xsl:text>
+			<a>
 				<xsl:attribute name="href"><xsl:value-of select="$baseLink"/><xsl:value-of select="next"/></xsl:attribute>
 				<xsl:text>Следующая страница</xsl:text>
 			</a>