Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #366 from marc1706/ticket/320

Browse Source 
[ticket/320] Remove setting for displaying phpBB menu from acp
This commit is contained in:
Marc Alexander
2014-09-05 20:56:10 +02:00
parent 27eef620ba 099beb8153
commit 1a87ad3431
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acp/portal_module.php
View File

@@ -81,7 +81,6 @@ class portal_module
'board3_left_column' => array('lang' => 'PORTAL_LEFT_COLUMN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'board3_right_column' => array('lang' => 'PORTAL_RIGHT_COLUMN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'board3_version_check' => array('lang' => 'PORTAL_VERSION_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
'board3_phpbb_menu' => array('lang' => 'PORTAL_PHPBB_MENU', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'board3_display_jumpbox' => array('lang' => 'PORTAL_DISPLAY_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'legend2' => 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS',

2
language/de/portal_acp.php
View File

@@ -91,8 +91,6 @@ $lang = array_merge($lang, array(
'PORTAL_LEFT_COLUMN_WIDTH_EXP' => 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180',
'PORTAL_RIGHT_COLUMN_WIDTH' => 'Breite der rechten Spalte',
'PORTAL_RIGHT_COLUMN_WIDTH_EXP' => 'Ändere hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180',
'PORTAL_PHPBB_MENU' => 'phpBB-Menü',
'PORTAL_PHPBB_MENU_EXP' => 'Den phpBB Header auf dem Portal anzeigen.',
'PORTAL_DISPLAY_JUMPBOX' => 'Zeige Jumpbox',
'PORTAL_DISPLAY_JUMPBOX_EXP' => 'Die Jumpbox auf dem Portal anzeigen. Die Jumpbox wird nur angezeigt, wenn sie gleichzeitig in den Board-Funktionalitäten aktiviert ist.',

2
language/en/portal_acp.php
View File

@@ -85,8 +85,6 @@ $lang = array_merge($lang, array(
'PORTAL_RIGHT_COLUMN' => 'Enable right column',
'PORTAL_RIGHT_COLUMN_EXP' => 'Switch to no if you wish to turn off the right column',
'PORTAL_VERSION_CHECK' => 'Versioncheck on Portal',
'PORTAL_PHPBB_MENU' => 'phpBB menu',
'PORTAL_PHPBB_MENU_EXP' => 'Display the phpBB Header on the portal.',
'PORTAL_DISPLAY_JUMPBOX' => 'Display jumpbox',
'PORTAL_DISPLAY_JUMPBOX_EXP' => 'Display the jumpbox on the portal. The jumpbox will only be displayed if it is also enabled in the board features.',
'ACP_PORTAL_COLUMN_WIDTH_SETTINGS' => 'Left and right column width settings',

26
migrations/v210_rc1.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
/**
*
* @package Board3 Portal v2.1
* @copyright (c) 2014 Board3 Group ( www.board3.de )
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
namespace board3\portal\migrations;
class v210_rc1 extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array('\board3\portal\migrations\v210_beta1');
}
public function update_data()
{
return array(
array('config.remove', array('board3_phpbb_menu')),
array('config.update', array('board3_portal_version', '2.1.0-rc1')),
);
}
}