1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-15 05:24:41 +01:00

- check whether config.php exists

- add <p> to installation dialogue
- forgot to commit an mcp info file


git-svn-id: file:///svn/phpbb/trunk@6040 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-06-10 16:09:46 +00:00
parent 7e917eb5d2
commit 349518c11f
5 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,7 @@
<form id="install_convert" method="post" action="{U_ACTION}">
<h2>{TITLE}</h2>
{BODY}
<p>{BODY}</p>
<!-- IF S_LIST -->
<table cellspacing="1">

View File

@ -3,7 +3,7 @@
<form id="install_install" method="post" action="{U_ACTION}">
<h2>{TITLE}</h2>
{BODY}
<p>{BODY}</p>
<!-- IF .checks -->
<fieldset>

View File

@ -1,6 +1,6 @@
<!-- INCLUDE install_header.html -->
<h2>{TITLE}</h2>
{BODY}
<p>{BODY}</p>
<!-- INCLUDE install_footer.html -->

View File

@ -23,7 +23,7 @@ class mcp_main_info
'front' => array('title' => 'MCP_MAIN_FRONT', 'auth' => '', 'cat' => array('MCP_MAIN')),
'forum_view' => array('title' => 'MCP_MAIN_FORUM_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')),
'topic_view' => array('title' => 'MCP_MAIN_TOPIC_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')),
'post_details' => array('title' => 'MCP_MAIN_POST_DETAILS', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')),
'post_details' => array('title' => 'MCP_MAIN_POST_DETAILS', 'auth' => 'acl_m_,$id || (!$id && aclf_m_)', 'cat' => array('MCP_MAIN')),
),
);
}

View File

@ -128,13 +128,13 @@ $lang = array_merge($lang, array(
'INSTALL_CONGRATS' => 'Congratulations',
'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB 3.0. Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Userguide and the phpBB support forums, see the %sREADME%s for further information.',
'INSTALL_INTRO' => 'Welcome to Installation',
'INSTALL_INTRO_BODY' => '<p>With this option, it is possible to install phpBB onto your server.</p><p>In order to proceed, you will need the following information to hand:</p>
'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.</p><p>In order to proceed, you will need the following information to hand:</p>
<ul>
<li>Database server name</li>
<li>Database name</li>
<li>Database username and password</li>
</ul>
<p>Some more introductory text can go here...</p>',
<p>Some more introductory text can go here...',
'INSTALL_INTRO_NEXT' => 'To commence the installation, please press the button below.',
'INSTALL_LOGIN' => 'Login',
'INSTALL_NEXT' => 'Next stage',
@ -171,7 +171,7 @@ $lang = array_merge($lang, array(
'NO_LOCATION' => 'Cannot determine location',
'NO_TABLES_FOUND' => 'No tables found.',
// TODO: Write some explanatory introduction text
'OVERVIEW_BODY' => '<p>Some brief explanatory text about phpBB will go here.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above</p>',
'OVERVIEW_BODY' => 'Some brief explanatory text about phpBB will go here.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above',
'PHP_OPTIONAL_MODULE' => 'Optional Modules',
'PHP_OPTIONAL_MODULE_EXPLAIN' => '<strong>Optional</strong> - These modules or applications are optional, you do not need these to use phpBB 3.0. However if you do have them they will will enable greater functionality.',
@ -216,7 +216,7 @@ $lang = array_merge($lang, array(
'SUB_SUPPORT' => 'Support',
'SUCCESSFUL_CONNECT' => 'Successful Connection',
// TODO: Write some text on obtaining support
'SUPPORT_BODY' => '<p>Some text on obtaining support, etc can go here.</p><p>Probably this can be copied from the documentation</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/" target="_new">subscribe to our mailing list</a></p>',
'SUPPORT_BODY' => 'Some text on obtaining support, etc can go here.</p><p>Probably this can be copied from the documentation</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/" target="_new">subscribe to our mailing list</a>',
'SYNC_FORUMS' => 'Starting to sync forums',
'SYNC_TOPICS' => 'Starting to sync topics',