UserLists reorganisation

Builder/IISMainHandler/build.txt

@@ -1 +1 @@
-1054
+1058

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();

IISMainHandler/handlers/response/ActiveAccountListHandler.cs

@@ -57,8 +57,7 @@ namespace FLocal.IISHandler.handlers.response {
 								)
 							)
 						)
-					),
+					)
-					pageOuter.exportToXml(2, 5, 2)
 				)
 			};
 		}

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),
+					from session in sessions select session.account.user.exportToXmlForViewing(context)
-					pageOuter.exportToXml(2, 5, 2)
 				)
 			};
 		}

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">
+						<xsl:if test="users/pageOuter">
-							<td colspan="7">
+							<tr class="tdheader">
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
+								<td colspan="7">
-									<tr>
+									<table width="100%" cellspacing="1" cellpadding="3" border="0">
-										<td>
+										<tr>
-											<xsl:text>ñòðàíèöû:</xsl:text>
+											<td>
-											<xsl:apply-templates select="users/pageOuter" mode="withCurrent">
+												<xsl:text>ñòðàíèöû:</xsl:text>
-												<xsl:with-param name="baseLink">/Users/All/</xsl:with-param>
+												<xsl:apply-templates select="users/pageOuter" mode="withCurrent">
-											</xsl:apply-templates>
+													<xsl:with-param name="baseLink">/Users/All/</xsl:with-param>
-										</td>
+												</xsl:apply-templates>
-									</tr>
+											</td>
-								</table>
+										</tr>
-							</td>
+									</table>
-						</tr>
+								</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>

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>