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

Improved boards display; modern.js implemented

Browse Source
main
Inga 🏳‍🌈 14 years ago
parent 70d1ca4368
commit 936f076f5f
10 changed files with 179 additions and 89 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. 45
      static/css/modern/global.css
  3. 6
      static/css/modern/iefixes.css
  4. 17
      static/css/modern/penartur.css
  5. 15
      static/js/modern.js
  6. 11
      templates/Modern/Board.xslt
  7. 28
      templates/Modern/Boards.xslt
  8. 106
      templates/Modern/elems/BoardInfo.xslt
  9. 8
      templates/Modern/elems/Main.xslt
  10. 4
      templates/Modern/elems/UserInfoBar.xslt

2
Builder/IISMainHandler/build.txt
Unescape View File

@ -1 +1 @@
1562 1597

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

@ -18,9 +18,8 @@ pre
font-size:10px; font-size:10px;
} }
[pseudolink] { [pseudolink], .pseudolink {
cursor:hand; cursor:hand;
text-decoration:underline;
} }
[spoiler] [inner] { [spoiler] [inner] {
display:none; display:none;
@ -121,3 +120,45 @@ BLOCKQUOTE BR {FONT-SIZE:1px}
.header .header { .header .header {
font-size:0.8em; font-size:0.8em;
} }
ul.categoriescontainer {
padding:0px;
}
li.categorycontainer {
display:inline-block;
vertical-align:top;
margin:5pt;
}
.categorycontainer_title {
display:inline;
font-size:1.2em;
margin:0px;
margin-left:1em;
padding:0.3em;
}
ul.boardscontainer {
padding:0px;
}
li.boardcontainer {
display:inline-block;
width:13em;
vertical-align:top;
font-size:1.25em;
margin:5pt;
}
.boardcontainer_name {
font-size:1.2em;
margin:0px;
}
.board_additionalcontainer {
width:0px;
max-width:0px;
height:0px;
max-height:0px;
overflow:visible;
}
.board_additional {
position:absolute;
padding:5pt;
font-size:0.8em;
width:16.25em;
}

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

@ -0,0 +1,6 @@
li.categorycontainer {
display:inline;
}
li.boardcontainer {
display:inline;
}

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

@ -1,5 +1,5 @@
A:link {text-decoration:none;color:#aaaaaa} A:link, a[pseudolink], a.pseudolink {text-decoration:none;color:#aaaaaa}
A:visited{text-decoration:none;color:#666666} A:visited{text-decoration:none;color:#666666}
A:active{text-decoration:none;color:#999999} A:active{text-decoration:none;color:#999999}
A:hover{COLOR:white;text-decoration:none} A:hover{COLOR:white;text-decoration:none}
@ -25,6 +25,21 @@ blockquote {
.userbar_additional { .userbar_additional {
background-color:#202020; background-color:#202020;
} }
.categorycontainer_title {
background-color:#101010;
}
.boardscontainer {
background-color:#101010;
}
.boardcontainer {
background-color:#202020;
}
.boardcontainer.updated {
background-color:#208020;
}
.board_additional {
background-color:#302010;
}
.tablesurround{BACKGROUND:#191919;margin-top:-0.1em;margin-bottom:-0.1em} .tablesurround{BACKGROUND:#191919;margin-top:-0.1em;margin-bottom:-0.1em}
.tableborders{BACKGROUND:#191919} .tableborders{BACKGROUND:#191919}

15
static/js/modern.js
Unescape View File

@ -0,0 +1,15 @@
function showChildren(elem) {
for(var i=0; i<elem.childNodes.length; i++) {
if(elem.childNodes[i].nodeName == "DIV") {
elem.childNodes[i].style.display="block";
}
}
}
function hideChildren(elem) {
for(var i=0; i<elem.childNodes.length; i++) {
if(elem.childNodes[i].nodeName == "DIV" && elem.childNodes[i].getAttribute("default") != "default") {
elem.childNodes[i].style.display="none";
}
}
}

11
templates/Modern/Board.xslt
Unescape View File

@ -10,16 +10,9 @@
<xsl:template name="isRssEnabled">true</xsl:template> <xsl:template name="isRssEnabled">true</xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<xsl:if test="boards/board"> <xsl:if test="boards/board">
<table width="95%" align="center" class="tableborders" border="1"> <ul class="boardscontainer">
<tr>
<td class="tdheader" colspan="2" width="61%">Ïîäðàçäåëû</td>
<td class="tdheader" align="center" width="7%">Òåìû</td>
<td class="tdheader" align="center" width="7%">Ñîîáùåíèé</td>
<td class="tdheader" align="center" width="15%">Ïîñëåäíåå</td>
<td class="tdheader" align="center" width="10%">Ìîäåðàòîð</td>
</tr>
<xsl:apply-templates select="boards/board"/> <xsl:apply-templates select="boards/board"/>
</table> </ul>
<br/> <br/>
</xsl:if> </xsl:if>
<table width="95%" align="center" class="tablesurround"> <table width="95%" align="center" class="tablesurround">

28
templates/Modern/Boards.xslt
Unescape View File

@ -5,13 +5,9 @@
<xsl:template name="specificTitle">Đŕçäĺëű</xsl:template> <xsl:template name="specificTitle">Đŕçäĺëű</xsl:template>
<xsl:template name="isLiteEnabled">true</xsl:template> <xsl:template name="isLiteEnabled">true</xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<table width="95%" align="center" class="tablesurround" cellspacing="1" cellpadding="1"> <ul class="categoriescontainer">
<tr>
<td>
<xsl:apply-templates select="categories/category"/> <xsl:apply-templates select="categories/category"/>
</td> </ul>
</tr>
</table>
<br /> <br />
<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1"> <table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
<tr> <tr>
@ -95,16 +91,16 @@
</xsl:template> </xsl:template>
<xsl:template match="category"> <xsl:template match="category">
<table width="100%" align="center" class="tableborders" cellpadding="3" cellspacing="1"> <li class="categorycontainer">
<tr> <h2 class="categorycontainer_title"><xsl:value-of select="name"/></h2>
<td class="tdheader" colspan="2" width="61%"><xsl:value-of select="name"/></td> <ul class="boardscontainer">
<td class="tdheader" align="center" width="7%">Òåìû</td> <xsl:apply-templates select="boards/board">
<td class="tdheader" align="center" width="7%">Ñîîáùåíèé</td> <xsl:with-param name="maxPerLine">
<td class="tdheader" align="center" width="15%">Ïîñëåäíåå</td> <xsl:value-of select="ceiling(count(boards/board) div 2)"/>
<td class="tdheader" align="center" width="10%">Ìîäåðàòîð</td> </xsl:with-param>
</tr> </xsl:apply-templates>
<xsl:apply-templates select="boards/board"/> </ul>
</table> </li>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

106
templates/Modern/elems/BoardInfo.xslt
Unescape View File

@ -2,73 +2,93 @@
<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:template match="board"> <xsl:template match="board">
<tr> <xsl:param name="maxPerLine">100</xsl:param>
<td width="4%" class="darktable" align="center" valign="middle"> <xsl:if test="((position() mod $maxPerLine) = 1) and (position() != 1)">
<a> <br/>
<xsl:attribute name="onClick">if(!confirm('Ïîìåòèòü âñå ñîîáùåíèÿ êàê ïðî÷èòàííûå?')) {event.returnValue=false; return false;} else { alert("Not implemented yet"); }</xsl:attribute> </xsl:if>
<xsl:choose> <li>
<xsl:when test="(hasNewPosts='true') and not(lastPostInfo/post/poster/user/id = /root/session/user/id)"> <xsl:attribute name="class">
<img border="0" width="17" height="21" src="/static/images/newposts.gif" alt=""/> <xsl:text>boardcontainer</xsl:text>
</xsl:when> <xsl:if test="(hasNewPosts='true') and not(lastPostInfo/post/poster/user/id = /root/session/user/id)">
<xsl:otherwise> <xsl:text> updated</xsl:text>
<img border="0" width="17" height="21" src="/static/images/nonewposts.gif" alt=""/> </xsl:if>
</xsl:otherwise> </xsl:attribute>
</xsl:choose>
</a>
</td>
<td width="57%" class="darktable">
<font class="forumtitle">
<a> <a>
<xsl:attribute name="href">/Board/<xsl:value-of select="id"/>/</xsl:attribute> <xsl:attribute name="href">/Forum/Board/<xsl:value-of select="id"/>/Threads/</xsl:attribute>
<h3 class="boardcontainer_name">
<xsl:value-of select="name"/> <xsl:value-of select="name"/>
</a> </h3>
</font>
<br />
<xsl:if test="(description != '') or (subBoards/board)">
<table cellpadding="0" cellspacing="0">
<xsl:if test="description != ''"> <xsl:if test="description != ''">
<tr> <p class="boardcontainer_description">
<td class="forumdescript"><xsl:value-of select="description"/></td> <xsl:attribute name="href">/Forum/Board/<xsl:value-of select="id"/>/Threads/</xsl:attribute>
</tr> <xsl:value-of select="description"/>
</p>
</xsl:if> </xsl:if>
</a>
<p>Òåì: <xsl:value-of select="totalThreads"/></p>
<p>Ñîîáùåíèé: <xsl:value-of select="totalPosts"/></p>
<xsl:if test="subBoards/board"> <xsl:if test="subBoards/board">
<tr> <div style="float:left">
<td class="forumdescript" style="padding-top:0.3em"> <xsl:attribute name="onMouseOver">showChildren(this);</xsl:attribute>
<xsl:attribute name="onMouseOut">hideChildren(this);</xsl:attribute>
<div default="default">
<a class="pseudolink">Ïîäðàçäåëû</a>
</div>
<div class="board_additionalcontainer" style="display:none">
<div class="board_additional">
<p>
<xsl:apply-templates select="subBoards/board"/> <xsl:apply-templates select="subBoards/board"/>
</td> </p>
</tr> </div>
</xsl:if> </div>
</table> </div>
</xsl:if> </xsl:if>
</td> <div style="float:right;">
<td width="7%" align="center" class="threadtotal" nowrap="nowrap"><xsl:value-of select="totalThreads"/></td> <xsl:attribute name="onMouseOver">showChildren(this);</xsl:attribute>
<td width="7%" align="center" class="posttotal" nowrap="nowrap"><xsl:value-of select="totalPosts"/></td> <xsl:attribute name="onMouseOut">hideChildren(this);</xsl:attribute>
<td width="15%" nowrap="nowrap" class="posttime"> <div default="default">
<a class="pseudolink">Èíôîðìàöèÿ</a>
</div>
<div class="board_additionalcontainer" style="display:none;">
<div class="board_additional">
<xsl:apply-templates select="lastPostInfo"/> <xsl:apply-templates select="lastPostInfo"/>
</td> <p>
<td width="10%" class="modcolumn" align="center"> <xsl:text>Ìîäåðàòîðû:</xsl:text>
<br/>
<xsl:apply-templates select="administrator/user | moderators/user" mode="userLink"/> <xsl:apply-templates select="administrator/user | moderators/user" mode="userLink"/>
</td> </p>
</tr> </div>
</div>
</div>
</li>
</xsl:template> </xsl:template>
<xsl:template match="lastPostInfo"> <xsl:template match="lastPostInfo">
<xsl:if test="post"> <xsl:if test="post">
<xsl:apply-templates select="post/postDate/date" mode="dateTime"/><br /> <p>
<xsl:text>Ïîñëåäíåå ñîîáùåíèå:</xsl:text>
<br/>
<a> <a>
<xsl:attribute name="href">/Thread/<xsl:value-of select="post/threadId"/>/p<xsl:value-of select="post/id"/>/</xsl:attribute> <xsl:attribute name="href">/Thread/<xsl:value-of select="post/threadId"/>/p<xsl:value-of select="post/id"/>/</xsl:attribute>
<xsl:text>îò </xsl:text> <xsl:apply-templates select="post/postDate/date" mode="dateTime"/>
<xsl:text> îò </xsl:text>
<xsl:value-of select="post/poster/user/name"/> <xsl:value-of select="post/poster/user/name"/>
</a> </a>
</p>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template match="subBoards/board"> <xsl:template match="subBoards/board">
<xsl:text> [</xsl:text> <xsl:if test="position() &gt; 1">
<hr/>
</xsl:if>
<a> <a>
<xsl:attribute name="href">/Board/<xsl:value-of select="id"/>/</xsl:attribute> <xsl:attribute name="href">/Board/<xsl:value-of select="id"/>/</xsl:attribute>
<xsl:value-of select="name"/> <xsl:value-of select="name"/>
<xsl:if test="description != ''">
<br/>
<xsl:value-of select="description"/>
</xsl:if>
</a> </a>
<xsl:text>]</xsl:text>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

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

@ -5,12 +5,16 @@
<xsl:template match="/root"> <xsl:template match="/root">
<html> <html>
<head> <head>
<link rel="stylesheet" href="/static/css/modern/global.css?v1" type="text/css" /> <link rel="stylesheet" href="/static/css/modern/global.css?v3" type="text/css" />
<xsl:comment>[if lte IE 7]&gt;<![CDATA[
<link rel="stylesheet" href="/static/css/modern/iefixes.css?v3" type="text/css" />
]]>&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?v1</xsl:attribute> <xsl:attribute name="href">/static/css/modern/penartur.css?v3</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>
<script language="Javascript" type="text/javascript" src="/static/js/modern.js"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/machichara/complex.js?v1"><xsl:text> </xsl:text></script> <script language="Javascript" type="text/javascript" src="/static/js/machichara/complex.js?v1"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v1"><xsl:text> </xsl:text></script> <script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v1"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v1"> <script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v1">

4
templates/Modern/elems/UserInfoBar.xslt
Unescape View File

@ -3,8 +3,8 @@
<xsl:template match="user" mode="userInfoBar"> <xsl:template match="user" mode="userInfoBar">
<div class="userbar"> <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="onMouseOver">showChildren(this);</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> <xsl:attribute name="onMouseOut">hideChildren(this);</xsl:attribute>
<div class="userbar_avatar" default="default"> <div class="userbar_avatar" default="default">
<a> <a>
<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute> <xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>

Write Preview
Loading…
Cancel
Save