Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (revision 7388) +++ typo3/sysext/install/mod/class.tx_install.php (working copy) @@ -181,7 +181,6 @@ var $scriptSelf = 'index.php'; // The url that calls this script var $updateIdentity = 'TYPO3 Install Tool'; var $headerStyle =''; - var $contentBeforeTable=''; var $setAllCheckBoxesByDefault=0; var $allowFileEditOutsite_typo3conf_dir=0; @@ -3166,7 +3165,7 @@ } if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(TYPO3_db_host, TYPO3_db_username, TYPO3_db_password)) { $this->message($ext, 'Connected to SQL database successfully', ' -
+
Username:
@@ -4461,7 +4460,7 @@ $im_path_lzw = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw']; $im_path_lzw_version = $this->config_array['im_versions'][$im_path_lzw]['convert']; $msg = ' -
+
ImageMagick enabled:
@@ -4487,7 +4486,7 @@ ' . ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] ? $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] : ' ') . '
-
+
GDLib enabled:
@@ -4528,7 +4527,7 @@ (Should be set for some IM versions approx. 5.4+)
-
+
File Formats:
@@ -5495,7 +5494,7 @@ ', 0); $this->message($headCode, 'Connected to SQL database successfully', ' -
+
Username:
@@ -5617,7 +5616,7 @@ files you want to either compare or import/merge with the existing database.

-
+
COMPARE:
@@ -7842,7 +7841,7 @@ // Define the markers content $markers = array( 'class' => ($this->INSTALL['type']==$k ? 'class="act"' : ''), - 'id' => $k, + 'id' => 't3-install-menu-' . $k, 'url' => htmlspecialchars( $this->scriptSelf . '?TYPO3_INSTALL[type]=' . @@ -8111,7 +8110,7 @@ 'label' => $label, 'tableId' => $tableId, 'checked' => ($checked ? ' checked="checked"' : ''), - 'selectAllId' => $tableId . '-checkbox', + 'selectAllId' => 't3-install-' . $tableId . '-checkbox', 'selectDeselectAll' => 'select/deselect all' ); // Fill the markers in the subpart @@ -8138,7 +8137,7 @@ $warnings = array(); // Define the markers content $rowsMarkers = array( - 'checkboxId' => 'db-' . $key, + 'checkboxId' => 't3-install-db-' . $key, 'name' => $this->dbUpdateCheckboxPrefix . '[' . $key . ']', 'checked' => ($checked ? 'checked="checked"' : ''), 'string' => htmlspecialchars($string) Index: typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html (working copy) @@ -14,22 +14,22 @@
  1. - - + +
  2. - - + +
  3. -
-
+
  1. - +
Index: typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html (working copy) @@ -10,7 +10,7 @@ - +
@@ -22,26 +22,26 @@ - +
    -
  1. - - +
  2. + +
  3. - - + +
  4. ###COMMENT###
-
+
  1. - +
Index: typo3/sysext/install/Resources/Private/Templates/CheckMail.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CheckMail.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CheckMail.html (working copy) @@ -17,19 +17,19 @@
  1. - - + +
  2. -
  3. - - +
  4. + +
-
+
  1. - +
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html (working copy) @@ -10,23 +10,23 @@ -
+
  1. - - + +
-
+
  1. - - + +
  2. - - + +
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html (working copy) @@ -20,19 +20,19 @@ -
+
    -
  1. - -
  2. + + Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html (working copy) @@ -11,13 +11,13 @@ -
    +
      -
    1. - -
    2. + +
###FILE###
+
@@ -35,7 +35,7 @@   @@ -54,17 +54,17 @@ ###FILESHORTNAME### (###FILESIZE###) @@ -75,7 +75,7 @@   @@ -85,7 +85,7 @@   @@ -95,7 +95,7 @@   @@ -105,13 +105,13 @@  
###UPDATEREQUIREDTABLES### - + ###COMPARE### - + ###IMPORT### - + ###COMPARE### - + ###IMPORT######SPECS### - + ###VIEW######SPECS### - + ###COMPAREWITHTCA### - + ###CREATEADMINUSER### - + ###RESETUSERPREFERENCES### - + ###CLEARTABLES###
- + \ No newline at end of file Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html (working copy) @@ -10,11 +10,11 @@ -
+
  1. - - + +
Index: typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html (working copy) @@ -10,7 +10,7 @@ -
+
###NUMBERCACHED###
@@ -22,8 +22,8 @@
  1. - - @@ -31,10 +31,10 @@
-
+
  1. - +
Index: typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html (working copy) @@ -10,7 +10,7 @@ - +
Index: typo3/sysext/install/Resources/Private/Templates/DisplayFields.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/DisplayFields.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/DisplayFields.html (working copy) @@ -10,10 +10,10 @@ - +
- -
+ ###HEADERFIELDNAME### @@ -24,7 +24,7 @@
+ ###FIELDNAME### Index: typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html (working copy) @@ -11,10 +11,10 @@ - +
- -
+ ###HEADERFIELDNAME### @@ -38,7 +38,7 @@
+ ###FIELDNAME### Index: typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html (working copy) @@ -11,7 +11,7 @@ - +
@@ -23,7 +23,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -84,7 +84,7 @@

-
+
@@ -100,7 +100,7 @@
-
+
Index: typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html (working copy) @@ -16,22 +16,22 @@ ###DESCRIPTION### -
  • - +
  • +
  • -
  • +
  • - +
  • -
  • - - +
  • + +
  • Index: typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html (working copy) @@ -14,13 +14,13 @@ ###LABEL###
      -
    1. +
    2. -
    3. +
    Index: typo3/sysext/install/Resources/Private/Templates/ImageMenu.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/ImageMenu.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/ImageMenu.html (working copy) @@ -10,7 +10,7 @@ -
      +
      1. Index: typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html (working copy) @@ -17,7 +17,7 @@
      2. Index: typo3/sysext/install/Resources/Private/Templates/Install.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/Install.html (revision 7388) +++ typo3/sysext/install/Resources/Private/Templates/Install.html (working copy) @@ -11,14 +11,13 @@ ###STYLESHEETS### -
        ###CONTENTBEFORETABLE###
        -
        +

        ###TITLE###

        ###HEADTITLE###

        -
        + -