From b83ed8281d1becf63dac87d7f23e1a94d411affc Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sat, 26 Jun 2010 14:13:57 +0000
Subject: [PATCH] Odd-even coloring moved out from C# code to XSLT

---
 Builder/IISMainHandler/build.txt                    |  2 +-
 Builder/IISUploadHandler/build.txt                  |  2 +-
 IISMainHandler/Extensions.cs                        | 11 -----------
 IISMainHandler/handlers/BoardHandler.cs             |  2 +-
 IISMainHandler/handlers/response/UserListHandler.cs |  2 +-
 templates/Full/UserList.xslt                        |  2 +-
 templates/Full/elems/ThreadInfo.xslt                |  2 +-
 7 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index b0e9f8d..4f36264 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-358
\ No newline at end of file
+360
\ No newline at end of file
diff --git a/Builder/IISUploadHandler/build.txt b/Builder/IISUploadHandler/build.txt
index 0fa6a7b..69226f7 100644
--- a/Builder/IISUploadHandler/build.txt
+++ b/Builder/IISUploadHandler/build.txt
@@ -1 +1 @@
-90
\ No newline at end of file
+92
\ No newline at end of file
diff --git a/IISMainHandler/Extensions.cs b/IISMainHandler/Extensions.cs
index cca4477..8feb7b1 100644
--- a/IISMainHandler/Extensions.cs
+++ b/IISMainHandler/Extensions.cs
@@ -18,16 +18,5 @@ namespace FLocal.IISHandler {
 			return str.Split(new string[] { separator }, options);
 		}
 
-		public static IEnumerable<XElement> addNumbers(this IEnumerable<XElement> elements) {
-			int i=0;
-			foreach(XElement element in elements) {
-				XElement result = new XElement(element);
-				result.Add(new XElement("number", i));
-				result.Add(new XElement("even", (i%2 == 0).ToPlainString()));
-				i++;
-				yield return result;
-			}
-		}
-
 	}
 }
diff --git a/IISMainHandler/handlers/BoardHandler.cs b/IISMainHandler/handlers/BoardHandler.cs
index 048b77f..6fb953a 100644
--- a/IISMainHandler/handlers/BoardHandler.cs
+++ b/IISMainHandler/handlers/BoardHandler.cs
@@ -27,7 +27,7 @@ namespace FLocal.IISHandler.handlers {
 				new XElement("currentLocation", board.exportToXmlSimpleWithParent(context)),
 				new XElement("boards", from subBoard in board.subBoards select subBoard.exportToXml(context, true)),
 				new XElement("threads", 
-					(from thread in threads select thread.exportToXml(context, false)).addNumbers(),
+					from thread in threads select thread.exportToXml(context, false),
 					pageOuter.exportToXml(1, 5, 1)
 				)
 			};
diff --git a/IISMainHandler/handlers/response/UserListHandler.cs b/IISMainHandler/handlers/response/UserListHandler.cs
index 9559335..0e75003 100644
--- a/IISMainHandler/handlers/response/UserListHandler.cs
+++ b/IISMainHandler/handlers/response/UserListHandler.cs
@@ -23,7 +23,7 @@ namespace FLocal.IISHandler.handlers.response {
 			IEnumerable<User> users = User.getUsers(pageOuter, context);
 			return new XElement[] {
 				new XElement("users", 
-					(from user in users select user.exportToXmlForViewing(context)).addNumbers(),
+					from user in users select user.exportToXmlForViewing(context),
 					pageOuter.exportToXml(2, 5, 2)
 				)
 			};
diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index 2156218..b898579 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -67,7 +67,7 @@
 	<xsl:template match="users/user">
 		<tr>
 			<xsl:choose>
-				<xsl:when test="even='true'">
+				<xsl:when test="position() mod 2 = 0">
 					<xsl:attribute name="class">lighttable</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
diff --git a/templates/Full/elems/ThreadInfo.xslt b/templates/Full/elems/ThreadInfo.xslt
index 40e2b16..34dfe90 100644
--- a/templates/Full/elems/ThreadInfo.xslt
+++ b/templates/Full/elems/ThreadInfo.xslt
@@ -4,7 +4,7 @@
 	<xsl:template match="thread">
 		<tr>
 			<xsl:choose>
-				<xsl:when test="even='true'">
+				<xsl:when test="position() mod 2 = 0">
 					<xsl:attribute name="class">lighttable</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>