merging upstream

This commit is contained in:
Jens-Andre Koch
2012-03-29 11:13:47 +02:00
4 changed files with 5 additions and 5 deletions
@@ -1,8 +1,8 @@
<div class="sectionbg">
<div class="sectionbody">
<div class="subsection">
<input type="hidden" name="embed_blockuser_presented" value="1">
<input type="hidden" name="embed_blockuser_old" value="<? VAR Blocked ?>">
<input type="hidden" name="embed_blockuser_presented" value="1"/>
<input type="hidden" name="embed_blockuser_old" value="<? VAR Blocked ?>"/>
<div class="checkbox">
<input type="checkbox" name="embed_blockuser_block" id="opt_embed_blockuser_block" value="1"<? IF Blocked ?> checked="checked"<? ENDIF ?><? IF Self ?> disabled="disabled"<? ENDIF ?> />
<label for="opt_embed_blockuser_block">Account is blocked</label>
+1 -1
View File
@@ -25,7 +25,7 @@
<table class="data">
<thead>
<tr>
<td style="width: 10px;">&nbsp;</td>
<td style="width: 10px;"></td>
<td>Key</td>
</tr>
</thead>
+1 -1
View File
@@ -29,7 +29,7 @@
<table class="data">
<thead>
<tr>
<td style="width: 10px;">&nbsp;</td>
<td style="width: 10px;"></td>
<td>Key</td>
<td>Note</td>
</tr>
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
<div class="subsection submitline">
<input type="submit" value="Send">
<input type="submit" value="Send"/>
</div>
</div>
</div>