From 8fc8268240ab8cf96777e1b2476c791badfed505 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Thu, 23 Sep 2010 16:51:10 +0000
Subject: [PATCH] Modern changes reverted in Classic design

---
 Builder/IISMainHandler/build.txt          |   2 +-
 templates/Full/AllPosts.xslt              |  23 ++-
 templates/Full/AllThreads.xslt            |  22 +++
 templates/Full/Board.xslt                 |  87 ++++++++-
 templates/Full/BoardAsThread.xslt         |  86 ++++++++-
 templates/Full/Boards.xslt                |  10 +-
 templates/Full/Post.xslt                  |  13 +-
 templates/Full/Thread.xslt                |  15 +-
 templates/Full/UserInfo.xslt              |  40 ++++
 templates/Full/UserList.xslt              |  59 ++++--
 templates/Full/UserPollsParticipated.xslt |  27 +++
 templates/Full/UserPosts.xslt             |  30 ++-
 templates/Full/UserReplies.xslt           |  30 ++-
 templates/Full/UserThreads.xslt           |  29 +++
 templates/Full/elems/BoardHeader.xslt     |  47 -----
 templates/Full/elems/ForumHeader.xslt     |  68 -------
 templates/Full/elems/Header.xslt          | 217 ++++++----------------
 templates/Full/elems/Main.xslt            |  44 -----
 templates/Full/elems/MyHeader.xslt        |  87 ---------
 templates/Full/elems/UploadHeader.xslt    |  28 ---
 templates/Full/elems/UserHeader.xslt      |  62 -------
 templates/Full/elems/UsersHeader.xslt     |  44 -----
 22 files changed, 483 insertions(+), 587 deletions(-)
 delete mode 100644 templates/Full/elems/BoardHeader.xslt
 delete mode 100644 templates/Full/elems/ForumHeader.xslt
 delete mode 100644 templates/Full/elems/MyHeader.xslt
 delete mode 100644 templates/Full/elems/UploadHeader.xslt
 delete mode 100644 templates/Full/elems/UserHeader.xslt
 delete mode 100644 templates/Full/elems/UsersHeader.xslt

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 8f05b33..894a5ad 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1504
\ No newline at end of file
+1510
\ No newline at end of file
diff --git a/templates/Full/AllPosts.xslt b/templates/Full/AllPosts.xslt
index 5405fcd..34ed437 100644
--- a/templates/Full/AllPosts.xslt
+++ b/templates/Full/AllPosts.xslt
@@ -5,8 +5,29 @@
 	<xsl:template name="specificTitle">
 		<xsl:text>Все сообщения</xsl:text>
 	</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%" class="tableborders"> 
+						<tr class="darktable">
+							<td>
+								<table width="100%" cellpadding="0" cellspacing="0">
+									<tr class="darktable">
+										<td align="left" width="33%">
+											<font class="catandforum">
+												<xsl:text>Все сообщения</xsl:text>
+											</font>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/AllThreads.xslt b/templates/Full/AllThreads.xslt
index 59dd4e8..ee3c20e 100644
--- a/templates/Full/AllThreads.xslt
+++ b/templates/Full/AllThreads.xslt
@@ -7,6 +7,28 @@
 	</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%" class="tableborders"> 
+						<tr class="darktable">
+							<td>
+								<table width="100%" cellpadding="0" cellspacing="0">
+									<tr class="darktable">
+										<td align="left" width="33%">
+											<font class="catandforum">
+												<xsl:text>Все темы</xsl:text>
+											</font>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br />
 		<table width="95%" align="center" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/Board.xslt b/templates/Full/Board.xslt
index d5da9c4..5a862be 100644
--- a/templates/Full/Board.xslt
+++ b/templates/Full/Board.xslt
@@ -6,9 +6,92 @@
 	<xsl:template name="specificTitle">
 		<xsl:value-of select="currentLocation/board/name"/>
 	</xsl:template>
-	<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/BoardAsThread.xslt b/templates/Full/BoardAsThread.xslt
index 7791b83..68f0ba5 100644
--- a/templates/Full/BoardAsThread.xslt
+++ b/templates/Full/BoardAsThread.xslt
@@ -5,8 +5,92 @@
 	<xsl:template name="specificTitle">
 		<xsl:value-of select="currentLocation/board/name"/>
 	</xsl:template>
-	<xsl:template name="isLiteEnabled">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" 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:attribute name="href">/Board/<xsl:value-of select="currentLocation/board/id"/>/</xsl:attribute>
+															<xsl:text>Как раздел</xsl:text>
+														</a>
+													</td>
+													<td class="navigation">
+														<a>
+															<xsl:text>Как тред</xsl:text>
+														</a>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/Boards.xslt b/templates/Full/Boards.xslt
index 9603af8..0e64b09 100644
--- a/templates/Full/Boards.xslt
+++ b/templates/Full/Boards.xslt
@@ -3,7 +3,6 @@
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\BoardInfo.xslt"/>
 	<xsl:template name="specificTitle">Разделы</xsl:template>
-	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
 				<table width="95%" align="center" class="tablesurround" cellspacing="1" cellpadding="1">
 					<tr>
@@ -50,14 +49,11 @@
 										<xsl:apply-templates select="currentDate" mode="dateTime"/>
 									</td>
 									<td width="30%" class="small" valign="top">
-										<a>
-											<xsl:attribute name="href">/AllPosts/</xsl:attribute>
-											<xsl:text>Последние сообщения</xsl:text>
-										</a>
+										<b>Просмотр новых сообщений</b>
 										<br />
 										<a>
-											<xsl:attribute name="href">/AllThreads/</xsl:attribute>
-											<xsl:text>Последние темы</xsl:text>
+											<xsl:attribute name="href">/AllPosts/</xsl:attribute>
+											<xsl:text>Последние 7 дней</xsl:text>
 										</a>
 										<br />
 										<a>
diff --git a/templates/Full/Post.xslt b/templates/Full/Post.xslt
index 3f23e0b..5bc34a0 100644
--- a/templates/Full/Post.xslt
+++ b/templates/Full/Post.xslt
@@ -5,12 +5,9 @@
 	<xsl:template name="specificTitle">
 		<xsl:value-of select="currentLocation/post/name"/>
 	</xsl:template>
-	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<!--xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if>
-		<br /-->
+		<xsl:call-template name="threadInfo"/>
+		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
@@ -22,10 +19,8 @@
 				</td>
 			</tr>
 		</table>
-		<!--br />
-		<xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if-->
+		<br />
+		<xsl:call-template name="threadInfo"/>
 	</xsl:template>
 
 	<xsl:template name="threadInfo">
diff --git a/templates/Full/Thread.xslt b/templates/Full/Thread.xslt
index b9bf3d8..3412ab8 100644
--- a/templates/Full/Thread.xslt
+++ b/templates/Full/Thread.xslt
@@ -5,14 +5,9 @@
 	<xsl:template name="specificTitle">
 		<xsl:value-of select="currentLocation/thread/name"/>
 	</xsl:template>
-	<xsl:template name="isLiteEnabled">true</xsl:template>
-	<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:call-template name="threadInfo"/>
-		</xsl:if>
-		<br /-->
+		<xsl:call-template name="threadInfo"/>
+		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
@@ -48,10 +43,8 @@
 				</td>
 			</tr>
 		</table>
-		<!--br />
-		<xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if-->
+		<br />
+		<xsl:call-template name="threadInfo"/>
 	</xsl:template>
 
 	<xsl:template name="threadInfo">
diff --git a/templates/Full/UserInfo.xslt b/templates/Full/UserInfo.xslt
index a668c3a..37b61cd 100644
--- a/templates/Full/UserInfo.xslt
+++ b/templates/Full/UserInfo.xslt
@@ -162,6 +162,46 @@
 											<xsl:text>Not implemented</xsl:text>
 										</td>
 									</tr>
+									<tr>
+										<td valign="top" colspan="3" align="center" class="darktable">
+											<a>
+												<xsl:if test="accountId">
+													<xsl:attribute name="href">/My/Conversations/NewPM/<xsl:value-of select="accountId"/>/</xsl:attribute>
+												</xsl:if>
+												<img src="/static/images/sendprivate.gif" border="0" style="vertical-align: text-bottom" />
+												<xsl:text> Послать личное сообщение</xsl:text>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a>
+												<xsl:if test="accountId">
+													<xsl:attribute name="href">/My/Conversations/Conversation/<xsl:value-of select="accountId"/>/</xsl:attribute>
+												</xsl:if>
+												<img src="/static/images/sundial.gif" border="0" style="vertical-align: text-bottom" />
+												<xsl:text> История</xsl:text>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a>
+												<img src="/static/images/addtobook.gif" align="top" style="vertical-align: text-bottom" />
+												<xsl:text> Добавить в адресную книгу</xsl:text>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a>
+												<xsl:attribute name="href">/Users/User/<xsl:value-of select="user/id"/>/Posts/</xsl:attribute>
+												<img src="/static/images/viewposts.gif" align="top" style="vertical-align: text-bottom" />
+												<xsl:text> Сообщения</xsl:text>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a>
+												<xsl:attribute name="href">/Users/User/<xsl:value-of select="user/id"/>/Replies/</xsl:attribute>
+												<xsl:text>Ответы</xsl:text>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a>
+												<img src="/static/images/graph.gif" align="top" border="0" style="vertical-align: text-bottom" />
+												<xsl:text> Статистика</xsl:text>
+											</a>
+										</td>
+									</tr>
 								</table>
 							</td>
 						</tr>
diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index 086ca9c..9ee656b 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -7,6 +7,19 @@
 			<tr>
 				<td>
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
+						<tr class="tdheader">
+							<td colspan="7">
+								<table width="100%" cellspacing="1" cellpadding="3" border="0">
+									<tr>
+										<td>
+											<a href="/Users/Active/">
+												<xsl:text>Активные (смигрированные)</xsl:text>
+											</a>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
 						<tr class="tdheader">
 							<td align="left" width="15%" nowrap="nowrap">
 								<a>
@@ -15,7 +28,12 @@
 							</td>
 							<td align="left" width="12%" nowrap="nowrap">
 								<a>
-									<xsl:text>Группа</xsl:text>
+									<xsl:text>Статус</xsl:text>
+								</a>
+							</td>
+							<td align="left" width="28%" nowrap="nowrap">
+								<a>
+									<xsl:text>Домашняя страница</xsl:text>
 								</a>
 							</td>
 							<td align="left" width="5%" nowrap="nowrap">
@@ -23,6 +41,11 @@
 									<xsl:text>Итого сообщений</xsl:text>
 								</a>
 							</td>
+							<td align="left" width="12%" nowrap="nowrap">
+								<a>
+									<xsl:text>Номер ICQ</xsl:text>
+								</a>
+							</td>
 							<td align="left" width="5%" nowrap="nowrap">
 								<a>
 									<xsl:text>Рейтинг</xsl:text>
@@ -35,20 +58,18 @@
 							</td>
 						</tr>
 						<xsl:apply-templates select="users/user"/>
-						<xsl:if test="users/pageOuter">
-							<tr class="tdheader">
-								<td colspan="7">
-									<table width="100%" cellspacing="1" cellpadding="3" border="0">
-										<tr>
-											<td>
-												<xsl:text>страницы:</xsl:text>
-												<xsl:apply-templates select="users/pageOuter" mode="withCurrent"/>
-											</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-						</xsl:if>
+						<tr class="tdheader">
+							<td colspan="7">
+								<table width="100%" cellspacing="1" cellpadding="3" border="0">
+									<tr>
+										<td>
+											<xsl:text>страницы:</xsl:text>
+											<xsl:apply-templates select="users/pageOuter" mode="withCurrent"/>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
 					</table>
 				</td>
 			</tr>
@@ -71,9 +92,12 @@
 			<td>
 				<xsl:value-of select="group/name"/>
 			</td>
+			<td>
+				<xsl:text>TODO</xsl:text>
+			</td>
 			<td>
 				<a>
-					<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Posts/</xsl:attribute>
+					<xsl:attribute name="href">/User/<xsl:value-of select="id"/>/Posts/</xsl:attribute>
 					<xsl:value-of select="totalPosts"/>
 					<xsl:if test="actualPosts">
 						<xsl:text> (</xsl:text>
@@ -85,6 +109,9 @@
 			<td>
 				<xsl:text>TODO</xsl:text>
 			</td>
+			<td>
+				<xsl:text>TODO</xsl:text>
+			</td>
 			<td>
 				<xsl:apply-templates select="regDate" mode="dateTime"/>
 			</td>
diff --git a/templates/Full/UserPollsParticipated.xslt b/templates/Full/UserPollsParticipated.xslt
index 9d48b9e..a6e8f0c 100644
--- a/templates/Full/UserPollsParticipated.xslt
+++ b/templates/Full/UserPollsParticipated.xslt
@@ -4,6 +4,33 @@
 	<xsl:import href="elems\PollShortInfo.xslt"/>
 	<xsl:template name="specificTitle">Опросы</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">
+											<a>
+												<xsl:attribute name="href">/Users/</xsl:attribute>
+												<xsl:text>Пользователи</xsl:text>
+											</a>
+											<xsl:text> &gt;&gt; </xsl:text>
+											<xsl:apply-templates select="user" mode="userLink"/>
+											<xsl:text> &gt;&gt; </xsl:text>
+											<xsl:text>Опросы с участием пользователя</xsl:text>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br/>
 		<table width="95%" align="center" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserPosts.xslt b/templates/Full/UserPosts.xslt
index 91f323f..84dd4f4 100644
--- a/templates/Full/UserPosts.xslt
+++ b/templates/Full/UserPosts.xslt
@@ -6,8 +6,36 @@
 		<xsl:text>Сообщения - </xsl:text>
 		<xsl:value-of select="user/name"/>
 	</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%" 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>
+													<xsl:attribute name="href">/Users/</xsl:attribute>
+													<xsl:text>Пользователи</xsl:text>
+												</a>
+												<xsl:text> &gt;&gt; </xsl:text>
+												<xsl:apply-templates select="user" mode="userLink"/>
+												<xsl:text> &gt;&gt; </xsl:text>
+												<xsl:text>Посты</xsl:text>
+											</font>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserReplies.xslt b/templates/Full/UserReplies.xslt
index 354ba76..d39cb8d 100644
--- a/templates/Full/UserReplies.xslt
+++ b/templates/Full/UserReplies.xslt
@@ -6,8 +6,36 @@
 		<xsl:text>Ответы - </xsl:text>
 		<xsl:value-of select="user/name"/>
 	</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%" 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>
+													<xsl:attribute name="href">/Users/</xsl:attribute>
+													<xsl:text>Пользователи</xsl:text>
+												</a>
+												<xsl:text> &gt;&gt; </xsl:text>
+												<xsl:apply-templates select="user" mode="userLink"/>
+												<xsl:text> &gt;&gt; </xsl:text>
+												<xsl:text>Ответы</xsl:text>
+											</font>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br />
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/UserThreads.xslt b/templates/Full/UserThreads.xslt
index 1331321..98b3251 100644
--- a/templates/Full/UserThreads.xslt
+++ b/templates/Full/UserThreads.xslt
@@ -8,6 +8,35 @@
 	</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%" 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>
+													<xsl:attribute name="href">/Users/</xsl:attribute>
+													<xsl:text>Пользователи</xsl:text>
+												</a>
+												<xsl:text> &gt;&gt; </xsl:text>
+												<xsl:apply-templates select="user" mode="userLink"/>
+												<xsl:text> &gt;&gt; </xsl:text>
+												<xsl:text>Темы</xsl:text>
+											</font>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<br/>
 		<table width="95%" align="center" class="tablesurround">
 			<tr>
 				<td>
diff --git a/templates/Full/elems/BoardHeader.xslt b/templates/Full/elems/BoardHeader.xslt
deleted file mode 100644
index 807ba4b..0000000
--- a/templates/Full/elems/BoardHeader.xslt
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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[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>
-					<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>
-								<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>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
-</xsl:stylesheet>
-
diff --git a/templates/Full/elems/ForumHeader.xslt b/templates/Full/elems/ForumHeader.xslt
deleted file mode 100644
index d5a8082..0000000
--- a/templates/Full/elems/ForumHeader.xslt
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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[not(name(../..)='board')]">
-									<xsl:text> | </xsl:text>
-									<xsl:apply-templates select="currentLocation//board[not(name(../..)='board')]" mode="headerBoardLink"/>
-								</xsl:if>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-		<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 dac8be1..9c80259 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -1,31 +1,5 @@
 <?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="PollsHeader.xslt"/>
-	<xsl:import href="UsersHeader.xslt"/>
-	<xsl:import href="UploadHeader.xslt"/>
-
-	<xsl:template name="isLiteEnabled">false</xsl:template>
-	<xsl:template name="isRssEnabled">false</xsl:template>
-	<xsl:template name="rssRelativeLink"><xsl:value-of select="currentBaseUrl"/></xsl:template>
-
-	<xsl:template name="headerLink">
-		<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="$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>
-			</xsl:if>
-			<xsl:value-of select="$text"/>
-		</a>
-	</xsl:template>
-
 	<xsl:template name="header">
 		<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
 			<tr>
@@ -33,143 +7,72 @@
 					<table width="100%" class="tableborders" cellpadding="3" cellspacing="1">
 						<tr>
 							<td align="center" class="menubar">
-								<table width="100%" border="0">
-									<tr>
-										<td width="15%">&#160;</td>
-										<td width="70%" align="center">
-											<xsl:if test="session/sessionKey and (session/indicators/unreadPrivateMessages != '0')">
-												<a href="/My/Conversations/">
-													<img src="/static/images/newpm.gif" border="0">
-														<xsl:attribute name="alt">
-															<xsl:text>У вас </xsl:text>
-															<xsl:value-of select="session/indicators/unreadPrivateMessages"/>
-															<xsl:text> непрочитанных личных сообщений</xsl:text>
-														</xsl:attribute>
-													</img>
-												</a>
-												<xsl:text> | </xsl:text>
-											</xsl:if>
-											<xsl:call-template name="headerLink">
-												<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">
-												<xsl:with-param name="url">/Polls/</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">/Upload/</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:text> | </xsl:text>
-											<xsl:call-template name="headerLink">
-												<xsl:with-param name="url">/My/</xsl:with-param>
-												<xsl:with-param name="text">My Home</xsl:with-param>
-											</xsl:call-template>
-											<xsl:text> | </xsl:text>
-											<xsl:call-template name="headerLink">
-												<xsl:with-param name="url">/q/faq/</xsl:with-param>
-												<xsl:with-param name="text">FAQ</xsl:with-param>
-											</xsl:call-template>
-											<xsl:text> | </xsl:text>
-											<xsl:call-template name="headerLink">
-												<xsl:with-param name="url">/Users/</xsl:with-param>
-												<xsl:with-param name="text">Пользователи</xsl:with-param>
-											</xsl:call-template>
-										</td>
-										<td width="15%" align="right">
-											<xsl:variable name="isLiteEnabled">
-												<xsl:call-template name="isLiteEnabled"/>
-											</xsl:variable>
-											<xsl:variable name="isRssEnabled">
-												<xsl:call-template name="isRssEnabled"/>
-											</xsl:variable>
-											<xsl:variable name="rssRelativeLink">
-												<xsl:call-template name="rssRelativeLink"/>
-											</xsl:variable>
-											<xsl:variable name="prefix">
-												<xsl:text>https://</xsl:text>
-												<xsl:value-of select="url/host"/>
-												<xsl:text>:</xsl:text>
-												<xsl:if test="url/port &gt;= 1000">
-													<xsl:value-of select="floor(url/port div 1000)"/>
-												</xsl:if>
-											</xsl:variable>
-											<a>
-												<xsl:if test="$isLiteEnabled='true'">
-													<xsl:attribute name="href">
-														<xsl:value-of select="$prefix"/>
-														<xsl:text>447</xsl:text>
-														<xsl:value-of select="currentUrl"/>
-													</xsl:attribute>
-												</xsl:if>
-												<img border="0">
-													<xsl:attribute name="src">
-														<xsl:text>/static/images/light</xsl:text>
-														<xsl:if test="not($isLiteEnabled='true')">
-															<xsl:text>-disabled</xsl:text>
-														</xsl:if>
-														<xsl:text>.png</xsl:text>
-													</xsl:attribute>
-												</img>
-											</a>
-											<xsl:text>&#160;&#160;</xsl:text>
-											<a>
-												<xsl:if test="$isRssEnabled='true'">
-													<xsl:attribute name="href">
-														<xsl:value-of select="$prefix"/>
-														<xsl:text>449</xsl:text>
-														<xsl:value-of select="$rssRelativeLink"/>
-													</xsl:attribute>
-												</xsl:if>
-												<img border="0">
-													<xsl:attribute name="src">
-														<xsl:text>/static/images/rss</xsl:text>
-														<xsl:if test="not($isRssEnabled='true')">
-															<xsl:text>-disabled</xsl:text>
-														</xsl:if>
-														<xsl:text>.png</xsl:text>
-													</xsl:attribute>
-												</img>
-											</a>
-											<xsl:if test="$isRssEnabled='true'">
-												<link rel="alternate" type="application/rss+xml" title="RSS">
-													<xsl:attribute name="href">
-														<xsl:value-of select="$prefix"/>
-														<xsl:text>449</xsl:text>
-														<xsl:value-of select="$rssRelativeLink"/>
-													</xsl:attribute>
-												</link>
-											</xsl:if>
-										</td>
-									</tr>
-								</table>
+								<a target="_top">
+									<xsl:attribute name="href">/Forum/Boards/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+									<xsl:text>Список форумов</xsl:text>
+								</a>
+								<xsl:text> | </xsl:text>
+								<a target="_top">
+									<xsl:if test="session/sessionKey">
+										<xsl:attribute name="href">/My/Conversations/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+										<xsl:if test="session/indicators/unreadPrivateMessages != '0'">
+											<img src="/static/images/newpm.gif" border="0">
+												<xsl:attribute name="alt">
+													<xsl:text>У вас </xsl:text>
+													<xsl:value-of select="session/indicators/unreadPrivateMessages"/>
+													<xsl:text> непрочитанных личных сообщений</xsl:text>
+												</xsl:attribute>
+											</img>
+										</xsl:if>
+									</xsl:if>
+									<xsl:text>Личные сообщения</xsl:text>
+								</a>
+								<xsl:text> | </xsl:text>
+								<a target="_top">
+									<xsl:if test="session/sessionKey">
+										<xsl:attribute name="href">/Upload/List/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+									</xsl:if>
+									<xsl:text>Аплоад</xsl:text>
+								</a>
+								<xsl:text> | </xsl:text>
+								<a target="_top">
+									<xsl:if test="session/sessionKey">
+										<xsl:attribute name="href">/My/Settings/</xsl:attribute>
+									</xsl:if>
+									<xsl:text>Настройки</xsl:text>
+								</a>
+								<xsl:text> | </xsl:text>
+								<a target="_top">
+									<xsl:if test="session/notLoggedIn">
+										<xsl:attribute name="href">/My/Login/</xsl:attribute>
+									</xsl:if>
+									<xsl:text>Вход</xsl:text>
+								</a>
+								<xsl:text> | </xsl:text>
+								<a target="_top">
+									<xsl:attribute name="href">/Users/Online/?<xsl:value-of select="current/date/ticks"/></xsl:attribute>
+									<xsl:text>Кто в онлайне</xsl:text>
+								</a>
+								<xsl:text> | </xsl:text>
+								<a target="_top">
+									<xsl:attribute name="href">/q/faq</xsl:attribute>
+									<xsl:text>FAQ</xsl:text>
+								</a>
+								<xsl:text> | </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:text> | </xsl:text>
+								<a href="/Users/" target="_top">Пользователи</a>
 							</td>
 						</tr>
 					</table>
 				</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>
-		<xsl:if test="starts-with(/root/currentUrl, '/My/')">
-			<xsl:call-template name="myHeader"/>
-		</xsl:if>
-		<xsl:if test="starts-with(/root/currentUrl, '/Upload/')">
-			<xsl:call-template name="uploadHeader"/>
-		</xsl:if>
-		<xsl:if test="starts-with(/root/currentUrl, '/Polls/')">
-			<xsl:call-template name="pollsHeader"/>
-		</xsl:if>
 		<center>&#160;&#160;</center>
 	</xsl:template>
 </xsl:stylesheet>
diff --git a/templates/Full/elems/Main.xslt b/templates/Full/elems/Main.xslt
index 7a01b39..c76b96c 100644
--- a/templates/Full/elems/Main.xslt
+++ b/templates/Full/elems/Main.xslt
@@ -11,16 +11,6 @@
 				</link>
 				<link rel="shortcut icon" href="/static/favicons/smirk.ico" type="image/x-icon" />
 				<script language="Javascript" type="text/javascript" src="/static/js/common.js"><xsl:text> </xsl:text></script>
-				<script language="Javascript" type="text/javascript" src="/static/js/machichara/complex.js?v1"><xsl:text> </xsl:text></script>
-				<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v1"><xsl:text> </xsl:text></script>
-				<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v1">
-					<xsl:attribute name="src">
-						<xsl:text>/static/js/machichara/</xsl:text>
-						<xsl:value-of select="machichara/name"/>
-						<xsl:text>-specific.js</xsl:text>
-					</xsl:attribute>
-					<xsl:text> </xsl:text>
-				</script>
 				<title>
 					<xsl:call-template name="specificTitle"/>
 					<xsl:text> - </xsl:text>
@@ -28,7 +18,6 @@
 				</title>
 			</head>
 			<body>
-				<xsl:attribute name="onLoad">machicharaInit();</xsl:attribute>
 				<xsl:if test="not(get/param[@name='headers'] = 'false')">
 					<xsl:call-template name="header"/>
 				</xsl:if>
@@ -38,39 +27,6 @@
 						<input type="hidden" name="data"/>
 					</form>
 				</div>
-				<xsl:if test="not(get/param[@name='headers'] = 'false')">
-					<div style="min-width:20px;width:20px;max-width:20px;overflow:visible;position:absolute;right:0px;top:0px;height:100%;text-align:right;">
-						<br/>
-						<div style="min-width:20px;width:20px;max-width:20px;overflow:visible;text-align:right;height:260px;min-height:260px;max-height:260px;">
-							<div style="position:absolute;top:20px;right:20px;display:none" id="pokerPlaceholder">
-								<img border="0" src="/static/images/poker.jpg" align="top"/>
-							</div>
-							<div style="min-width:20px;width:20px;max-width:20px;text-align:right;">
-								<xsl:attribute name="onMouseOver">document.getElementById("pokerPlaceholder").style.display = "block";</xsl:attribute>
-								<xsl:attribute name="onMouseOut">document.getElementById("pokerPlaceholder").style.display = "none";</xsl:attribute>
-								<img border="0" src="/static/images/tab_poker.png" align="top"/>
-							</div>
-						</div>
-						<br/>
-						<div style="min-width:20px;width:20px;max-width:20px;overflow:visible;text-align:right;height:260px;min-height:260px;max-height:260px;">
-							<div style="position:absolute;top:20px;right:20px;display:none" id="courtesansPlaceholder">
-								<img border="0" src="/static/images/courtesans.jpg" align="top"/>
-							</div>
-							<div style="min-width:20px;width:20px;max-width:20px;text-align:right;">
-								<xsl:attribute name="onMouseOver">document.getElementById("courtesansPlaceholder").style.display = "block";</xsl:attribute>
-								<xsl:attribute name="onMouseOut">document.getElementById("courtesansPlaceholder").style.display = "none";</xsl:attribute>
-								<img border="0" src="/static/images/tab_courtesans.png" align="top"/>
-							</div>
-						</div>
-					</div>
-				</xsl:if>
-				<xsl:if test="get/param[@name='debug'] = 'true'">
-					<xsl:text disable-output-escaping="yes"><![CDATA[<!--]]></xsl:text>
-					<br />
-					<xsl:text>Data used for authoring this XHTML document:</xsl:text>
-					<xmp><xsl:copy-of select="/"/></xmp>
-					<xsl:text disable-output-escaping="yes"><![CDATA[-->]]></xsl:text>
-				</xsl:if>
 			</body>
 		</html>
 	</xsl:template>
diff --git a/templates/Full/elems/MyHeader.xslt b/templates/Full/elems/MyHeader.xslt
deleted file mode 100644
index b89d418..0000000
--- a/templates/Full/elems/MyHeader.xslt
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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="myHeader">
-		<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">/My/Login/</xsl:with-param>
-									<xsl:with-param name="text">Вход</xsl:with-param>
-									<xsl:with-param name="isDisabled">
-										<xsl:if test="session/sessionKey">true</xsl:if>
-									</xsl:with-param>
-								</xsl:call-template>
-								<xsl:text> | </xsl:text>
-								<xsl:call-template name="headerLink">
-									<xsl:with-param name="url">/My/Conversations/</xsl:with-param>
-									<xsl:with-param name="text">
-										<xsl:choose>
-											<xsl:when test="session/sessionKey and (session/indicators/unreadPrivateMessages != '0')">
-												<b>
-													<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:otherwise>
-										</xsl:choose>
-									</xsl:with-param>
-									<xsl:with-param name="isDisabled">
-										<xsl:if test="not(session/sessionKey)">true</xsl:if>
-									</xsl:with-param>
-								</xsl:call-template>
-								<xsl:text> | </xsl:text>
-								<xsl:call-template name="headerLink">
-									<xsl:with-param name="url">/My/Settings/</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:text> | </xsl:text>
-								<xsl:call-template name="headerLink">
-									<xsl:with-param name="url">/My/UserData/</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:text> | </xsl:text>
-								<xsl:call-template name="headerLink">
-									<xsl:with-param name="url">/My/Avatars/</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: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"/>/Info/</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:text> | </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>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
-</xsl:stylesheet>
-
diff --git a/templates/Full/elems/UploadHeader.xslt b/templates/Full/elems/UploadHeader.xslt
deleted file mode 100644
index 1f2fbb2..0000000
--- a/templates/Full/elems/UploadHeader.xslt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="uploadHeader">
-		<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">/Upload/List/</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">/Upload/New/</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/UserHeader.xslt b/templates/Full/elems/UserHeader.xslt
deleted file mode 100644
index 2610ef7..0000000
--- a/templates/Full/elems/UserHeader.xslt
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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="userHeader">
-		<xsl:variable name="baseLink">/Users/User/<xsl:value-of select="user/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"/>Info/</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"/>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"/>Posts/</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"/>Replies/</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"/>PollsParticipated/</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">/My/Conversations/Conversation/<xsl:value-of select="accountId"/>/</xsl:with-param>
-									<xsl:with-param name="text">История</xsl:with-param>
-									<xsl:with-param name="isDisabled">
-										<xsl:if test="not(accountId)">true</xsl:if>
-									</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">/My/Conversations/PMSend/<xsl:value-of select="accountId"/>/</xsl:with-param>
-									<xsl:with-param name="text">Написать</xsl:with-param>
-									<xsl:with-param name="isDisabled">
-										<xsl:if test="not(accountId)">true</xsl:if>
-									</xsl:with-param>
-								</xsl:call-template>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
-</xsl:stylesheet>
-
diff --git a/templates/Full/elems/UsersHeader.xslt b/templates/Full/elems/UsersHeader.xslt
deleted file mode 100644
index eed23ed..0000000
--- a/templates/Full/elems/UsersHeader.xslt
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="UserHeader.xslt"/>
-
-	<xsl:template name="usersHeader">
-		<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">/Users/All/</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">/Users/Active/</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">/Users/Online/</xsl:with-param>
-									<xsl:with-param name="text">В онлайне</xsl:with-param>
-								</xsl:call-template>
-								<xsl:if test="user">
-									<xsl:text> | </xsl:text>
-									<xsl:call-template name="headerLink">
-										<xsl:with-param name="url">/Users/User/<xsl:value-of select="user/id"/>/</xsl:with-param>
-										<xsl:with-param name="text"><xsl:value-of select="user/name"/></xsl:with-param>
-									</xsl:call-template>
-								</xsl:if>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-		<xsl:if test="user">
-			<xsl:call-template name="userHeader"/>
-		</xsl:if>
-	</xsl:template>
-</xsl:stylesheet>
-