Improved result pages 'pmsent', 'messagecreated' and 'migrateaccount'

main
Inga 🏳‍🌈 15 years ago
parent e61e1a197e
commit e699dee40d
  1. 2
      Builder/IISMainHandler/build.txt
  2. 2
      Builder/IISUploadHandler/build.txt
  3. 5
      IISMainHandler/handlers/request/CreateThreadHandler.cs
  4. 5
      IISMainHandler/handlers/request/ReplyHandler.cs
  5. 27
      static/js/common.js
  6. BIN
      static/js/textEditor.js
  7. 29
      templates/Full/result/MessageCreated.xslt
  8. 24
      templates/Full/result/MigrateAccount.xslt
  9. 29
      templates/Full/result/PMSent.xslt

@ -23,7 +23,10 @@ namespace FLocal.IISHandler.handlers.request {
newThread.markAsRead(context.session.account, newPost, newPost); newThread.markAsRead(context.session.account, newPost, newPost);
return new XElement[] { newPost.exportToXmlWithoutThread(context, false) }; return new XElement[] {
newThread.board.exportToXml(context, false),
newPost.exportToXmlWithoutThread(context, false)
};
} }
} }
} }

@ -23,7 +23,10 @@ namespace FLocal.IISHandler.handlers.request {
newPost.thread.markAsRead(context.session.account, newPost, newPost); newPost.thread.markAsRead(context.session.account, newPost, newPost);
return new XElement[] { newPost.exportToXmlWithoutThread(context, false) }; return new XElement[] {
newPost.thread.board.exportToXml(context, false),
newPost.exportToXmlWithoutThread(context, false)
};
} }
} }

@ -5,4 +5,29 @@ function showSpoiler(obj) {
} else { } else {
inner.style.display = "none"; inner.style.display = "none";
} }
} }
var isNetscape = (document.layers) ? true : false;
var isOpera = (navigator.userAgent.toLowerCase ().indexOf ("opera") != -1);
var isIe = (document.all && !isOpera) ? true : false;
var isWebkit = (navigator.userAgent.toLowerCase ().indexOf ("webkit") != -1);
var isMozilla = (document.getElementById && !isIe && !isOpera && !isWebkit) ? true : false;
var isMac = (navigator.userAgent.toLowerCase ().indexOf ("macintosh") != -1);
function assignArrowsHandlers() {
document.onkeydown = function(event) {
if(window.event && isIe) {
keyCode = window.event.keyCode;
} else if (event.keyCode) {
keyCode = event.keyCode;
} else {
keyCode = event.which;
}
if (keyCode == 37) {
location.href = document.getElementById("actionLink_left").href;
} else if (keyCode == 39) {
location.href = document.getElementById("actionLink_right").href;
}
}
}

Binary file not shown.

@ -11,14 +11,31 @@
<xsl:text>Новое сообщение</xsl:text> <xsl:text>Новое сообщение</xsl:text>
</td> </td>
</tr> </tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
<tr> <tr>
<td class="lighttable"> <td class="lighttable">
<xsl:text>Ваше сообщение было успешно создано</xsl:text> <p>Âàøå ñîîáùåíèå áûëî óñïåøíî ñîçäàíî</p>
<br/> <p align="center">
<a> <xsl:text>[&#8592;] </xsl:text>
<xsl:attribute name="href">/Thread/<xsl:value-of select="post/threadId"/>/p<xsl:value-of select="post/id"/></xsl:attribute> <a id="actionLink_left">
<xsl:text>Просмотреть сообщение</xsl:text> <xsl:attribute name="href">/Board/<xsl:value-of select="board/id"/>/</xsl:attribute>
</a> <xsl:text>Âåðíóòüñÿ â ðàçäåë</xsl:text>
</a>
<xsl:text> | </xsl:text>
<a id="actionLink_right">
<xsl:attribute name="href">/Thread/<xsl:value-of select="post/threadId"/>/p<xsl:value-of select="post/id"/></xsl:attribute>
<xsl:text>Ïðîñìîòðåòü ñîîáùåíèå</xsl:text>
</a>
<xsl:text> [&#8594;]</xsl:text>
</p>
<script type="text/javascript" language="Javascript">
<xsl:text>assignArrowsHandlers();</xsl:text>
</script>
</td> </td>
</tr> </tr>
</table> </table>

@ -11,9 +11,31 @@
<xsl:text>Миграция пользователя</xsl:text> <xsl:text>Миграция пользователя</xsl:text>
</td> </td>
</tr> </tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
<tr> <tr>
<td class="lighttable"> <td class="lighttable">
<xsl:text>Миграция успешно завершена, теперь вы можете войти в форум, используя свой логин и новый пароль.</xsl:text> <p>Ìèãðàöèÿ áûëà óñïåøíî çàâåðøåíà, òåïåðü âû ìîæåòå âîéòè â ôîðóì, èñïîëüçóÿ ñâîé ëîãèí è íîâûé ïàðîëü</p>
<p align="center">
<xsl:text>[&#8592;] </xsl:text>
<a id="actionLink_left">
<xsl:attribute name="href">/Boards/</xsl:attribute>
<xsl:text>Âåðíóòüñÿ ê ñïèñêó ðàçäåëîâ</xsl:text>
</a>
<xsl:text> | </xsl:text>
<a id="actionLink_right">
<xsl:attribute name="href">/Login/</xsl:attribute>
<xsl:text>Âîéòè</xsl:text>
</a>
<xsl:text> [&#8594;]</xsl:text>
</p>
<script type="text/javascript" language="Javascript">
<xsl:text>assignArrowsHandlers();</xsl:text>
</script>
</td> </td>
</tr> </tr>
</table> </table>

@ -11,14 +11,31 @@
<xsl:text>Новое приватное сообщение</xsl:text> <xsl:text>Новое приватное сообщение</xsl:text>
</td> </td>
</tr> </tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
<tr> <tr>
<td class="lighttable"> <td class="lighttable">
<xsl:text>Âàøå ñîîáùåíèå áûëî óñïåøíî ñîçäàíî</xsl:text> <p>Âàøå ñîîáùåíèå áûëî óñïåøíî ñîçäàíî</p>
<br/> <p align="center">
<a> <xsl:text>[&#8592;] </xsl:text>
<xsl:attribute name="href">/Conversation/<xsl:value-of select="message/interlocutor/account/id"/>/p<xsl:value-of select="message/id"/></xsl:attribute> <a id="actionLink_left">
<xsl:text>Ïðîñìîòðåòü ñîîáùåíèå</xsl:text> <xsl:attribute name="href">/Conversations/</xsl:attribute>
</a> <xsl:text>Âåðíóòüñÿ ê ëè÷íûì ñîîáùåíèÿì</xsl:text>
</a>
<xsl:text> | </xsl:text>
<a id="actionLink_right">
<xsl:attribute name="href">/Conversation/<xsl:value-of select="message/interlocutor/account/id"/>/p<xsl:value-of select="message/id"/></xsl:attribute>
<xsl:text>Ïðîñìîòðåòü ñîîáùåíèå</xsl:text>
</a>
<xsl:text> [&#8594;]</xsl:text>
</p>
<script type="text/javascript" language="Javascript">
<xsl:text>assignArrowsHandlers();</xsl:text>
</script>
</td> </td>
</tr> </tr>
</table> </table>

Loading…
Cancel
Save