Userbar improved

Builder/IISMainHandler/build.txt

@@ -1 +1 @@
-1530
+1538

static/css/modern/global.css

@@ -30,28 +30,32 @@ pre
 	background-color:red;
 }
 .userbar_name {
-	font-size:2em;
+	font-size:1.7em;
 }
 .userbar_title {
 	font-weight:bold;
 }
-.userbar_avatar {
+.avatar, .userbar_avatar {
-	text-align:right;
-}
-.avatar {
 	border:none;
-	max-height:8em;
+	max-height:6em;
-	height:expression((this.scrollHeight >= 120) ? '120px' : 'auto');
+	height:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
-	max-width:8em;
+	max-width:6em;
-	width:expression((this.scrollHeight >= 120) ? '120px' : 'auto');
+	width:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
 }
 .userbarcontainer {
 	border:none;
-	width:8em;
+	width:6em;
-	min-width:8em;
+	min-width:6em;
-	max-width:8em;
+	max-width:6em;
+	width:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
 	overflow:visible;
 }
+.userbar_additional {
+	position:absolute;
+	white-space:nowrap;
+	padding:5pt;
+	font-size:1.2em;
+}
 .UG_Blondes {
 	color:red !important;
 	background-color:yellow !important;

static/css/modern/penartur.css

@@ -20,6 +20,6 @@ PRE{background-color:#303030;font-size:0.9em;font-family:"Consolas";BORDER:#9999
 blockquote {
 	border-color:white;
 }
-.userbarcontainer {
+.userbar_additional {
-	background-color:#222200;
+	background-color:#181818;
 }

templates/Modern/elems/UserInfoBar.xslt

@@ -2,45 +2,48 @@
 <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">
-		<div class="user">
+		<div class="userbar">
 			<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">
 			<div class="userbar_avatar" default="default">
 				<a>
 					<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>
+					<xsl:choose>
+						<xsl:when test="avatar">
 							<img alt="" class="avatar">
 								<xsl:attribute name="src">/Upload/Item/<xsl:value-of select="avatar"/>/</xsl:attribute>
 							</img>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="current()" mode="userLink"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</a>
 			</div>
+			<div class="userbar_additional" style="display:none">
+				<xsl:if test="avatar">
+					<div class="userbar_name">
+						<xsl:apply-templates select="current()" mode="userLink"/>
+					</div>
 				</xsl:if>
-			<div class="userbar_regdate" style="display:none">
+				<div class="userbar_title">
+					<xsl:value-of select="title"/>
+				</div>
+				<div class="userbar_regdate">
 					<xsl:text>Ðåã.: </xsl:text>
 					<xsl:apply-templates select="regDate/date" mode="date"/>
 				</div>
-			<div class="userbar_totalposts" style="display:none">
+				<div class="userbar_totalposts">
 					<xsl:text>Ñîîáùåíèé: </xsl:text>
 					<xsl:value-of select="totalPosts"/>
 				</div>
 				<xsl:if test="location!=''">
-				<div class="userbar_location" style="display:none">
+					<div class="userbar_location">
 						<xsl:text>Èç: </xsl:text>
 						<xsl:value-of select="location"/>
 					</div>
 				</xsl:if>
 			</div>
+		</div>
 	</xsl:template>
 </xsl:stylesheet>