From b84035351bf076779a1aee17654829b32915a93e Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 26 Sep 2010 13:07:05 +0000
Subject: [PATCH] New uploads interface in Modern design

---
 templates/Modern/UploadInfo.xslt       | 12 ++----
 templates/Modern/UploadList.xslt       | 44 ++++++----------------
 templates/Modern/elems/UploadInfo.xslt | 51 ++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/templates/Modern/UploadInfo.xslt b/templates/Modern/UploadInfo.xslt
index dcaebe7..6f5df76 100644
--- a/templates/Modern/UploadInfo.xslt
+++ b/templates/Modern/UploadInfo.xslt
@@ -4,15 +4,9 @@
 	<xsl:import href="elems\UploadInfo.xslt"/>
 	<xsl:template name="specificTitle">Аплоад</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">
-						<xsl:apply-templates select="upload"/>
-					</table>
-				</td>
-			</tr>
-		</table>
+		<div id="uploadsContainer">
+			<xsl:apply-templates select="upload"/>
+		</div>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/UploadList.xslt b/templates/Modern/UploadList.xslt
index 24ebb93..2fd44da 100644
--- a/templates/Modern/UploadList.xslt
+++ b/templates/Modern/UploadList.xslt
@@ -6,39 +6,17 @@
 	<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">
-		<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="uploads/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-						<xsl:apply-templates select="uploads/upload"/>
-						<tr class="tdheader">
-							<td>
-								<table width="100%" cellspacing="1" cellpadding="3" border="0">
-									<tr>
-										<td>
-											<xsl:text>страницы:</xsl:text>
-											<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
+		</div>
+		<div id="uploadsContainer">
+			<xsl:apply-templates select="uploads/upload"/>
+		</div>
+		<div>
+			<xsl:text>страницы:</xsl:text>
+			<xsl:apply-templates select="uploads/pageOuter" mode="withCurrent"/>
+		</div>
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/Modern/elems/UploadInfo.xslt b/templates/Modern/elems/UploadInfo.xslt
index 6f1aaea..a63f32d 100644
--- a/templates/Modern/elems/UploadInfo.xslt
+++ b/templates/Modern/elems/UploadInfo.xslt
@@ -3,6 +3,56 @@
 
 	<xsl:import href="UserInfoBar.xslt"/>
 	<xsl:template match="upload">
+		<div class="uploadcontainer" style="clear:both">
+			<a><xsl:attribute name="name">Upload<xsl:value-of select="id"/></xsl:attribute></a>
+			<div class="userbarcontainer" style="float:left">
+				<xsl:apply-templates select="uploader/user" mode="userInfoBar"/>
+			</div>
+			<div class="linkscontainer" style="float:right;text-align:right;">
+				<xsl:comment>fill</xsl:comment>
+			</div>
+			<div class="uploadcontent">
+				<xsl:variable name="uploadDate"><xsl:apply-templates select="uploadDate/date" mode="dateTime"/></xsl:variable>
+				<a target="_blank" class="separate">
+					<xsl:attribute name="href">/Upload/Info/<xsl:value-of select="id"/>/</xsl:attribute>
+					<xsl:attribute name="title"><xsl:value-of select="$uploadDate"/></xsl:attribute>
+					<img border="0" alt="" style="vertical-align: text-bottom" width="16" height="16">
+						<xsl:attribute name="src">/static/images/woocons/Pictures.png</xsl:attribute>
+					</img>
+				</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"/>
+					<xsl:text>)</xsl:text>
+				</font>
+				<div class="uploadbody">
+					<img style="max-width:800px;max-height:600px;">
+						<xsl:attribute name="src">/Upload/Item/<xsl:value-of select="id"/>/</xsl:attribute>
+					</img>
+					<br/>
+					<br/>
+					<xsl:text>Для вставки ссылки в форум используйте тэг [uploadLink]</xsl:text>
+					<xsl:value-of select="id"/>
+					<xsl:text>[/uploadLink]</xsl:text>
+					<br/>
+					<xsl:text>Для вставки изображения в форум используйте тэг [uploadImage]</xsl:text>
+					<xsl:value-of select="id"/>
+					<xsl:text>[/uploadImage]</xsl:text>
+				</div>
+				<xsl:if test="uploader/user/signature != ''">
+					<div class="signature" style="float:right;">
+						<xsl:value-of select="uploader/user/signature" disable-output-escaping="yes" />
+					</div>
+				</xsl:if>
+			</div>
+			<div style="clear:both;" class="zerosize">
+				<xsl:comment>fill</xsl:comment>
+			</div>
+		</div>
+<!--
 		<tr>
 			<td>
 				<table width="100%" cellspacing="1" cellpadding="3" border="0">
@@ -59,6 +109,7 @@
 				</table>
 			</td>
 		</tr>
+-->
 	</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file