aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-12-23 13:32:23 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-12-23 13:32:23 +0100
commit84ed888cb9642918575008e91da9bef82f80ce69 (patch)
tree70c598be83e3af02bdeb777beee04c2747b6e1aa /phpBB
parenta7ca311d6ca52b94147d139c6069e1a46c10b4ec (diff)
parent7ebbc69dbdd6f5517420bcd87528bc83560af4ac (diff)
downloadforums-84ed888cb9642918575008e91da9bef82f80ce69.tar
forums-84ed888cb9642918575008e91da9bef82f80ce69.tar.gz
forums-84ed888cb9642918575008e91da9bef82f80ce69.tar.bz2
forums-84ed888cb9642918575008e91da9bef82f80ce69.tar.xz
forums-84ed888cb9642918575008e91da9bef82f80ce69.zip
Merge pull request #4084 from exussum12/ticket/14046
[ticket/14046] Jabber message incorrect
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/memberlist_im.html8
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_im.html11
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>&nbsp;</dt>
<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
</dl>
- <dl class="fields2">
- <dt>&nbsp;</dt>
- <dd>{L_IM_SENT_JABBER}</dd>
- </dl>
<!-- ELSE IF S_NO_SEND_JABBER -->
<dl class="fields2">
<dt>&nbsp;</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>