[TASK] Move install.html to EXT: install 75/20475/3
authorFelix Kopp <felix-source@phorax.com>
Fri, 3 May 2013 17:35:17 +0000 (19:35 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 4 May 2013 07:20:43 +0000 (09:20 +0200)
Moves typo3/templates/install.html to EXT: install as Notice.html

Change-Id: If2f663ba88bf952a8c15c3478dd277d796a283f7
Fixes: #47896
Releases: 6.2
Reviewed-on: https://review.typo3.org/20475
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
typo3/sysext/install/Classes/Controller/InstallToolModuleController.php
typo3/sysext/install/Classes/InstallBootstrap.php
typo3/sysext/install/Classes/Installer.php
typo3/sysext/install/Resources/Private/Templates/Notice.html [new file with mode: 0644]
typo3/templates/install.html [deleted file]

index bf188d4..a7e1fa6 100644 (file)
@@ -91,7 +91,7 @@ class InstallToolModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptCl
                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\ErrorpageMessage');
                $message->setTitle($GLOBALS['LANG']->sL('LLL:EXT:install/mod/locallang_mod.xlf:confirmUnlockInstallToolTitle'));
                $message->setSeverity(\TYPO3\CMS\Core\Messaging\ErrorpageMessage::WARNING);
-               $message->setHtmlTemplate('/typo3/templates/install.html');
+               $message->setHtmlTemplate('/typo3/sysext/install/Resources/Private/Templates/Notice.html');
                $content = $GLOBALS['LANG']->sL('LLL:EXT:install/mod/locallang_mod.xlf:confirmUnlockInstallToolMessage') . '<button type="submit">' . $GLOBALS['LANG']->sL('LLL:EXT:install/mod/locallang_mod.xlf:confirmUnlockInstallToolButton') . '<span class="t3-install-form-button-icon-positive">&nbsp;</span></button>';
                $messageMarkers = array();
                $messageMarkers['###CONTENT###'] = $content;
index 332c504..dba0f32 100644 (file)
@@ -102,7 +102,7 @@ class InstallBootstrap {
                $javascript = '<script type="text/javascript" src="' . '../contrib/prototype/prototype.js"></script>';
                $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'));
+               $template = @file_get_contents(PATH_site . 'typo3/sysext/install/Resources/Private/Templates/Notice.html');
                // Define the markers content
                $markers = array(
                        'styleSheet' => $stylesheet,
index 69edd55..3090d5d 100644 (file)
@@ -6111,7 +6111,7 @@ REMOTE_ADDR was \'' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . '\' (' . Gener
                $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'));
+               $template = @file_get_contents(PATH_site . 'typo3/sysext/install/Resources/Private/Templates/Notice.html');
                // Define the markers content
                $markers = array(
                        'styleSheet' => $stylesheet,
diff --git a/typo3/sysext/install/Resources/Private/Templates/Notice.html b/typo3/sysext/install/Resources/Private/Templates/Notice.html
new file mode 100644 (file)
index 0000000..7f92fa9
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="###CHARSET###"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+               <title>###TITLE###</title>
+               <link rel="shortcut icon" href="../../../../../gfx/favicon.ico" />
+               ###STYLESHEET###
+               ###JAVASCRIPT###
+       </head>
+       <body>
+               <div id="container">
+                       <h1>TYPO3</h1>
+                       <div class="typo3-message message-warning">
+                               <h2>###TITLE###</h2>
+                               ###CONTENT###
+                       </div>
+               </div>
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/templates/install.html b/typo3/templates/install.html
deleted file mode 100644 (file)
index 1f08cdf..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="###CHARSET###"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-       <head>
-               <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-               <title>###TITLE###</title>
-               <link rel="shortcut icon" href="../gfx/favicon.ico" />
-               ###STYLESHEET###
-               ###JAVASCRIPT###
-       </head>
-       <body>
-               <div id="container">
-                       <h1>TYPO3</h1>
-                       <div class="typo3-message message-warning">
-                               <h2>###TITLE###</h2>
-                               ###CONTENT###
-                       </div>
-               </div>
-       </body>
-</html>
\ No newline at end of file