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

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
This commit is contained in:
Joas Schilling 2013-07-31 23:40:35 +02:00
commit ca07be9c57
4 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -1,13 +1,22 @@
<!-- INCLUDE ucp_header.html --> <!-- INCLUDE ucp_header.html -->
<script type="text/javascript">
// <![CDATA[
var form_name = 'ucp';
var text_name = 'signature';
// ]]>
</script>
<!-- DEFINE $S_SIGNATURE = 1 --> <!-- DEFINE $S_SIGNATURE = 1 -->
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<th colspan="2">{L_TITLE}</th> <th colspan="2">{L_TITLE}</th>
</tr> </tr>
<!-- IF not S_SMILIES_ALLOWED -->
<tr> <tr>
<td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td> <td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td>
</tr> </tr>
<!-- ENDIF -->
<!-- IF ERROR --> <!-- IF ERROR -->
<tr> <tr>
@ -16,14 +25,32 @@
<!-- ENDIF --> <!-- ENDIF -->
<tr> <tr>
<td colspan="2" class="row2"> <!-- IF S_SMILIES_ALLOWED -->
<script type="text/javascript"> <td class="row1" width="22%" valign="top">
// <![CDATA[ {L_SIGNATURE_EXPLAIN}
var form_name = 'ucp'; <table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">
var text_name = 'signature'; <tr>
// ]]> <td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
</script> </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%"> <table cellspacing="0" cellpadding="2" border="0" width="99%">
<!-- INCLUDE posting_buttons.html --> <!-- INCLUDE posting_buttons.html -->
<tr> <tr>