[BUGFIX] Minor styling issues in install tool 56/44656/3
authorBenjamin Mack <benni@typo3.org>
Tue, 10 Nov 2015 10:36:34 +0000 (11:36 +0100)
committerMathias Schreiber <mathias.schreiber@wmdb.de>
Tue, 10 Nov 2015 11:59:27 +0000 (12:59 +0100)
Resolves: #71457
Releases: master
Change-Id: Id86a1077c7d0e579ed831748ea18ff1a1e35df12
Reviewed-on: https://review.typo3.org/44656
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
12 files changed:
typo3/sysext/install/Resources/Private/Partials/Action/Common/LoginForm.html
typo3/sysext/install/Resources/Private/Partials/Action/Step/DatabaseConnect/ConnectDetails.html
typo3/sysext/install/Resources/Private/Partials/Action/Step/DatabaseConnect/LoadDbal.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/CleanUp/Typo3TempFiles.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/CreateAdministrator.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/SystemInformation.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/UpgradeWizard/ListUpdates.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseData.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DefaultConfiguration.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/EnvironmentAndFolders.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/About.html

index 70390f2..f24db01 100644 (file)
 
                <form method="post" class="form-inline" id="t3-install-form-login">
                        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-                       <div class="form-group form-group-lg">
+                       <div class="form-group">
                                <label for="t3-install-form-password">Password</label>
-                               <input id="t3-install-form-password" type="password" name="install[values][password]" class="t3-install-form-input-text form-control input-lg" autofocus="autofocus" />
+                               <input id="t3-install-form-password" type="password" name="install[values][password]" class="t3-install-form-input-text form-control" autofocus="autofocus" />
                        </div>
-                       <f:render partial="Action/Common/SubmitButton" arguments="{name:'login', text:'Login', className:'btn-lg'}"/>
+                       <f:render partial="Action/Common/SubmitButton" arguments="{name:'login', text:'Login', className:'btn-success'}"/>
                </form>
        </div>
        <div id="t3-install-box-border-bottom">&nbsp;</div>
        </f:if>
 
        <div class="panel panel-info">
-               <div class="panel-heading"><h3 class="panel-title">Information:</h3></div>
+               <div class="panel-heading"><h3 class="panel-title">Information</h3></div>
                <div class="panel-body">
                        By default the install tool password is the one specified during the installation.
                </div>
        </div>
        <div class="panel panel-warning">
-               <div class="panel-heading"><h3 class="panel-title">Important:</h3></div>
+               <div class="panel-heading"><h3 class="panel-title">Important</h3></div>
                <div class="panel-body">
                        If you don't know the current password, you can set a new one by setting the value of
                        $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] in typo3conf/LocalConfiguration.php to
index feb7d1f..7cebcbd 100644 (file)
@@ -1,83 +1,88 @@
-<form method="post" class="form-horizontal">
-       <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-       <input type="hidden" value="execute" name="install[set]" />
+<p>&nbsp;</p>
+<div class="row">
+       <div class="col-md-6">
+               <form method="post" class="form-horizontal">
+                       <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
+                       <input type="hidden" value="execute" name="install[set]" />
 
-       <f:if condition="{renderConnectDetailsUsername}">
-               <div class="form-group">
-                       <label for="t3-install-step-username" class="control-label col-md-2">Username</label>
-                       <div class="col-md-7">
-                               <input id="t3-install-step-username" class="form-control" type="text" value="{username}" name="install[values][username]" autocomplete="off" />
-                       </div>
-               </div>
-       </f:if>
-       <f:if condition="{renderConnectDetailsPassword}">
-               <div class="form-group">
-                       <label for="t3-install-step-password" class="control-label col-md-2">Password</label>
-                       <div class="col-md-7">
-                               <input id="t3-install-step-password" class="form-control" type="password" value="{password}" name="install[values][password]" autocomplete="off" />
-                       </div>
-               </div>
-       </f:if>
-       <f:if condition="{renderConnectDetailsHost}">
-               <div class="form-group">
-                       <label for="t3-install-step-type" class="control-label col-md-2">Type</label>
-                       <div class="col-md-7">
-                               <select id="t3-install-step-type" class="form-control">
-                                       <option value="tcp">TCP/IP based connection</option>
-                                       <option value="socket" {f:if(condition:'{host} == \'localhost\'',then:'selected="selected"')}>Socket based connection</option>
-                               </select>
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="t3-install-step-host" class="control-label col-md-2">Host</label>
-                       <div class="col-md-7">
-                               <input id="t3-install-step-host" class="t3-install-form-input-text form-control" type="text" value="{host}" name="install[values][host]" />
-                       </div>
-               </div>
-       </f:if>
-       <f:if condition="{renderConnectDetailsPort}">
-               <div class="form-group">
-                       <label for="t3-install-step-port" class="control-label col-md-2">Port</label>
-                       <div class="col-md-7">
-                               <input id="t3-install-step-port" class="t3-install-form-input-text form-control" type="text" value="{port}" name="install[values][port]" />
-                       </div>
-               </div>
-       </f:if>
-       <f:if condition="{renderConnectDetailsSocket}">
-               <div class="form-group">
-                       <label for="t3-install-step-socket" class="control-label col-md-2">Socket</label>
-                       <div class="col-md-7">
-                               <input id="t3-install-step-socket" class="t3-install-form-input-text form-control" type="text" value="{socket}" name="install[values][socket]" placeholder="Default socket or enter name" />
-                       </div>
-               </div>
-       </f:if>
-       <f:if condition="{renderConnectDetailsDatabase}">
-               <div class="form-group">
-                       <label for="t3-install-step-database" class="control-label col-md-2">Database</label>
-                       <div class="col-md-7">
-                               <input id="t3-install-step-database" class="t3-install-form-input-text form-control" type="text" value="{database}" name="install[values][database]" />
-                       </div>
-               </div>
-       </f:if>
-       <f:if condition="{renderConnectDetailsOracleSidConnect}">
-               <div class="form-group">
-                       <label for="t3-install-form-type" class="control-label col-md-2">Oracle Sid</label>
-                       <div class="col-md-7"><select id="t3-install-form-type" name="install[values][type]" class="form-control">
-                               <option value="servicename">Service name</option>
-                               <f:if condition="{oracleSidSelected}">
-                                       <f:then>
-                                               <option value="sid" selected="selected">SID</option>
-                                       </f:then>
-                                       <f:else>
-                                               <option value="sid">SID</option>
-                                       </f:else>
-                               </f:if>
-                       </select></div>
-               </div>
-       </f:if>
+                       <f:if condition="{renderConnectDetailsUsername}">
+                               <div class="form-group">
+                                       <label for="t3-install-step-username" class="control-label col-md-2">Username</label>
+                                       <div class="col-md-10">
+                                               <input id="t3-install-step-username" class="form-control" type="text" value="{username}" name="install[values][username]" autocomplete="off" />
+                                       </div>
+                               </div>
+                       </f:if>
+                       <f:if condition="{renderConnectDetailsPassword}">
+                               <div class="form-group">
+                                       <label for="t3-install-step-password" class="control-label col-md-2">Password</label>
+                                       <div class="col-md-10">
+                                               <input id="t3-install-step-password" class="form-control" type="password" value="{password}" name="install[values][password]" autocomplete="off" />
+                                       </div>
+                               </div>
+                       </f:if>
+                       <f:if condition="{renderConnectDetailsHost}">
+                               <div class="form-group">
+                                       <label for="t3-install-step-type" class="control-label col-md-2">Type</label>
+                                       <div class="col-md-10">
+                                               <select id="t3-install-step-type" class="form-control">
+                                                       <option value="tcp">TCP/IP based connection</option>
+                                                       <option value="socket" {f:if(condition:'{host} == \'localhost\'',then:'selected="selected"')}>Socket based connection</option>
+                                               </select>
+                                       </div>
+                               </div>
+                               <div class="form-group">
+                                       <label for="t3-install-step-host" class="control-label col-md-2">Host</label>
+                                       <div class="col-md-10">
+                                               <input id="t3-install-step-host" class="t3-install-form-input-text form-control" type="text" value="{host}" name="install[values][host]" />
+                                       </div>
+                               </div>
+                       </f:if>
+                       <f:if condition="{renderConnectDetailsPort}">
+                               <div class="form-group">
+                                       <label for="t3-install-step-port" class="control-label col-md-2">Port</label>
+                                       <div class="col-md-10">
+                                               <input id="t3-install-step-port" class="t3-install-form-input-text form-control" type="text" value="{port}" name="install[values][port]" />
+                                       </div>
+                               </div>
+                       </f:if>
+                       <f:if condition="{renderConnectDetailsSocket}">
+                               <div class="form-group">
+                                       <label for="t3-install-step-socket" class="control-label col-md-2">Socket</label>
+                                       <div class="col-md-10">
+                                               <input id="t3-install-step-socket" class="t3-install-form-input-text form-control" type="text" value="{socket}" name="install[values][socket]" placeholder="Default socket or enter name" />
+                                       </div>
+                               </div>
+                       </f:if>
+                       <f:if condition="{renderConnectDetailsDatabase}">
+                               <div class="form-group">
+                                       <label for="t3-install-step-database" class="control-label col-md-2">Database</label>
+                                       <div class="col-md-10">
+                                               <input id="t3-install-step-database" class="t3-install-form-input-text form-control" type="text" value="{database}" name="install[values][database]" />
+                                       </div>
+                               </div>
+                       </f:if>
+                       <f:if condition="{renderConnectDetailsOracleSidConnect}">
+                               <div class="form-group">
+                                       <label for="t3-install-form-type" class="control-label col-md-2">Oracle Sid</label>
+                                       <div class="col-md-10"><select id="t3-install-form-type" name="install[values][type]" class="form-control">
+                                               <option value="servicename">Service name</option>
+                                               <f:if condition="{oracleSidSelected}">
+                                                       <f:then>
+                                                               <option value="sid" selected="selected">SID</option>
+                                                       </f:then>
+                                                       <f:else>
+                                                               <option value="sid">SID</option>
+                                                       </f:else>
+                                               </f:if>
+                                       </select></div>
+                               </div>
+                       </f:if>
 
-       <button class="btn btn-default" type="submit">
-               Continue
-       </button>
-</form>
-<hr />
\ No newline at end of file
+                       <button class="btn btn-success" type="submit">
+                               Continue
+                       </button>
+               </form>
+               <hr />
+       </div>
+</div>
\ No newline at end of file
index 0017a7b..79c5915 100644 (file)
@@ -9,8 +9,8 @@
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <input type="hidden" value="execute" name="install[set]" />
        <input type="hidden" value="1" name="install[values][loadDbal]" />
-       <button class="btn btn-default" type="submit">
+       <button class="btn btn-warning" type="submit">
                I do not use MySQL
                <span class="t3-install-form-button-icon-negative">&nbsp;</span>
        </button>
-</form>
\ No newline at end of file
+</form>
index 827827f..4265f79 100644 (file)
 
 <form method="post" class="form-horizontal">
 <div class="row">
-       <div class="col-sm-4">Number of temporary files:</div>
+       <div class="col-sm-4"><strong class="pull-right">Number of temporary files</strong></div>
        <div class="col-sm-8">{typo3TempData.numberOfFilesInSelectedDirectory}</div>
 </div>
 <div class="row">
-       <div class="col-sm-4">Number matching:</div>
+       <div class="col-sm-4"><strong class="pull-right">Number matching</strong></div>
        <div class="col-sm-8">{typo3TempData.numberOfFilesMatchingCriteria}     </div>
 </div>
 <div class="row">
-       <div class="col-sm-4">Number deleted:</div>
+       <div class="col-sm-4"><strong class="pull-right">Number deleted</strong></div>
        <div class="col-sm-8">{typo3TempData.numberOfDeletedFiles}</div>
 </div>
+<br>
 <div class="row">
        <div class="form-group">
                <label for="t3-install-delete" class="col-sm-4 control-label">Delete files by condition</label>
@@ -52,7 +53,7 @@
                </div>
        </div>
        <div class="form-group">
-               <label for="t3-install-action" class="col-sm-4 control-label">Number of files at a time:</label>
+               <label for="t3-install-action" class="col-sm-4 control-label">Number of files at a time</label>
                <div class="col-sm-7">
                        <select
                                        id="t3-install-action"
@@ -68,7 +69,7 @@
        </div>
 
        <div class="form-group">
-               <label for="t3-install-subdirectory" class="col-sm-4 control-label">From sub-directory:</label>
+               <label for="t3-install-subdirectory" class="col-sm-4 control-label">From sub-directory</label>
                <div class="col-sm-7">
                        <select
                                id="t3-install-subdirectory"
index 7fe2e2c..e3cd700 100644 (file)
@@ -41,5 +41,5 @@
                                        />
                </div>
        </div>
-       <f:render partial="Action/Common/SubmitButton" arguments="{name:'createAdministrator', text:'Create administrator'}"/>
+       <f:render partial="Action/Common/SubmitButton" arguments="{name:'createAdministrator', text:'Create administrator user'}"/>
 </form>
index 157006f..593ad31 100644 (file)
@@ -1,7 +1,7 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
 <h3>Main system information</h3>
-<table class="table table-striped">
+<table class="table table-striped table-bordered">
        <tr>
                <td>Operating system:</td>
                <td><strong>{operatingSystem}</strong></td>
index 9e2b2a6..098dd67 100644 (file)
@@ -1,5 +1,5 @@
 <p>
-       If you upgrade your TYPO3 installation from one major version to another (e.g. 6.1 to 6.2),
+       If you upgrade your TYPO3 installation from one major version to another (e.g. 6.2 to 7 LTS),
        then the Upgrade Wizards guide you through the necessary steps to upgrade your database
        records or explicitly install extensions that ship with the latest TYPO3 version.
 </p>
@@ -17,7 +17,7 @@
                                        <div>
                                                <f:render
                                                        partial="Action/Common/SubmitButton"
-                                                       arguments="{name:'getUserInput', text:'Execute'}"
+                                                       arguments="{name:'getUserInput', text:'Execute', className: 'btn-primary'}"
                                                />
                                        </div>
                                </f:if>
index 7c49bb2..f6c3c72 100644 (file)
@@ -9,74 +9,76 @@
 
        <p>
                Import basic database structure and create a backend administrator user.
+       </p>
+       <p>
                The password can be used to log in to the <strong>install tool</strong> and the <strong>TYPO3 CMS backend</strong>
                (default username is "admin").
        </p>
+       <p>&nbsp;</p>
 
-       <form method="post" id="stepInstaller-databaseData" class="t3-install-form-label-before form-horizontal">
-               <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-               <input type="hidden" value="execute" name="install[set]" />
-               <div class="form-group">
-                       <label for="password" class="control-label col-md-2">Username</label>
-                       <div class="col-md-10">
-                               <input
-                                               class="t3-install-form-input-text form-control"
-                                               name="install[values][username]"
-                                               id="username"
-                                               placeholder="admin"
-                                               autocomplete="off"
-                                               />
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="password" class="control-label col-md-2">Password</label>
-                       <div class="col-md-10">
-                               <input
-                                               class="t3-install-form-input-text t3-install-form-password-strength form-control"
-                                               name="install[values][password]"
-                                               id="password"
-                                               type="password"
-                                               autocomplete="off"
-                                               />
-                       </div>
-               </div>
-               <div class="row">
-                       <div class="col-md-2"></div>
-                       <div class="col-md-10">
-                               <div class="checkbox">
-                                       <label>
+       <div class="row">
+               <div class="col-md-6">
+                       <form method="post" id="stepInstaller-databaseData" class="t3-install-form-label-before form-horizontal">
+                               <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
+                               <input type="hidden" value="execute" name="install[set]" />
+                               <div class="form-group">
+                                       <label for="password" class="control-label col-md-2">Username</label>
+                                       <div class="col-md-10">
                                                <input
-                                                       type="checkbox"
-                                                       id="show-password"
-                                                       onchange="if (this.checked==true) { document.getElementById('password').type='text'; } else { document.getElementById('password').type='password'; }"
-                                               />
-                                               Show password
-                                       </label>
+                                                               class="t3-install-form-input-text form-control"
+                                                               name="install[values][username]"
+                                                               id="username"
+                                                               placeholder="admin"
+                                                               autocomplete="off"
+                                                               />
+                                       </div>
                                </div>
-                       </div>
-               </div>
-               <div class="row">
-                       <div class="col-md-2"></div>
-                       <div class="col-md-10">
-                               <div class="alert alert-warning">
-                                       This password gives an attacker full control over your instance if cracked. It should be strong (include lower and upper case characters, special characters and numbers) and must be at least eight characters long.
+                               <div class="form-group">
+                                       <label for="password" class="control-label col-md-2">Password</label>
+                                       <div class="col-md-10">
+                                               <input
+                                                               class="t3-install-form-input-text t3-install-form-password-strength form-control"
+                                                               name="install[values][password]"
+                                                               id="password"
+                                                               type="password"
+                                                               autocomplete="off"
+                                                               />
+                                               <div class="checkbox">
+                                                       <label>
+                                                               <input
+                                                                       type="checkbox"
+                                                                       id="show-password"
+                                                                       onchange="if (this.checked==true) { document.getElementById('password').type='text'; } else { document.getElementById('password').type='password'; }"
+                                                               />
+                                                               Show password
+                                                       </label>
+                                               </div>
+                                       </div>
                                </div>
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="sitename" class="control-label col-md-2">Site name</label>
-                       <div class="col-md-10">
-                               <input
-                                               class="t3-install-form-input-text form-control"
-                                               name="install[values][sitename]"
-                                               id="sitename"
-                                               type="text"
-                                               value="{siteName}"
-                                               />
-                       </div>
+                               <div class="row">
+                                       <div class="col-md-2"></div>
+                                       <div class="col-md-10">
+                                               <div class="alert alert-warning">
+                                                       This password gives an attacker full control over your instance if cracked. It should be strong (include lower and upper case characters, special characters and numbers) and must be at least eight characters long.
+                                               </div>
+                                       </div>
+                               </div>
+                               <div class="form-group">
+                                       <label for="sitename" class="control-label col-md-2">Site name</label>
+                                       <div class="col-md-10">
+                                               <input
+                                                               class="t3-install-form-input-text form-control"
+                                                               name="install[values][sitename]"
+                                                               id="sitename"
+                                                               type="text"
+                                                               value="{siteName}"
+                                                               />
+                                       </div>
+                               </div>
+                               <button class="btn btn-success" type="submit">
+                                       Continue
+                               </button>
+                       </form>
                </div>
-               <button class="btn btn-default" type="submit">
-                       Continue
-               </button>
-       </form>
+       </div>
 </f:section>
index 7aeefd1..24344b3 100644 (file)
                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
                <input type="hidden" value="execute" name="install[set]" />
 
-               <f:if condition="{isInitialInstallationInProgress}">
+               <p>&nbsp;</p>
+               <div class="row">
+                       <div class="col-md-6">
 
-                       <f:then>
-                               <f:comment>
-                                       First installation
-                               </f:comment>
-                               <div class="radio">
-                                       <label for="t3-install-form-db-select-type-existing">
-                                               <input id="t3-install-form-db-select-type-existing" type="radio" name="install[values][type]" value="existing" class="radio" checked="checked" />
-                                               Use an existing empty database:
-                                       </label>
-                               </div>
-                               <div class="form-group">
-                                       <select
-                                                       id="t3-install-step-database-existing"
-                                                       name="install[values][existing]"
-                                                       class="form-control"
-                                                       onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
-                                                       >
-                                               <option value="">-- Select database --</option>
-                                               <f:for each="{databaseList}" as="database">
-                                                       <f:if condition="{database.tables}">
-                                                               <f:then>
-                                                                       <option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
-                                                               </f:then>
-                                                               <f:else>
-                                                                       <option value="{database.name}">{database.name}</option>
-                                                               </f:else>
-                                                       </f:if>
-                                               </f:for>
-                                       </select>
-                               </div>
-                               <div class="radio">
-                                       <label for="t3-install-step-database-new">
+                               <f:if condition="{isInitialInstallationInProgress}">
+
+                                       <f:then>
+                                               <f:comment>
+                                                       First installation
+                                               </f:comment>
+                                               <div class="radio">
+                                                       <label for="t3-install-form-db-select-type-existing">
+                                                               <input id="t3-install-form-db-select-type-existing" type="radio" name="install[values][type]" value="existing" class="radio" checked="checked" />
+                                                               Use an existing empty database:
+                                                       </label>
+                                               </div>
+                                               <div class="form-group">
+                                                       <select
+                                                                       id="t3-install-step-database-existing"
+                                                                       name="install[values][existing]"
+                                                                       class="form-control"
+                                                                       onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
+                                                                       >
+                                                               <option value="">-- Select database --</option>
+                                                               <f:for each="{databaseList}" as="database">
+                                                                       <f:if condition="{database.tables}">
+                                                                               <f:then>
+                                                                                       <option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
+                                                                               </f:then>
+                                                                               <f:else>
+                                                                                       <option value="{database.name}">{database.name}</option>
+                                                                               </f:else>
+                                                                       </f:if>
+                                                               </f:for>
+                                                       </select>
+                                               </div>
+                                               <div class="radio">
+                                                       <label for="t3-install-step-database-new">
+                                                               <input
+                                                                               id="t3-install-form-db-select-type-new"
+                                                                               type="radio"
+                                                                               name="install[values][type]"
+                                                                               value="new"
+                                                                               class="radio"
+                                                                               />
+                                                               OR create a new database:</label>
+                                               </div>
+                                               <div class="form-group">
+                                                       <p>
+                                                               <em>Attention: The database user must have sufficient privileges to create the whole structure.</em>
+                                                               <br />
+                                                               Enter a name for your TYPO3 database.
+                                                       </p>
+                                                       <input
+                                                               id="t3-install-step-database-new"
+                                                               class="t3-install-form-input-text form-control"
+                                                               type="text"
+                                                               name="install[values][new]"
+                                                               checked="checked"
+                                                               onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
+                                                       />
+                                               </div>
+                                       </f:then>
+
+                                       <f:else>
+                                               <f:comment>
+                                                       Upgrading
+                                               </f:comment>
                                                <input
-                                                               id="t3-install-form-db-select-type-new"
-                                                               type="radio"
-                                                               name="install[values][type]"
-                                                               value="new"
-                                                               class="radio"
-                                                               />
-                                               OR create a new database:</label>
-                               </div>
-                               <div class="form-group">
-                                       <p>
-                                               <em>Attention: The database user must have sufficient privileges to create the whole structure.</em>
-                                               <br />
-                                               Enter a name for your TYPO3 database.
-                                       </p>
-                                       <input
-                                               id="t3-install-step-database-new"
-                                               class="t3-install-form-input-text form-control"
-                                               type="text"
-                                               name="install[values][new]"
-                                               checked="checked"
-                                               onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
-                                       />
-                               </div>
-                       </f:then>
+                                                       id="t3-install-form-db-select-type-existing"
+                                                       type="hidden"
+                                                       name="install[values][type]"
+                                                       value="existing"
+                                               />
+                                               <div class="">
+                                                       <label for="t3-install-step-database-existing">Select an existing database:</label>
+                                                       <p>The database will not be altered in any way.</p>
+                                                       <select
+                                                               id="t3-install-step-database-existing"
+                                                               name="install[values][existing]"
+                                                               onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
+                                                       >
+                                                               <option value="">Select database</option>
+                                                               <f:for each="{databaseList}" as="database">
+                                                                       <option value="{database}">{database}</option>
+                                                               </f:for>
+                                                       </select>
+                                               </div>
+                                       </f:else>
 
-                       <f:else>
-                               <f:comment>
-                                       Upgrading
-                               </f:comment>
-                               <input
-                                       id="t3-install-form-db-select-type-existing"
-                                       type="hidden"
-                                       name="install[values][type]"
-                                       value="existing"
-                               />
-                               <div class="">
-                                       <label for="t3-install-step-database-existing">Select an existing database:</label>
-                                       <p>The database will not be altered in any way.</p>
-                                       <select
-                                               id="t3-install-step-database-existing"
-                                               name="install[values][existing]"
-                                               onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
-                                       >
-                                               <option value="">Select database</option>
-                                               <f:for each="{databaseList}" as="database">
-                                                       <option value="{database}">{database}</option>
-                                               </f:for>
-                                       </select>
+                               </f:if>
+                               <div class="form-group">
+                                       <button class="btn btn-success" type="submit">
+                                               Continue
+                                       </button>
                                </div>
-                       </f:else>
-
-               </f:if>
-               <div class="form-group">
-                       <button class="btn btn-default" type="submit">
-                               Continue
-                       </button>
+                       </div>
                </div>
        </form>
-</f:section>
\ No newline at end of file
+</f:section>
index ea8721b..086080d 100644 (file)
@@ -7,13 +7,14 @@
 
        <h3>Installation done!</h3>
 
-       <div class="alert alert-success">
+       <p>
                The only thing remaining is to set some configuration values based on your
                system environment, which happens automatically in this step.
                Then you will be redirected to your TYPO3 CMS backend, ready for you to log in
                with the user you just created.
-       </div>
+       </p>
 
+       <p>&nbsp;</p>
        <div class="alert alert-notice">
                <h4>Want a pre-configured site?</h4>
                <p>
@@ -48,8 +49,8 @@
                                </label>
                        </div>
                </div>
-               <button class="btn btn-default" type="submit">
-                       Open the backend
+               <button class="btn btn-success" type="submit">
+                       Open the TYPO3 Backend
                </button>
        </form>
 </f:section>
index e858696..7b4dba5 100644 (file)
        <f:if condition="{errorsOrWarningsFromStatus}">
                <f:then>
                        <form method="post">
-                               <button class="btn btn-default" type="submit">
-                                       Fixed. Check again!
-                               </button>
+                               <div class="form-group">
+                                       <button class="btn btn-default" type="submit">
+                                               Fixed. Check again!
+                                       </button>
+                               </div>
                        </form>
 
                        <form method="post">
-                               <input type="hidden" value="environmentAndFolders" name="install[action]" />
-                               <input type="hidden" value="execute" name="install[set]" />
-                               <button class="btn btn-default" type="submit">
-                                       I know what I'm doing, continue!
-                                       <span class="t3-install-form-button-icon-negative">&nbsp;</span>
-                               </button>
+                               <div class="form-group">
+                                       <input type="hidden" value="environmentAndFolders" name="install[action]" />
+                                       <input type="hidden" value="execute" name="install[set]" />
+                                       <button class="btn btn-danger" type="submit">
+                                               I know what I'm doing, continue!
+                                               <span class="t3-install-form-button-icon-negative">&nbsp;</span>
+                                       </button>
+                               </div>
                        </form>
                </f:then>
                <f:else>
                        <form method="post">
                                <input type="hidden" value="environmentAndFolders" name="install[action]" />
                                <input type="hidden" value="execute" name="install[set]" />
-                               <button class="btn btn-default" type="submit">
+                               <button class="btn success" type="submit">
                                        System looks good. Continue!
                                </button>
                        </form>
@@ -44,7 +48,8 @@
        </f:if>
 
        <f:if condition="{errorsOrWarningsFromStatus}">
-               <p>Detailed analysis</p>
+               <br>
+               <h3>Detailed analysis</h3>
 
                <f:if condition="{structureErrors}">
                        <f:for each="{structureErrors}" as="message">
@@ -65,4 +70,4 @@
                </f:if>
        </f:if>
 
-</f:section>
\ No newline at end of file
+</f:section>
index 01f2444..403a47a 100644 (file)
@@ -8,7 +8,7 @@
                        <h1>About</h1>
                </f:then>
                <f:else>
-                       <h1>TYPO3 CMS {typo3Version} Install tool on site: {siteName}
+                       <h1>TYPO3 CMS {typo3Version} Install tool on site: {siteName}</h1>
                </f:else>
        </f:if>
 
        <p>
                These are the primary steps for you to take:
        </p>
+
+       <hr />
+       <h4>1: Important actions</h4>
        <p>
-               <strong>1: Important actions</strong>
-               <br />
                This step provides an overview of the main system information
                (operating system, PHP information and database).
                <br />
                                are no admin users in the database, for instance if this is a blank database</li>
                </ul>
        </p>
+
+       <hr />
+       <h4>2: Configuration presets</h4>
        <p>
-               <strong>2: Configuration presets</strong>
-               <br />
                The following configuration preset groups are available here:
                <ul>
                        <li><strong>Character set conversion settings</strong> - charset conversion.</li>
                        <li><strong>Extbase object cache</strong> - choose between APC / Database cache backend</li>
                </ul>
        </p>
+
+       <hr />
+       <h4>3: All configuration</h4>
        <p>
-               <strong>3: All configuration</strong>
-               <br />
                In this step you can change the configuration values of your TYPO3 CMS installation.
        </p>
+
+       <hr />
+       <h4>4: Upgrade Wizard</h4>
        <p>
-               <strong>4: Upgrade Wizard</strong>
-               <br />
                If you upgrade your TYPO3 CMS installation from one version to another (e.g. 6.1 to 6.2),
                then the Upgrade Wizards guide you through the necessary steps to upgrade your database records
                or explicitly install extensions that ship with the latest TYPO3 CMS version.
        </p>
+
+       <hr />
+       <h4>5: System environment</h4>
        <p>
-               <strong>5: System environment</strong>
-               <br />
                In this step your system environment is checked. If there are any settings that will prevent TYPO3 CMS from
                running correctly, you'll get warnings and errors with a description of the problem.
        </p>
+
+       <hr />
+       <h4>6: Folder structure</h4>
        <p>
-               <strong>6: Folder structure</strong>
-               <br />
                This step checks the folder structure of your TYPO3 CMS installation and fixes errors that you might have
                with files or folders.
        </p>
+
+       <hr />
+       <h4>7: Test setup</h4>
        <p>
-               <strong>7: Test setup</strong>
-               <br />
                This gives you a set of tests for your TYPO3 CMS installation in order to test system settings:
                <ul>
                        <li>Mail setup</li>
                        <li>GDlib</li>
                </ul>
        </p>
+
+       <hr />
+       <h4>8: Clean up</h4>
        <p>
-               <strong>8: Clean up</strong>
-               <br />
                Here you can clean up temporary files in the typo3temp/ folder and the database tables used for
                caching. Furthermore you can reset the preferences of all backend users.
        </p>