From 354dcf497f9b91c5ee174ea3bc8a9a5f3fdad522 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sat, 18 Sep 2010 22:23:34 +0000
Subject: [PATCH] Forum navigation improved

---
 Builder/IISMainHandler/build.txt              |  2 +-
 .../handlers/response/CreateThreadHandler.cs  |  1 +
 templates/Full/Board.xslt                     | 85 -------------------
 templates/Full/elems/BoardHeader.xslt         | 34 ++++++++
 templates/Full/elems/ForumHeader.xslt         | 53 ++++++++++++
 templates/Full/elems/Header.xslt              |  8 +-
 6 files changed, 95 insertions(+), 88 deletions(-)
 create mode 100644 templates/Full/elems/BoardHeader.xslt
 create mode 100644 templates/Full/elems/ForumHeader.xslt

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index ca12c17..10c8942 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1404
\ No newline at end of file
+1409
\ No newline at end of file
diff --git a/IISMainHandler/handlers/response/CreateThreadHandler.cs b/IISMainHandler/handlers/response/CreateThreadHandler.cs
index 3a6fd6c..cd195fd 100644
--- a/IISMainHandler/handlers/response/CreateThreadHandler.cs
+++ b/IISMainHandler/handlers/response/CreateThreadHandler.cs
@@ -22,6 +22,7 @@ namespace FLocal.IISHandler.handlers.response {
 			Board board = this.url.board;
 
 			return new XElement[] {
+				new XElement("currentLocation", board.exportToXmlSimpleWithParent(context)),
 				board.exportToXml(context, Board.SubboardsOptions.None),
 				board.exportLayersInfoForUser(context),
 			};
diff --git a/templates/Full/Board.xslt b/templates/Full/Board.xslt
index 518862a..d5da9c4 100644
--- a/templates/Full/Board.xslt
+++ b/templates/Full/Board.xslt
@@ -9,91 +9,6 @@
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="3" cellspacing="1" width="100%" border="0" class="tableborders">
-						<tr class="darktable">
-							<td colspan="6">
-								<table width="100%" cellpadding="0" cellspacing="0">
-									<tr>
-										<td colspan="2" class="catandforum">
-											<xsl:apply-templates select="currentLocation" mode="breadcrumbs"/>
-										</td>
-										<td align="right" valign="bottom">
-											<table border="0" class="tablesurround">
-												<tr>
-													<td class="navigation" nowrap="nowrap">
-														<!-- postoption is either newpost.gif or greynewpost.gif -->
-														<a>
-															<xsl:if test="session/sessionKey">
-																<xsl:attribute name="href">/Board/<xsl:value-of select="currentLocation/board/id"/>/NewThread/</xsl:attribute>
-															</xsl:if>
-															<img src="/static/images/newpost.gif" alt="Новое сообщение" border="0" width="13" height="15" style="vertical-align: text-bottom" />
-															<xsl:text>Сообщение</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<form method="get" action="" name="fullview">
-															<select name="fullview" class="formboxes" style="font-size:10px">
-																<option value="0">Норм</option>
-																<option value="1">Офт</option>
-																<option value="2" selected="selected">Мус</option>
-															</select>
-														</form>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<!-- prevoption is either previous.gif or greyprevious.gif -->
-														<a>
-															<img alt="Предыдущая страница" border="0" width="12" height="15" style="vertical-align: text-bottom">
-																<xsl:attribute name="src">/static/images/greyprevious.gif</xsl:attribute>
-															</img>
-															<xsl:text>Пред.</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<img src="/static/images/all.gif" alt="Список форумов" border="0" width="19" height="15" style="vertical-align: text-bottom" />
-															<xsl:text>Список</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<!-- nextoption is either next.gif or greynext.gif -->
-														<a>
-															<img alt="Следующая страница" border="0" width="14" height="15" style="vertical-align: text-bottom">
-																<xsl:attribute name="src">/static/images/next.gif</xsl:attribute>
-															</img>
-															<xsl:text>След.</xsl:text>
-														</a>
-													</td>
-													<td class="navigation">
-														<a>
-															<img src="/static/images/lb.gif" border="0" alt="Прочитать всё" style="vertical-align: text-bottom" />
-														</a>
-													</td>
-													<td class="navigation">
-														<a>
-															<xsl:text>Как раздел</xsl:text>
-														</a>
-													</td>
-													<td class="navigation">
-														<a>
-															<xsl:attribute name="href">/BoardAsThread/<xsl:value-of select="currentLocation/board/id"/>/</xsl:attribute>
-															<xsl:text>Как тред</xsl:text>
-														</a>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-		<br/>
 		<xsl:if test="boards/board">
 			<table width="95%" align="center" class="tableborders" border="1">
 				<tr>
diff --git a/templates/Full/elems/BoardHeader.xslt b/templates/Full/elems/BoardHeader.xslt
new file mode 100644
index 0000000..83660f5
--- /dev/null
+++ b/templates/Full/elems/BoardHeader.xslt
@@ -0,0 +1,34 @@
+<?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="boardHeader">
+		<xsl:variable name="baseLink">/Forum/Board/<xsl:value-of select="currentLocation/board/id"/>/</xsl:variable>
+		<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
+			<tr>
+				<td>
+					<table width="100%" class="tableborders" cellpadding="3" cellspacing="1">
+						<tr>
+							<td align="center" class="menubar">
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Threads/</xsl:with-param>
+									<xsl:with-param name="text">Темы</xsl:with-param>
+								</xsl:call-template>
+								<xsl:text> | </xsl:text>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Headlines/</xsl:with-param>
+									<xsl:with-param name="text">Заглавные сообщения</xsl:with-param>
+								</xsl:call-template>
+								<xsl:text> | </xsl:text>
+								<xsl:call-template name="headerLink">
+									<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>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
+</xsl:stylesheet>
+
diff --git a/templates/Full/elems/ForumHeader.xslt b/templates/Full/elems/ForumHeader.xslt
new file mode 100644
index 0000000..1ae194e
--- /dev/null
+++ b/templates/Full/elems/ForumHeader.xslt
@@ -0,0 +1,53 @@
+<?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="BoardHeader.xslt"/>
+
+	<xsl:template name="forumHeader">
+		<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
+			<tr>
+				<td>
+					<table width="100%" class="tableborders" cellpadding="3" cellspacing="1">
+						<tr>
+							<td align="center" class="menubar">
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Forum/Boards/</xsl:with-param>
+									<xsl:with-param name="text">Список разделов</xsl:with-param>
+								</xsl:call-template>
+								<xsl:text> | </xsl:text>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Forum/AllThreads/</xsl:with-param>
+									<xsl:with-param name="text">Последние темы</xsl:with-param>
+								</xsl:call-template>
+								<xsl:text> | </xsl:text>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Forum/AllPosts/</xsl:with-param>
+									<xsl:with-param name="text">Последние сообщения</xsl:with-param>
+								</xsl:call-template>
+								<xsl:text> | </xsl:text>
+								<img src="/static/images/shortcut.png" border="0"/>
+								<xsl:call-template name="headerLink">
+									<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/Replies/</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:call-template>
+								<xsl:if test="currentLocation//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:with-param>
+										<xsl:with-param name="text"><xsl:value-of select="currentLocation//board/name"/></xsl:with-param>
+									</xsl:call-template>
+								</xsl:if>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<xsl:if test="currentLocation/board">
+			<xsl:call-template name="boardHeader"/>
+		</xsl:if>
+	</xsl:template>
+</xsl:stylesheet>
+
diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt
index 91b4ad8..90d26ee 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -1,5 +1,6 @@
 <?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="ForumHeader.xslt"/>
 	<xsl:import href="MyHeader.xslt"/>
 	<xsl:import href="UsersHeader.xslt"/>
 	<xsl:import href="UploadHeader.xslt"/>
@@ -47,8 +48,8 @@
 												<xsl:text> | </xsl:text>
 											</xsl:if>
 											<xsl:call-template name="headerLink">
-												<xsl:with-param name="url">/Boards/</xsl:with-param>
-												<xsl:with-param name="text">Список форумов</xsl:with-param>
+												<xsl:with-param name="url">/Forum/</xsl:with-param>
+												<xsl:with-param name="text">Форум</xsl:with-param>
 											</xsl:call-template>
 											<xsl:text> | </xsl:text>
 											<xsl:call-template name="headerLink">
@@ -147,6 +148,9 @@
 				</td>
 			</tr>
 		</table>
+		<xsl:if test="starts-with(/root/currentUrl, '/Forum/')">
+			<xsl:call-template name="forumHeader"/>
+		</xsl:if>
 		<xsl:if test="starts-with(/root/currentUrl, '/Users/')">
 			<xsl:call-template name="usersHeader"/>
 		</xsl:if>