From e6e7a52b8f9786810350b2c68558b6b5142ef2eb Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Fri, 30 Dec 2011 12:45:14 +0000
Subject: [PATCH] Slight PageOuter refactoring

---
 templates/Modern/AllPosts.xslt               | 12 +--
 templates/Modern/AllThreads.xslt             | 12 +--
 templates/Modern/Board.xslt                  | 12 +--
 templates/Modern/BoardAsThread.xslt          | 12 +--
 templates/Modern/Conversation.xslt           | 12 +--
 templates/Modern/Conversations.xslt          | 12 +--
 templates/Modern/PollsList.xslt              |  5 +-
 templates/Modern/Thread.xslt                 | 10 +-
 templates/Modern/UploadList.xslt             | 10 +-
 templates/Modern/UserList.xslt               |  1 -
 templates/Modern/UserPollsParticipated.xslt  |  5 +-
 templates/Modern/UserPosts.xslt              | 10 +-
 templates/Modern/UserReplies.xslt            | 10 +-
 templates/Modern/UserThreads.xslt            | 10 +-
 templates/Modern/elems/ConversationInfo.xslt | 11 +--
 templates/Modern/elems/Main.xslt             | 98 +++++++++++---------
 templates/Modern/elems/ThreadInfo.xslt       | 11 +--
 17 files changed, 83 insertions(+), 170 deletions(-)

diff --git a/templates/Modern/AllPosts.xslt b/templates/Modern/AllPosts.xslt
index b645b99..a3eb014 100644
--- a/templates/Modern/AllPosts.xslt
+++ b/templates/Modern/AllPosts.xslt
@@ -7,19 +7,11 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:call-template name="Messages_PageOuterTitle"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		<div class="postscontainer">
 			<xsl:apply-templates select="posts/post"/>
 		</div>
-		<div>
-			<xsl:call-template name="Messages_PageOuterTitle"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/AllThreads.xslt b/templates/Modern/AllThreads.xslt
index b524190..f49a513 100644
--- a/templates/Modern/AllThreads.xslt
+++ b/templates/Modern/AllThreads.xslt
@@ -7,19 +7,11 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:call-template name="Messages_PageOuterTitle"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 		<div class="threadscontainer">
 			<xsl:apply-templates select="threads/thread"/>
 		</div>
-		<div>
-			<xsl:call-template name="Messages_PageOuterTitle"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/Board.xslt b/templates/Modern/Board.xslt
index 730a9f0..e4c5822 100644
--- a/templates/Modern/Board.xslt
+++ b/templates/Modern/Board.xslt
@@ -14,11 +14,7 @@
 				<xsl:apply-templates select="boards/board"/>
 			</div>
 		</xsl:if>
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 		<div class="threadscontainer">
 			<xsl:if test="threads/thread[isAnnouncement='true']">
 				<div style="position:relative;z-index:1000">
@@ -29,11 +25,7 @@
 				<xsl:apply-templates select="threads/thread[not(isAnnouncement='true')]"/>
 			</div>
 		</div>
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/BoardAsThread.xslt b/templates/Modern/BoardAsThread.xslt
index edfc0b9..c00e864 100644
--- a/templates/Modern/BoardAsThread.xslt
+++ b/templates/Modern/BoardAsThread.xslt
@@ -7,19 +7,11 @@
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		<div class="postscontainer">
 			<xsl:apply-templates select="posts/post"/>
 		</div>
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/Conversation.xslt b/templates/Modern/Conversation.xslt
index 7cae94d..c268a0b 100644
--- a/templates/Modern/Conversation.xslt
+++ b/templates/Modern/Conversation.xslt
@@ -7,19 +7,11 @@
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="messages/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="messages/pageOuter" mode="withCurrent"/>
 		<div class="postscontainer">
 			<xsl:apply-templates select="messages/message"/>
 		</div>
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="messages/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="messages/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/Conversations.xslt b/templates/Modern/Conversations.xslt
index d0b9bfd..7ec8e9e 100644
--- a/templates/Modern/Conversations.xslt
+++ b/templates/Modern/Conversations.xslt
@@ -8,19 +8,11 @@
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="conversations/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="conversations/pageOuter" mode="withCurrent"/>
 		<div class="conversationscontainer">
 			<xsl:apply-templates select="conversations/conversation"/>
 		</div>
-		<div>
-			<xsl:call-template name="Messages_PageOuter"/>
-			<xsl:text>:</xsl:text>
-			<xsl:apply-templates select="conversations/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="conversations/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/PollsList.xslt b/templates/Modern/PollsList.xslt
index 9d48b9e..57a4617 100644
--- a/templates/Modern/PollsList.xslt
+++ b/templates/Modern/PollsList.xslt
@@ -18,10 +18,7 @@
 						<!-- END OF LOOP -->
 						<tr class="tdheader">
 							<td colspan="3">
-								<font class="onbody">
-									<xsl:text>страницы:</xsl:text>
-									<xsl:apply-templates select="polls/pageOuter" mode="withCurrent"/>
-								</font>
+								<xsl:apply-templates select="polls/pageOuter" mode="withCurrent"/>
 							</td>
 						</tr>
 					</table>
diff --git a/templates/Modern/Thread.xslt b/templates/Modern/Thread.xslt
index e6268f1..b4eaae4 100644
--- a/templates/Modern/Thread.xslt
+++ b/templates/Modern/Thread.xslt
@@ -9,19 +9,13 @@
 	<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">
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		<div class="postscontainer">
 			<xsl:apply-templates select="posts/post">
 				<xsl:with-param name="isReplyDisabled"><xsl:value-of select="thread/isLocked"/></xsl:with-param>
 			</xsl:apply-templates>
 		</div>
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/UploadList.xslt b/templates/Modern/UploadList.xslt
index c5cd1cd..93af421 100644
--- a/templates/Modern/UploadList.xslt
+++ b/templates/Modern/UploadList.xslt
@@ -6,17 +6,11 @@
 	<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">
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
 		<div class="uploadscontainer">
 			<xsl:apply-templates select="uploads/upload"/>
 		</div>
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/UserList.xslt b/templates/Modern/UserList.xslt
index 086ca9c..c533054 100644
--- a/templates/Modern/UserList.xslt
+++ b/templates/Modern/UserList.xslt
@@ -41,7 +41,6 @@
 									<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>
diff --git a/templates/Modern/UserPollsParticipated.xslt b/templates/Modern/UserPollsParticipated.xslt
index 9d48b9e..57a4617 100644
--- a/templates/Modern/UserPollsParticipated.xslt
+++ b/templates/Modern/UserPollsParticipated.xslt
@@ -18,10 +18,7 @@
 						<!-- END OF LOOP -->
 						<tr class="tdheader">
 							<td colspan="3">
-								<font class="onbody">
-									<xsl:text>страницы:</xsl:text>
-									<xsl:apply-templates select="polls/pageOuter" mode="withCurrent"/>
-								</font>
+								<xsl:apply-templates select="polls/pageOuter" mode="withCurrent"/>
 							</td>
 						</tr>
 					</table>
diff --git a/templates/Modern/UserPosts.xslt b/templates/Modern/UserPosts.xslt
index 93f1b0e..508013b 100644
--- a/templates/Modern/UserPosts.xslt
+++ b/templates/Modern/UserPosts.xslt
@@ -8,17 +8,11 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		<div class="postscontainer">
 			<xsl:apply-templates select="posts/post"/>
 		</div>
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/UserReplies.xslt b/templates/Modern/UserReplies.xslt
index 527e432..f0ea11b 100644
--- a/templates/Modern/UserReplies.xslt
+++ b/templates/Modern/UserReplies.xslt
@@ -8,17 +8,11 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		<div class="postscontainer">
 			<xsl:apply-templates select="posts/post"/>
 		</div>
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/UserThreads.xslt b/templates/Modern/UserThreads.xslt
index ce5ab9a..76514df 100644
--- a/templates/Modern/UserThreads.xslt
+++ b/templates/Modern/UserThreads.xslt
@@ -8,17 +8,11 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 		<div class="threadscontainer">
 			<xsl:apply-templates select="threads/thread[not(isAnnouncement='true')]"/>
 		</div>
-		<div>
-			<xsl:text>страницы:</xsl:text>
-			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
-		</div>
+		<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 	</xsl:template>
 
 </xsl:stylesheet>
diff --git a/templates/Modern/elems/ConversationInfo.xslt b/templates/Modern/elems/ConversationInfo.xslt
index d2bd395..79534a6 100644
--- a/templates/Modern/elems/ConversationInfo.xslt
+++ b/templates/Modern/elems/ConversationInfo.xslt
@@ -73,14 +73,9 @@
 							<xsl:text>Последнее: </xsl:text>
 							<xsl:apply-templates select="lastMessageDate/date" mode="dateTime"/>
 						</p>
-						<xsl:if test="pageOuter/isEmpty='false'">
-							<p>
-								<xsl:text>Страницы: </xsl:text>
-								<xsl:apply-templates select="pageOuter" mode="withoutCurrent">
-									<xsl:with-param name="baseLink">/My/Conversations/Conversation/<xsl:value-of select="interlocutor/account/id"/>/</xsl:with-param>
-								</xsl:apply-templates>
-							</p>
-						</xsl:if>
+						<xsl:apply-templates select="pageOuter" mode="withoutCurrent">
+							<xsl:with-param name="baseLink">/My/Conversations/Conversation/<xsl:value-of select="interlocutor/account/id"/>/</xsl:with-param>
+						</xsl:apply-templates>
 					</div>
 				</div>
 			</div>
diff --git a/templates/Modern/elems/Main.xslt b/templates/Modern/elems/Main.xslt
index 6bd2e62..8b576e5 100644
--- a/templates/Modern/elems/Main.xslt
+++ b/templates/Modern/elems/Main.xslt
@@ -240,11 +240,16 @@
 
 	<xsl:template match="pageOuter" mode="withoutCurrent">
 		<xsl:param name="baseLink"/>
-		<xsl:apply-templates select="pages/page" mode="withoutCurrent">
-			<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
-			<xsl:with-param name="postfix"/>
-			<xsl:with-param name="selected">-1</xsl:with-param>
-		</xsl:apply-templates>
+		<xsl:if test="isEmpty = 'false'">
+			<p>
+				<xsl:text>Страницы: </xsl:text>
+				<xsl:apply-templates select="pages/page" mode="withoutCurrent">
+					<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
+					<xsl:with-param name="postfix"/>
+					<xsl:with-param name="selected">-1</xsl:with-param>
+				</xsl:apply-templates>
+			</p>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="pageOuter" mode="withCurrent">
@@ -252,51 +257,54 @@
 		<xsl:variable name="postfix">
 			<xsl:if test="isReversed='true'">-reversed</xsl:if>
 		</xsl:variable>
-		<xsl:text> </xsl:text>
-		<xsl:apply-templates select="pages/page" mode="withoutCurrent">
-			<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
-			<xsl:with-param name="postfix">
-				<xsl:value-of select="$postfix"/>
-			</xsl:with-param>
-			<xsl:with-param name="selected">
-				<xsl:choose>
-					<xsl:when test="unlimited='false'">
-						<xsl:value-of select="start"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>-1</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:with-param>
-		</xsl:apply-templates>
-		<xsl:if test="total &lt;= 1000">
-			<xsl:text>&#8201;|&#8201;</xsl:text>
-			<xsl:choose>
-				<xsl:when test="unlimited='false'">
-					<a>
+		<xsl:when test="total &gt; 0">
+			<div>
+				<xsl:call-template name="Messages_PageOuterTitle"/>
+				<xsl:text>: </xsl:text>
+				<xsl:apply-templates select="pages/page" mode="withoutCurrent">
+					<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
+					<xsl:with-param name="postfix" select="$postfix"/>
+					<xsl:with-param name="selected">
+						<xsl:choose>
+							<xsl:when test="unlimited='false'">
+								<xsl:value-of select="start"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:text>-1</xsl:text>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:with-param>
+				</xsl:apply-templates>
+				<xsl:if test="(total &lt;= 1000) and isEmpty = 'false'">
+					<xsl:text>&#8201;|&#8201;</xsl:text>
+					<xsl:choose>
+						<xsl:when test="unlimited='false'">
+							<a>
+								<xsl:attribute name="href">
+									<xsl:value-of select="$baseLink"/>
+									<xsl:text>all</xsl:text>
+									<xsl:value-of select="$postfix"/>
+								</xsl:attribute>
+								<xsl:text>все</xsl:text>
+							</a>
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="current">все</a>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:if>
+				<xsl:if test="next">
+					<xsl:text>&#8201;|&#8201;</xsl:text>
+					<a rel="next">
 						<xsl:attribute name="href">
 							<xsl:value-of select="$baseLink"/>
-							<xsl:text>all</xsl:text>
+							<xsl:value-of select="next"/>
 							<xsl:value-of select="$postfix"/>
 						</xsl:attribute>
-						<xsl:text>все</xsl:text>
+						<xsl:text>Следующая страница</xsl:text>
 					</a>
-				</xsl:when>
-				<xsl:otherwise>
-					<a class="current">все</a>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:if>
-		<xsl:if test="next">
-			<xsl:text>&#8201;|&#8201;</xsl:text>
-			<a rel="next">
-				<xsl:attribute name="href">
-					<xsl:value-of select="$baseLink"/>
-					<xsl:value-of select="next"/>
-					<xsl:value-of select="$postfix"/>
-				</xsl:attribute>
-				<xsl:text>Следующая страница</xsl:text>
-			</a>
+				</xsl:if>
+			</div>
 		</xsl:if>
 	</xsl:template>
 
diff --git a/templates/Modern/elems/ThreadInfo.xslt b/templates/Modern/elems/ThreadInfo.xslt
index 7ff63f5..f123a12 100644
--- a/templates/Modern/elems/ThreadInfo.xslt
+++ b/templates/Modern/elems/ThreadInfo.xslt
@@ -108,14 +108,9 @@
 							<xsl:text>Просмотров: </xsl:text>
 							<xsl:value-of select="totalViews"/>
 						</p>
-						<xsl:if test="pageOuter/isEmpty='false'">
-							<p>
-								<xsl:text>Страницы: </xsl:text>
-								<xsl:apply-templates select="pageOuter" mode="withoutCurrent">
-									<xsl:with-param name="baseLink">/Thread/<xsl:value-of select="id"/>/</xsl:with-param>
-								</xsl:apply-templates>
-							</p>
-						</xsl:if>
+						<xsl:apply-templates select="pageOuter" mode="withoutCurrent">
+							<xsl:with-param name="baseLink">/Thread/<xsl:value-of select="id"/>/</xsl:with-param>
+						</xsl:apply-templates>
 					</div>
 				</div>
 			</div>