From a292a99a1968eadecf4e7314516f57ece58ec819 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Thu, 23 Sep 2010 19:15:08 +0000
Subject: [PATCH] PostInfo and UserInfoBar new appearance

---
 Builder/IISMainHandler/build.txt        |   2 +-
 static/css/modern/global.css            |  83 +++++
 static/css/modern/penartur.css          |  20 ++
 templates/Modern/AllPosts.xslt          |  44 +--
 templates/Modern/Post.xslt              |  83 +----
 templates/Modern/Thread.xslt            | 114 +-----
 templates/Modern/UserPosts.xslt         |  44 +--
 templates/Modern/elems/Main.xslt        |  22 +-
 templates/Modern/elems/PostInfo.xslt    | 449 +++++++++---------------
 templates/Modern/elems/UserInfoBar.xslt |  77 ++--
 10 files changed, 371 insertions(+), 567 deletions(-)
 create mode 100644 static/css/modern/global.css
 create mode 100644 static/css/modern/penartur.css

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 894a5ad..beae451 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1510
\ No newline at end of file
+1524
\ No newline at end of file
diff --git a/static/css/modern/global.css b/static/css/modern/global.css
new file mode 100644
index 0000000..39f08ec
--- /dev/null
+++ b/static/css/modern/global.css
@@ -0,0 +1,83 @@
+pre 
+{ 
+  overflow-x: auto;
+  overflow-y: hidden;
+  margin: 10px;
+  width: 99%;
+  font-family:Consolas, monospace;
+}
+
+[type=button].iconize, [type=submit].iconize {
+	padding-left:16px;
+	background-position:center left;
+	background-repeat:no-repeat;
+	font-size:10px;
+}
+
+[pseudolink] {
+	cursor:hand;
+	text-decoration:underline;
+}
+[spoiler] [inner] {
+	display:none;
+}
+[spoiler] [opener] {
+	cursor:hand;
+}
+.warning {
+	background-color:red;
+}
+.userbar_name {
+	font-size:2em;
+}
+.userbar_title {
+	font-weight:bold;
+}
+.avatar {
+	border:none;
+	max-height:10em;
+	height:expression((this.scrollHeight >= 120) ? '120px' : 'auto');
+	max-width:10em;
+	width:expression((this.scrollHeight >= 120) ? '120px' : 'auto');
+}
+.userbarcontainer {
+	border:none;
+	width:10em;
+	min-width:10em;
+	max-width:10em;
+}
+.UG_Blondes {
+	color:red !important;
+	background-color:yellow !important;
+	font-weight: bold !important;
+}
+.UG_Moderators {
+	color:blue !important;
+}
+.UG_Administrators {
+	color:black !important;
+}
+p {
+	margin:0em;
+}
+.punishment {
+	color:red !important;
+}
+.punishment.withdrawed {
+	color:red !important;
+	text-decoration: line-through;
+}
+.currentLink {
+	font-weight:bolder;font-style:italic;
+}
+input {
+	z-index:90000;
+}
+[nobr] {
+	white-space: nowrap;
+}
+.postcontainer {
+	border-style:none none solid none;
+	padding-bottom:5pt;
+	margin-bottom:5pt;
+}
diff --git a/static/css/modern/penartur.css b/static/css/modern/penartur.css
new file mode 100644
index 0000000..b5c2d36
--- /dev/null
+++ b/static/css/modern/penartur.css
@@ -0,0 +1,20 @@
+body { font-size:11pt; }
+
+A:link {text-decoration:none;color:#aaaaaa}
+A:visited{text-decoration:none;color:#666666}
+A:active{text-decoration:none;color:#999999}
+A:hover{COLOR:white;text-decoration:none}
+
+BODY, P, TABLE, TD, TR {font-family:"Calibri"}
+BODY{color:#ffffff;background-color:black}
+FORM{DISPLAY:inline;MARGIN-BOTTOM:0}
+
+.formboxes{font-size:1em;font-family:"Segoe Print";color:#eeeeee;BACKGROUND-COLOR:black}
+
+PRE{background-color:#303030;font-size:0.9em;font-family:"Consolas";BORDER:#999999 1px solid;PADDING: 0.2em 0.3em;MARGIN:0 0.5em 0 1em;color:white}
+
+.confluent{COLOR:#141414;}
+
+.postcontainer {
+	border-color:white;
+}
diff --git a/templates/Modern/AllPosts.xslt b/templates/Modern/AllPosts.xslt
index 5405fcd..7ebed7f 100644
--- a/templates/Modern/AllPosts.xslt
+++ b/templates/Modern/AllPosts.xslt
@@ -7,39 +7,17 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="0" cellspacing="1" width="100%" class="tableborders">
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-						<xsl:apply-templates select="posts/post"/>
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
+		</div>
+		<div id="postsContainer">
+			<xsl:apply-templates select="posts/post"/>
+		</div>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
+		</div>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/Post.xslt b/templates/Modern/Post.xslt
index 3f23e0b..5832b0e 100644
--- a/templates/Modern/Post.xslt
+++ b/templates/Modern/Post.xslt
@@ -7,84 +7,11 @@
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<!--xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if>
-		<br /-->
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="0" cellspacing="1" width="100%" class="tableborders">
-						<xsl:apply-templates select="posts/post">
-							<xsl:with-param name="isReplyDisabled"><xsl:value-of select="thread/isLocked"/></xsl:with-param>
-						</xsl:apply-templates>
-					</table>
-				</td>
-			</tr>
-		</table>
-		<!--br />
-		<xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if-->
-	</xsl:template>
-
-	<xsl:template name="threadInfo">
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders"> 
-						<tr class="darktable">
-							<td>
-								<table width="100%" cellpadding="0" cellspacing="0">
-									<tr class="darktable">
-										<td align="left" width="33%">
-											<font class="catandforum">
-												<xsl:apply-templates select="currentLocation" mode="breadcrumbs"/>
-											</font>
-										</td>
-										<td width="33%" align="right">
-											<table border="0" class="tablesurround">
-												<tr>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<xsl:attribute name="href">/Board/<xsl:value-of select="currentLocation/post/parent/thread/parent/board/id"/>/</xsl:attribute>
-															<img src="/static/images/all.gif" alt="" border="0" width="19" height="15" style="vertical-align: text-bottom" />
-															<xsl:text>Список</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<form method="get" name="fullview">
-															<select name="fullview" class="formboxes" style="font-size:10px">
-																<option value="0" >Норм</option>
-																<option value="1" >Офт</option>
-																<option value="2" selected="selected">Мус</option>
-															</select>
-														</form>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<xsl:attribute name="href">/Thread/<xsl:value-of select="currentLocation/post/parent/thread/id"/>/p<xsl:value-of select="currentLocation/post/id"/></xsl:attribute>
-															<img alt="*" src="/static/images/flat.gif" style="vertical-align: text-bottom" />
-															<xsl:text>Плоский</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<img src="/static/images/greythreaded.gif" border="0" style="vertical-align: text-bottom" alt="Дерево" />
-															<xsl:text>Дерево</xsl:text>
-														</a>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
+		<div id="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>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/Thread.xslt b/templates/Modern/Thread.xslt
index b9bf3d8..ea18aae 100644
--- a/templates/Modern/Thread.xslt
+++ b/templates/Modern/Thread.xslt
@@ -9,107 +9,19 @@
 	<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">
-		<!--xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if>
-		<br /-->
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="0" cellspacing="1" width="100%" class="tableborders">
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-						<xsl:apply-templates select="posts/post">
-							<xsl:with-param name="isReplyDisabled"><xsl:value-of select="thread/isLocked"/></xsl:with-param>
-						</xsl:apply-templates>
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-		<!--br />
-		<xsl:if test="not(get/param[@name='headers'] = 'false')">
-			<xsl:call-template name="threadInfo"/>
-		</xsl:if-->
-	</xsl:template>
-
-	<xsl:template name="threadInfo">
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders"> 
-						<tr class="darktable">
-							<td>
-								<table width="100%" cellpadding="0" cellspacing="0">
-									<tr class="darktable">
-										<td align="left" width="33%">
-											<font class="catandforum">
-												<xsl:apply-templates select="currentLocation" mode="breadcrumbs"/>
-											</font>
-										</td>
-										<td width="33%" align="right">
-											<table border="0" class="tablesurround">
-												<tr>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<xsl:attribute name="href">/Board/<xsl:value-of select="currentLocation/thread/parent/board/id"/>/</xsl:attribute>
-															<img src="/static/images/all.gif" alt="" border="0" width="19" height="15" style="vertical-align: text-bottom" />
-															<xsl:text>Список</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<form method="get" name="fullview">
-															<select name="fullview" class="formboxes" style="font-size:10px">
-																<option value="0" >Норм</option>
-																<option value="1" >Офт</option>
-																<option value="2" selected="selected">Мус</option>
-															</select>
-														</form>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<img alt="*" src="/static/images/greyflat.gif" style="vertical-align: text-bottom" />
-															<xsl:text>Плоский</xsl:text>
-														</a>
-													</td>
-													<td class="navigation" nowrap="nowrap">
-														<a>
-															<img src="/static/images/greythreaded.gif" border="0" style="vertical-align: text-bottom" alt="Дерево" />
-															<xsl:text>Дерево</xsl:text>
-														</a>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
+		</div>
+		<div id="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:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/UserPosts.xslt b/templates/Modern/UserPosts.xslt
index 91f323f..ab74e96 100644
--- a/templates/Modern/UserPosts.xslt
+++ b/templates/Modern/UserPosts.xslt
@@ -8,39 +8,17 @@
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
-		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
-			<tr>
-				<td>
-					<table cellpadding="0" cellspacing="1" width="100%" class="tableborders">
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-						<xsl:apply-templates select="posts/post"/>
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
+		</div>
+		<div id="postsContainer">
+			<xsl:apply-templates select="posts/post"/>
+		</div>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
+		</div>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/elems/Main.xslt b/templates/Modern/elems/Main.xslt
index 7a01b39..59f7cf3 100644
--- a/templates/Modern/elems/Main.xslt
+++ b/templates/Modern/elems/Main.xslt
@@ -5,9 +5,9 @@
 	<xsl:template match="/root">
 		<html>
 			<head>
-				<link rel="stylesheet" href="/static/css/global.css?v1" type="text/css" />
+				<link rel="stylesheet" href="/static/css/modern/global.css" type="text/css" />
 				<link rel="stylesheet" type="text/css" skin="skin">
-					<xsl:attribute name="href">/static/css/<xsl:value-of select="skin/name"/>.css</xsl:attribute>
+					<xsl:attribute name="href">/static/css/modern/penartur.css</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"><xsl:text> </xsl:text></script>
@@ -305,5 +305,23 @@
 		</a>
 	</xsl:template>
 
+	<xsl:template match="user" mode="userNick">
+		<a nobr="nobr">
+			<xsl:attribute name="class">
+				<xsl:text>separate </xsl:text>
+				<xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/>
+			</xsl:attribute>
+			<xsl:value-of select="name"/>
+			<xsl:choose>
+				<xsl:when test="isAdministrator='true'">
+					<img src="/static/images/adm.gif" border="0"/>
+				</xsl:when>
+				<xsl:when test="isModerator='true'">
+					<img src="/static/images/mod.gif" border="0"/>
+				</xsl:when>
+			</xsl:choose>
+		</a>
+	</xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/templates/Modern/elems/PostInfo.xslt b/templates/Modern/elems/PostInfo.xslt
index 1c2b43c..4cd352b 100644
--- a/templates/Modern/elems/PostInfo.xslt
+++ b/templates/Modern/elems/PostInfo.xslt
@@ -4,301 +4,200 @@
 	<xsl:import href="UserInfoBar.xslt"/>
 	<xsl:template match="post">
 		<xsl:param name="isReplyDisabled">true</xsl:param>
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="3" border="0">
-					<tr>
-						<td width="120" valign="top" class="darktable" rowspan="2">
-							<a><xsl:attribute name="name">Post<xsl:value-of select="id"/></xsl:attribute></a>
-							<xsl:apply-templates select="poster/user" mode="userInfoBar"/>
-						</td>
-						<td class="subjecttable">
-							<table width="100%" border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td align="left" width="80%" valign="top">
-										<a target="_blank" class="separate">
-											<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/</xsl:attribute>
-											<img border="0" alt="" style="vertical-align: text-bottom">
-												<xsl:choose>
-													<xsl:when test="isUnread='true'">
-														<xsl:attribute name="src">/static/images/message-<xsl:value-of select="layerName"/>-notread.gif</xsl:attribute>
-													</xsl:when>
-													<xsl:otherwise>
-														<xsl:attribute name="src">/static/images/message-<xsl:value-of select="layerName"/>-read.gif</xsl:attribute>
-													</xsl:otherwise>
-												</xsl:choose>
-											</img>
-										</a>
-										<b class="separate"><xsl:value-of select="title"/></b>
-										<xsl:if test="isUnread='true'">
-											<img alt="new" src="/static/images/new.gif" />
-										</xsl:if>
-										<xsl:if test="parentPost/post">
-											<font class="small separate">
-												<xsl:text>[</xsl:text>
-												<a>
-													<xsl:attribute name="title"><xsl:value-of select="parentPost/post/bodyShort"/></xsl:attribute>
-													<xsl:attribute name="href">/Thread/<xsl:value-of select="threadId"/>/p<xsl:value-of select="parentPost/post/id"/>/</xsl:attribute>
-													<xsl:text>re: </xsl:text>
-													<xsl:value-of select="parentPost/post/poster/user/name"/>
-												</a>
-												<xsl:text>]</xsl:text>
-											</font>
-										</xsl:if>
-										<br />
-										<font class="small" style="padding-left:2em"><xsl:apply-templates select="postDate/date" mode="dateTime"/></font>
-									</td>
-									<td align="right" width="20%">
-										<table cellpadding="0" cellspacing="0" border="0">
-											<tr>
-												<td align="right">
-													<table class="tablesurround" border="0">
-														<tr>
-															<td class="navigation">
-																<a>
-																	<xsl:if test="$isReplyDisabled='false'">
-																		<xsl:if test="/root/session/sessionKey">
-																			<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/Reply/</xsl:attribute>
-																			<xsl:attribute name="onClick">submitSelText(this.href);return false;</xsl:attribute>
-																			<xsl:attribute name="onMouseDown">submitSelText(this.href);return false;</xsl:attribute>
-																		</xsl:if>
-																	</xsl:if>
-																	<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																		<xsl:with-param name="src">reply.gif</xsl:with-param>
-																		<xsl:with-param name="alt">Ответ</xsl:with-param>
-																	</xsl:apply-templates>
-																</a>
-															</td>
-															<td class="navigation">
-																<a>
-																	<xsl:if test="isOwner='true'">
-																		<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/Edit/</xsl:attribute>
-																	</xsl:if>
-																	<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																		<xsl:with-param name="src">edit.gif</xsl:with-param>
-																		<xsl:with-param name="alt">Правка</xsl:with-param>
-																	</xsl:apply-templates>
-																</a>
-															</td>
-															<td class="navigation">
-																<a target="_blank">
-																	<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																		<xsl:with-param name="src">print.gif</xsl:with-param>
-																		<xsl:with-param name="alt">Печать</xsl:with-param>
-																	</xsl:apply-templates>
-																</a>
-															</td>
-															<td class="navigation">
-																<a>
-																	<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																		<xsl:with-param name="src">addreminder.gif</xsl:with-param>
-																		<xsl:with-param name="alt">Запомнить</xsl:with-param>
-																	</xsl:apply-templates>
-																</a>
-															</td>
-															<td class="navigation">
-																<xsl:choose>
-																	<xsl:when test="isPunishmentEnabled='true'">
-																		<a>
-																			<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/Punish/</xsl:attribute>
-																			<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																				<xsl:with-param name="src">punish.gif</xsl:with-param>
-																				<xsl:with-param name="alt">Модерировать</xsl:with-param>
-																			</xsl:apply-templates>
-																		</a>
-																	</xsl:when>
-																	<xsl:otherwise>
-																		<a>
-																			<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																				<xsl:with-param name="src">notifymod.gif</xsl:with-param>
-																				<xsl:with-param name="alt">Известить модератора</xsl:with-param>
-																			</xsl:apply-templates>
-																		</a>
-																	</xsl:otherwise>
-																</xsl:choose>
-															</td>
-															<td class="navigation">
-																<a>
-																	<xsl:if test="/root/session/sessionKey">
-																		<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/PMReply/</xsl:attribute>
-																		<xsl:attribute name="onClick">submitSelText(this.href);return false;</xsl:attribute>
-																		<xsl:attribute name="onMouseDown">submitSelText(this.href);return false;</xsl:attribute>
-																	</xsl:if>
-																	<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-																		<xsl:with-param name="src">email2.gif</xsl:with-param>
-																		<xsl:with-param name="alt">Ответить в ПМ</xsl:with-param>
-																	</xsl:apply-templates>
-																</a>
-															</td>
-														</tr>
-													</table>
-												</td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td class="lighttable">
-							<table width="100%" cellspacing="0" cellpadding="0" style="table-layout: fixed">
-								<tr>
-									<td>
-										<br />
-										<font class="post">
-											<xsl:value-of select="body" disable-output-escaping="yes" />
-											<!--<xsl:copy-of select="body"/>-->
-											<br />
-											<br />
-										</font>
-									</td>
-								</tr>
-								<xsl:apply-templates select="specific"/>
-								<xsl:if test="poster/user/signature != ''">
-									<tr>
-										<td>
-											<div style="width:100%;max-height:50px;height: expression( this.scrollHeight > 49 ? '50px' : 'auto' );overflow:hidden">
-												<font size="-2"><xsl:value-of select="poster/user/signature" disable-output-escaping="yes" /><br /></font>
-											</div>
-										</td>
-									</tr>
-								</xsl:if>
-							</table>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+		<div class="postcontainer" style="clear:both">
+			<a><xsl:attribute name="name">Post<xsl:value-of select="id"/></xsl:attribute></a>
+			<div class="userbarcontainer" style="float:left">
+				<xsl:apply-templates select="poster/user" mode="userInfoBar"/>
+			</div>
+			<div class="linkscontainer" style="float:right">
+				<xsl:if test="isOwner='true'">
+					<a>
+						<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/Edit/</xsl:attribute>
+						<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
+							<xsl:with-param name="src">edit.gif</xsl:with-param>
+							<xsl:with-param name="alt">Правка</xsl:with-param>
+						</xsl:apply-templates>
+					</a>
+				</xsl:if>
+				<xsl:text> </xsl:text>
+				<a>
+					<xsl:if test="$isReplyDisabled='false'">
+						<xsl:if test="/root/session/sessionKey">
+							<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/Reply/</xsl:attribute>
+							<xsl:attribute name="onClick">submitSelText(this.href);return false;</xsl:attribute>
+							<xsl:attribute name="onMouseDown">submitSelText(this.href);return false;</xsl:attribute>
+						</xsl:if>
+					</xsl:if>
+					<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
+						<xsl:with-param name="src">reply.gif</xsl:with-param>
+						<xsl:with-param name="alt">Ответ</xsl:with-param>
+					</xsl:apply-templates>
+				</a>
+				<xsl:text> </xsl:text>
+				<a>
+					<xsl:if test="/root/session/sessionKey">
+						<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/PMReply/</xsl:attribute>
+						<xsl:attribute name="onClick">submitSelText(this.href);return false;</xsl:attribute>
+						<xsl:attribute name="onMouseDown">submitSelText(this.href);return false;</xsl:attribute>
+					</xsl:if>
+					<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
+						<xsl:with-param name="src">email2.gif</xsl:with-param>
+						<xsl:with-param name="alt">Ответить в ПМ</xsl:with-param>
+					</xsl:apply-templates>
+				</a>
+				<xsl:text> </xsl:text>
+				<xsl:choose>
+					<xsl:when test="isPunishmentEnabled='true'">
+						<a>
+							<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/Punish/</xsl:attribute>
+							<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
+								<xsl:with-param name="src">punish.gif</xsl:with-param>
+								<xsl:with-param name="alt">Модерировать</xsl:with-param>
+							</xsl:apply-templates>
+						</a>
+					</xsl:when>
+					<xsl:otherwise>
+						<a>
+							<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
+								<xsl:with-param name="src">notifymod.gif</xsl:with-param>
+								<xsl:with-param name="alt">Известить модератора</xsl:with-param>
+							</xsl:apply-templates>
+						</a>
+					</xsl:otherwise>
+				</xsl:choose>
+			</div>
+			<div class="postcontent">
+				<a target="_blank" class="separate">
+					<xsl:attribute name="href">/Post/<xsl:value-of select="id"/>/</xsl:attribute>
+					<xsl:variable name="postDate"><xsl:apply-templates select="postDate/date" mode="dateTime"/></xsl:variable>
+					<xsl:attribute name="title"><xsl:value-of select="$postDate"/></xsl:attribute>
+					<img border="0" alt="" style="vertical-align: text-bottom">
+						<xsl:choose>
+							<xsl:when test="isUnread='true'">
+								<xsl:attribute name="src">/static/images/message-<xsl:value-of select="layerName"/>-notread.gif</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="src">/static/images/message-<xsl:value-of select="layerName"/>-read.gif</xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</img>
+				</a>
+				<xsl:text> </xsl:text>
+				<xsl:if test="parentPost/post">
+					<font class="small separate">
+						<xsl:text>[</xsl:text>
+						<a>
+							<xsl:attribute name="title"><xsl:value-of select="parentPost/post/bodyShort"/></xsl:attribute>
+							<xsl:attribute name="href">/Thread/<xsl:value-of select="threadId"/>/p<xsl:value-of select="parentPost/post/id"/>/</xsl:attribute>
+							<xsl:text>re: </xsl:text>
+							<xsl:value-of select="parentPost/post/poster/user/name"/>
+						</a>
+						<xsl:text>]</xsl:text>
+					</font>
+				</xsl:if>
+				<div class="postbody">
+					<xsl:value-of select="body" disable-output-escaping="yes" />
+				</div>
+				<xsl:apply-templates select="specific"/>
+				<xsl:if test="poster/user/signature != ''">
+					<div style="width:100%;max-height:3.5em;height: expression( this.scrollHeight > 49 ? '50px' : 'auto' );overflow:hidden;text-align:right;font-size:0.8em;">
+						<xsl:value-of select="poster/user/signature" disable-output-escaping="yes" />
+					</div>
+				</xsl:if>
+			</div>
+		</div>
 	</xsl:template>
 
 	<xsl:template match="specific/changeInfo">
 		<xsl:if test="(revision != '') and (revision != '0')">
-			<tr>
-				<td>
-					<font size="-2">
-						<xsl:text>Это сообщение было отредактировано пользователем </xsl:text>
-						<xsl:value-of select="revision"/>
-						<xsl:text> раз, последний раз </xsl:text>
-						<xsl:apply-templates select="lastChangeDate/date" mode="dateTime"/>
-						<br/>
-						<br/>
-					</font>
-				</td>
-			</tr>
+			<span style="font-size:0.8em" class="revision">
+				<xsl:value-of select="revision"/>
+				<xsl:text> правок, последняя </xsl:text>
+				<xsl:apply-templates select="lastChangeDate/date" mode="dateTime"/>
+			</span>
+			<xsl:text> </xsl:text>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="specific/punishment">
-		<tr>
-			<td>
-				<font size="-2">
-					<xsl:attribute name="class">
-						<xsl:text>punishment</xsl:text>
-						<xsl:if test="isWithdrawed='true'">
-							<xsl:text> withdrawed</xsl:text>
-						</xsl:if>
-					</xsl:attribute>
-					<xsl:value-of select="punishmentType/description"/>
-					<xsl:text> (</xsl:text>
-					<xsl:value-of select="punishmentType/weightDescription"/>
-					<xsl:text>). </xsl:text>
-					<xsl:value-of select="comment"/>
-					<xsl:text> (</xsl:text>
-					<xsl:apply-templates select="moderator/user" mode="userLink"/>
-					<xsl:text>, </xsl:text>
-					<xsl:apply-templates select="punishmentDate/date" mode="dateTime"/>
-					<xsl:text>)</xsl:text>
-					<br/>
-					<xsl:if test="transfer">
-						<xsl:choose>
-							<xsl:when test="transfer/isSubthreadTransfer='true'">
-								<xsl:text>Подветка была перенесена</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>Сообщение было перенесено</xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:if test="transfer/oldParentPost">
-							<xsl:text> из обсуждения сообщения </xsl:text>
-							<a>
-								<xsl:attribute name="href">
-									<xsl:text>/Post/</xsl:text>
-									<xsl:value-of select="transfer/oldParentPost/post/id"/>
-									<xsl:text>/</xsl:text>
-								</xsl:attribute>
-								<xsl:value-of select="transfer/oldParentPost/post/title"/>
-							</a>
-						</xsl:if>
-						<xsl:text> из раздела </xsl:text>
+		<xsl:if test="not(isWithdrawed='true')">
+			<span style="font-size:0.8em" class="punishment">
+				<xsl:value-of select="punishmentType/description"/>
+				<xsl:text>. </xsl:text>
+				<xsl:value-of select="comment"/>
+				<xsl:text> (</xsl:text>
+				<xsl:apply-templates select="moderator/user" mode="userLink"/>
+				<xsl:text>, </xsl:text>
+				<xsl:apply-templates select="punishmentDate/date" mode="dateTime"/>
+				<xsl:text>).</xsl:text>
+				<xsl:if test="transfer">
+					<xsl:text> </xsl:text>
+					<xsl:choose>
+						<xsl:when test="transfer/isSubthreadTransfer='true'">
+							<xsl:text>Подветка была перенесена</xsl:text>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>Сообщение было перенесено</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:if test="transfer/oldParentPost">
+						<xsl:text> из обсуждения сообщения </xsl:text>
 						<a>
 							<xsl:attribute name="href">
-								<xsl:text>/Board/</xsl:text>
-								<xsl:value-of select="transfer/oldBoard/board/id"/>
+								<xsl:text>/Post/</xsl:text>
+								<xsl:value-of select="transfer/oldParentPost/post/id"/>
 								<xsl:text>/</xsl:text>
 							</xsl:attribute>
-							<xsl:value-of select="transfer/oldBoard/board/name"/>
+							<xsl:value-of select="transfer/oldParentPost/post/title"/>
 						</a>
-						<br/>
-					</xsl:if>
-					<xsl:if test="layerChange">
-						<xsl:choose>
-							<xsl:when test="layerChange/isSubthreadChange='true'">
-								<xsl:text>Слой подветки был изменён</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>Слой сообщения был изменён</xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:text> с </xsl:text>
-						<xsl:value-of select="layerChange/oldLayer/layer/name"/>
-						<br/>
 					</xsl:if>
-					<br/>
-				</font>
-			</td>
-		</tr>
-	</xsl:template>
-
-	<xsl:template match="specific/thread">
-		<tr>
-			<td>
-				<font size="-1">
+					<xsl:text> из раздела </xsl:text>
 					<a>
 						<xsl:attribute name="href">
-							<xsl:text>/Thread/</xsl:text>
-							<xsl:value-of select="id"/>
+							<xsl:text>/Board/</xsl:text>
+							<xsl:value-of select="transfer/oldBoard/board/id"/>
 							<xsl:text>/</xsl:text>
-							<xsl:if test="afterLastRead&lt;=lastPostId">
-								<xsl:text>p</xsl:text>
-								<xsl:value-of select="afterLastRead"/>
-							</xsl:if>
 						</xsl:attribute>
-						<xsl:choose>
-							<xsl:when test="totalPosts &gt; 1">
-								<xsl:text>Обсуждение этого сообщения</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>Начать обсуждение</xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
+						<xsl:value-of select="transfer/oldBoard/board/name"/>
 					</a>
-					<xsl:if test="totalPosts &gt; 1">
-						<span class="separate"><xsl:value-of select="totalPosts"/></span>
-						<xsl:if test="totalNewPosts and totalNewPosts!='0'">
-							<a class="cup separate">
-								<xsl:if test="/root/session/sessionKey">
-									<xsl:attribute name="href">/do/MarkThreadAsRead/<xsl:value-of select="id"/>/p<xsl:value-of select="lastPostId"/>/</xsl:attribute>
-								</xsl:if>
-								<font class="new"><i>(<xsl:value-of select="totalNewPosts"/>)</i></font>
-							</a>
-						</xsl:if>
+					<xsl:text>.</xsl:text>
+				</xsl:if>
+				<xsl:if test="layerChange">
+					<xsl:text> </xsl:text>
+					<xsl:text>Исходный слой </xsl:text>
+					<xsl:value-of select="layerChange/oldLayer/layer/name"/>
+					<xsl:text>.</xsl:text>
+				</xsl:if>
+			</span>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="specific/thread">
+		<div class="discussionlinkcontainer">
+			<a>
+				<xsl:attribute name="href">
+					<xsl:text>/Thread/</xsl:text>
+					<xsl:value-of select="id"/>
+					<xsl:text>/</xsl:text>
+					<xsl:if test="afterLastRead&lt;=lastPostId">
+						<xsl:text>p</xsl:text>
+						<xsl:value-of select="afterLastRead"/>
 					</xsl:if>
-					<br/>
-					<br/>
-				</font>
-			</td>
-		</tr>
+				</xsl:attribute>
+				<xsl:text>Обсудить</xsl:text>
+			</a>
+			<xsl:if test="totalPosts &gt; 1">
+				<span class="separate"><xsl:value-of select="totalPosts"/></span>
+				<xsl:if test="totalNewPosts and totalNewPosts!='0'">
+					<a class="cup separate">
+						<xsl:if test="/root/session/sessionKey">
+							<xsl:attribute name="href">/do/MarkThreadAsRead/<xsl:value-of select="id"/>/p<xsl:value-of select="lastPostId"/>/</xsl:attribute>
+						</xsl:if>
+						<font class="new"><i>(<xsl:value-of select="totalNewPosts"/>)</i></font>
+					</a>
+				</xsl:if>
+			</xsl:if>
+		</div>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/elems/UserInfoBar.xslt b/templates/Modern/elems/UserInfoBar.xslt
index 092fcda..e8a4366 100644
--- a/templates/Modern/elems/UserInfoBar.xslt
+++ b/templates/Modern/elems/UserInfoBar.xslt
@@ -2,56 +2,45 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 
 	<xsl:template match="user" mode="userInfoBar">
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td>
-					<xsl:apply-templates select="current()" mode="userLink"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="small">
-					<b><xsl:value-of select="title"/></b>
-				</td>
-			</tr>
-			<tr>
-				<td class="small">
-					<i></i> 
-				</td>
-			</tr>
-			<tr>
-				<td class="small">
-					<i><font color="red"></font></i>
-				</td>
-			</tr>
+		<div class="user">
+			<xsl:attribute name="onMouseOver">for(var i=0;i&lt;this.childNodes.length;i++) if(this.childNodes[i].nodeName == "DIV") this.childNodes[i].style.display="block";</xsl:attribute>
+			<xsl:attribute name="onMouseOut">for(var i=0;i&lt;this.childNodes.length;i++) if(this.childNodes[i].nodeName == "DIV" &amp;&amp; this.childNodes[i].getAttribute("default") != "default") this.childNodes[i].style.display="none";</xsl:attribute>
+			<div class="userbar_name">
+				<xsl:if test="not(avatar)">
+					<xsl:attribute name="default">default</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="avatar">
+					<xsl:attribute name="style">display:none</xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates select="current()" mode="userLink"/>
+			</div>
+			<div class="userbar_title" style="display:none">
+				<xsl:value-of select="title"/>
+			</div>
 			<xsl:if test="avatar">
-				<tr>
-					<td class="small">
+				<div class="userbar_avatar" default="default">
+					<a>
+						<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>
 						<img alt="" class="avatar">
 							<xsl:attribute name="src">/Upload/Item/<xsl:value-of select="avatar"/>/</xsl:attribute>
 						</img>
-					</td>
-				</tr>
+					</a>
+				</div>
 			</xsl:if>
-			<tr>
-				<td class="small">
-					<xsl:text>Рег.: </xsl:text>
-					<xsl:apply-templates select="regDate/date" mode="date"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="small">
-					<xsl:text>Сообщений: </xsl:text>
-					<xsl:value-of select="totalPosts"/>
-				</td>
-			</tr>
+			<div class="userbar_regdate" style="display:none">
+				<xsl:text>Рег.: </xsl:text>
+				<xsl:apply-templates select="regDate/date" mode="date"/>
+			</div>
+			<div class="userbar_totalposts" style="display:none">
+				<xsl:text>Сообщений: </xsl:text>
+				<xsl:value-of select="totalPosts"/>
+			</div>
 			<xsl:if test="location!=''">
-				<tr>
-					<td class="small">
-						<xsl:text>Из: </xsl:text>
-						<xsl:value-of select="location"/>
-					</td>
-				</tr>
+				<div class="userbar_location" style="display:none">
+					<xsl:text>Из: </xsl:text>
+					<xsl:value-of select="location"/>
+				</div>
 			</xsl:if>
-		</table>
+		</div>
 	</xsl:template>
 </xsl:stylesheet>
\ No newline at end of file