mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-26 09:44:26 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

Browse Source 
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
This commit is contained in:
Marc Alexander
2016-03-27 09:59:25 +02:00
parent 4db229ff6c b39b3da5af
commit 1600d82b77
33 changed files with 130 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/adm/style/acp_icons.html
View File

@@ -111,8 +111,8 @@
<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
<!-- ENDIF -->
<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
<td><input class="text post" type="number" min="0" max="999" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
<td><input class="text post" type="number" min="0" max="999" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
<!-- IF not S_SMILIES -->
<td><input class="text post" type="text" name="alt[{items.IMG}]" value="{items.ALT}" size="10" maxlength="50" /></td>
<!-- ENDIF -->
@@ -142,8 +142,8 @@
<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
<td><input class="text post" type="number" min="0" max="999" name="add_width" id="add_width" value="{WIDTH}" /></td>
<td><input class="text post" type="number" min="0" max="999" name="add_height" id="add_height" value="{HEIGHT}" /></td>
<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
<td><select id="order_add_order" name="add_order">
<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>