[TASK] Improve Installer database selection step 70/23770/4
authorMarkus Klein <klein.t3@mfc-linz.at>
Wed, 11 Sep 2013 22:53:01 +0000 (00:53 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 12 Sep 2013 15:20:10 +0000 (17:20 +0200)
Make the following adaption:
 * Change the order of the two options.
 * Preselect the first, empty, existing database.
 * Add a hint, that the user must have sufficient privileges
   to create a new database.

Resolves: #51931
Releases: 6.2
Change-Id: I823a194ddd1dc3aad2d560354bce20855c5c372c
Reviewed-on: https://review.typo3.org/23770
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html

index 8e7c369..8f304f2 100644 (file)
                                        <ul>
                                                <li>
                                                        <input
-                                                               id="t3-install-form-db-select-type-new"
-                                                               type="radio"
-                                                               name="install[values][type]"
-                                                               value="new"
-                                                               checked="checked"
-                                                               class="radio"
-                                                       />
-                                                       <div>
-                                                               <label for="t3-install-step-database-new">Create a new database (recommended):</label>
-                                                               <p>Enter a name for your TYPO3 database.</p>
-                                                               <input
-                                                                       id="t3-install-step-database-new"
-                                                                       class="t3-install-form-input-text"
-                                                                       type="text"
-                                                                       name="install[values][new]"
-                                                                       checked="checked"
-                                                                       onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
-                                                               />
-                                                       </div>
-                                               </li>
-                                               <li>
-                                                       <input
                                                                id="t3-install-form-db-select-type-existing"
                                                                type="radio"
                                                                name="install[values][type]"
                                                                value="existing"
                                                                class="radio"
+                                                               checked="checked"
                                                        />
                                                        <div>
                                                                <label for="t3-install-step-database-existing">Select an EMPTY existing database:</label>
                                                                        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 each="{databaseList}" as="database" iteration="databaseIterator">
+                                                                               <option value="{database}"{f:if(condition: databaseIterator.isFirst ,then: ' selected="selected"')}>{database}</option>
                                                                        </f:for>
                                                                </select>
                                                        </div>
                                                </li>
+                                               <li>
+                                                       <input
+                                                               id="t3-install-form-db-select-type-new"
+                                                               type="radio"
+                                                               name="install[values][type]"
+                                                               value="new"
+                                                               class="radio"
+                                                       />
+                                                       <div>
+                                                               <label for="t3-install-step-database-new">Create a new database:</label>
+                                                               <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"
+                                                                       type="text"
+                                                                       name="install[values][new]"
+                                                                       checked="checked"
+                                                                       onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
+                                                               />
+                                                       </div>
+                                               </li>
                                        </ul>
                                </f:then>
 
                        Continue
                </button>
        </form>
-</f:section>
+</f:section>
\ No newline at end of file