From 08f99571572544f5fe7264d488e512db3acf0b64 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Fri, 6 Jan 2012 20:38:11 +0000
Subject: [PATCH] Cosmetic improvements

---
 .../templates/Modern/elems/BoardHeader.xslt   |  3 --
 .../Modern/elems/ConversationsHeader.xslt     |  2 -
 .../templates/Modern/elems/ForumHeader.xslt   |  4 --
 .../FLocal/templates/Modern/elems/Header.xslt | 39 +++++++++----------
 .../FLocal/templates/Modern/elems/Main.xslt   | 14 +++----
 .../templates/Modern/elems/MyHeader.xslt      |  6 ---
 .../templates/Modern/elems/PollsHeader.xslt   |  2 -
 .../templates/Modern/elems/PostInfo.xslt      |  1 -
 .../templates/Modern/elems/UploadHeader.xslt  |  1 -
 .../templates/Modern/elems/UploadInfo.xslt    |  1 -
 .../templates/Modern/elems/UserHeader.xslt    |  6 ---
 .../templates/Modern/elems/UsersHeader.xslt   |  3 --
 12 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/Resources/FLocal/templates/Modern/elems/BoardHeader.xslt b/Resources/FLocal/templates/Modern/elems/BoardHeader.xslt
index 5722b04..cc67216 100644
--- a/Resources/FLocal/templates/Modern/elems/BoardHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/BoardHeader.xslt
@@ -8,12 +8,10 @@
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Threads/</xsl:with-param>
 				<xsl:with-param name="text">Темы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Headlines/</xsl:with-param>
 				<xsl:with-param name="text">Заголовки</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>NewThread/</xsl:with-param>
 				<xsl:with-param name="text">Новая (?)</xsl:with-param>
@@ -22,7 +20,6 @@
 				</xsl:with-param>
 			</xsl:call-template>
 			<xsl:if test="currentLocation//thread">
-				<xsl:text>&#160;&#160;&#160;</xsl:text>
 				<xsl:call-template name="headerLink">
 					<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Thread/<xsl:value-of select="currentLocation//thread/id"/>-<xsl:value-of select="currentLocation//thread/nameTranslit"/>/</xsl:with-param>
 					<xsl:with-param name="postfix">
diff --git a/Resources/FLocal/templates/Modern/elems/ConversationsHeader.xslt b/Resources/FLocal/templates/Modern/elems/ConversationsHeader.xslt
index 6274b5c..efd05f4 100644
--- a/Resources/FLocal/templates/Modern/elems/ConversationsHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/ConversationsHeader.xslt
@@ -7,13 +7,11 @@
 				<xsl:with-param name="url">/My/Conversations/List/</xsl:with-param>
 				<xsl:with-param name="text">Список</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Conversations/NewPM/</xsl:with-param>
 				<xsl:with-param name="text">Новое (?)</xsl:with-param>
 			</xsl:call-template>
 			<xsl:if test="conversation">
-				<xsl:text>&#160;&#160;&#160;</xsl:text>
 				<xsl:call-template name="headerLink">
 					<xsl:with-param name="url">
 						<xsl:text>/My/Conversations/Conversation/</xsl:text>
diff --git a/Resources/FLocal/templates/Modern/elems/ForumHeader.xslt b/Resources/FLocal/templates/Modern/elems/ForumHeader.xslt
index 90da6a3..a25c78f 100644
--- a/Resources/FLocal/templates/Modern/elems/ForumHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/ForumHeader.xslt
@@ -8,17 +8,14 @@
 				<xsl:with-param name="url">/Forum/Boards/</xsl:with-param>
 				<xsl:with-param name="text">Разделы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Forum/AllThreads/</xsl:with-param>
 				<xsl:with-param name="text">Темы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Forum/AllPosts/</xsl:with-param>
 				<xsl:with-param name="text">Сообщения</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/Replies/</xsl:with-param>
 				<xsl:with-param name="text">Ответы</xsl:with-param>
@@ -27,7 +24,6 @@
 				</xsl:with-param>
 			</xsl:call-template>
 			<xsl:if test="currentLocation//board[not(name(../..)='board')]">
-				<xsl:text>&#160;&#160;&#160;</xsl:text>
 				<xsl:apply-templates select="currentLocation//board[not(name(../..)='board')]" mode="headerBoardLink"/>
 			</xsl:if>
 			<xsl:if test="currentLocation//board">
diff --git a/Resources/FLocal/templates/Modern/elems/Header.xslt b/Resources/FLocal/templates/Modern/elems/Header.xslt
index 3d266f6..a9677f4 100644
--- a/Resources/FLocal/templates/Modern/elems/Header.xslt
+++ b/Resources/FLocal/templates/Modern/elems/Header.xslt
@@ -18,21 +18,24 @@
 		<xsl:param name="postfix"/>
 		<xsl:param name="skipDatePostfix"/>
 		<a target="_top">
-			<xsl:choose>
-				<xsl:when test="$isDisabled='true'">
-					<xsl:attribute name="class">disabled</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:if test="starts-with(/root/currentUrl, $url)">
-						<xsl:attribute name="class">selected</xsl:attribute>
-					</xsl:if>
-					<xsl:attribute name="href">
-						<xsl:value-of select="$url"/>
-						<xsl:value-of select="$postfix"/>
-						<xsl:if test="not($skipDatePostfix='true')">?<xsl:value-of select="current/date/ticks"/></xsl:if>
-					</xsl:attribute>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:attribute name="class">
+				<xsl:text>headerLink</xsl:text>
+				<xsl:choose>
+					<xsl:when test="$isDisabled='true'">
+						<xsl:text> disabled</xsl:text>
+					</xsl:when>
+					<xsl:when test="starts-with(/root/currentUrl, $url)">
+						<xsl:text> selected</xsl:text>
+					</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:if test="not($isDisabled='true')">
+				<xsl:attribute name="href">
+					<xsl:value-of select="$url"/>
+					<xsl:value-of select="$postfix"/>
+					<xsl:if test="not($skipDatePostfix='true')">?<xsl:value-of select="current/date/ticks"/></xsl:if>
+				</xsl:attribute>
+			</xsl:if>
 			<xsl:value-of select="$text"/>
 		</a>
 	</xsl:template>
@@ -141,12 +144,10 @@
 				<xsl:with-param name="url">/Forum/</xsl:with-param>
 				<xsl:with-param name="text">Форум</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Polls/</xsl:with-param>
 				<xsl:with-param name="text">Опросы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Upload/</xsl:with-param>
 				<xsl:with-param name="text">Аплоад</xsl:with-param>
@@ -154,7 +155,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/</xsl:with-param>
 				<xsl:with-param name="text">
@@ -164,12 +164,10 @@
 					</xsl:choose>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</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>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Users/</xsl:with-param>
 				<xsl:with-param name="text">Пользователи</xsl:with-param>
@@ -190,7 +188,6 @@
 				<xsl:call-template name="pollsHeader"/>
 			</xsl:if>
 		</div>
-		<center>&#160;&#160;</center>
 	</xsl:template>
 </xsl:stylesheet>
 
diff --git a/Resources/FLocal/templates/Modern/elems/Main.xslt b/Resources/FLocal/templates/Modern/elems/Main.xslt
index 545f651..f4db580 100644
--- a/Resources/FLocal/templates/Modern/elems/Main.xslt
+++ b/Resources/FLocal/templates/Modern/elems/Main.xslt
@@ -8,18 +8,18 @@
 		<html>
 			<head>
 				<meta http-equiv="x-ua-compatible" content="IE=8"/>
-				<link rel="stylesheet" href="/static/css/modern/global.css?v6.5" type="text/css" />
+				<link rel="stylesheet" href="/static/css/modern/global.css?v6.6" type="text/css" />
 				<xsl:comment>[if lte IE 7]&gt;<![CDATA[
-					<link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.5" type="text/css" />
+					<link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.6" type="text/css" />
 				]]>&lt;![endif]</xsl:comment>
 				<link rel="stylesheet" type="text/css" skin="skin">
-					<xsl:attribute name="href">/static/css/modern/<xsl:value-of select="modernSkin/name"/>.css?v6.5</xsl:attribute>
+					<xsl:attribute name="href">/static/css/modern/<xsl:value-of select="modernSkin/name"/>.css?v6.6</xsl:attribute>
 				</link>
 				<link rel="shortcut icon" href="/static/favicons/smirk.ico" type="image/x-icon" />
-				<script language="Javascript" type="text/javascript" src="/static/js/common.js?v6.5"><xsl:text> </xsl:text></script>
-				<script language="Javascript" type="text/javascript" src="/static/js/modern.js?v6.5"><xsl:text> </xsl:text></script>
+				<script language="Javascript" type="text/javascript" src="/static/js/common.js?v6.6"><xsl:text> </xsl:text></script>
+				<script language="Javascript" type="text/javascript" src="/static/js/modern.js?v6.6"><xsl:text> </xsl:text></script>
 				<script language="Javascript" type="text/javascript" src="/static/js/machichara/complex.js?v1"><xsl:text> </xsl:text></script>
-				<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v6.5"><xsl:text> </xsl:text></script>
+				<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v6.6"><xsl:text> </xsl:text></script>
 				<script language="Javascript" type="text/javascript">
 					<xsl:attribute name="src">
 						<xsl:text>/static/js/machichara/</xsl:text>
@@ -48,7 +48,7 @@
 						<xsl:call-template name="header"/>
 					</div>
 				</xsl:if>
-				<div style="float:left;width:97%;max-width:97%;overflow:visible;" id="contentContainer">
+				<div style="float:left;width:99%;max-width:99%;overflow:visible;" id="contentContainer">
 					<xsl:call-template name="specific"/>
 				</div>
 				<xsl:if test="not(get/param[@name='headers'] = 'false')">
diff --git a/Resources/FLocal/templates/Modern/elems/MyHeader.xslt b/Resources/FLocal/templates/Modern/elems/MyHeader.xslt
index 8b33ba9..d8aab18 100644
--- a/Resources/FLocal/templates/Modern/elems/MyHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/MyHeader.xslt
@@ -12,7 +12,6 @@
 					<xsl:if test="session/sessionKey">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Conversations/</xsl:with-param>
 				<xsl:with-param name="text">
@@ -33,7 +32,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Settings/</xsl:with-param>
 				<xsl:with-param name="text">Настройки</xsl:with-param>
@@ -41,7 +39,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/UserData/</xsl:with-param>
 				<xsl:with-param name="text">Данные (?)</xsl:with-param>
@@ -49,7 +46,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Avatars/</xsl:with-param>
 				<xsl:with-param name="text">Аватарки</xsl:with-param>
@@ -57,7 +53,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/Info/</xsl:with-param>
 				<xsl:with-param name="text">Профиль</xsl:with-param>
@@ -65,7 +60,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/do/Logout/?sessionKey=<xsl:value-of select="session/sessionKey"/></xsl:with-param>
 				<xsl:with-param name="text">Выход</xsl:with-param>
diff --git a/Resources/FLocal/templates/Modern/elems/PollsHeader.xslt b/Resources/FLocal/templates/Modern/elems/PollsHeader.xslt
index cbffdf7..8beb22d 100644
--- a/Resources/FLocal/templates/Modern/elems/PollsHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/PollsHeader.xslt
@@ -7,7 +7,6 @@
 				<xsl:with-param name="url">/Polls/List/</xsl:with-param>
 				<xsl:with-param name="text">Список</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/PollsParticipated/</xsl:with-param>
 				<xsl:with-param name="text">Мои (?)</xsl:with-param>
@@ -15,7 +14,6 @@
 					<xsl:if test="not(session/sessionKey)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Polls/New/</xsl:with-param>
 				<xsl:with-param name="text">Новый</xsl:with-param>
diff --git a/Resources/FLocal/templates/Modern/elems/PostInfo.xslt b/Resources/FLocal/templates/Modern/elems/PostInfo.xslt
index a1eeae4..8c7d85b 100644
--- a/Resources/FLocal/templates/Modern/elems/PostInfo.xslt
+++ b/Resources/FLocal/templates/Modern/elems/PostInfo.xslt
@@ -113,7 +113,6 @@
 				<xsl:if test="not(parentPost/post/title = title) and not(concat('Re: ', parentPost/post/title) = title)">
 					<xsl:value-of select="title"/>
 				</xsl:if>
-				<xsl:text>&#160;&#160;</xsl:text>
 				<font style="font-size:0.6em">
 					<xsl:text>(</xsl:text>
 					<xsl:value-of select="$postDate"/>
diff --git a/Resources/FLocal/templates/Modern/elems/UploadHeader.xslt b/Resources/FLocal/templates/Modern/elems/UploadHeader.xslt
index 43064a5..c2dceb4 100644
--- a/Resources/FLocal/templates/Modern/elems/UploadHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/UploadHeader.xslt
@@ -7,7 +7,6 @@
 				<xsl:with-param name="url">/Upload/List/</xsl:with-param>
 				<xsl:with-param name="text">Список</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/Upload/New/</xsl:with-param>
 				<xsl:with-param name="text">Новый</xsl:with-param>
diff --git a/Resources/FLocal/templates/Modern/elems/UploadInfo.xslt b/Resources/FLocal/templates/Modern/elems/UploadInfo.xslt
index 3c64da3..2cadf26 100644
--- a/Resources/FLocal/templates/Modern/elems/UploadInfo.xslt
+++ b/Resources/FLocal/templates/Modern/elems/UploadInfo.xslt
@@ -23,7 +23,6 @@
 				</a>
 				<xsl:text> </xsl:text>
 				<xsl:value-of select="filename"/>
-				<xsl:text>&#160;&#160;</xsl:text>
 				<font style="font-size:0.6em">
 					<xsl:text>(</xsl:text>
 					<xsl:value-of select="$uploadDate"/>
diff --git a/Resources/FLocal/templates/Modern/elems/UserHeader.xslt b/Resources/FLocal/templates/Modern/elems/UserHeader.xslt
index d233c04..c1f8dbd 100644
--- a/Resources/FLocal/templates/Modern/elems/UserHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/UserHeader.xslt
@@ -8,27 +8,22 @@
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Info/</xsl:with-param>
 				<xsl:with-param name="text">Информация</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Threads/</xsl:with-param>
 				<xsl:with-param name="text">Темы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Posts/</xsl:with-param>
 				<xsl:with-param name="text">Сообщения</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Replies/</xsl:with-param>
 				<xsl:with-param name="text">Ответы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>PollsParticipated/</xsl:with-param>
 				<xsl:with-param name="text">Опросы</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Conversations/Conversation/<xsl:value-of select="accountId"/>/</xsl:with-param>
 				<xsl:with-param name="text">История</xsl:with-param>
@@ -36,7 +31,6 @@
 					<xsl:if test="not(accountId)">true</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</xsl:text>
 			<xsl:call-template name="headerLink">
 				<xsl:with-param name="url">/My/Conversations/PMSend/<xsl:value-of select="accountId"/>/</xsl:with-param>
 				<xsl:with-param name="text">Написать</xsl:with-param>
diff --git a/Resources/FLocal/templates/Modern/elems/UsersHeader.xslt b/Resources/FLocal/templates/Modern/elems/UsersHeader.xslt
index 13a6cc4..2c3e76c 100644
--- a/Resources/FLocal/templates/Modern/elems/UsersHeader.xslt
+++ b/Resources/FLocal/templates/Modern/elems/UsersHeader.xslt
@@ -8,18 +8,15 @@
 				<xsl:with-param name="url">/Users/All/</xsl:with-param>
 				<xsl:with-param name="text">Все</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>&#160;&#160;&#160;</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>&#160;&#160;&#160;</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:if test="user">
-				<xsl:text>&#160;&#160;&#160;</xsl:text>
 				<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>