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 @@
-