Metro icons in modern interface

Builder/IISMainHandler/build.txt

@@ -1 +1 @@
-2021
+2024

Resources/FLocal/static/css/modern/blue.css

@@ -41,7 +41,7 @@ pre {
 .pmcontainer.unread {
 	background-color:#bbcddf;
 }
-blockquote {
+blockquote .quotecontent {
 	border:solid 1px #9f9f9f;
 	background-color:#cfcfcf;
 }
@@ -100,3 +100,20 @@ blockquote {
 .UG_Administrators {
 	color:black !important;
 }
+
+.metroicon-add {
+	background-image:url(/static/images/metro.icons/black/add.png);
+}
+.metroicon-cancel {
+	background-image:url(/static/images/metro.icons/black/cancel.png);
+}
+.metroicon-edit {
+	background-image:url(/static/images/metro.icons/black/edit.png);
+}
+.metroicon-mail {
+	background-image:url(/static/images/metro.icons/black/mail.png);
+}
+.metroicon-settings {
+	background-image:url(/static/images/metro.icons/black/settings.png);
+}
+

Resources/FLocal/static/css/modern/global.css

@@ -128,7 +128,7 @@ input {
 	padding-bottom:5pt;
 	padding-top:5pt;
 }
-blockquote {
+blockquote .quotecontent {
 	display:block;
 	border:solid 2px;
 	font-size:0.8em;
@@ -255,3 +255,8 @@ a.external {
 	width:15em;
 	z-index:3000;
 }
+
+.metroicon-slowpoke {
+	background-image:url(/static/images/slowpoke-48.png);
+}
+

Resources/FLocal/static/css/modern/high-contrast.css

@@ -30,7 +30,7 @@ PRE{background-color:#303030;border-color:#999999;color:white}
 .pmcontainer.unread {
 	background-color:#200000;
 }
-blockquote {
+blockquote .quotecontent {
 	border:solid 1px #606060;
 	background-color:#303030;
 }
@@ -80,3 +80,20 @@ blockquote {
 	color:black !important;
 	background-color:white !important;
 }
+
+.metroicon-add {
+	background-image:url(/static/images/metro.icons/white/add.png);
+}
+.metroicon-cancel {
+	background-image:url(/static/images/metro.icons/white/cancel.png);
+}
+.metroicon-edit {
+	background-image:url(/static/images/metro.icons/white/edit.png);
+}
+.metroicon-mail {
+	background-image:url(/static/images/metro.icons/white/mail.png);
+}
+.metroicon-settings {
+	background-image:url(/static/images/metro.icons/white/settings.png);
+}
+

Resources/FLocal/static/images/metro.icons/info.txt

@@ -0,0 +1 @@
+http://metro.windowswiki.info/

Resources/FLocal/templates/Modern/elems/Main.xslt

@@ -13,7 +13,7 @@
 					<link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.3" 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.3</xsl:attribute>
+					<xsl:attribute name="href">/static/css/modern/<xsl:value-of select="modernSkin/name"/>.css?v6.4</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>
@@ -132,17 +132,20 @@
 		<xsl:param name="alt"/>
 		<xsl:param name="src"/>
 		<img border="0" style="vertical-align: text-bottom">
-			<xsl:attribute name="src">
+			<xsl:attribute name="class">
-				<xsl:text>/static/images/</xsl:text>
+				<xsl:text>metroicon-</xsl:text>
 				<xsl:choose>
 					<xsl:when test="year = /root/current/date/year">
 						<xsl:value-of select="$src"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:text>slowpoke-32.png</xsl:text>
+						<xsl:text>slowpoke</xsl:text>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
+			<xsl:attribute name="src">
+				<xsl:text>/static/images/metro.icons/placeholder.png</xsl:text>
+			</xsl:attribute>
 			<xsl:attribute name="alt">
 				<xsl:value-of select="$alt"/>
 			</xsl:attribute>

Resources/FLocal/templates/Modern/elems/PMInfo.xslt

@@ -20,7 +20,7 @@
 					<xsl:attribute name="onclick">submitSelText(this.href);return false;</xsl:attribute>
 					<xsl:attribute name="onmousedown">submitSelText(this.href);return false;</xsl:attribute>
 					<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-						<xsl:with-param name="src">woocons/MailReply.png</xsl:with-param>
+						<xsl:with-param name="src">mail</xsl:with-param>
 						<xsl:with-param name="alt">Îòâåò</xsl:with-param>
 					</xsl:apply-templates>
 				</a>

Resources/FLocal/templates/Modern/elems/PostInfo.xslt

@@ -36,7 +36,7 @@
 						</xsl:if>
 					</xsl:if>
 					<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-						<xsl:with-param name="src">woocons/Comment.png</xsl:with-param>
+						<xsl:with-param name="src">add</xsl:with-param>
 						<xsl:with-param name="alt">Îòâåò</xsl:with-param>
 					</xsl:apply-templates>
 				</a>
@@ -48,7 +48,7 @@
 						<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">woocons/Mail.png</xsl:with-param>
+						<xsl:with-param name="src">mail</xsl:with-param>
 						<xsl:with-param name="alt">Îòâåòèòü â ÏÌ</xsl:with-param>
 					</xsl:apply-templates>
 				</a>
@@ -58,7 +58,7 @@
 						<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">woocons/Stop2.png</xsl:with-param>
+								<xsl:with-param name="src">settings</xsl:with-param>
 								<xsl:with-param name="alt">Ìîäåðèðîâàòü</xsl:with-param>
 							</xsl:apply-templates>
 						</a>
@@ -66,7 +66,7 @@
 					<xsl:otherwise>
 						<a>
 							<xsl:apply-templates select="postDate/date" mode="navigationImageFor">
-								<xsl:with-param name="src">woocons/SignWarning.png</xsl:with-param>
+								<xsl:with-param name="src">cancel</xsl:with-param>
 								<xsl:with-param name="alt">Èçâåñòèòü ìîäåðàòîðà</xsl:with-param>
 							</xsl:apply-templates>
 						</a>
@@ -77,7 +77,7 @@
 					<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">woocons/CommentEdit.png</xsl:with-param>
+							<xsl:with-param name="src">edit</xsl:with-param>
 							<xsl:with-param name="alt">Ïðàâêà</xsl:with-param>
 						</xsl:apply-templates>
 					</a>

Resources/FLocal/templates/Modern/elems/ThreadInfo.xslt

@@ -84,7 +84,7 @@
 				<xsl:attribute name="onmouseover">showChildren(this);</xsl:attribute>
 				<xsl:attribute name="onmouseout">hideChildren(this);</xsl:attribute>
 				<div class="pseudolink" default="default" style="z-index:1;">
-					<img src="/static/images/woocons/ButtonWhiteInfo.png" width="16" height="16" alt="info" border="0" style="vertical-align: text-bottom;" />
+					<img src="/static/images/metro.icons/white/i.png" width="16" height="16" alt="info" border="0" style="vertical-align: text-bottom;" />
 				</div>
 				<div class="threadcontainer_additionalcontainer" style="display:none;">
 					<div class="threadcontainer_additional" style="right:-5pt;">