Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ticket/10037] Add smilies in signature editor #1613

Merged
merged 2 commits into from Jul 31, 2013
Merged

[ticket/10037] Add smilies in signature editor #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
866e475
[ticket/10037] Apply attached patch with a few changes
Elsensee Jul 25, 2013
6f883b6
[ticket/10037] Fix table in subsilver2
Elsensee Jul 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions phpBB/includes/ucp/ucp_profile.php
View file
Open in desktop
Expand Up @@ -548,6 +548,9 @@ function main($id, $mode)
// Build custom bbcodes array
display_custom_bbcodes();

// Generate smiley listing
generate_smilies('inline', 0);

break;

case 'avatar':
Expand Down
4 changes: 2 additions & 2 deletions phpBB/styles/prosilver/template/posting_smilies.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions phpBB/styles/subsilver2/template/posting_smilies.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
43 changes: 35 additions & 8 deletions phpBB/styles/subsilver2/template/ucp_profile_signature.html
View file
Open in desktop
@@ -1,13 +1,22 @@
<!-- INCLUDE ucp_header.html -->

<script type="text/javascript">
// <![CDATA[
var form_name = 'ucp';
var text_name = 'signature';
// ]]>
</script>

<!-- DEFINE $S_SIGNATURE = 1 -->
<table class="tablebg" width="100%" cellspacing="1">
<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>
Expand All @@ -16,14 +25,32 @@
<!-- ENDIF -->

<tr>
<td colspan="2" class="row2">
<script type="text/javascript">
// <![CDATA[
var form_name = 'ucp';
var text_name = 'signature';
// ]]>
</script>

<!-- IF S_SMILIES_ALLOWED -->
<td class="row1" width="22%" valign="top">
{L_SIGNATURE_EXPLAIN}
<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>
</td>
<td class="row2">
<!-- ELSE -->
<td class="row2" colspan="2">
<!-- ENDIF -->

<table cellspacing="0" cellpadding="2" border="0" width="99%">
<!-- INCLUDE posting_buttons.html -->
<tr>
Expand Down