tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT #3903 Initial changes to installer to support selection of different database drivers

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98659 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-02-10 03:22:41 +00:00 committed by Sam Minnee
parent f685cf956d
commit 9d15cb4f38
2 changed files with 91 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
dev/install/config-form.html
View File

@ -87,8 +87,7 @@
</p> </p>
<?php } ?> <?php } ?>
<input type="hidden" name="database" value="MySQLDatabase" /> <h4 class="sectionHeading">Database</h4>
<h4>MySQL Database</h4>
<?php if($dbReq->hasErrors()) { ?> <?php if($dbReq->hasErrors()) { ?>
<p class="error"><!-- class="error" --> <p class="error"><!-- class="error" -->
These database details don't appear to be correct. Please enter the correct details before installing. These database details don't appear to be correct. Please enter the correct details before installing.
@ -99,49 +98,69 @@
</p> </p>
<?php } ?> <?php } ?>
<p id="mysql_credentials"> <div id="database_credentials" class="section">
<label for="mysql_server">MySQL server:</label> <label for="db_class">Database type:</label>
<span class="middleColumn"><input<?php if (defined('SS_DATABASE_SERVER')) echo ' disabled="true"'; ?> id="mysql_server" class="text" type="text" name="mysql[server]" value="<?php echo $databaseConfig['server']; ?>" /></span> <br><br>
<label for="mysql_username">MySQL username:</label> <ul id="database_selection" class="field">
<span class="middleColumn"><input<?php if (defined('SS_DATABASE_USERNAME')) echo ' disabled="true"'; ?> id="mysql_username" class="text" type="text" name="mysql[username]" value="<?php echo $databaseConfig['username']; ?>" /></span> <?php
<label for="mysql_password">MySQL password:</label> foreach($foundDatabaseClasses as $class => $title) {
<span class="middleColumn"><input<?php if (defined('SS_DATABASE_PASSWORD')) echo ' disabled="true"'; ?> id="mysql_password" class="text" type="password" name="mysql[password]" value="<?php echo $databaseConfig['password']; ?>" /></span> $checked = ($databaseConfig['type'] == $class) ? ' checked="checked"' : '';
<label for="mysql_database">MySQL database:</label>
<span class="middleColumn"><input id="mysql_database" class="text" type="text" name="mysql[database]" value="<?php echo $databaseConfig['database']; ?>" onchange="this.value = this.value.replace(/[\/\\:*?&quot;<>|. \t]+/g,'');" /></span> $disabled = '';
global $usingEnv;
if($usingEnv) {
// All are disabled by default when environment is used
$disabled = 'disabled="disabled"';
// If SS_DATABASE_CLASS is specified, check the database in the list
if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) {
$checked = ' checked="checked"';
}
}
echo "<li>";
echo "<input id=\"$class\" type=\"radio\" name=\"db[type]\" value=\"$class\"$checked $disabled />";
echo "<label class=\"left\" for=\"$class\">$title</label>";
echo "</li>";
}
?>
</ul>
<label for="db_server">Database server:</label>
<span class="middleColumn"><input id="db_server" class="text" type="text" name="db[server]" value="<?php echo $databaseConfig['server']; ?>" <?php if(defined('SS_DATABASE_SERVER')) echo 'disabled="disabled"'; ?> /></span>
<label for="db_username">Database username:</label>
<span class="middleColumn"><input id="db_username" class="text" type="text" name="db[username]" value="<?php echo $databaseConfig['username']; ?>" <?php if(defined('SS_DATABASE_USERNAME')) echo 'disabled="disabled"'; ?> /></span>
<label for="db_password">Database password:</label>
<span class="middleColumn"><input id="db_password" class="text" type="password" name="db[password]" value="<?php echo $databaseConfig['password']; ?>" <?php if(defined('SS_DATABASE_PASSWORD')) echo 'disabled="disabled"'; ?> /></span>
<label for="db_database">Database name:</label>
<span class="middleColumn"><input id="db_database" class="text" type="text" name="db[database]" value="<?php echo $databaseConfig['database']; ?>" onchange="this.value = this.value.replace(/[\/\\:*?&quot;<>|. \t]+/g,'');" /></span>
<input type="submit" class="action" value="Re-check requirements" /> <input type="submit" class="action" value="Re-check requirements" />
</p> </div>
<p class="mysql">SilverStripe stores its content in a MySQL database. Please provide the username and password to connect to the server here. If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a database that already exists.</p> <p class="database">SilverStripe stores its content in a relational SQL database. Please provide the username and password to connect to the server here. If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a database that already exists.</p>
<div class="clear"><!-- --></div> <?php $dbReq->showTable("Database Configuration"); ?>
<h5>Details</h5>
<?php $dbReq->showTable("MySQL Configuration"); ?>
<br /> <h4 class="sectionHeading">SilverStripe Administration Account</h4>
<div id="AdminAccount" class="section">
<h4>SilverStripe Administration Account</h4>
<p id="AdminAccount">
<label for="admin_username">Administrator email:</label> <label for="admin_username">Administrator email:</label>
<span class="middleColumn"><input type="text" class="text" name="admin[username]" id="admin_username" value="<?php echo $adminConfig['username']; ?>" /></span> <span class="middleColumn"><input type="text" class="text" name="admin[username]" id="admin_username" value="<?php echo $adminConfig['username']; ?>" <?php if(defined('SS_DEFAULT_ADMIN_USERNAME')) echo 'disabled="disabled"' ?> /></span>
<label for="admin_password">Administrator password:</label> <label for="admin_password">Administrator password:</label>
<span class="middleColumn"><input type="password" class="text" name="admin[password]" id="admin_password" value="<?php echo $adminConfig['password']; ?>" /></span> <span class="middleColumn"><input type="password" class="text" name="admin[password]" id="admin_password" value="<?php echo $adminConfig['password']; ?>" <?php if(defined('SS_DEFAULT_ADMIN_PASSWORD')) echo 'disabled="disabled"' ?> /></span>
<label for="admin_firstname">Administrator first name:</label> <label for="admin_firstname">Administrator first name:</label>
<span class="middleColumn"><input type="text" class="text" name="admin[firstname]" id="admin_firstname" value="<?php echo $adminConfig['firstname']; ?>" /></span> <span class="middleColumn"><input type="text" class="text" name="admin[firstname]" id="admin_firstname" value="<?php echo $adminConfig['firstname']; ?>" /></span>
<label for="admin_surname">Administrator surname:</label> <label for="admin_surname">Administrator surname:</label>
<span class="middleColumn"><input type="text" class="text" name="admin[surname]" id="admin_surname" value="<?php echo $adminConfig['surname']; ?>" /></span> <span class="middleColumn"><input type="text" class="text" name="admin[surname]" id="admin_surname" value="<?php echo $adminConfig['surname']; ?>" /></span>
</p> </div>
<p class="adminAcc"> <p class="adminAcc">
We will set up 1 administrator account for you automatically. Enter the email address and password. If you'd We will set up 1 administrator account for you automatically. Enter the email address and password. If you'd
rather log-in with a username instead of an email address, enter that instead. rather log-in with a username instead of an email address, enter that instead.
</p> </p>
<br /> <h4 class="sectionHeading">Development Servers</h4>
<div id="DevSites" class="section">
<h4>Development Servers</h4>
<p id="DevSites">
<label for="devsites">Development servers:</label> <label for="devsites">Development servers:</label>
<span class="middleColumn"><textarea name="devsites" id="devsites" rows="5" />localhost <span class="middleColumn"><textarea name="devsites" id="devsites" rows="5" />localhost
127.0.0.1</textarea></span> 127.0.0.1</textarea></span>
</p> </div>
<p class="devHelp"> <p class="devHelp">
SilverStripe allows you to run a site in <a href="http://doc.silverstripe.org/doku.php?id=configuration">development mode</a>. SilverStripe allows you to run a site in <a href="http://doc.silverstripe.org/doku.php?id=configuration">development mode</a>.
This shows all error messages in the web browser instead of emailing them to the administrator, and allows This shows all error messages in the web browser instead of emailing them to the administrator, and allows
@ -149,14 +168,8 @@
you will be using for development. you will be using for development.
</p> </p>
<br />
<h4 id="requirements">Requirements</h4> <h4 id="requirements">Requirements</h4>
<?php <?php $req->showTable(); ?>
$req->showTable();
?>
</form> </form>
</div> </div>
</div> </div>

49
dev/install/install.css
View File

@ -33,6 +33,10 @@ ul#Themes{
color: red; color: red;
} }
h4.sectionHeading {
margin-top: 20px;
}
p.error { p.error {
padding: 0.5em; padding: 0.5em;
background-color: #ffe9e9; background-color: #ffe9e9;
@ -99,20 +103,47 @@ table.testResults {
.clear { .clear {
clear: both; clear: both;
} }
p.mysql, #adminAcc,
p.adminAcc, #devHelp {
p.devHelp {
padding-top: 20px; padding-top: 20px;
} }
p#mysql_credentials,
p#AdminAccount, div.section {
p#DevSites { margin-top: 30px;
width: 330px; width: 330px;
margin-top: 0;
float: left; float: left;
overflow: hidden;
} }
#Layout input.action { #Layout input.action {
text-align: center; text-align: center;
width: 160px; font-size: 13px;
font-size: 1em; width: 220px;
font-weight: bold;
margin: 5px 0;
} }
#database_credentials {
margin: 0;
line-height: 1;
}
#database_selection {
width: 200px;
overflow: hidden;
margin: 0;
}
#database_selection li {
float: left;
width: 200px;
}
#database_selection li input {
float: left;
}
#database_selection li label {
float: left;
margin: 0;
margin-left: 5px;
font-weight: bold;
}