projects / Packages / TYPO3.CMS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cfc62a6)
Follow-up to bug #14365: Bug: Install Tool skin is sometimes wrong (thanks to Lars...
authorSteffen Kamper <info@sk-typo3.de>
Fri, 14 May 2010 11:58:47 +0000 (11:58 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Fri, 14 May 2010 11:58:47 +0000 (11:58 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7611 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog patch | blob | history
typo3/install/index.php patch | blob | history
typo3/templates/install.html patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index b19e78b..af5d474 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-05-14  Steffen Kamper  <info@sk-typo3.de>
 
+       * Follow-up to bug #14365: Bug: Install Tool skin is sometimes wrong (thanks to Lars Houmark)
        * Fixed bug #14367: Install Tool does not provide a logout possibility (thanks to Lars Houmark)
 
 2010-05-13  Ernesto Baschny  <ernst@cron-it.de>
diff --git a/typo3/install/index.php b/typo3/install/index.php
index fb242c3..0264843 100755 (executable)
--- a/typo3/install/index.php
+++ b/typo3/install/index.php
@@ -67,21 +67,21 @@ if (1==2 || !is_file($enableInstallToolFile)) {
                // Include t3lib_div and t3lib_parsehtml for templating
        require_once($PATH_site . '/t3lib/class.t3lib_div.php');
        require_once($PATH_site . '/t3lib/class.t3lib_parsehtml.php');
-               // Get the referer to define if this is called from backend or stand alone
-       $referer = parse_url(t3lib_div::getIndpEnv('HTTP_REFERER'));
-               // Define body class when stand alone
-       if (!strpos($referer['path'], 'backend.php')) {
-               $bodyClass = 'class="standalone"';
-       }
+
                // Define the stylesheet
        $stylesheet = '<link rel="stylesheet" type="text/css" href="' .
                '../stylesheets/install/install.css" />';
+       $javascript = '<script type="text/javascript" src="' .
+               '../contrib/prototype/prototype.js"></script>' . LF;
+       $javascript .= '<script type="text/javascript" src="' .
+               '../sysext/install/Resources/Public/Javascript/install.js"></script>';
+       
                // Get the template file
        $template = @file_get_contents($PATH_site . '/typo3/templates/install.html');
                // Define the markers content
        $markers = array(
-               'bodyClass' => $bodyClass,
                'styleSheet' => $stylesheet,
+               'javascript' => $javascript,
                'title' => 'The install tool is locked',
                'content' => '
                        <p>
diff --git a/typo3/templates/install.html b/typo3/templates/install.html
index 12960ba..683008b 100644 (file)
--- a/typo3/templates/install.html
+++ b/typo3/templates/install.html
@@ -8,8 +8,9 @@
                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                <title>###TITLE###</title>
                ###STYLESHEET###
+               ###JAVASCRIPT###
        </head>
-       <body ###BODYCLASS###>
+       <body>
                <div id="container">
                        <h1>TYPO3</h1>
                        <div class="typo3-message message-warning">
TYPO3 CMS Core Development