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

Cosmetic improvements

Browse Source
main
Inga 🏳‍🌈 13 years ago
parent 23eeb2140c
commit 08f9957157
12 changed files with 25 additions and 57 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. 3
      Resources/FLocal/templates/Modern/elems/BoardHeader.xslt
  2. 2
      Resources/FLocal/templates/Modern/elems/ConversationsHeader.xslt
  3. 4
      Resources/FLocal/templates/Modern/elems/ForumHeader.xslt
  4. 39
      Resources/FLocal/templates/Modern/elems/Header.xslt
  5. 14
      Resources/FLocal/templates/Modern/elems/Main.xslt
  6. 6
      Resources/FLocal/templates/Modern/elems/MyHeader.xslt
  7. 2
      Resources/FLocal/templates/Modern/elems/PollsHeader.xslt
  8. 1
      Resources/FLocal/templates/Modern/elems/PostInfo.xslt
  9. 1
      Resources/FLocal/templates/Modern/elems/UploadHeader.xslt
  10. 1
      Resources/FLocal/templates/Modern/elems/UploadInfo.xslt
  11. 6
      Resources/FLocal/templates/Modern/elems/UserHeader.xslt
  12. 3
      Resources/FLocal/templates/Modern/elems/UsersHeader.xslt

3
Resources/FLocal/templates/Modern/elems/BoardHeader.xslt
Unescape View File

@ -8,12 +8,10 @@
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Threads/</xsl:with-param>
<xsl:with-param name="text">Òåìû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Headlines/</xsl:with-param>
<xsl:with-param name="text">Çàãîëîâêè</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>NewThread/</xsl:with-param>
<xsl:with-param name="text">Íîâàÿ (?)</xsl:with-param>
@ -22,7 +20,6 @@
</xsl:with-param>
</xsl:call-template>
<xsl:if test="currentLocation//thread">
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Thread/<xsl:value-of select="currentLocation//thread/id"/>-<xsl:value-of select="currentLocation//thread/nameTranslit"/>/</xsl:with-param>
<xsl:with-param name="postfix">

2
Resources/FLocal/templates/Modern/elems/ConversationsHeader.xslt
Unescape View File

@ -7,13 +7,11 @@
<xsl:with-param name="url">/My/Conversations/List/</xsl:with-param>
<xsl:with-param name="text">Ñïèñîê</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/Conversations/NewPM/</xsl:with-param>
<xsl:with-param name="text">Íîâîå (?)</xsl:with-param>
</xsl:call-template>
<xsl:if test="conversation">
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">
<xsl:text>/My/Conversations/Conversation/</xsl:text>

4
Resources/FLocal/templates/Modern/elems/ForumHeader.xslt
Unescape View File

@ -8,17 +8,14 @@
<xsl:with-param name="url">/Forum/Boards/</xsl:with-param>
<xsl:with-param name="text">Ðàçäåëû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Forum/AllThreads/</xsl:with-param>
<xsl:with-param name="text">Òåìû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Forum/AllPosts/</xsl:with-param>
<xsl:with-param name="text">Ñîîáùåíèÿ</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/Replies/</xsl:with-param>
<xsl:with-param name="text">Îòâåòû</xsl:with-param>
@ -27,7 +24,6 @@
</xsl:with-param>
</xsl:call-template>
<xsl:if test="currentLocation//board[not(name(../..)='board')]">
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:apply-templates select="currentLocation//board[not(name(../..)='board')]" mode="headerBoardLink"/>
</xsl:if>
<xsl:if test="currentLocation//board">

39
Resources/FLocal/templates/Modern/elems/Header.xslt
Unescape View File

@ -18,21 +18,24 @@
<xsl:param name="postfix"/>
<xsl:param name="skipDatePostfix"/>
<a target="_top">
<xsl:choose>
<xsl:when test="$isDisabled='true'">
<xsl:attribute name="class">disabled</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:if test="starts-with(/root/currentUrl, $url)">
<xsl:attribute name="class">selected</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
<xsl:value-of select="$url"/>
<xsl:value-of select="$postfix"/>
<xsl:if test="not($skipDatePostfix='true')">?<xsl:value-of select="current/date/ticks"/></xsl:if>
</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
<xsl:attribute name="class">
<xsl:text>headerLink</xsl:text>
<xsl:choose>
<xsl:when test="$isDisabled='true'">
<xsl:text> disabled</xsl:text>
</xsl:when>
<xsl:when test="starts-with(/root/currentUrl, $url)">
<xsl:text> selected</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:attribute>
<xsl:if test="not($isDisabled='true')">
<xsl:attribute name="href">
<xsl:value-of select="$url"/>
<xsl:value-of select="$postfix"/>
<xsl:if test="not($skipDatePostfix='true')">?<xsl:value-of select="current/date/ticks"/></xsl:if>
</xsl:attribute>
</xsl:if>
<xsl:value-of select="$text"/>
</a>
</xsl:template>
@ -141,12 +144,10 @@
<xsl:with-param name="url">/Forum/</xsl:with-param>
<xsl:with-param name="text">Ôîðóì</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Polls/</xsl:with-param>
<xsl:with-param name="text">Îïðîñû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Upload/</xsl:with-param>
<xsl:with-param name="text">Àïëîàä</xsl:with-param>
@ -154,7 +155,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/</xsl:with-param>
<xsl:with-param name="text">
@ -164,12 +164,10 @@
</xsl:choose>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/q/faq/</xsl:with-param>
<xsl:with-param name="text">FAQ</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/</xsl:with-param>
<xsl:with-param name="text">Ïîëüçîâàòåëè</xsl:with-param>
@ -190,7 +188,6 @@
<xsl:call-template name="pollsHeader"/>
</xsl:if>
</div>
<center>&#160;&#160;</center>
</xsl:template>
</xsl:stylesheet>

14
Resources/FLocal/templates/Modern/elems/Main.xslt
Unescape View File

@ -8,18 +8,18 @@
<html>
<head>
<meta http-equiv="x-ua-compatible" content="IE=8"/>
<link rel="stylesheet" href="/static/css/modern/global.css?v6.5" type="text/css" />
<link rel="stylesheet" href="/static/css/modern/global.css?v6.6" type="text/css" />
<xsl:comment>[if lte IE 7]&gt;<![CDATA[
<link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.5" type="text/css" />
<link rel="stylesheet" href="/static/css/modern/iefixes.css?v6.6" 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.5</xsl:attribute>
<xsl:attribute name="href">/static/css/modern/<xsl:value-of select="modernSkin/name"/>.css?v6.6</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?v6.5"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/modern.js?v6.5"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/common.js?v6.6"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/modern.js?v6.6"><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?v6.5"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript" src="/static/js/machichara/simple.js?v6.6"><xsl:text> </xsl:text></script>
<script language="Javascript" type="text/javascript">
<xsl:attribute name="src">
<xsl:text>/static/js/machichara/</xsl:text>
@ -48,7 +48,7 @@
<xsl:call-template name="header"/>
</div>
</xsl:if>
<div style="float:left;width:97%;max-width:97%;overflow:visible;" id="contentContainer">
<div style="float:left;width:99%;max-width:99%;overflow:visible;" id="contentContainer">
<xsl:call-template name="specific"/>
</div>
<xsl:if test="not(get/param[@name='headers'] = 'false')">

6
Resources/FLocal/templates/Modern/elems/MyHeader.xslt
Unescape View File

@ -12,7 +12,6 @@
<xsl:if test="session/sessionKey">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/Conversations/</xsl:with-param>
<xsl:with-param name="text">
@ -33,7 +32,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/Settings/</xsl:with-param>
<xsl:with-param name="text">Íàñòðîéêè</xsl:with-param>
@ -41,7 +39,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/UserData/</xsl:with-param>
<xsl:with-param name="text">Äàííûå (?)</xsl:with-param>
@ -49,7 +46,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/Avatars/</xsl:with-param>
<xsl:with-param name="text">Àâàòàðêè</xsl:with-param>
@ -57,7 +53,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/Info/</xsl:with-param>
<xsl:with-param name="text">Ïðîôèëü</xsl:with-param>
@ -65,7 +60,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/do/Logout/?sessionKey=<xsl:value-of select="session/sessionKey"/></xsl:with-param>
<xsl:with-param name="text">Âûõîä</xsl:with-param>

2
Resources/FLocal/templates/Modern/elems/PollsHeader.xslt
Unescape View File

@ -7,7 +7,6 @@
<xsl:with-param name="url">/Polls/List/</xsl:with-param>
<xsl:with-param name="text">Ñïèñîê</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/User/<xsl:value-of select="session/user/id"/>/PollsParticipated/</xsl:with-param>
<xsl:with-param name="text">Ìîè (?)</xsl:with-param>
@ -15,7 +14,6 @@
<xsl:if test="not(session/sessionKey)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Polls/New/</xsl:with-param>
<xsl:with-param name="text">Íîâûé</xsl:with-param>

1
Resources/FLocal/templates/Modern/elems/PostInfo.xslt
Unescape View File

@ -113,7 +113,6 @@
<xsl:if test="not(parentPost/post/title = title) and not(concat('Re: ', parentPost/post/title) = title)">
<xsl:value-of select="title"/>
</xsl:if>
<xsl:text>&#160;&#160;</xsl:text>
<font style="font-size:0.6em">
<xsl:text>(</xsl:text>
<xsl:value-of select="$postDate"/>

1
Resources/FLocal/templates/Modern/elems/UploadHeader.xslt
Unescape View File

@ -7,7 +7,6 @@
<xsl:with-param name="url">/Upload/List/</xsl:with-param>
<xsl:with-param name="text">Ñïèñîê</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Upload/New/</xsl:with-param>
<xsl:with-param name="text">Íîâûé</xsl:with-param>

1
Resources/FLocal/templates/Modern/elems/UploadInfo.xslt
Unescape View File

@ -23,7 +23,6 @@
</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"/>

6
Resources/FLocal/templates/Modern/elems/UserHeader.xslt
Unescape View File

@ -8,27 +8,22 @@
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Info/</xsl:with-param>
<xsl:with-param name="text">Èíôîðìàöèÿ</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Threads/</xsl:with-param>
<xsl:with-param name="text">Òåìû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Posts/</xsl:with-param>
<xsl:with-param name="text">Ñîîáùåíèÿ</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>Replies/</xsl:with-param>
<xsl:with-param name="text">Îòâåòû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url"><xsl:value-of select="$baseLink"/>PollsParticipated/</xsl:with-param>
<xsl:with-param name="text">Îïðîñû</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/Conversations/Conversation/<xsl:value-of select="accountId"/>/</xsl:with-param>
<xsl:with-param name="text">Èñòîðèÿ</xsl:with-param>
@ -36,7 +31,6 @@
<xsl:if test="not(accountId)">true</xsl:if>
</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/My/Conversations/PMSend/<xsl:value-of select="accountId"/>/</xsl:with-param>
<xsl:with-param name="text">Íàïèñàòü</xsl:with-param>

3
Resources/FLocal/templates/Modern/elems/UsersHeader.xslt
Unescape View File

@ -8,18 +8,15 @@
<xsl:with-param name="url">/Users/All/</xsl:with-param>
<xsl:with-param name="text">Âñå</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/Active/</xsl:with-param>
<xsl:with-param name="text">Àêòèâíûå</xsl:with-param>
</xsl:call-template>
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/Online/</xsl:with-param>
<xsl:with-param name="text">Îíëàéí</xsl:with-param>
</xsl:call-template>
<xsl:if test="user">
<xsl:text>&#160;&#160;&#160;</xsl:text>
<xsl:call-template name="headerLink">
<xsl:with-param name="url">/Users/User/<xsl:value-of select="user/id"/>/</xsl:with-param>
<xsl:with-param name="text"><xsl:value-of select="user/name"/></xsl:with-param>

Write Preview
Loading…
Cancel
Save