aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-03-18 14:47:43 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-03-18 14:47:43 +0000
commit02a5032a52784339e75d0d3fc9c24e92e235c26b (patch)
tree7be064ec5e37c3a81e35971a7f7d8c5519388f6c /phpBB/styles
parentc34599126fe8a7d38b604ceb92136be6a6c89ee8 (diff)
downloadforums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.gz
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.bz2
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.xz
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.zip
merging... again
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/template/posting_editor.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 6ec79dfb8b..459efc72b3 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -4,7 +4,7 @@
<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
<div class="column1">
- <!-- IF S_ALLOW_MASS_PM -->
+ <!-- IF not S_ALLOW_MASS_PM -->
<!-- IF .to_recipient -->
<dl>
<dt><label>{L_TO}:</label></dt>
@@ -29,15 +29,17 @@
</dd>
</dl>
<!-- ENDIF -->
+ <!-- IF not S_EDIT_POST -->
<dl class="pmlist">
<dt><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2"></textarea></dt>
<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd>
<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /></dd>
</dl>
+ <!-- ENDIF -->
<!-- ELSE -->
<dl>
- <dt><label for="username_list">{L_TO}:</label><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span></dt>
+ <dt><label for="username_list">{L_TO}:</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
<!-- IF .to_recipient -->
<dd>
<!-- BEGIN to_recipient -->
@@ -48,7 +50,9 @@
</dd>
<!-- ENDIF -->
+ <!-- IF not S_EDIT_POST -->
<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
+ <!-- ENDIF -->
</dl>
<!-- ENDIF -->