makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10037] Apply attached patch with a few changes

Browse source 
PHPBB3-10037
This commit is contained in:
Oliver Schramm 2013-07-25 15:47:55 +02:00
parent 76a7d544cf
commit 866e475f96
4 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/ucp/ucp_profile.php
View file

@ -548,6 +548,9 @@ class ucp_profile
// Build custom bbcodes array
display_custom_bbcodes();
// Generate smiley listing
generate_smilies('inline', 0);
break;
case 'avatar':

4
phpBB/styles/prosilver/template/posting_smilies.html
View file

@ -2,8 +2,8 @@
<script type="text/javascript">
// <![CDATA[
var form_name = 'postform';
var text_name = 'message';
var form_name = opener.form_name;
var text_name = opener.text_name;
// ]]>
</script>
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>

4
phpBB/styles/subsilver2/template/posting_smilies.html
View file

@ -2,8 +2,8 @@
<script type="text/javascript">
// <![CDATA[
var form_name = 'postform';
var text_name = 'message';
var form_name = opener.form_name;
var text_name = opener.text_name;
// ]]>
</script>
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>

35
phpBB/styles/subsilver2/template/ucp_profile_signature.html
View file

@ -5,9 +5,11 @@
<tr>
<th colspan="2">{L_TITLE}</th>
</tr>
<!-- IF not S_SMILIES_ALLOWED -->
<tr>
<td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td>
</tr>
<!-- ENDIF -->
<!-- IF ERROR -->
<tr>
@ -23,7 +25,33 @@
var text_name = 'signature';
// ]]>
</script>
<!-- IF S_SMILIES_ALLOWED -->
<table cellspacing="0">
<tr>
<td class="row1" width="22%" valign="top" style="border-right:1px solid #a9b8c2">
{L_SIGNATURE_EXPLAIN}
<!-- IF .smiley -->
<table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">
<tr>
<td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
</tr>
<tr>
<td align="center">
<!-- BEGIN smiley -->
<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a>
<!-- END smiley -->
</td>
</tr>
<!-- IF S_SHOW_SMILEY_LINK -->
<tr>
<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></td>
</tr>
<!-- ENDIF -->
</table>
<!-- ENDIF -->
</td>
<td class="row2">
<!-- ENDIF -->
<table cellspacing="0" cellpadding="2" border="0" width="99%">
<!-- INCLUDE posting_buttons.html -->
<tr>
@ -47,6 +75,11 @@
</tr>
<!-- ENDIF -->
</table>
<!-- IF S_SMILIES_ALLOWED -->
</td>
</tr>
</table>
<!-- ENDIF -->
</td>
</tr>
<tr>