diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2013-07-25 15:47:55 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2013-07-25 15:47:55 +0200 |
| commit | 866e475f9644dd3575ed62bfb0e7dde0338fd5cc (patch) | |
| tree | e7d046b18bbf4122eb18a286c886ba032c050c43 | |
| parent | 76a7d544cf8ac09229ac4c1eb17d4ded51fc92e3 (diff) | |
| download | forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar.gz forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar.bz2 forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar.xz forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.zip | |
[ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
4 files changed, 41 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index d35d13b6c1..847311058b 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -548,6 +548,9 @@ class ucp_profile // Build custom bbcodes array display_custom_bbcodes(); + // Generate smiley listing + generate_smilies('inline', 0); + break; case 'avatar': diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index 86ac24aa53..d45b185ed3 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -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> diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html index fcab578bd9..d2224887bc 100644 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ b/phpBB/styles/subsilver2/template/posting_smilies.html @@ -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> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index a33726e166..8588a99438 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -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> |