From 7c9ddf80330965e93f3d227459e13b00b73a6977 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Mon, 20 Sep 2010 17:12:51 +0000
Subject: [PATCH] Boards/threads navigation improved

---
 Builder/IISMainHandler/build.txt      |  2 +-
 Common/dataobjects/Thread.cs          |  1 +
 templates/Full/Post.xslt              |  8 ++++----
 templates/Full/Thread.xslt            |  8 ++++----
 templates/Full/elems/BoardHeader.xslt | 15 ++++++++++++++-
 templates/Full/elems/ForumHeader.xslt | 27 +++++++++++++++++++++------
 templates/Full/elems/Header.xslt      |  3 ++-
 7 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 039a4fd..0e8ebf5 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1467
\ No newline at end of file
+1476
\ No newline at end of file
diff --git a/Common/dataobjects/Thread.cs b/Common/dataobjects/Thread.cs
index 7d77596..97584f9 100644
--- a/Common/dataobjects/Thread.cs
+++ b/Common/dataobjects/Thread.cs
@@ -184,6 +184,7 @@ namespace FLocal.Common.dataobjects {
 			return new XElement("thread",
 				new XElement("id", this.id),
 				new XElement("name", this.title),
+				new XElement("nameTranslit", this.titleTranslit),
 				new XElement("parent", this.board.exportToXmlSimpleWithParent(context))
 			);
 		}
diff --git a/templates/Full/Post.xslt b/templates/Full/Post.xslt
index 8fa0af5..3f23e0b 100644
--- a/templates/Full/Post.xslt
+++ b/templates/Full/Post.xslt
@@ -7,10 +7,10 @@
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<xsl:if test="not(get/param[@name='headers'] = 'false')">
+		<!--xsl:if test="not(get/param[@name='headers'] = 'false')">
 			<xsl:call-template name="threadInfo"/>
 		</xsl:if>
-		<br />
+		<br /-->
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
@@ -22,10 +22,10 @@
 				</td>
 			</tr>
 		</table>
-		<br />
+		<!--br />
 		<xsl:if test="not(get/param[@name='headers'] = 'false')">
 			<xsl:call-template name="threadInfo"/>
-		</xsl:if>
+		</xsl:if-->
 	</xsl:template>
 
 	<xsl:template name="threadInfo">
diff --git a/templates/Full/Thread.xslt b/templates/Full/Thread.xslt
index 3cf0169..b9bf3d8 100644
--- a/templates/Full/Thread.xslt
+++ b/templates/Full/Thread.xslt
@@ -9,10 +9,10 @@
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="rssRelativeLink"><xsl:value-of select="/root/currentBaseUrl"/>0-reversed</xsl:template>
 	<xsl:template name="specific">
-		<xsl:if test="not(get/param[@name='headers'] = 'false')">
+		<!--xsl:if test="not(get/param[@name='headers'] = 'false')">
 			<xsl:call-template name="threadInfo"/>
 		</xsl:if>
-		<br />
+		<br /-->
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
@@ -48,10 +48,10 @@
 				</td>
 			</tr>
 		</table>
-		<br />
+		<!--br />
 		<xsl:if test="not(get/param[@name='headers'] = 'false')">
 			<xsl:call-template name="threadInfo"/>
-		</xsl:if>
+		</xsl:if-->
 	</xsl:template>
 
 	<xsl:template name="threadInfo">
diff --git a/templates/Full/elems/BoardHeader.xslt b/templates/Full/elems/BoardHeader.xslt
index d730fe3..807ba4b 100644
--- a/templates/Full/elems/BoardHeader.xslt
+++ b/templates/Full/elems/BoardHeader.xslt
@@ -2,7 +2,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 
 	<xsl:template name="boardHeader">
-		<xsl:variable name="baseLink">/Forum/Board/<xsl:value-of select="currentLocation/board/id"/>-<xsl:value-of select="currentLocation/board/nameTranslit"/>/</xsl:variable>
+		<xsl:variable name="baseLink">/Forum/Board/<xsl:value-of select="currentLocation//board[not(name(../..)='board')]/id"/>-<xsl:value-of select="currentLocation//board[not(name(../..)='board')]/nameTranslit"/>/</xsl:variable>
 		<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
 			<tr>
 				<td>
@@ -23,6 +23,19 @@
 									<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>NewThread/</xsl:with-param>
 									<xsl:with-param name="text">Новая тема</xsl:with-param>
 								</xsl:call-template>
+								<xsl:if test="currentLocation//thread">
+									<xsl:text> | </xsl:text>
+									<xsl:call-template name="headerLink">
+										<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Thread/<xsl:value-of select="currentLocation//thread/id"/>-<xsl:value-of select="currentLocation//thread/nameTranslit"/>/</xsl:with-param>
+										<xsl:with-param name="postfix">
+											<xsl:if test="currentLocation//post">
+												<xsl:text>Posts/p</xsl:text>
+												<xsl:value-of select="currentLocation//post/id"/>
+											</xsl:if>
+										</xsl:with-param>
+										<xsl:with-param name="text"><xsl:value-of select="substring(currentLocation//thread/name, 1, 30)"/></xsl:with-param>
+									</xsl:call-template>
+								</xsl:if>
 							</td>
 						</tr>
 					</table>
diff --git a/templates/Full/elems/ForumHeader.xslt b/templates/Full/elems/ForumHeader.xslt
index 3adefbc..d5a8082 100644
--- a/templates/Full/elems/ForumHeader.xslt
+++ b/templates/Full/elems/ForumHeader.xslt
@@ -32,12 +32,9 @@
 										<xsl:if test="not(session/sessionKey)">true</xsl:if>
 									</xsl:with-param>
 								</xsl:call-template>
-								<xsl:if test="currentLocation//board">
+								<xsl:if test="currentLocation//board[not(name(../..)='board')]">
 									<xsl:text> | </xsl:text>
-									<xsl:call-template name="headerLink">
-										<xsl:with-param name="url">/Forum/Board/<xsl:value-of select="currentLocation//board/id"/>-<xsl:value-of select="currentLocation//board/nameTranslit"/>/</xsl:with-param>
-										<xsl:with-param name="text"><xsl:value-of select="currentLocation//board/name"/></xsl:with-param>
-									</xsl:call-template>
+									<xsl:apply-templates select="currentLocation//board[not(name(../..)='board')]" mode="headerBoardLink"/>
 								</xsl:if>
 							</td>
 						</tr>
@@ -45,9 +42,27 @@
 				</td>
 			</tr>
 		</table>
-		<xsl:if test="currentLocation/board">
+		<xsl:if test="currentLocation//board">
 			<xsl:call-template name="boardHeader"/>
 		</xsl:if>
 	</xsl:template>
+
+	<xsl:template match="board" mode="headerParentBoardLink">
+		<xsl:apply-templates select="parent/board" mode="headerParentBoardLink"/>
+		<xsl:call-template name="headerLink">
+			<xsl:with-param name="url">/Forum/Board/<xsl:value-of select="id"/>-<xsl:value-of select="nameTranslit"/>/</xsl:with-param>
+			<xsl:with-param name="text"><xsl:value-of select="substring(name, 1, 1)"/></xsl:with-param>
+		</xsl:call-template>
+		<xsl:text> &#8594; </xsl:text>
+	</xsl:template>
+
+	<xsl:template match="board" mode="headerBoardLink">
+		<xsl:apply-templates select="parent/board" mode="headerParentBoardLink"/>
+		<xsl:call-template name="headerLink">
+			<xsl:with-param name="url">/Forum/Board/<xsl:value-of select="id"/>-<xsl:value-of select="nameTranslit"/>/</xsl:with-param>
+			<xsl:with-param name="text"><xsl:value-of select="name"/></xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt
index 90d26ee..88e54cf 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -13,9 +13,10 @@
 		<xsl:param name="url"/>
 		<xsl:param name="text"/>
 		<xsl:param name="isDisabled"/>
+		<xsl:param name="postfix"/>
 		<a target="_top">
 			<xsl:if test="not($isDisabled='true')">
-				<xsl:attribute name="href"><xsl:value-of select="$url"/>?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+				<xsl:attribute name="href"><xsl:value-of select="$url"/><xsl:value-of select="$postfix"/>?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
 			</xsl:if>
 			<xsl:if test="starts-with(/root/currentUrl, $url)">
 				<xsl:attribute name="class">currentLink</xsl:attribute>