From 585f4afd20214e229b1c57c3f05ed0a6795fb600 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 5 Sep 2010 12:37:16 +0000
Subject: [PATCH] UserLists reorganisation

---
 Builder/IISMainHandler/build.txt              |  2 +-
 IISMainHandler/HandlersFactory.cs             |  3 +
 .../response/ActiveAccountListHandler.cs      |  3 +-
 .../handlers/response/WhoIsOnlineHandler.cs   |  3 +-
 templates/Full/UserList.xslt                  | 74 ++++++++++++-------
 templates/Full/elems/Header.xslt              |  5 --
 6 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 062e64a..9ce16c5 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1054
\ No newline at end of file
+1058
\ No newline at end of file
diff --git a/IISMainHandler/HandlersFactory.cs b/IISMainHandler/HandlersFactory.cs
index feaef32..4f1fda3 100644
--- a/IISMainHandler/HandlersFactory.cs
+++ b/IISMainHandler/HandlersFactory.cs
@@ -83,6 +83,9 @@ namespace FLocal.IISHandler {
 				case "registerbyinvite":
 					return new handlers.response.RegisterByInviteHandler();
 				case "users":
+					if(context.requestParts.Length == 1) {
+						throw new RedirectException("/Users/All/");
+					}
 					switch(context.requestParts[1].ToLower()) {
 						case "all":
 							return new handlers.response.UserListHandler();
diff --git a/IISMainHandler/handlers/response/ActiveAccountListHandler.cs b/IISMainHandler/handlers/response/ActiveAccountListHandler.cs
index 9698de7..e0e99b0 100644
--- a/IISMainHandler/handlers/response/ActiveAccountListHandler.cs
+++ b/IISMainHandler/handlers/response/ActiveAccountListHandler.cs
@@ -57,8 +57,7 @@ namespace FLocal.IISHandler.handlers.response {
 								)
 							)
 						)
-					),
-					pageOuter.exportToXml(2, 5, 2)
+					)
 				)
 			};
 		}
diff --git a/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs b/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs
index 0bd5608..43c4822 100644
--- a/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs
+++ b/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs
@@ -34,8 +34,7 @@ namespace FLocal.IISHandler.handlers.response {
 				) select Session.LoadByKey(stringId);
 			return new XElement[] {
 				new XElement("users", 
-					from session in sessions select session.account.user.exportToXmlForViewing(context),
-					pageOuter.exportToXml(2, 5, 2)
+					from session in sessions select session.account.user.exportToXmlForViewing(context)
 				)
 			};
 		}
diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index 47da58f..86e42e0 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -3,23 +3,11 @@
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">Пользователи</xsl:template>
 	<xsl:template name="specific">
+		<xsl:call-template name="subHeader"/>
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<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>
@@ -58,20 +46,22 @@
 							</td>
 						</tr>
 						<xsl:apply-templates select="users/user"/>
-						<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">
-												<xsl:with-param name="baseLink">/Users/All/</xsl:with-param>
-											</xsl:apply-templates>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
+						<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">
+													<xsl:with-param name="baseLink">/Users/All/</xsl:with-param>
+												</xsl:apply-templates>
+											</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</xsl:if>
 					</table>
 				</td>
 			</tr>
@@ -120,4 +110,34 @@
 		</tr>
 	</xsl:template>
 
+	<xsl:template name="subHeader">
+		<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>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<center>&#160;&#160;</center>
+	</xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt
index 071c2c7..7fdaf75 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -71,11 +71,6 @@
 									</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: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>