inga-lovinde
/
FLocal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New threads display in Modern design

Browse Source
main
Inga 🏳‍🌈 14 years ago
parent b1a015411b
commit 96b9a0116f
10 changed files with 191 additions and 115 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Builder/IISMainHandler/build.txt
  2. 53
      static/css/modern/global.css
  3. 20
      static/css/modern/iefixes.css
  4. 10
      static/css/modern/penartur.css
  5. 37
      templates/Modern/AllThreads.xslt
  6. 42
      templates/Modern/Board.xslt
  7. 35
      templates/Modern/UserThreads.xslt
  8. 6
      templates/Modern/elems/Main.xslt
  9. 2
      templates/Modern/elems/PostInfo.xslt
  10. 97
      templates/Modern/elems/ThreadInfo.xslt

2
Builder/IISMainHandler/build.txt
Unescape View File

@ -1 +1 @@
1633 1656

53
static/css/modern/global.css
Unescape View File

@ -1,5 +1,12 @@
body { font-size:11pt; } body { font-size:11pt; }
.signature {
max-height:3.5em;
overflow:hidden;
text-align:right;
font-size:0.8em;
}
.zerosize { width:0px;height:0px;max-width:0px;max-height:0px; } .zerosize { width:0px;height:0px;max-width:0px;max-height:0px; }
pre pre
@ -39,15 +46,12 @@ pre
.avatar, .userbar_avatar { .avatar, .userbar_avatar {
border:none; border:none;
max-height:6em; max-height:6em;
height:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
max-width:6em; max-width:6em;
width:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
overflow:hidden; overflow:hidden;
} }
.userbarcontainer { .userbarcontainer {
border:none; border:none;
max-width:6em; max-width:6em;
width:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
margin:5pt; margin:5pt;
} }
.userbar_additionalcontainer { .userbar_additionalcontainer {
@ -62,6 +66,7 @@ pre
white-space:nowrap; white-space:nowrap;
padding:5pt; padding:5pt;
font-size:1.2em; font-size:1.2em;
z-index:10;
} }
.UG_Blondes { .UG_Blondes {
color:red !important; color:red !important;
@ -166,6 +171,7 @@ BLOCKQUOTE BR {FONT-SIZE:1px}
padding:5pt; padding:5pt;
font-size:0.8em; font-size:0.8em;
width:16.25em; width:16.25em;
z-index:10;
} }
a.external { a.external {
padding-right:13px; padding-right:13px;
@ -173,3 +179,44 @@ a.external {
background-repeat:no-repeat; background-repeat:no-repeat;
background-position:right center; background-position:right center;
} }
.threadscontainer {
vertical-align:top;
}
.threadcontainer {
vertical-align:top;
display:inline-block;
width:17em;
height:4em;
font-size:1em;
margin:5pt;
position:relative;
}
.threadcontainer .avatar, .threadcontainer .userbar_avatar {
max-height:3em;
max-width:4em;
}
.threadcontainer .userbarcontainer {
max-width:4em;
}
.threadcontainer .userbar_additional {
font-size:1em;
}
.threadcontainer_title {
font-size:1.1em;
font-weight:normal;
margin:0px;
height:3.5em;
overflow:hidden;
}
.threadcontainer_additionalcontainer {
height:0px;
max-height:0px;
overflow:visible;
position:relative;
}
.threadcontainer_additional {
position:absolute;
padding:5pt;
width:15em;
z-index:10;
}

20
static/css/modern/iefixes.css
Unescape View File

@ -1,3 +1,13 @@
.signature {
height: expression( this.scrollHeight > 49 ? '50px' : 'auto' );
}
.avatar, .userbar_avatar {
height:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
width:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
}
.userbarcontainer {
width:expression((this.scrollHeight >= 90) ? '90px' : 'auto');
}
.categorycontainer { .categorycontainer {
display:inline; display:inline;
} }
@ -8,3 +18,13 @@
width:0px; width:0px;
max-width:0px; max-width:0px;
} }
.threadcontainer {
display:inline;
}
.threadcontainer .avatar, .threadcontainer .userbar_avatar {
height:expression((this.scrollHeight >= 45) ? '45px' : 'auto');
width:expression((this.scrollHeight >= 60) ? '60px' : 'auto');
}
.threadcontainer .userbarcontainer {
width:expression((this.scrollHeight >= 60) ? '60px' : 'auto');
}

10
static/css/modern/penartur.css
Unescape View File

@ -30,19 +30,19 @@ blockquote {
.boardscontainer { .boardscontainer {
background-color:#101010; background-color:#101010;
} }
.boardcontainer { .boardcontainer, .threadcontainer {
background-color:#202020; background-color:#202020;
} }
.boardcontainer:hover { .boardcontainer:hover, .threadcontainer:hover {
background-color:#303030; background-color:#303030;
} }
.boardcontainer.updated { .boardcontainer.updated, .threadcontainer.updated {
background-color:#502800; background-color:#502800;
} }
.boardcontainer.updated:hover { .boardcontainer.updated:hover, .threadcontainer.updated:hover {
background-color:#684000; background-color:#684000;
} }
.board_additional { .board_additional, .threadcontainer_additional {
background-color:#302010; background-color:#302010;
} }

37
templates/Modern/AllThreads.xslt
Unescape View File

@ -7,32 +7,17 @@
</xsl:template> </xsl:template>
<xsl:template name="isRssEnabled">true</xsl:template> <xsl:template name="isRssEnabled">true</xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<table width="95%" align="center" class="tablesurround"> <div>
<tr> <xsl:text>ñòðàíèöû:</xsl:text>
<td> <xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders"> </div>
<tr> <div id="threadsContainer">
<td align="left" width="55%" class="tdheader">Òåìà</td> <xsl:apply-templates select="threads/thread[not(isAnnouncement='true')]"/>
<td align="left" nowrap="nowrap" width="15%" class="tdheader">Àâòîð</td> </div>
<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïðîñìîòðîâ</td> <div>
<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïîñòîâ</td> <xsl:text>ñòðàíèöû:</xsl:text>
<td nowrap="nowrap" width="20%" class="tdheader" align="center">Ïîñëåäíåå</td> <xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
</tr> </div>
<!-- BEGIN POST LOOP DO NOT DELETE -->
<xsl:apply-templates select="threads/thread"/>
<!-- END OF LOOP -->
<tr class="tdheader">
<td colspan="5">
<font class="onbody">
<xsl:text>ñòðàíèöû:</xsl:text>
<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
</font>
</td>
</tr>
</table>
</td>
</tr>
</table>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

42
templates/Modern/Board.xslt
Unescape View File

@ -13,34 +13,22 @@
<div class="boardscontainer"> <div class="boardscontainer">
<xsl:apply-templates select="boards/board"/> <xsl:apply-templates select="boards/board"/>
</div> </div>
<hr/>
</xsl:if> </xsl:if>
<table width="95%" align="center" class="tablesurround"> <div>
<tr> <xsl:text>ñòðàíèöû:</xsl:text>
<td> <xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders"> </div>
<tr> <div id="threadsContainer">
<td align="left" width="55%" class="tdheader">Òåìà</td> <xsl:if test="threads/thread[isAnnouncement='true']">
<td align="left" nowrap="nowrap" width="15%" class="tdheader">Àâòîð</td> <xsl:apply-templates select="threads/thread[isAnnouncement='true']"/>
<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïðîñìîòðîâ</td> <br/>
<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïîñòîâ</td> </xsl:if>
<td nowrap="nowrap" width="20%" class="tdheader" align="center">Ïîñëåäíåå</td> <xsl:apply-templates select="threads/thread[not(isAnnouncement='true')]"/>
</tr> </div>
<!-- BEGIN POST LOOP DO NOT DELETE --> <div>
<xsl:apply-templates select="threads/thread"/> <xsl:text>ñòðàíèöû:</xsl:text>
<!-- END OF LOOP --> <xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
<tr class="tdheader"> </div>
<td colspan="5">
<font class="onbody">
<xsl:text>ñòðàíèöû:</xsl:text>
<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
</font>
</td>
</tr>
</table>
</td>
</tr>
</table>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

35
templates/Modern/UserThreads.xslt
Unescape View File

@ -8,30 +8,17 @@
</xsl:template> </xsl:template>
<xsl:template name="isRssEnabled">true</xsl:template> <xsl:template name="isRssEnabled">true</xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<table width="95%" align="center" class="tablesurround"> <div>
<tr> <xsl:text>ñòðàíèöû:</xsl:text>
<td> <xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders"> </div>
<tr> <div id="threadsContainer">
<td align="left" width="55%" class="tdheader">Òåìà</td> <xsl:apply-templates select="threads/thread[not(isAnnouncement='true')]"/>
<td align="left" nowrap="nowrap" width="15%" class="tdheader">Àâòîð</td> </div>
<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïðîñìîòðîâ</td> <div>
<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïîñòîâ</td> <xsl:text>ñòðàíèöû:</xsl:text>
<td nowrap="nowrap" width="20%" class="tdheader" align="center">Ïîñëåäíåå</td> <xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
</tr> </div>
<xsl:apply-templates select="threads/thread"/>
<tr class="tdheader">
<td colspan="5">
<font class="onbody">
<xsl:text>ñòðàíèöû:</xsl:text>
<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
</font>
</td>
</tr>
</table>
</td>
</tr>
</table>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

6
templates/Modern/elems/Main.xslt
Unescape View File

@ -7,12 +7,12 @@
<html> <html>
<head> <head>
<meta http-equiv="x-ua-compatible" content="IE=8"/> <meta http-equiv="x-ua-compatible" content="IE=8"/>
<link rel="stylesheet" href="/static/css/modern/global.css?v3.3" type="text/css" /> <link rel="stylesheet" href="/static/css/modern/global.css?v3.4" type="text/css" />
<xsl:comment>[if lte IE 7]&gt;<![CDATA[ <xsl:comment>[if lte IE 7]&gt;<![CDATA[
<link rel="stylesheet" href="/static/css/modern/iefixes.css?v3.3" type="text/css" /> <link rel="stylesheet" href="/static/css/modern/iefixes.css?v3.4" type="text/css" />
]]>&lt;![endif]</xsl:comment> ]]>&lt;![endif]</xsl:comment>
<link rel="stylesheet" type="text/css" skin="skin"> <link rel="stylesheet" type="text/css" skin="skin">
<xsl:attribute name="href">/static/css/modern/penartur.css?v3.3</xsl:attribute> <xsl:attribute name="href">/static/css/modern/penartur.css?v3.4</xsl:attribute>
</link> </link>
<link rel="shortcut icon" href="/static/favicons/smirk.ico" type="image/x-icon" /> <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> <script language="Javascript" type="text/javascript" src="/static/js/common.js"><xsl:text> </xsl:text></script>

2
templates/Modern/elems/PostInfo.xslt
Unescape View File

@ -109,7 +109,7 @@
</div> </div>
<div style=""> <div style="">
<xsl:if test="poster/user/signature != ''"> <xsl:if test="poster/user/signature != ''">
<div style="float:right;max-height:3.5em;height: expression( this.scrollHeight > 49 ? '50px' : 'auto' );overflow:hidden;text-align:right;font-size:0.8em;"> <div class="signature" style="float:right;">
<xsl:value-of select="poster/user/signature" disable-output-escaping="yes" /> <xsl:value-of select="poster/user/signature" disable-output-escaping="yes" />
</div> </div>
</xsl:if> </xsl:if>

97
templates/Modern/elems/ThreadInfo.xslt
Unescape View File

@ -1,37 +1,32 @@
<?xml version="1.0" encoding="Windows-1251"?> <?xml version="1.0" encoding="Windows-1251"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
<xsl:import href="UserInfoBar.xslt"/>
<xsl:template match="thread"> <xsl:template match="thread">
<tr> <div>
<xsl:choose> <xsl:attribute name="class">
<xsl:when test="position() mod 2 = 0"> <xsl:text>threadcontainer</xsl:text>
<xsl:attribute name="class">lighttable</xsl:attribute> <xsl:if test="totalNewPosts and totalNewPosts!='0'">
</xsl:when> <xsl:text> updated</xsl:text>
<xsl:otherwise> </xsl:if>
<xsl:attribute name="class">darktable</xsl:attribute> </xsl:attribute>
</xsl:otherwise> <div class="userbarcontainer" style="float:left">
</xsl:choose> <xsl:apply-templates select="firstPost/post/poster/user" mode="userInfoBar"/>
<td align="left"> </div>
<xsl:attribute name="title"><xsl:value-of select="firstPost/post/bodyShort"/></xsl:attribute> <div class="threadicons" style="float:right">
<xsl:if test="isAnnouncement='true'"> <xsl:if test="isAnnouncement='true'">
<img src="/static/images/sticky.gif" width="16" height="16" alt="" border="0" style="vertical-align: text-bottom;" />
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<img src="/static/images/sticky.gif" width="16" height="16" alt="" border="0" style="vertical-align: text-bottom;" />
</xsl:if> </xsl:if>
<xsl:if test="isLocked='true'"> <xsl:if test="isLocked='true'">
<img src="/static/images/lock.gif" width="16" height="16" alt="" border="0" style="vertical-align:text-bottom"/>
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<img src="/static/images/lock.gif" width="16" height="16" alt="" border="0" style="vertical-align:text-bottom"/>
</xsl:if> </xsl:if>
<img alt="*" hspace="5" style="vertical-align: text-bottom"> <xsl:comment>fill</xsl:comment>
<xsl:choose> </div>
<xsl:when test="totalNewPosts and totalNewPosts!='0'"> <h4 class="threadcontainer_title">
<xsl:attribute name="src">/static/images/message-<xsl:value-of select="firstPost/post/layerName"/>-notread.gif</xsl:attribute> <xsl:attribute name="title"><xsl:value-of select="firstPost/post/bodyShort"/></xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="src">/static/images/message-<xsl:value-of select="firstPost/post/layerName"/>-read.gif</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</img>
<xsl:text> </xsl:text>
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:text>/Thread/</xsl:text> <xsl:text>/Thread/</xsl:text>
@ -44,6 +39,59 @@
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="title"/> <xsl:value-of select="title"/>
</a> </a>
</h4>
<div style="position:absolute;right:0px;bottom:0px;background-color:inherit;padding:3pt 0pt 0pt 3pt;">
<xsl:attribute name="onmouseover">showChildren(this);</xsl:attribute>
<xsl:attribute name="onmouseout">hideChildren(this);</xsl:attribute>
<div default="default" style="z-index:1;">
<a class="pseudolink">Èíôîðìàöèÿ</a>
</div>
<div class="threadcontainer_additionalcontainer" style="display:none;">
<div class="threadcontainer_additional" style="right:0px;">
<p>
<xsl:text>Ñîîáùåíèé: </xsl:text>
<xsl:value-of select="totalPosts"/>
<xsl:if test="totalNewPosts and totalNewPosts!='0'">
<a>
<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>
</p>
<p>
<xsl:text>Ïîñëåäíåå: </xsl:text>
<xsl:apply-templates select="lastPostDate/date" mode="dateTime"/>
</p>
<p>
<xsl:text>Ïðîñìîòðîâ: </xsl:text>
<xsl:value-of select="totalViews"/>
</p>
<xsl:if test="pageOuter/isEmpty='false'">
<p>
<xsl:text>Ñòðàíèöû: </xsl:text>
<xsl:apply-templates select="pageOuter" mode="withoutCurrent">
<xsl:with-param name="baseLink">/Thread/<xsl:value-of select="id"/>/</xsl:with-param>
</xsl:apply-templates>
</p>
</xsl:if>
</div>
</div>
</div>
</div>
<!--
<img alt="*" hspace="5" style="vertical-align: text-bottom">
<xsl:choose>
<xsl:when test="totalNewPosts and totalNewPosts!='0'">
<xsl:attribute name="src">/static/images/message-<xsl:value-of select="firstPost/post/layerName"/>-notread.gif</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="src">/static/images/message-<xsl:value-of select="firstPost/post/layerName"/>-read.gif</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</img>
<xsl:text> </xsl:text>
<xsl:if test="pageOuter/isEmpty='false'"> <xsl:if test="pageOuter/isEmpty='false'">
<span class="small" style="margin-left:1.5em"> <span class="small" style="margin-left:1.5em">
<xsl:apply-templates select="pageOuter" mode="withoutCurrent"> <xsl:apply-templates select="pageOuter" mode="withoutCurrent">
@ -73,6 +121,7 @@
<xsl:apply-templates select="lastPostDate/date" mode="dateTime"/> <xsl:apply-templates select="lastPostDate/date" mode="dateTime"/>
</td> </td>
</tr> </tr>
-->
</xsl:template> </xsl:template>

Write Preview
Loading…
Cancel
Save