From e002446817f836674c60fb011d64962aecf368df Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 5 Sep 2010 17:35:52 +0000
Subject: [PATCH] Headers panel improvements

---
 Builder/IISMainHandler/build.txt          |  2 +-
 Common/BBCodes/User.cs                    |  2 +-
 IISMainHandler/HandlersFactory.cs         |  4 +++-
 templates/Full/UserPollsParticipated.xslt | 27 ---------------------
 templates/Full/UserPosts.xslt             | 29 -----------------------
 templates/Full/UserReplies.xslt           | 29 -----------------------
 templates/Full/elems/Main.xslt            |  2 +-
 templates/Full/elems/MyHeader.xslt        |  1 -
 templates/Full/elems/UploadHeader.xslt    |  1 -
 templates/Full/elems/UsersHeader.xslt     | 12 +++++++++-
 templates/Lite/elems/Main.xslt            |  2 +-
 11 files changed, 18 insertions(+), 93 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 304a6a5..03a524d 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1109
\ No newline at end of file
+1115
\ No newline at end of file
diff --git a/Common/BBCodes/User.cs b/Common/BBCodes/User.cs
index d1b3cdf..0aa9cf4 100644
--- a/Common/BBCodes/User.cs
+++ b/Common/BBCodes/User.cs
@@ -13,7 +13,7 @@ namespace FLocal.Common.BBCodes {
 
 		public override string Format(ITextFormatter formatter) {
 			var user = dataobjects.User.LoadByName(this.Default);
-			return String.Format("<a class=\"separate UG_{0}\" href=\"/Users/User/{1}/\">{2}</a>", this.Safe(user.userGroup.name), user.id, this.Safe(user.name));
+			return String.Format("<a class=\"separate UG_{0}\" href=\"/Users/User/{1}/Info/\">{2}</a>", this.Safe(user.userGroup.name), user.id, this.Safe(user.name));
 		}
 
 	}
diff --git a/IISMainHandler/HandlersFactory.cs b/IISMainHandler/HandlersFactory.cs
index e8a8bdd..0b2bbaa 100644
--- a/IISMainHandler/HandlersFactory.cs
+++ b/IISMainHandler/HandlersFactory.cs
@@ -134,9 +134,11 @@ namespace FLocal.IISHandler {
 								return new handlers.WrongUrlHandler();
 							}
 							if(context.requestParts.Length == 3) {
-								return new handlers.response.UserInfoHandler();
+								throw new RedirectException("/Users/User/" + context.requestParts[2] + "/Info/");
 							}
 							switch(context.requestParts[3].ToLower()) {
+								case "info":
+									return new handlers.response.UserInfoHandler();
 								case "posts":
 									return new handlers.response.UserPostsHandler();
 								case "replies":
diff --git a/templates/Full/UserPollsParticipated.xslt b/templates/Full/UserPollsParticipated.xslt
index b198804..6a75cb9 100644
--- a/templates/Full/UserPollsParticipated.xslt
+++ b/templates/Full/UserPollsParticipated.xslt
@@ -4,33 +4,6 @@
 	<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 b38bbf7..e98cbfe 100644
--- a/templates/Full/UserPosts.xslt
+++ b/templates/Full/UserPosts.xslt
@@ -7,35 +7,6 @@
 		<xsl:value-of select="user/name"/>
 	</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 1740721..27c11f9 100644
--- a/templates/Full/UserReplies.xslt
+++ b/templates/Full/UserReplies.xslt
@@ -7,35 +7,6 @@
 		<xsl:value-of select="user/name"/>
 	</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/elems/Main.xslt b/templates/Full/elems/Main.xslt
index c0d7a5f..16efd1b 100644
--- a/templates/Full/elems/Main.xslt
+++ b/templates/Full/elems/Main.xslt
@@ -198,7 +198,7 @@
 				<xsl:text>separate </xsl:text>
 				<xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/>
 			</xsl:attribute>
-			<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/</xsl:attribute>
+			<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>
 			<xsl:value-of select="name"/>
 			<xsl:if test="isModerator='true'">
 				<img src="/static/images/mod.gif" border="0"/>
diff --git a/templates/Full/elems/MyHeader.xslt b/templates/Full/elems/MyHeader.xslt
index c23d1d2..9a6bb75 100644
--- a/templates/Full/elems/MyHeader.xslt
+++ b/templates/Full/elems/MyHeader.xslt
@@ -57,7 +57,6 @@
 				</td>
 			</tr>
 		</table>
-		<center>&#160;&#160;</center>
 	</xsl:template>
 </xsl:stylesheet>
 
diff --git a/templates/Full/elems/UploadHeader.xslt b/templates/Full/elems/UploadHeader.xslt
index f12a77b..1f2fbb2 100644
--- a/templates/Full/elems/UploadHeader.xslt
+++ b/templates/Full/elems/UploadHeader.xslt
@@ -23,7 +23,6 @@
 				</td>
 			</tr>
 		</table>
-		<center>&#160;&#160;</center>
 	</xsl:template>
 </xsl:stylesheet>
 
diff --git a/templates/Full/elems/UsersHeader.xslt b/templates/Full/elems/UsersHeader.xslt
index 363b281..bc555cf 100644
--- a/templates/Full/elems/UsersHeader.xslt
+++ b/templates/Full/elems/UsersHeader.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="UserHeader.xslt"/>
 
 	<xsl:template name="usersHeader">
 		<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
@@ -22,13 +23,22 @@
 									<xsl:with-param name="url">/Users/Online/</xsl:with-param>
 									<xsl:with-param name="text">В онлайне</xsl:with-param>
 								</xsl:call-template>
+								<xsl:text> | </xsl:text>
+								<xsl:if test="user">
+									<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>
-		<center>&#160;&#160;</center>
+		<xsl:if test="user">
+			<xsl:call-template name="userHeader"/>
+		</xsl:if>
 	</xsl:template>
 </xsl:stylesheet>
 
diff --git a/templates/Lite/elems/Main.xslt b/templates/Lite/elems/Main.xslt
index 27f03cb..e230bd1 100644
--- a/templates/Lite/elems/Main.xslt
+++ b/templates/Lite/elems/Main.xslt
@@ -204,7 +204,7 @@
 				<xsl:text>separate </xsl:text>
 				<xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/>
 			</xsl:attribute>
-			<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/</xsl:attribute>
+			<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>
 			<xsl:value-of select="name"/>
 			<xsl:if test="isModerator='true'">
 				<xsl:text>^M</xsl:text>