diff options
| author | Scott Dutton <scott@exussum.co.uk> | 2015-12-16 22:02:22 +0000 |
|---|---|---|
| committer | Scott Dutton <scott@exussum.co.uk> | 2015-12-16 22:15:29 +0000 |
| commit | 7ebbc69dbdd6f5517420bcd87528bc83560af4ac (patch) | |
| tree | 6d1f0472b388dadfb7f25d162c31c0a37249c590 | |
| parent | 8f5d76111243fae8d2926037e8fef0cbc97802c7 (diff) | |
| download | forums-7ebbc69dbdd6f5517420bcd87528bc83560af4ac.tar forums-7ebbc69dbdd6f5517420bcd87528bc83560af4ac.tar.gz forums-7ebbc69dbdd6f5517420bcd87528bc83560af4ac.tar.bz2 forums-7ebbc69dbdd6f5517420bcd87528bc83560af4ac.tar.xz forums-7ebbc69dbdd6f5517420bcd87528bc83560af4ac.zip | |
[ticket/14046] Jabber message incorrect
When making a Jabber message, the page says the message has been sent
when loading the page for the first time, This message should only be
shown after the message has actually been sent
PHPBB3-14046
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_im.html | 8 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/memberlist_im.html | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index bc71aa0969..874607d913 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -9,6 +9,10 @@ <p>{L_SEND_IM_EXPLAIN}</p> + <!-- IF S_SENT_JABBER --> + <p>{L_IM_SENT_JABBER}</p> + <!-- ENDIF --> + <fieldset> <dl class="fields2"> <dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt> @@ -24,10 +28,6 @@ <dt> </dt> <dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd> </dl> - <dl class="fields2"> - <dt> </dt> - <dd>{L_IM_SENT_JABBER}</dd> - </dl> <!-- ELSE IF S_NO_SEND_JABBER --> <dl class="fields2"> <dt> </dt> diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index a19229605a..ecd9aca86f 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -7,6 +7,11 @@ <tr> <th colspan="2">{L_SEND_IM}</th> </tr> + <!-- IF S_SENT_JABBER --> + <tr> + <td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td> + </tr> + <!-- ENDIF --> <tr> <td class="row3" colspan="2"><span class="gensmall">{L_SEND_IM_EXPLAIN}</span></td> </tr> @@ -23,12 +28,6 @@ <tr> <td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> </tr> - <tr> - <td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"></td> - </tr> <!-- ELSEIF S_NO_SEND_JABBER --> <tr> <td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td> |