Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contribution/bbcode/type.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ protected function configure()
'explain' => 'REVISION_BBCODE_USE_EXPLAIN',
),
'revision_bbc_help_line' => array(
'type' => 'input',
'type' => 'textarea',
'name' => 'REVISION_HELP_LINE',
'explain' => '',
'explain' => 'REVISION_HELP_LINE_EXPLAIN',
),
'revision_bbc_demo' => array(
'type' => 'textarea',
Expand Down
4 changes: 2 additions & 2 deletions language/en/types/bbcode.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
'PUBLIC_ATTR_WAIVED' => 'Public performance attribution has been waived.',
'REVISION_HTML_REPLACE' => 'HTML Replacement',
'REVISION_BBCODE_USE' => 'BBCode Usage',
'REVISION_HELP_LINE' => 'Help Line',
'REVISION_HELP_LINE' => 'BBCode Help',
'REVISION_HTML_REPLACE_EXPLAIN' => 'Here you define the default HTML replacement.',
'REVISION_BBCODE_USE_EXPLAIN' => 'Here you define how to use the BBCode.',
'REVISION_HELP_LINE_EXPLAIN' => 'This field contains the bbcode help that shows when mouse over text of the BBCode',
'REVISION_HELP_LINE_EXPLAIN' => 'The help text shown in the posting editor when hovering over the BBCode button.',
));
57 changes: 57 additions & 0 deletions migrations/bbcode_help_text.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php
/**
*
* This file is part of the phpBB Customisation Database package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/

namespace phpbb\titania\migrations;

/**
* Class bbcode_help_text
* Extends the BBCode help line to a text column, following phpBB 3.3.5's
* extension of bbcode_helpline (PHPBB3-16804).
* @package phpbb\titania\migrations
*/
class bbcode_help_text extends base
{
static public function depends_on()
{
return array(
'\phpbb\titania\migrations\release_1_1_0',
'\phpbb\titania\migrations\release_1_1_1',
);
}

public function update_schema()
{
$table_prefix = $this->get_titania_table_prefix();

return array(
'change_columns' => array(
$table_prefix . 'revisions' => array(
'revision_bbc_help_line' => array('TEXT_UNI', ''),
),
),
);
}

public function revert_schema()
{
$table_prefix = $this->get_titania_table_prefix();

return array(
'change_columns' => array(
$table_prefix . 'revisions' => array(
'revision_bbc_help_line' => array('VCHAR:255', ''),
),
),
);
}
}
2 changes: 1 addition & 1 deletion styles/prosilver/template/common/contribution_details.html
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ <h3 class="details-heading">{{ lang('SETTINGS') }}</h3>
<dl class="codebox"><dt>{{ lang('REVISION_HTML_REPLACE') ~ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></dt><dd><code>{{ CONTRIB_BBC_HTML_REPLACEMENT }}</code></dd></dl>
{% if CONTRIB_BBC_HELPLINE %}
<br />
<dl class="codebox"><dt>{{ lang('REVISION_HELP_LINE') ~ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></dt><dd><code>{{ CONTRIB_BBC_HELPLINE }}</code></dd></dl>
<dl class="codebox"><dt>{{ lang('REVISION_HELP_LINE') ~ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></dt><dd><code>{{ CONTRIB_BBC_HELPLINE|nl2br }}</code></dd></dl>
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion styles/prosilver/template/common/revision_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dl class="codebox"><dt>{{ lang('REVISION_HTML_REPLACE') ~ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></dt><dd><code>{{ revisions.BBC_HTML_REPLACEMENT }}</code></dd></dl>
{% if revisions.BBC_HELPLINE %}
<br />
<dl class="codebox"><dt>{{ lang('REVISION_HELP_LINE') ~ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></dt><dd><code>{{ revisions.BBC_HELPLINE }}</code></dd></dl>
<dl class="codebox"><dt>{{ lang('REVISION_HELP_LINE') ~ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></dt><dd><code>{{ revisions.BBC_HELPLINE|nl2br }}</code></dd></dl>
{% endif %}
{% if revisions.BBC_DEMO and S_IN_QUEUE %}
<br />
Expand Down