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

Headers panel improvements

Browse Source
main
Inga 🏳‍🌈 14 years ago
parent 8598cd60a1
commit e002446817
11 changed files with 18 additions and 93 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. 2
      Common/BBCodes/User.cs
  3. 4
      IISMainHandler/HandlersFactory.cs
  4. 27
      templates/Full/UserPollsParticipated.xslt
  5. 29
      templates/Full/UserPosts.xslt
  6. 29
      templates/Full/UserReplies.xslt
  7. 2
      templates/Full/elems/Main.xslt
  8. 1
      templates/Full/elems/MyHeader.xslt
  9. 1
      templates/Full/elems/UploadHeader.xslt
  10. 12
      templates/Full/elems/UsersHeader.xslt
  11. 2
      templates/Lite/elems/Main.xslt

2
Builder/IISMainHandler/build.txt
Unescape View File

@ -1 +1 @@
1109 1115

2
Common/BBCodes/User.cs
Unescape View File

@ -13,7 +13,7 @@ namespace FLocal.Common.BBCodes {
public override string Format(ITextFormatter formatter) { public override string Format(ITextFormatter formatter) {
var user = dataobjects.User.LoadByName(this.Default); var user = dataobjects.User.LoadByName(this.Default);
return String.Format("<a class=\"separate UG_{0}\" href=\"/Users/User/{1}/\">{2}</a>", this.Safe(user.userGroup.name), user.id, this.Safe(user.name)); return String.Format("<a class=\"separate UG_{0}\" href=\"/Users/User/{1}/Info/\">{2}</a>", this.Safe(user.userGroup.name), user.id, this.Safe(user.name));
} }
} }

4
IISMainHandler/HandlersFactory.cs
Unescape View File

@ -134,9 +134,11 @@ namespace FLocal.IISHandler {
return new handlers.WrongUrlHandler(); return new handlers.WrongUrlHandler();
} }
if(context.requestParts.Length == 3) { if(context.requestParts.Length == 3) {
return new handlers.response.UserInfoHandler(); throw new RedirectException("/Users/User/" + context.requestParts[2] + "/Info/");
} }
switch(context.requestParts[3].ToLower()) { switch(context.requestParts[3].ToLower()) {
case "info":
return new handlers.response.UserInfoHandler();
case "posts": case "posts":
return new handlers.response.UserPostsHandler(); return new handlers.response.UserPostsHandler();
case "replies": case "replies":

27
templates/Full/UserPollsParticipated.xslt
Unescape View File

@ -4,33 +4,6 @@
<xsl:import href="elems\PollShortInfo.xslt"/> <xsl:import href="elems\PollShortInfo.xslt"/>
<xsl:template name="specificTitle">Îďđîńű</xsl:template> <xsl:template name="specificTitle">Îďđîńű</xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
<tr>
<td>
<table cellpadding="3" cellspacing="1" width="100%" border="0" class="tableborders">
<tr class="darktable">
<td colspan="6">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2" class="catandforum">
<a>
<xsl:attribute name="href">/Users/</xsl:attribute>
<xsl:text>Ïîëüçîâàòåëè</xsl:text>
</a>
<xsl:text> &gt;&gt; </xsl:text>
<xsl:apply-templates select="user" mode="userLink"/>
<xsl:text> &gt;&gt; </xsl:text>
<xsl:text>Îïðîñû ñ ó÷àñòèåì ïîëüçîâàòåëÿ</xsl:text>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<br/>
<table width="95%" align="center" class="tablesurround"> <table width="95%" align="center" class="tablesurround">
<tr> <tr>
<td> <td>

29
templates/Full/UserPosts.xslt
Unescape View File

@ -7,35 +7,6 @@
<xsl:value-of select="user/name"/> <xsl:value-of select="user/name"/>
</xsl:template> </xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
<tr>
<td>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
<tr class="darktable">
<td>
<table width="100%" cellpadding="0" cellspacing="0">
<tr class="darktable">
<td align="left" width="33%">
<font class="catandforum">
<a>
<xsl:attribute name="href">/Users/</xsl:attribute>
<xsl:text>Ïîëüçîâàòåëè</xsl:text>
</a>
<xsl:text> &gt;&gt; </xsl:text>
<xsl:apply-templates select="user" mode="userLink"/>
<xsl:text> &gt;&gt; </xsl:text>
<xsl:text>Ïîñòû</xsl:text>
</font>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<br />
<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround"> <table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
<tr> <tr>
<td> <td>

29
templates/Full/UserReplies.xslt
Unescape View File

@ -7,35 +7,6 @@
<xsl:value-of select="user/name"/> <xsl:value-of select="user/name"/>
</xsl:template> </xsl:template>
<xsl:template name="specific"> <xsl:template name="specific">
<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
<tr>
<td>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
<tr class="darktable">
<td>
<table width="100%" cellpadding="0" cellspacing="0">
<tr class="darktable">
<td align="left" width="33%">
<font class="catandforum">
<a>
<xsl:attribute name="href">/Users/</xsl:attribute>
<xsl:text>Ïîëüçîâàòåëè</xsl:text>
</a>
<xsl:text> &gt;&gt; </xsl:text>
<xsl:apply-templates select="user" mode="userLink"/>
<xsl:text> &gt;&gt; </xsl:text>
<xsl:text>Îòâåòû</xsl:text>
</font>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<br />
<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround"> <table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
<tr> <tr>
<td> <td>

2
templates/Full/elems/Main.xslt
Unescape View File

@ -198,7 +198,7 @@
<xsl:text>separate </xsl:text> <xsl:text>separate </xsl:text>
<xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/> <xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/</xsl:attribute> <xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>
<xsl:value-of select="name"/> <xsl:value-of select="name"/>
<xsl:if test="isModerator='true'"> <xsl:if test="isModerator='true'">
<img src="/static/images/mod.gif" border="0"/> <img src="/static/images/mod.gif" border="0"/>

1
templates/Full/elems/MyHeader.xslt
Unescape View File

@ -57,7 +57,6 @@
</td> </td>
</tr> </tr>
</table> </table>
<center>&#160;&#160;</center>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

1
templates/Full/elems/UploadHeader.xslt
Unescape View File

@ -23,7 +23,6 @@
</td> </td>
</tr> </tr>
</table> </table>
<center>&#160;&#160;</center>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

12
templates/Full/elems/UsersHeader.xslt
Unescape View File

@ -1,5 +1,6 @@
<?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="UserHeader.xslt"/>
<xsl:template name="usersHeader"> <xsl:template name="usersHeader">
<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1"> <table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
@ -22,13 +23,22 @@
<xsl:with-param name="url">/Users/Online/</xsl:with-param> <xsl:with-param name="url">/Users/Online/</xsl:with-param>
<xsl:with-param name="text">Â îíëàéíå</xsl:with-param> <xsl:with-param name="text">Â îíëàéíå</xsl:with-param>
</xsl:call-template> </xsl:call-template>
<xsl:text> | </xsl:text>
<xsl:if test="user">
<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>
</xsl:call-template>
</xsl:if>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<center>&#160;&#160;</center> <xsl:if test="user">
<xsl:call-template name="userHeader"/>
</xsl:if>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

2
templates/Lite/elems/Main.xslt
Unescape View File

@ -204,7 +204,7 @@
<xsl:text>separate </xsl:text> <xsl:text>separate </xsl:text>
<xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/> <xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/</xsl:attribute> <xsl:attribute name="href">/Users/User/<xsl:value-of select="id"/>/Info/</xsl:attribute>
<xsl:value-of select="name"/> <xsl:value-of select="name"/>
<xsl:if test="isModerator='true'"> <xsl:if test="isModerator='true'">
<xsl:text>^M</xsl:text> <xsl:text>^M</xsl:text>

Write Preview
Loading…
Cancel
Save